* Created standardized headers with explanations in /conf/mapflag/, deleted "fireworks" file (deprecated, 1 commented entry)

* Updated Wiki links and fixed grammar in /src/config/

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

35 files changed, 279 insertions, 160 deletions

diff --git a/conf/mapflag/battleground.txt b/conf/mapflag/battleground.txt
index 514d617ef..86dcf95f0 100644
--- a/conf/mapflag/battleground.txt
+++ b/conf/mapflag/battleground.txt
@@ -1,13 +1,16 @@
 //===== rAthena Script =======================================
-//= Battleground map setting. '2' shows scoreboard.
+//= Mapflag: Battleground map setting.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
-//= 1.0a [Epoque]
+//= 1.0a
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Defines a Battleground map.
+//= Additional parameter '2' shows scoreboard.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 bat_c01	mapflag	battleground	2
diff --git a/conf/mapflag/fireworks.txt b/conf/mapflag/fireworks.txt
deleted file mode 100644
index eedcc15e0..000000000
--- a/conf/mapflag/fireworks.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//===== rAthena Script =======================================
-//= Displays Fireworks effect (Depreciated)
-//===== By: ==================================================
-//= Epoque
-//===== Current Version: =====================================
-//= 1.0a [Epoque]
-//===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
-//============================================================
-
-//prontera	mapflag	fireworks
diff --git a/conf/mapflag/gvg.txt b/conf/mapflag/gvg.txt
index a7de7657e..31430d856 100644
--- a/conf/mapflag/gvg.txt
+++ b/conf/mapflag/gvg.txt
@@ -1,16 +1,19 @@
 //===== rAthena Script =======================================
-//= GvG On Map Flags
+//= Mapflag: Guild versus Guild mode.
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Description: =========================================
-//= gvg: Turns on GvG mode (same as PvP except Guilds are
-//=      automatically allied)
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Players can attack other guilds, and will have their guild
+//= icons shown. WoE damage reductions will also take place.
+//= gvg: Turns on GvG mode
 //= gvg_castle: Describes castle maps for WoE.
-//===== Additional Comments: =================================
-//= 1.2 Updated with new meanings of gvg and gvg_castle
-//= 1.1 Added Novice Guild Castles
+//===== Additional Comments: ================================= 
+//= 1.1 - Added Novice Guild Castles.
+//= 1.2 - Updated with new meanings of gvg and gvg_castle.
 //============================================================
 
 // GvG Arenas =============
@@ -101,6 +104,5 @@ gld_dun01	mapflag	gvg_dungeon
 gld_dun02	mapflag	gvg_dungeon
 gld_dun03	mapflag	gvg_dungeon
 gld_dun04	mapflag	gvg_dungeon
-
 arug_dun01	mapflag	gvg_dungeon
 schg_dun01	mapflag	gvg_dungeon
diff --git a/conf/mapflag/jail.txt b/conf/mapflag/jail.txt
index b638f36bf..024a5cd6f 100644
--- a/conf/mapflag/jail.txt
+++ b/conf/mapflag/jail.txt
@@ -1,12 +1,12 @@
 //===== rAthena Script =======================================
-//= Map Flags for Jails ( ATCommand @jail <player> )
+//= Mapflag: Jail.
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
+//= rAthena SVN
+//===== Description: ========================================= 
 //= pvp: Turns on PvP mode
 //= pvp_noparty: Can't attack player in same party
 //= nobranch: No Dead Branching allowed.
@@ -14,12 +14,11 @@
 //= nopenalty: No Exp. penalty when player dies.
 //= nosave: No saving respawn point allowed. Use SavePoint to use the
 //=                players previous savepoint, or choose one manually.
-//= noteleport: No Teleporting allowed.  No f-wings or b-wings.
-//===== Additional Comments: =================================
-//= 
+//= noteleport: No Teleporting allowed.  No fly wings or butterfly wings.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
-
 // No Memory =============================
 sec_pri	mapflag	nomemo
 
@@ -35,9 +34,6 @@ sec_pri	mapflag	nowarp
 // No Return, Stop people from being pulled out of jail (warpparty/guild)
 sec_pri	mapflag	noreturn
 
-// Bloody Jail ===========================
-//Uncomment following mapflags to let your prisoners fight with other prisoners
-
 // PvP ===================================
 sec_pri	mapflag	pvp
 
diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt
index 71d6a7a74..4584f068f 100644
--- a/conf/mapflag/night.txt
+++ b/conf/mapflag/night.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Map Flags for maps where the night is visible.
+//= Mapflag: Night mode.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Skotlex
 //===== Current Version: =====================================
