Fixed a documentation mistake in 'areamonster' (missing argument).

Fixed incorrect sprite used for twintowers event npc.
Fixed a mistake in changelog.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 981672103..040a91ef7 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -36,8 +36,8 @@ gm_all_skill: no
 // [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
 gm_all_equipment: no
 
-// [GM] Can use skills without meeting the required conditions (no 
-//   blue gems? no or minimum GM level to bypass requirements.
+// [GM] Can use skills without meeting the required conditions (items, etc...)?
+// 'no' or minimum GM level to bypass requirements.
 gm_skill_unconditional: no
 
 // [GM] Can join a password protected chat? (No or mimimum GM level)
@@ -54,6 +54,9 @@ atcommand_gm_only: no
 // Is the character of a GM account set as the object of a display by @ command etc. or not?
 hide_GM_session: no
 
+// At what GM level can you see GMs and Account/Char IDs in the @who command?
+who_display_aid: 40
+
 // Ban people that try trade dupe.
 // Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
 ban_hack_trade: 5
@@ -84,9 +87,6 @@ gm_cant_drop_max_lv: 0
 // no/0 can be used to disable it.
 disp_hpmeter: 0
 
-// At what GM level can users see Account/Character IDs in the @who command?
-who_display_aid: 40
-
 // Players Titles (check msg_athena.conf for title strings)
 // You may assign different titles for your Players and GMs
 title_lvl1: 1