Merge branch 'tajmone-Tristano-typos'

This commit is contained in:
Griatch 2015-03-01 12:52:18 +01:00
commit 80258d5506

View file

@ -123,7 +123,7 @@ LANGUAGE_CODE = 'en-us'
# How long time (in seconds) a user may idle before being logged # How long time (in seconds) a user may idle before being logged
# out. This can be set as big as desired. A user may avoid being # out. This can be set as big as desired. A user may avoid being
# thrown off by sending the empty system command 'idle' to the server # thrown off by sending the empty system command 'idle' to the server
# at regular intervals. Set <=0 to deactivate idle timout completely. # at regular intervals. Set <=0 to deactivate idle timeout completely.
IDLE_TIMEOUT = 3600 IDLE_TIMEOUT = 3600
# The idle command can be sent to keep your session active without actually # The idle command can be sent to keep your session active without actually
# having to spam normal commands regularly. It gives no feedback, only updates # having to spam normal commands regularly. It gives no feedback, only updates
@ -248,7 +248,7 @@ OOB_PLUGIN_MODULES = ["src.server.oob_cmds"]
# Default command sets # Default command sets
###################################################################### ######################################################################
# Note that with the exception of the unloggedin set (which is not # Note that with the exception of the unloggedin set (which is not
# stored anywhere in the databse), changing these paths will only affect # stored anywhere in the database), changing these paths will only affect
# NEW created characters/objects, not those already in play. So if you plan to # NEW created characters/objects, not those already in play. So if you plan to
# change this, it's recommended you do it before having created a lot of objects # change this, it's recommended you do it before having created a lot of objects
# (or simply reset the database after the change for simplicity). Remember # (or simply reset the database after the change for simplicity). Remember
@ -276,7 +276,7 @@ CMDSET_PATHS = ["game.gamesrc.commands"]
SERVER_SESSION_CLASS = "src.server.serversession.ServerSession" SERVER_SESSION_CLASS = "src.server.serversession.ServerSession"
# Base paths for typeclassed object classes. These paths must be # Base paths for typeclassed object classes. These paths must be
# defined relative evennia's root directory. They will be searched in # defined relatively to Evennia's root directory. They will be searched in
# order to find relative typeclass paths. # order to find relative typeclass paths.
OBJECT_TYPECLASS_PATHS = ["game.gamesrc.objects", OBJECT_TYPECLASS_PATHS = ["game.gamesrc.objects",
"game.gamesrc.objects.examples", "game.gamesrc.objects.examples",
@ -383,7 +383,7 @@ MULTISESSION_MODE = 0
# checked by the default ooc char-creation command. Forced to 1 for # checked by the default ooc char-creation command. Forced to 1 for
# MULTISESSION_MODE 0 and 1. # MULTISESSION_MODE 0 and 1.
MAX_NR_CHARACTERS = 1 MAX_NR_CHARACTERS = 1
# The access hiearchy, in climbing order. A higher permission in the # The access hierarchy, in climbing order. A higher permission in the
# hierarchy includes access of all levels below it. Used by the perm()/pperm() # hierarchy includes access of all levels below it. Used by the perm()/pperm()
# lock functions. # lock functions.
PERMISSION_HIERARCHY = ["Guests", # note-only used if GUEST_ENABLED=True PERMISSION_HIERARCHY = ["Guests", # note-only used if GUEST_ENABLED=True
@ -415,7 +415,7 @@ GUEST_HOME = DEFAULT_HOME
# The start position used for guest characters. # The start position used for guest characters.
GUEST_START_LOCATION = START_LOCATION GUEST_START_LOCATION = START_LOCATION
# The naming convention used for creating new guest # The naming convention used for creating new guest
# players/characters. The size of this list also detemines how many # players/characters. The size of this list also determines how many
# guests may be on the game at once. The default is a maximum of nine # guests may be on the game at once. The default is a maximum of nine
# guests, named Guest1 through Guest9. # guests, named Guest1 through Guest9.
GUEST_LIST = ["Guest" + str(s+1) for s in range(9)] GUEST_LIST = ["Guest" + str(s+1) for s in range(9)]
@ -496,7 +496,7 @@ DEBUG = False
# While true, show "pretty" error messages for template syntax errors. # While true, show "pretty" error messages for template syntax errors.
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
# Emails are sent to these people if the above DEBUG value is False. If you'd # Emails are sent to these people if the above DEBUG value is False. If you'd
# rather nobody recieve emails, leave this commented out or empty. # rather prefer nobody receives emails, leave this commented out or empty.
ADMINS = () #'Your Name', 'your_email@domain.com'),) ADMINS = () #'Your Name', 'your_email@domain.com'),)
# These guys get broken link notifications when SEND_BROKEN_LINK_EMAILS is True. # These guys get broken link notifications when SEND_BROKEN_LINK_EMAILS is True.
MANAGERS = ADMINS MANAGERS = ADMINS