From 16f52f1e0353529f3c6725cbc9d4dd20d8374b36 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 24 Feb 2012 22:58:01 +0000
Subject: - Clarified the comment about spaces in 'server_name' config.
 (bugreport:2656) - Grouped all the log file/table settings together, follow
 up to r15253 (ea:15042). - Added "DROP TABLE" statements to the mob_skill_db
 SQL files. (bugreport:5284)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15629 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/char_athena.conf |  6 ++++--
 conf/log_athena.conf  | 36 ++++++++++++------------------------
 2 files changed, 16 insertions(+), 26 deletions(-)

(limited to 'conf')

diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 1b5e96a16..498e406f9 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -9,8 +9,10 @@ userid: s1
 passwd: p1
 
 // Server name, use alternative character such as ASCII 160 for spaces.
-// NOTE: Do not use spaces in the name, or guild emblems won't work client-side!
-server_name: RAthena
+// NOTE: Do not use spaces or any of these characters which are not allowed in 
+//       Windows filenames \/:*?"<>|
+//       ... or else guild emblems won't work client-side!
+server_name: rAthena
 
 // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
 wisp_server_name: Server
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index 13174a018..16430884c 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -110,36 +110,24 @@ log_chat: 0
 // Disable chat logging when WoE is running? (Note 1)
 log_chat_woe_disable: no
 
-// Logging tables/files
+// Logging files/tables
 // Following settings specify where to log to. If 'sql_logs' is
 // enabled, SQL tables are assumed, otherwise flat files.
 
-// Dead Branch Log
+log_gm_db: log/atcommandlog.log
 log_branch_db: log/branchlog.log
-//log_branch_db: branchlog
-
-// Drops & Pickups
-log_pick_db: log/picklog.log
-//log_pick_db: picklog
-
-// Zeny
-log_zeny_db: log/zenylog.log
-//log_zeny_db: zenylog
-
-// MVP Drops
+log_chat_db: log/chatlog.log
 log_mvpdrop_db: log/mvplog.log
-//log_mvpdrop_db: mvplog
-
-// GM Log
-log_gm_db: log/atcommandlog.log
-//log_gm_db: atcommandlog
-
-// NPC Log
 log_npc_db: log/npclog.log
-//log_npc_db: npclog
+log_pick_db: log/picklog.log
+log_zeny_db: log/zenylog.log
 
-// CHAT Log
-log_chat_db: log/chatlog.log
-//log_chat_db: chatlog
+// log_gm_db: atcommandlog
+// log_branch_db: branchlog
+// log_chat_db: chatlog
+// log_mvpdrop_db: mvplog
+// log_npc_db: npclog
+// log_pick_db: picklog
+// log_zeny_db: zenylog
 
 import: conf/import/log_conf.txt
-- 
cgit v1.2.3-60-g2f50