From 21fb427ffc41858edd8edc21280609ddca0d6b22 Mon Sep 17 00:00:00 2001
From: Nay <dnpd.dd@gmail.com>
Date: Thu, 16 Aug 2012 20:17:29 +0100
Subject: Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist
---
 src/server/authserver/authserver.conf.dist | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/server/authserver/authserver.conf.dist')

diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 15dd02d9052..9a4beca9bf6 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -198,7 +198,7 @@ LoginDatabase.WorkerThreads = 1
 #                         Example: "13 11 9 5 3 1"
 #
 #                     File: Name of the file (read as optional1 if Type = File)
-#                         Allows to use one "%u" to create dynamic files
+#                         Allows to use one "%s" to create dynamic files
 #
 #                     Mode: Mode to open the file (read as optional2 if Type = File)
 #                          a - (Append)
@@ -208,19 +208,6 @@ LoginDatabase.WorkerThreads = 1
 Appender.Console=1,2,6
 Appender.Auth=2,2,7,Auth.log,w
 
-#  Logger config values: Given a logger "name"
-#    Logger.name
-#        Description: Defines 'What to log'
-#        Format:      Type,LogLevel,AppenderList
-#                     Type
-#                         0 - Default. Each type that has no config will
-#                             rely on this one. Core will create this logger
-#                             (disabled) if it's not configured
-#                         7 - Network input/output,
-#                        30 - Authserver
-
-Logger.Root=0,3,Console Auth
-
 #                     LogLevel
 #                         0 - (Disabled)
 #                         1 - (Trace)
@@ -240,6 +227,19 @@ Logger.Root=0,3,Console Auth
 
 Appenders=Console Auth
 
+#  Logger config values: Given a logger "name"
+#    Logger.name
+#        Description: Defines 'What to log'
+#        Format:      Type,LogLevel,AppenderList
+#                     Type
+#                         0 - Default. Each type that has no config will
+#                             rely on this one. Core will create this logger
+#                             (disabled) if it's not configured
+#                         7 - Network input/output,
+#                        30 - Authserver
+
+Logger.Root=0,3,Console Auth
+
 #
 #    Loggers
 #        Description: List of Loggers to read from config
-- 
cgit v1.2.3