-//= 1.0 [Skotlex]
+//= 1.0
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//= 'nightenabled' specifies which maps can display "night".
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Enables night mode effects.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 alb2trea	mapflag	nightenabled
diff --git a/conf/mapflag/nightmare.txt b/conf/mapflag/nightmare.txt
index 0436e5c59..9c7d3f8f7 100644
--- a/conf/mapflag/nightmare.txt
+++ b/conf/mapflag/nightmare.txt
@@ -1,11 +1,21 @@
 //===== rAthena Script =======================================
-//= Map flags that allow players to drop items/equips on death
+//= Mapflag: Nightmare mode.
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Players drop items/equipment on death.
+//= pvp_nightmaredrop	id,type,percent
+//=   id: Drop a specific item ID or "random"
+//=   type: "inventory", "equip", or "all"
+//=   percent: Rate of item drop.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
+//============================================================
 
-
-//Nightmare Equipment Drops PVP
 pvp_n_1-1	mapflag	pvp_nightmaredrop	random,equip,300
 pvp_n_2-1	mapflag	pvp_nightmaredrop	random,equip,300
 pvp_n_3-1	mapflag	pvp_nightmaredrop	random,equip,300
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 3fb607fd3..f9eea4890 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -1,13 +1,21 @@
 //===== rAthena Script =======================================
-//= Map flags that disable dead branching
+//= Mapflag: Disable Dead Branch use.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.2 [Lupus]
-//= 1.3 [massdriller]
-//= 1.6a [Lupus]
-//= 1.7 Added all novice maps. [L0ne_W0lf]
-//= 1.8 Removed restriction on PVP maps. [L0ne_W0lf]
 //===== Current Version: =====================================
+//= 1.8
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables the following items:
+//=   Dead Branch (604), Bloody Branch (12103),
+//=   Red Pouch (12024), Poring Box (12109)
+//===== Additional Comments: ================================= 
+//= 1.3 - Updated. [massdriller]
+//= 1.6a - Updated. [Lupus]
+//= 1.7 - Added all novice maps. [L0ne_W0lf]
+//= 1.8 - Removed restriction on PVP maps. [L0ne_W0lf]
+//============================================================
 
 // Cities ======================
 ayo_in01	mapflag	nobranch
diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt
index 71e476d9a..4161a923c 100644
--- a/conf/mapflag/noexp.txt
+++ b/conf/mapflag/noexp.txt
@@ -1,10 +1,17 @@
 //===== rAthena Script =======================================
-//= Map flags that disable gaining EXP
+//= Mapflag: Disable EXP gain.
 //===== By: ==================================================
 //= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Same as 'nobaseexp' and 'nojobexp' combined.
+//===== Additional Comments: ================================= 
 //= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
-//= 1.6 Added Lighthalzen (due to quests) [Lupus]
-//= 1.7 Commented out entries. (Quests are official) [L0ne_W0lf]
+//= 1.6 - Added Lighthalzen (due to quests) [Lupus]
+//= 1.7 - Commented out entries. (Quests are official) [L0ne_W0lf]
 //============================================================
 
 // Job Quests ========================
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
index 7338454ed..392bf16e0 100644
--- a/conf/mapflag/noicewall.txt
+++ b/conf/mapflag/noicewall.txt
@@ -1,13 +1,17 @@
 //===== rAthena Script =======================================
-//= Map flags that disable icewall skill
+//= Mapflag: Disable Ice Wall.
 //===== By: ==================================================
 //= rAthena Dev Team
-//=============================================================
-//= noicewall: Disables Icewall skill.
-//= To disable Icewall on a specific map add the mapname here.
-//= 1.6a Re-enabled icewalls for cities [Lupus]
-//= 1.7 Officially icewall is allowed on interoirs. [L0ne_w0lf]
-//= 1.8 fixed aru castles mapnames
+//===== Current Version: =====================================
+//= 1.8
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Blocks usage of WZ_ICEWALL.
+//===== Additional Comments: ================================= 
+//= 1.6a - Re-enabled icewalls for cities [Lupus]
+//= 1.7 - Officially icewall is allowed on interiors. [L0ne_w0lf]
+//= 1.8 - Fixed arug_cas map names.
 //============================================================
 
 //ayo_in01	mapflag	noicewall
diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt
index 51dcfbc28..adab17a5d 100644
--- a/conf/mapflag/noloot.txt
+++ b/conf/mapflag/noloot.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Mapflag from a script in the NPC folder
+//= Mapflag: Disable monster drops.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
-//= 1.0a [Epoque]
+//= 1.0a
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Same as 'nomobloot' and 'nomvploot' combined.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 //hunte	mapflag	noloot
@@ -21,6 +23,4 @@
 //job_soul	mapflag	noloot
 //job_star	mapflag	noloot
 //que_ng	mapflag	noloot
-
-//Thieves have to gather some mushrooms. So they need loot
 //job_thief1	mapflag	noloot
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index c01c508a7..a35dac295 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -1,15 +1,22 @@
 //===== rAthena Script =======================================
-//= Map flags that disable warp portal memory
+//= Mapflag: Disable Warp Portal memory.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.6a added up to Hugel maps. [Lupus]
-//= 1.6b Added job_knt map. [Samuray22]
-//= 1.7 Added all novice maps. [L0ne_W0lf]
-//= 1.8 Added nameless_i location [Lupus]
-//= 1.8a Removed duplicate gef_cas nomemo mapflags [Yommy]
-//= 1.8b Removed duplicate arug_dun01 & schg_dun01 entries [Gepard]
 //===== Current Version: =====================================
-
+//= 1.8b
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Prevents players from using /memo on a map.
+//= Also disables marriage warp skills.
+//===== Additional Comments: ================================= 
+//= 1.6a - Added up to Hugel maps. [Lupus]
+//= 1.6b - Added job_knt map. [Samuray22]
+//= 1.7 - Added all novice maps. [L0ne_W0lf]
+//= 1.8 - Added nameless_i location. [Lupus]
+//= 1.8a - Removed duplicate gef_cas nomemo mapflags. [Yommy]
+//= 1.8b - Removed duplicate arug_dun01 & schg_dun01 entries. [Gepard]
+//============================================================
 
 // Towns  ====================
 ayo_in01	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index a993f0c5e..2517a3759 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -1,14 +1,20 @@
 //===== rAthena Script =======================================
-//= Map flags that disable exp. penalty on death.
+//= Mapflag: Disable death penalty.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.2 [Lupus]
-//= 1.3 Added all novice maps. [L0ne_W0lf]
-//= 1.4 Removed Nightmare PVP maps. [L0ne_W0lf]
 //===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Same as 'noexppenalty' and 'nozenypenalty' combined.
+//===== Additional Comments: ================================= 
+//= 1.2 - Updated. [Lupus]
+//= 1.3 - Added all novice maps. [L0ne_W0lf]
+//= 1.4 - Removed Nightmare PVP maps. [L0ne_W0lf]
+//============================================================
 
-
-// Towns ====================>\\
+// Towns ====================
 ayo_in01	mapflag	nopenalty
 ayo_in02	mapflag	nopenalty
 alb_ship	mapflag	nopenalty
@@ -214,7 +220,7 @@ guild_vs3	mapflag	nopenalty
 guild_vs4	mapflag	nopenalty
 guild_vs5	mapflag	nopenalty
 
-// Arenas=======================>\\
+// Arenas=======================
 sec_in01	mapflag	nopenalty
 sec_in02	mapflag	nopenalty
 
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
index c7587c63c..3bb9d681a 100644
--- a/conf/mapflag/nopvp.txt
+++ b/conf/mapflag/nopvp.txt
@@ -1,7 +1,15 @@
-//===== Description: =========================================
-//= pvp	off: Disables Player versus Player mode.
-//= To disable PvP mode on a specific map add the mapname here.
-//= v 1.1a
+//===== rAthena Script =======================================
+//= Mapflag: Disable Player versus Player mode.
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.1a
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Prevents PvP mode on a map.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 1@cata	mapflag	pvp	off
diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt
index ee4ad650e..da694de91 100644
--- a/conf/mapflag/noreturn.txt
+++ b/conf/mapflag/noreturn.txt
@@ -1,16 +1,24 @@
 //===== rAthena Script =======================================
-//= Map flags that disable use of Butterfly wings
+//= Mapflag: Disable return warp.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.4a [Lupus]
-//===== Notes: ===============================================
-//= For disabling Fly wings use noteleport
-//= 1.3 According to the patch, enabled Butterfly wings in the Castles [Lupus]
-//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
-//= 1.4a Added job_knt. [Samuray22]
-//= 1.5 Commented out new_zone entries. [L0ne_W0lf]
-//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
 //===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables the following items:
