--- C:/Users/Mike/AppData/Local/Temp/atcommands.txt-revBASE.svn001.tmp.txt	Fri Aug 31 22:49:48 2012
+++ C:/rAthena/doc/atcommands.txt	Fri Aug 31 23:19:40 2012
@@ -9,17 +9,157 @@
 //===== Additional Comments: =================================
 //= TODO: With such short descriptions, it's duplicated 'conf/help.txt' 
 //= Consider explaining commands in detail, similar to 'doc/script_commands.txt'
+//=
+//= This file describes the usage of in-game commands and
+//= assumes that 'conf/atcommand_athena.conf' has the following:
+//= atcommand_symbol : "@"
+//= charcommand_symbol: "#"
+//=
+//= To search this file for commands, add an asterisk (*) to
+//= the beginning of your command.
+//= Example: *rates
+//= If you search for the string 'rates' on its own, you will have
+//= multiple search results, and only a selection of them may
+//= refer to the actual command.
 //============================================================
 
-commands: Displays a list of @ commands available to the player.
-charcommands: Displays a list of # commands available to the player.
-rates: Displays the server rates.
-uptime: Show server uptime since last map server restart.
-showdelay: Shows/Hides the "there is a delay after a skill" message.
-exp: Displays current levels and % progress.
-email: To change your (own) email. Note: this command doesn't check email itself, but check structure of the email (xxx@xxx).
-monsterinfo: Show Monster info (rates, stats, drops, MVP stuff).
-iteminfo: Show Item info (type, price, etc).
+
+*commands
+Syntax: @commands
+
+Description:
+Displays a list of @ commands available to the player.
+
+Output Example:
+Commands available:
+size   dex   monsterignore   rates   party   tonpc
+snow   refresh   skillon   reloadscript   shownpc   autotrade
+exp   homfriendly   doom   etc..   etc..
+
+
+---------------------------------------
+*charcommands
+Syntax: @charcommands
+
+Description:
+Displays a list of # (char)commands available to the player.
+
+Output Example:
+Commands available:
+size   dex   monsterignore   rates   party   tonpc
+snow   refresh   skillon   reloadscript   shownpc   autotrade
+exp   homfriendly   doom   etc..   etc..
+
+
+---------------------------------------
+*rates
+Syntax: @rates
+
+Description:
+Displays the server rates.
+
+Output Example:
+Experience rates: Base 1.00x / Job 1.00x
+Normal Drop Rates: Common 1.00x / Healing 1.00x / Usable 1.00x Equipment 1.00x / Card 1.00x
+Boss Drop Rates:  Common 1.00x / Healing 1.00x / Usable 1.00x Equipment 1.00x / Card 1.00x
+Other Drop Rates: MvP 1.00x / Card-Based 1.00x / Treasure 1.00x
+
+
+---------------------------------------
+*uptime
+Syntax: @uptime
+
+Description:
+Show server uptime since last map server restart.
+
+Output Example:
+Server Uptime: 3 days, 8 hours, 6 minutes, 4 seconds.
+
+
+---------------------------------------
+*showdelay
+Syntax: @showdelay
+
+Description:
+Shows/Hides the "Cannot use the skills" message.
+
+Output Example:
+Skill delay failures are shown now.
+-- or -- 
+Skill delay failures won't be shown.
+
+If @showdelay is toggled, for skill 89 (Storm Gust), the chat window will display in red:
+[Storm Gust] Cannot use the skills.
+
+If @showdelay is toggled, for skill 85 (Lord of Vermilion), the chat window will display in red:
+[Lord of Vermilion] Cannot use the skills.
+
+
+---------------------------------------
+*exp
+Syntax: @charcommands
+
+Description:
+Displays current levels and % progress.
+
+Output Example:
+Base Level: 13 (3.323%) | Job Level: 10 (0.000%)
+
+
+---------------------------------------
+*email
+Syntax: @email <current@email.tld> <new@email.tld>
+
+Description:
+To change your (own) email. 
+Note: This command doesn't validate the email address itself, but checks the structure of the email (xxx@xxx).
+
+Output Example:
+In this example, my current email is a@a.com and i want to change it to b@b.com
+
+@email a@b.com b@b.com
+This returns a fail message: Invalid email. If you have default e-mail, type a@a.com.
+
+@email a@a.com b@b
+Returns success message: Information sent to login-server via char-server.
+
+
+---------------------------------------
+*monsterinfo
+Syntax: @monsterinfo <ID/Name>
+
+Description:
+Show Monster info (rates, stats, drops, MVP stuff).
+
+Example:
+@monsterinfo Poring
+
+Output:
+Monster: 'Poring'/'Poring'/'PORING' (1002)
+Lv: 1 HP:60 Base EXP:27 Job EXP:20 HIT:103 FLEE:183
+DEF:2 MDEF:5 STR:6 AGI:1 VIT:1 INT:1 DEX:6 LUK:5
+ATK:8~9 Range:1~10~12 Size:Medium Race:Plant Element:Water (Lv:1)
+Drops:
+ - Jellopy 70.00% - Knife[4] 1.00% etc.. etc...
+ 
+
+---------------------------------------
+*iteminfo
+Syntax: @iteminfo <ID/Name>
+
+Description:
+Show Item info (type, price, etc).
+
+Example:
+@iteminfo Jellopy
+
+Output:
+Item: 'Jellopy'/'Jellopy'[0] (909) Type: Etc. | Extra Effect: None
+NPC Buy:6z, Sell:3z | Weight: 1.0
+- Maximal monsters drop change: 75.00%
+
+
+---------------------------------------
 whodrops: Show who drops an item (mobs with highest drop rate).
 refresh: Syncs the player's position on the client with the one stored on the server.
 time: Give server time.