Merge commit 'mainline/master'

Conflicts:
	npc/020-1_Nivalis/_import.txt

1 files changed, 7 insertions, 18 deletions

diff --git a/conf/atcommand_local.conf.example b/conf/atcommand_local.conf.example
index 6de470ef..f2f925df 100644
--- a/conf/atcommand_local.conf.example
+++ b/conf/atcommand_local.conf.example
@@ -63,24 +63,17 @@ follow: 40
 // Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
 kick: 40
 
-// Returns list of logged in characters with their position (2 same commands).
+// Returns list of logged in characters with their position.
 who: 40
-whois: 40
-
-// Returns list of logged in characters with their job.
-who2: 40
 
 // Returns list of logged in characters with their party/guild.
-who3: 40
+whogroup: 40
 
 // Returns list of logged in characters with their position in a specifical map.
 whomap: 40
 
-// Returns list of logged in characters with their job in a specifical map.
-whomap2: 40
-
 // Returns list of logged in characters with their party/guild in a specifical map.
-whomap3: 40
+whomapgroup: 40
 
 // Like @who+@who2+who3, but only for GM.
 whogm: 40
@@ -97,25 +90,21 @@ hide: 40
 // Enables you to to jump randomly on a map (that you are already on).
 jump: 40
 
-// Warps you to your last save point (2 same commands).
+// Warps you to your last save point.
 return: 40
-load: 40
 
-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
-rura: 40
+// Warp yourself to a certain map, at (x,y) coordinates.
 warp: 40
 
 // Changes GM clothes color (2 same commands)
 dye: 40
 ccolor: 40
 
-// Changes GM hair style (2 same commands)
+// Changes own hair style.
 hairstyle: 40
-hstyle: 40
 
-// Changes GM hair color (2 same commands)
+// Changes own hair color.
 haircolor: 40
-hcolor: 40
 
 // Deletes all your items.
 itemreset: 40