+//=   Butterfly Wing (602), Siege Teleport Scroll (14591),
+//=   Yellow/Green/Red/Blue Butterfly Wings (14582-14585),
+//=   Dungeon Teleport Scrolls (14527/14581)
+//= Also restricts "warpparty" and "warpguild" script commands.
+//===== Additional Comments: ================================= 
+//= 1.3 - According to the patch, enabled Butterfly wings in the Castles. [Lupus]
+//= 1.4 - Enabled Butterfly wings on PvP maps. [Skotlex]
+//= 1.4a - Added job_knt. [Samuray22]
+//= 1.5 - Commented out new_zone entries. [L0ne_W0lf]
+//= 1.6 - Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
+//============================================================
 
 // Cities ========================
 //ayo_in01	mapflag	noreturn
@@ -140,7 +148,7 @@ que_hugel	mapflag	noreturn
 //guild_vs4	mapflag	noreturn
 //guild_vs5	mapflag	noreturn
 
-// Arenas =====================>\\
+// Arenas =====================
 //arena_room	mapflag	noreturn
 //sec_in01	mapflag	noreturn
 //sec_in02	mapflag	noreturn
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index 8b6aa2896..12cb2ef0e 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -1,9 +1,17 @@
 //===== rAthena Script =======================================
-//= Map flags that disable auto saving
+//= Mapflag: Disable auto-save.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.7 [Lupus]
 //===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Characters logging out on the specified map will be warped
+//= to the map specified in the last field, or "SavePoint".
+//===== Additional Comments: ================================= 
+//= 1.7 - Updated. [Lupus]
+//============================================================
 
 // Job Quests ====================
 job_sword1	mapflag	nosave	SavePoint
diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt
index b91834786..8e41f08b4 100644
--- a/conf/mapflag/noskill.txt
+++ b/conf/mapflag/noskill.txt
@@ -1,10 +1,16 @@
 //===== rAthena Script =======================================
-//= Map flags that disable skills on a map
+//= Mapflag: Disable skill use.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.0 [L0ne_W0lf]
-//= 1.1 Added additional maps. [L0ne_W0lf]
 //===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables all skills on the map.
+//===== Additional Comments: ================================= 
+//= 1.1 - Added additional maps. [L0ne_W0lf]
+//============================================================
 
 //Prontera Arena ===============
 prt_are_in	mapflag	noskill
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index 49ffbd7ca..4ef0639ee 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -1,11 +1,22 @@
 //===== rAthena Script =======================================
-//= Map flags that disable use of fly wings
+//= Mapflag: Disable teleportation.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= 1.6a [Lupus]
-//===== Notes: ===============================================
-//= For disabling Butterfly wings use noreturn
 //===== Current Version: =====================================
+//= 1.6a
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables all means of teleportation within a map.
+//= Script commands 'warp', 'areawarp', 'warpchar',
+//=   'warpparty', 'warpguild', 'warpwaitingpc' will not
+//=   work with "Random" destination.
+//= Disables skills AL_TELEPORT and TK_HIGHJUMP.
+//= Disables the following items:
+//=   Fly Wing (601), Giant Fly Wing (12212)
+//===== Additional Comments: ================================= 
+//= 1.6a - Updated. [Lupus]
+//============================================================
 
 // Cities ========================
 ayo_in01	mapflag	noteleport
diff --git a/conf/mapflag/novending.txt b/conf/mapflag/novending.txt
index 9825c2ba8..816d52252 100644
--- a/conf/mapflag/novending.txt
+++ b/conf/mapflag/novending.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Mapflag from a script in the NPC folder
+//= Mapflag: Disable vending.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
-//= 1.0a [Epoque]
+//= 1.0a
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables skill MC_VENDING on a map.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 //prontera	mapflag	novending
diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt
index 1eac63d44..bc41d29a6 100644
--- a/conf/mapflag/nowarp.txt
+++ b/conf/mapflag/nowarp.txt
@@ -1,10 +1,16 @@
 //===== rAthena Script =======================================
-//= Map flags that disable warp
+//= Mapflag: Disable warping.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= v 1.2
-//= 1.3 Added WoE SE maps
 //===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables use of @go to a map.
+//===== Additional Comments: ================================= 
+//= 1.3 - Added WoE SE maps.
+//============================================================
 
 // Special Quests Places =====
 ama_test	mapflag	nowarp
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index e52d4a7d3..db47fa1b0 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -1,9 +1,16 @@
 //===== rAthena Script =======================================
-//= Map flags that disable warpto
+//= Mapflag: Disable warpto.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= v 1.3
 //===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables use of @warp to a map.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
