- Corrected a totally incorrect comment for the public ip config setting

- Adjusted the formatting of several config files

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10756 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 58 insertions, 62 deletions

diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index d080b9dc4..0639f93e2 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -9,7 +9,7 @@ userid: s1
 passwd: p1
 
 // Server name, use alternative character such as ASCII 160 for spaces.
-// NOTE: You should not use spaces in the server name, or guild emblems won't work client-side!
+// NOTE: Do not use spaces in the name, or guild emblems won't work client-side!
 server_name: eAthena
 
 // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
@@ -19,21 +19,20 @@ wisp_server_name: Server
 // The character server connects to the login server using this IP address.
 // NOTE: This is useful when you are running behind a firewall or are on
 // a machine with multiple interfaces.
-//login_ip: 127.0.0.1
+login_ip: 127.0.0.1
 
 // The character server listens on the interface with this IP address.
 // NOTE: This allows you to run multiple servers on multiple interfaces
 // while using the same ports for each server.
-//bind_ip: 127.0.0.1
+bind_ip: 127.0.0.1
 
 // Login Server Port
 login_port: 6900
 
 // Character Server IP
-// The character server exports this IP address to the entire world.
-// NOTE: You should only need to set this if you are running behind a
-// firewall or are on a machine with multiple interfaces.
-// char_ip:127.0.0.1
+// The IP address which clients will use to connect.
+// Set this to what your server's public IP address is.
+char_ip: 127.0.0.1
 
 // Character Server Port
 char_port: 6121
diff --git a/conf-tmpl/log_athena.conf b/conf-tmpl/log_athena.conf
index 9edc77b55..80aacd122 100644
--- a/conf-tmpl/log_athena.conf
+++ b/conf-tmpl/log_athena.conf
@@ -10,54 +10,52 @@
 // 0032 - (S) Log NPC transactions (buy/sell)
 // 0064 - (N) Log Script transactions (items deleted/acquired through quests)
 // 0128 - (M) Log items stolen from mobs (Steal/Gank)
-// 0256 - (C) Log player-used items.
+// 0256 - (C) Log player-used items
 // 0512 - (M) Log MVP prize items
 // 1024 - (A) Log player created/deleted items (through @/# commands)
 // 2048 - (R) Log items placed/retrieved from storage.
 // 4096 - (G) Log items placed/retrieved from guild storage.
-// Example: Log trades+vending+script items+created items: 2+4+64+1024:
-// enable_logs: 1094
+// Example: Log trades+vending+script items+created items: 2+4+64+1024 = 1094
 enable_logs: 1
 
 // Use MySQL Logs? (SQL Version Only)
 sql_logs: 0
 
-// LOGGING FILTERS [Lupus]
-//=============================================================
-//if any condition is true then the item will be logged
-//0 = Don't log at all
-//1 = Log any item
-//Advanced Filter Bits by item type: ||
-//0002 - Healing items (0)
-//0004 - Etc Items(3) + Arrows (10)
-//0008 - Usable Items(2) + Lures,Scrolls(11)
-//0016 - Weapon(4)
-//0032 - Shields,Armor,Headgears,Accessories,etc(5)
-//0064 - Cards(6)
-//0128 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
-//0256 - Log expensive items ( >= price_items_log)
-//0512 - Log big amount of items ( >= amount_items_log)
-//1024 - Log refined items (if their refine >= refine_items_log )
-//2048 - Log rare items (if their drop chance <= rare_items_log )
-
-//Examples: (log filters)
-//log_filter: 1	= logs ANY items
-//log_filter: 2	= logs only HEALING items
-//log_filter: 4	= logs only Etc Items and Arrows
-//log_filter: 64	= logs only Cards
-//log_filter: 322	= logs only Healing items, Cards and those items which price is >= price_items_log
-//log_filter: 4080 = logs all items (including all rare, big amount) exept healing, etc, arrows and useble ones
-//etc
+// LOGGING FILTERS
+// =============================================================
+// if any condition is true then the item will be logged
+// 0 = Don't log at all
+// 1 = Log any item
+// Advanced Filter Bits by item type: ||
+// 0002 - Healing items (0)
+// 0004 - Etc Items(3) + Arrows (10)
+// 0008 - Usable Items(2) + Lures,Scrolls(11)
+// 0016 - Weapon(4)
+// 0032 - Shields,Armor,Headgears,Accessories,etc(5)
+// 0064 - Cards(6)
+// 0128 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
+// 0256 - Log expensive items ( >= price_items_log)
+// 0512 - Log big amount of items ( >= amount_items_log)
+// 1024 - Log refined items (if their refine >= refine_items_log )
+// 2048 - Log rare items (if their drop chance <= rare_items_log )
+
+// Examples: (log filters)
+// log_filter: 1    = logs ANY items
+// log_filter: 2    = logs only HEALING items
+// log_filter: 4    = logs only Etc Items and Arrows
+// log_filter: 64   = logs only Cards
+// log_filter: 322  = logs only Healing items, Cards and those items which price is >= price_items_log
+// log_filter: 4080 = logs all items (including all rare, big amount) exept healing, etc, arrows and useble ones
 log_filter: 1
 
 // Log Items which Refine >= refine_items_log
 refine_items_log: 5
 // Log Items whith min drop rate <= rare_items_log
