help bits

Fix a typo (count example "20s." shouldn't have the period).

Also expand the text for several gotchas that tend to hit newbies.

diff --git a/dat/help b/dat/help
index 73c7a1d5ce9a97c9e2f4af62f68663ce2e13ce4c..eb500b0b008e7394386667f4b85e5cb3cdfb8354 100644 (file)
--- a/dat/help
+++ b/dat/help
@@ -125,21 +125,24 @@ Commands:
         O       Review current options and possibly change them.
                 A menu displaying the option settings will be displayed
                 and most can be changed by simply selecting their entry.
-                Options are usually set before the game with a NETHACKOPTIONS
-                environment variable, or via a config file (defaults.nh,
-                NetHack Defaults, nethack.cnf, .nethackrc, etc.), not with 
-                the 'O' command.
+                Options are usually set before the game with NETHACKOPTIONS
+                environment variable or via a configuration file (defaults.nh,
+                NetHack Defaults, nethack.cnf, ~/.nethackrc, etc.) rather
+                than with the 'O' command.
         p       Pay your shopping bill.
         P       Put on an accessory (ring, amulet, etc).
         ^P      Repeat last message (subsequent ^P's repeat earlier messages).
                 The behavior can be varied via the msg_window option.
         q       Drink (quaff) something (potion, water, etc).
         Q       Select ammunition for quiver.
+        #quit   Exit the program without saving the current game.
         r       Read a scroll or spellbook.
         R       Remove an accessory (ring, amulet, etc).
         ^R      Redraw the screen.
         s       Search for secret doors and traps around you.
-        S       Save the game.
+        S       Save the game.  Also exits the program.
+                [To restore, just play again and use the same character name.]
+                [There is no "save current data but keep playing" capability.]
         t       Throw an object or shoot a projectile.
         T       Take off armor.
         ^T      Teleport, if you are able.
@@ -151,9 +154,12 @@ Commands:
         x       Swap wielded and secondary weapons.
         X       Toggle two-weapon combat.
         ^X      Show your attributes.
+        #explore  Switch to Explore Mode (aka Discovery Mode) where dying and
+                deleting the save file during restore can both be overridden.
         z       Zap a wand.  (Use y instead of z if number_pad is -1.)
         Z       Cast a spell.  (Use Y instead of Z if number_pad is -1.)
         ^Z      Suspend the game.  (^Y instead of ^Z if number_pad is -1.)
+                [To resume, use the shell command 'fg'.]
         :       Look at what is here.
         ;       Look at what is somewhere else.
         ,       Pick up some things.
@@ -170,6 +176,7 @@ Commands:
         \       Show what types of objects have been discovered.
         `       Show discovered types for one class of objects.
         !       Escape to a shell, if supported in your version and OS.
+                [To resume play, terminate the shell subprocess via 'exit'.]
         #       Introduces one of the "extended" commands.  To get a list of
                 the commands you can use with "#" type "#?".  The extended
                 commands you can use depends upon what options the game was
@@ -192,7 +199,7 @@ Commands:
         u       Untrap a trapped object or door.
 
         You can put a number before a command to repeat it that many times,
-        as in "40." or "20s.".  If you have the number_pad option set, you
+        as in "40." or "20s".  If you have the number_pad option set, you
         must type 'n' to prefix the count, as in "n40." or "n20s".
 
 

diff --git a/dat/hh b/dat/hh
index d689f65efd26fea38c06ea20978bc6fc013bdbc5..75f87b33b7300bdfe518385f4650ec031e175faf 100644 (file)
--- a/dat/hh
+++ b/dat/hh
@@ -25,8 +25,10 @@ General commands:
 ?       help    display one of several informative texts
 #quit   quit    end the game without saving current game
 S       save    save the game (to be continued later) and exit
-!       sh      escape to some SHELL (if allowed)
+                [to restore, play again and use the same character name]
+!       sh      escape to some SHELL (if allowed; 'exit' to resume play)
 ^Z      suspend suspend the game (independent of your current suspend char)
+                [on UNIX(tm)-based systems, use the 'fg' command to resume]
 O       options set options
 /       what-is tell what a map symbol represents
 \       known   display list of what's been discovered