+//============================================================
 
 // Guild Castles ========================
 //alde_gld	mapflag	nowarpto
diff --git a/conf/mapflag/partylock.txt b/conf/mapflag/partylock.txt
index a080225de..3afda71d5 100644
--- a/conf/mapflag/partylock.txt
+++ b/conf/mapflag/partylock.txt
@@ -1,10 +1,17 @@
 //===== rAthena Script =======================================
-//= Map flag that disable party modification.
-//= Currently not used officially by any maps.
+//= Mapflag: Party lock.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= v 1.0
 //===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Blocks all party modifications on a map:
+//=   /organize, /leave, /invite, @changeleader
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
+//============================================================
 
 // Sealed Shrine ==================
 1@cata	mapflag	partylock
diff --git a/conf/mapflag/pvp.txt b/conf/mapflag/pvp.txt
index f2b430dac..8463b8923 100644
--- a/conf/mapflag/pvp.txt
+++ b/conf/mapflag/pvp.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Map flags that enable pvp
+//= Mapflag: Player versus Player mode.
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: =========================================
-//= pvp: Turns on PvP mode
-//===== Additional Comments: =================================
-//=
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Enables PvP on a map.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 // PvP ========================
diff --git a/conf/mapflag/pvp_noguild.txt b/conf/mapflag/pvp_noguild.txt
index 700d17d64..731739dd1 100644
--- a/conf/mapflag/pvp_noguild.txt
+++ b/conf/mapflag/pvp_noguild.txt
@@ -1,9 +1,16 @@
 //===== rAthena Script =======================================
-//= Map flags that disable guilds on pvp grounds. 
+//= Mapflag: Ignore guilds.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= v 1.1
 //===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Ignores guild alliances on GvG-enabled maps.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
+//============================================================
 
 // PvP Arenas =================
 pvp_y_1-1	mapflag	pvp_noguild
diff --git a/conf/mapflag/pvp_noparty.txt b/conf/mapflag/pvp_noparty.txt
index ba3bc1e3f..abc9529d2 100644
--- a/conf/mapflag/pvp_noparty.txt
+++ b/conf/mapflag/pvp_noparty.txt
@@ -1,9 +1,16 @@
 //===== rAthena Script =======================================
-//= Map flags that disable parties in pvp maps 
+//= Mapflag: Ignore parties.
 //===== By: ==================================================
 //= rAthena Dev Team
-//= v 1.2
 //===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Ignores party alliances on PvP-enabled maps.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
+//============================================================
 
 // GvG Arenas =================
 guild_vs1	mapflag	pvp_noparty
diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt
index 226676884..24adf9f3a 100644
--- a/conf/mapflag/reset.txt
+++ b/conf/mapflag/reset.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Map flags that enable the use of Neuralizer
+//= Mapflag: Enable Neuralizer use.
 //===== By: ==================================================
 //= Daegaladh
 //===== Current Version: =====================================
-//= 1.0 [Daegaladh]
+//= 1.0
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Maps where Neuralizer (12213) can be used.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 alberta	mapflag	reset
diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index 6a9a293d8..f4bd6d175 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -1,13 +1,19 @@
 //===== rAthena Script =======================================
-//= Map flags that disable certain items/skills configured in
-//= item_noequip.txt and skill_nocast_db.txt
+//= Mapflag: Restricted.
 //===== By: ==================================================
-//= rAthena Dev Team
-//= 1.0 [Komurka]
-//= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf]
-//= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
-//= 1.3 Added Orc's Memory, Nidhoggur's Nest and towns restrictions [Daegaladh]
+//= Komurka
 //===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Disables items configured in item_noequip.txt
+//= and skills configured in skill_nocast_db.txt.
+//===== Additional Comments: ================================= 
+//= 1.1 - Added WoE:SE Map restrictions. [L0ne_W0lf]
+//= 1.2 - Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
+//= 1.3 - Added Orc's Memory, Nidhoggur's Nest and towns restrictions. [Daegaladh]
+//============================================================
 
 //Aldebaran Turbo Track
 alde_tt02	mapflag	restricted	1
diff --git a/conf/mapflag/town.txt b/conf/mapflag/town.txt
index 5a4b4d74c..8dabb2c4a 100644
--- a/conf/mapflag/town.txt
+++ b/conf/mapflag/town.txt
@@ -1,13 +1,15 @@
 //===== rAthena Script =======================================
