Update documentation for Ctrl-Direction. I hope I missed nothing.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3781 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 18 insertions, 17 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index e893e7647e..97a3ae2b28 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -313,14 +313,14 @@ Doors and Traps:
 ----------------
 Doors can be usually be opened by just walking into them (there is an
 option for disabling this); else this can also be done with either the 
-'o' command or by pressing Ctrl plus a direction or '*', followed by a 
-direction. They can be closed with the 'c' command. If there is no 
-closed door in the indicated space, both Ctrl-direction and * direction
-will attempt to attack any monster which may be standing there (this is
-the only way to attack a friendly creature hand-to-hand). If there is 
-no creature there, you will attempt to disarm any trap in the target
-square. If there is apparently nothing there you will still attack it, 
-just in case there's something invisible lurking around. 
+'O' command. They can be closed with the 'C command. Pressing Ctrl plus
+a direction or '*', followed by a direction, will open/close doors, too.
+If there is no door in the indicated space, both Ctrl-direction and * 
+direction will attempt to attack any monster which may be standing there
+(this is the only way to attack a friendly creature hand-to-hand). If 
+there is no creature there, you will attempt to disarm any trap in the 
+target square. If there is apparently nothing there you will still 
+attack it, just in case there's something invisible lurking around. 
 
 A variety of dangerous and irritating traps are hidden around the
 dungeon. Traps look like normal floor until discovered. Some traps
@@ -2187,8 +2187,9 @@ Dungeon interaction:
                         easy_open to false.
         C               Close door.
      Ctrl-direction     Tries to untrap a known trap on the specified 
-     or * direction     square, else opens door if there is one, else 
-                        attacks without move (even if nothing is seen).
+     or * direction     square, else opens/closes door if there is one, 
+                        else attacks without move (even if no monster is 
+                        seen).
         <               Use staircase to go higher, also enters shops. 
         >               Use staircase to go deeper, or enters branch.  
         ;               Examine occupied tile, also causes auto-pickup.
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index be5f086b58..4ac2b0602b 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -514,11 +514,11 @@ friend_brand = none
 
 neutral_brand = none
         Brand neutral monsters in some way. Useful both to get out of
-	a neutral monster's path, and to avoid accidentally killing it.
-	E.g.
-	     neutral_brand = hi:darkgrey
-	shows neutrals with a dark grey background. Since there are
-	no darkgrey monster glyphs anymore, this works fine.	
+        a neutral monster's path, and to avoid accidentally killing it.
+        E.g.
+             neutral_brand = hi:darkgrey
+        shows neutrals with a dark grey background. Since there are
+        no darkgrey monster glyphs anymore, this works fine.	
 
 stab_brand = none
         Some deities object to you stabbing monsters. Certain classes 
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 9861fe001d..090e393965 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1493,8 +1493,8 @@ static void add_formatted_keyhelp(column_composer &cols)
             "<w>Ctrl-F</w> : Find items\n"
             "<w>Ctrl-W</w> : set Waypoint\n"
             "<w>/ Dir.</w>, <w>Shift-Dir.</w>: long walk\n"
-            "<w>* Dir.</w>, <w>Ctrl-Dir.</w> : untrap, or else\n"
-            "         attack without move\n",
+            "<w>* Dir.</w>, <w>Ctrl-Dir.</w> : open/close door, \n"
+            "         untrap, attack without move\n",
             true, true, cmdhelp_textfilter);
 
     cols.add_formatted(