- Added Perl based conf merger script

- Removed LogSQL config option until reimplementation on code side
- A bit of cosmetics for .conf files

--HG--
branch : trunk

2 files changed, 11 insertions, 20 deletions

diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 6f1af3e2d8d..aecb0ec1424 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -41,7 +41,7 @@ LogsDir = ""
 #
 #    MaxPingTime
 #        Description: Time (in minutes) between database pings.
-#        Default:     30 - (minutes)
+#        Default:     30
 
 MaxPingTime = 30
 
@@ -225,16 +225,16 @@ LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
 #    LoginDatabase.WorkerThreads
 #        Description: The amount of worker threads spawned to handle asynchronous (delayed) MySQL
 #                     statements. 
-#        Default:     1 - (LoginDatabase.WorkerThreads)
+#        Default:     1
 
-LoginDatabase.WorkerThreads     = 1
+LoginDatabase.WorkerThreads = 1
 
 #
 #    LoginDatabase.Connections
 #        Description: The amount of MySQL connections spawned.
-#        Default: 1
+#        Default:     1
 
-LoginDatabase.Connections     = 1
+LoginDatabase.Connections = 1
 
 #
 ###################################################################################################
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 3721c78e78a..0e3654a9744 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -119,7 +119,7 @@ CharacterDatabase.Connections = 2
 #
 #    MaxPingTime
 #        Description: Time (in minutes) between database pings.
-#        Default:     30 - (minutes)
+#        Default:     30
 
 MaxPingTime = 30
 
@@ -390,16 +390,6 @@ CleanCharacterDB = 0
 ###################################################################################################
 # SERVER LOGGING
 #
-#    LogSQL
-#        Description: Enable logging of SQL queries triggered by in game commands from in game
-#                     All commands are written to a file: YYYY-MM-DD_logSQL.sql
-#                     A new file will be created every day at 00:00:00.
-#        Default:     1 - (Enabled)
-#                     0 - (Disabled)
-
-LogSQL = 1
-
-#
 #    PidFile
 #        Description: World daemon PID file
 #        Example:     "./worldd.pid" - (Enabled)
@@ -1370,7 +1360,7 @@ DungeonFinder.Enable = 0
 
 #
 #   DBC.EnforceItemAttributes
-#        Description: Disallow overriding item attributes stored in DBC files with values from the 
+#        Description: Disallow overriding item attributes stored in DBC files with values from the
 #                     database.
 #        Default:     1 - (Enabled, Enforce DBC values)
 #                     0 - (Disabled, Use database values)
@@ -1640,6 +1630,7 @@ ListenRange.TextEmote = 40
 #        Default:     300
 
 ListenRange.Yell = 300
+
 #
 ###################################################################################################
 
@@ -1747,7 +1738,7 @@ AllowPlayerCommands = 1
 #
 #    PreserveCustomChannels
 #        Description: Store custom chat channel settings like password, automatic ownership handout
-#                     or ban list in the database. Needs to be enabled to save custom 
+#                     or ban list in the database. Needs to be enabled to save custom
 #                     world/trade/etc. channels that have automatic ownership handout disabled.
 #                     (.channel set ownership $channel off)
 #        Default:     0 - (Disabled, Blizzlike, Channel settings are lost if last person left)
@@ -1926,7 +1917,7 @@ Visibility.Distance.BGArenas = 180
 
 Visibility.Notify.Period.OnContinents = 1000
 Visibility.Notify.Period.InInstances  = 1000
-Visibility.Notify.Period.InBGArenas = 1000
+Visibility.Notify.Period.InBGArenas   = 1000
 
 #
 ###################################################################################################
@@ -2083,7 +2074,7 @@ Rate.Mining.Amount = 1
 #        Description: Mining rates.
 #        Default:     Chance to to mine a deposit again.
 
-Rate.Mining.Next   = 1
+Rate.Mining.Next = 1
 
 #
 #    Rate.Talent