-//= Allows Mailbox access
+//= Mapflag: Town.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
-//= 1.0a [Epoque]
+//= 1.0a
 //===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Designates a map as a town, granting mailbox access.
+//===== Additional Comments: ================================= 
+//= 1.0 - Initial script.
 //============================================================
 
 prontera	mapflag	town
diff --git a/npc/pre-re/scripts_mapflags.conf b/npc/pre-re/scripts_mapflags.conf
index 485d404cd..ed553ac6a 100644
--- a/npc/pre-re/scripts_mapflags.conf
+++ b/npc/pre-re/scripts_mapflags.conf
@@ -24,7 +24,6 @@ npc: conf/mapflag/pvp_noguild.txt
 npc: conf/mapflag/night.txt
 npc: conf/mapflag/restricted.txt
 npc: conf/mapflag/battleground.txt
-npc: conf/mapflag/fireworks.txt
 npc: conf/mapflag/novending.txt
 npc: conf/mapflag/town.txt
 npc: conf/mapflag/reset.txt
diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf
index 485d404cd..ed553ac6a 100644
--- a/npc/re/scripts_mapflags.conf
+++ b/npc/re/scripts_mapflags.conf
@@ -24,7 +24,6 @@ npc: conf/mapflag/pvp_noguild.txt
 npc: conf/mapflag/night.txt
 npc: conf/mapflag/restricted.txt
 npc: conf/mapflag/battleground.txt
-npc: conf/mapflag/fireworks.txt
 npc: conf/mapflag/novending.txt
 npc: conf/mapflag/town.txt
 npc: conf/mapflag/reset.txt
diff --git a/src/config/classes/general.h b/src/config/classes/general.h
index a2c9c64c3..aefbbbedb 100644
--- a/src/config/classes/general.h
+++ b/src/config/classes/general.h
@@ -5,7 +5,7 @@
 
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
 /**
diff --git a/src/config/classes/swordsman.h b/src/config/classes/swordsman.h
index 44ae922d5..a3638fd11 100644
--- a/src/config/classes/swordsman.h
+++ b/src/config/classes/swordsman.h
@@ -4,10 +4,10 @@
 #define _CONFIG_SKILLS_SWORDS_H_
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
-/// rune knight
+/// Rune Knight
 ///
 /// maximum number of runes that a rune knight character can carry at any given time
 /// default: 20
diff --git a/src/config/const.h b/src/config/const.h
index 85a76b1ab..9447d85a1 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -5,7 +5,7 @@
 
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
 /**
diff --git a/src/config/core.h b/src/config/core.h
index 848829ea2..b0e139f27 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -5,7 +5,7 @@
 
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
 /**
@@ -20,7 +20,7 @@
 
 //Comment to disable the official walk path
 // -- The official walkpath disables users from taking non-clear walk paths,
-// -- e.g. if they want to get around a obstacle they have to walk around it,
+// -- e.g. if they want to get around an obstacle they have to walk around it,
 // -- while with OFFICIAL_WALKPATH disabled if they click to walk around a obstacle the server will do it automatically
 #define OFFICIAL_WALKPATH
 
diff --git a/src/config/renewal.h b/src/config/renewal.h
index c169c5642..33e9a995b 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -5,11 +5,11 @@
 
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
 /**
- * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/config/Skills folder
+ * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/config/classes folder
  **/
 
 /// game renewal server mode
@@ -70,9 +70,9 @@
 /// 
 /// leave this line to enable renewal ASPD
 /// - shield penalty is applied
-/// - agi has a greater factor to your ASPD increase
-/// - there is a change in how skill/items give ASPD
-/// - some skills/items ASPD bonus won't stack
+/// - AGI has a greater factor in ASPD increase
+/// - there is a change in how skills/items give ASPD
+/// - some skill/item ASPD bonuses won't stack
 #define RENEWAL_ASPD
 
 #endif // _CONFIG_RENEWAL_H_
diff --git a/src/config/secure.h b/src/config/secure.h
index e2b000440..c57db018a 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -5,7 +5,7 @@
 
 /**
  * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
  **/
 
 /**
@@ -15,7 +15,7 @@
 /**
  * Optional NPC Dialog Timer
  * When enabled all npcs dialog will 'timeout' if user is on idle for longer than the amount of seconds allowed
- * - On 'timeout' the npc dialog window changes it's next/menu to a 'close' button
+ * - On 'timeout' the npc dialog window changes its next/menu to a 'close' button
  * @values
  * - ? : Desired idle time in seconds (e.g. 10)
  * - 0 : Disabled