diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
| commit | 01d9681a4d75be566f359f54fc37173b043befdf (patch) | |
| tree | da097e38d1c4f7b71b929ba6477156d5b5da3171 /src/server/worldserver | |
| parent | 4f6db255a23b8d321bea2265295fd09ba3095833 (diff) | |
| parent | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index a048a7d3a80..e482e3d4c37 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -146,7 +146,7 @@ BindIP = "0.0.0.0" # # ThreadPool -# Description: Number of threads to be used for the global thread pool +# Description: Number of threads to be used for the global thread pool # The thread pool is currently used for the signal handler and remote access # Default: 1 @@ -170,7 +170,7 @@ UseProcessors = 0 # # ProcessPriority # Description: Process priority setting for Windows and Linux based systems. -# Details: On Linux, a nice value of -15 is used. (requires superuser). +# Details: On Linux, a nice value of -15 is used. (requires superuser). # On Windows, process is set to HIGH class. # Default: 0 - (Normal) # 1 - (High) @@ -1052,7 +1052,7 @@ Account.PasswordChangeSecurity = 0 # # BirthdayTime -# Description: Set to date of project's birth in UNIX time. By default the date when +# Description: Set to date of project's birth in UNIX time. By default the date when # TrinityCore was started (Thu Oct 2, 2008) # Default: 1222964635 # @@ -2605,9 +2605,9 @@ UI.ShowQuestLevelsInDialogs = 0 # 1 - Prefix Timestamp to the text # 2 - Prefix Log Level to the text # 4 - Prefix Log Filter type to the text -# 8 - Append timestamp to the log file name. Format: YYYY-MM-DD_HH-MM-SS +# 8 - Append timestamp to the log file name. Format: YYYY-MM-DD_HH-MM-SS # (Only used with Type = 2) -# 16 - Make a backup of existing file before overwrite +# 16 - Make a backup of existing file before overwrite # (Only used with Mode = w) # # Colors (read as optional1 if Type = Console) @@ -2724,7 +2724,7 @@ Log.Async.Enable = 0 # # Allow.IP.Based.Action.Logging -# Description: Logs actions, e.g. account login and logout to name a few, based on IP of +# Description: Logs actions, e.g. account login and logout to name a few, based on IP of # current session. # Default: 0 - (Disabled) # 1 - (Enabled) |