-//1 = 0.01%, 100 = 1% drop chance, etc
+// 1 = 0.01%, 100 = 1% drop chance, etc
 rare_items_log: 100
-//don't log it if the current item price < price_items_log
+// don't log it if the current item price < price_items_log
 price_items_log: 1000
-//don't log it if the current item amount < amount_items_log
+// don't log it if the current item amount < amount_items_log
 amount_items_log: 100
 //=============================================================
 
@@ -70,7 +68,7 @@ log_branch: 0
 log_zeny: 0
 
 // Log MVP Monster Drops
-//Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
+// Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
 log_mvpdrop: 0
 
 // Log GM Commands (set to minimum level of Logged Commands)
@@ -80,21 +78,21 @@ log_gm: 40
 log_npc: 0
 
 // Log CHAT (Global, Whisper, Party, Guild, Main chat)
-// LOGGING FILTERS [Lupus]
-//=============================================================
-//00 = Don't log at all
-//Advanced Filter Bits: ||
-//01 - Log Global messages
-//02 - Log Whisper messages
-//04 - Log Party messages
-//08 - Log Guild messages
-//16 - Log Main chat messages
-//32 - Don't log anything when WOE is on
-//Example:
-//log_chat:  6	= logs both Whisper & Party messages
-//log_chat:  8	= logs only Guild messages
-//log_chat: 34	= logs only Whisper, when WOE is off
-//log_chat: 31	= logs EVERYTHING
+// LOGGING FILTERS
+// =============================================================
+// 00 = Don't log at all
+// Advanced Filter Bits: ||
+// 01 - Log Global messages
+// 02 - Log Whisper messages
+// 04 - Log Party messages
+// 08 - Log Guild messages
+// 16 - Log Main chat messages
+// 32 - Don't log anything when WOE is on
+// Example:
+// log_chat:  6 = logs both Whisper & Party messages
+// log_chat:  8 = logs only Guild messages
+// log_chat: 34 = logs only Whisper, when WOE is off
+// log_chat: 31 = logs EVERYTHING
 
 log_chat: 0
 
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index 3ad980de6..44ce8cdd7 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -8,7 +8,7 @@
 // The login server listens on the interface with this IP address.
 // NOTE: This allows you to run multiple servers on multiple interfaces
 // while using the same ports for each server.
-//bind_ip: 127.0.0.1
+bind_ip: 127.0.0.1
  
 // Login Server Port
 login_port: 6900
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index eb9bb7cfd..1ca34af31 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -29,21 +29,20 @@ passwd: p1
 // The map server connects to the character server using this IP address.
 // NOTE: This is useful when you are running behind a firewall or are on
 // a machine with multiple interfaces.
-//char_ip: 127.0.0.1
+char_ip: 127.0.0.1
 
 // The map server listens on the interface with this IP address.
 // NOTE: This allows you to run multiple servers on multiple interfaces
 // while using the same ports for each server.
-//bind_ip: 127.0.0.1
+bind_ip: 127.0.0.1
 
 // Character Server Port
 char_port: 6121
 
 // Map Server IP
-// The map server exports this IP address to the entire world.
-// NOTE: You should only need to set this if you are running behind a
-// firewall or are on a machine with multiple interfaces.
-//map_ip: 127.0.0.1
+// The IP address which clients will use to connect.
+// Set this to what your server's public IP address is.
+map_ip: 127.0.0.1
 
 // Map Server Port
 map_port: 5121