From: PatR <rankin@nethack.org>
Date: Thu, 10 Dec 2020 09:01:04 +0000 (-0800)
Subject: Guidebook catchup
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=241cb2a8d37a3325094001e8661e069c90ed6294;p=nethack

Guidebook catchup

The command rename "#seegold" to "#showgold" that also revised
a few of the short command desctipions didn't include a Guidebook
update.  So here one is.
---

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 82880c6d1..074cbf2d8 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,4 +1,4 @@
-.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.402 $ $NHDT-Date: 1606781766 2020/12/01 00:16:06 $
+.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.403 $ $NHDT-Date: 1607590842 2020/12/10 09:00:42 $
 .\"
 .\" This is an excerpt from the 'roff' man page from the 'groff' package.
 .\" Guidebook.mn currently does *not* fully adhere to these guidelines.
@@ -35,7 +35,7 @@
 .ds vr "NetHack 3.7
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "November 30, 2020
+.ds f2 "December 9, 2020
 .
 .\" A note on some special characters:
 .\" \(lq = left double quote
@@ -1036,7 +1036,7 @@ Tell what equipment you are using.
 Combines the preceding five type-specific
 commands into one.
 .lp $
-Count your gold pieces.
+Report the gold you're carrying, possibly shop credit and/or debt too.
 .lp +
 List the spells you know.
 .lp ""
@@ -1387,9 +1387,6 @@ Default key is \(oq\(dq\(cq. \" double quote
 .lp #seearmor
 Show the armor currently worn.
 Default key is \(oq[\(cq.
-.lp "#seegold "
-Count your gold.
-Default key is \(oq$\(cq.
 .lp #seerings
 Show the ring(s) currently worn.
 Default key is \(oq=\(cq.
@@ -1406,11 +1403,20 @@ When enabled, access for specific users can be controlled by the system
 configuration file.
 Use the shell command \(oq\f(CRexit\fP\(cq to return to the game.
 Default key is \(oq!\(cq.
+.lp "#showgold"
+Report the gold in your inventory and if you are inside a shop,
+report any credit or debt you have in that shop.
+Does not report on any gold inside containers you're carrying.
+Default key is \(oq$\(cq.
 .lp #showspells
 List and reorder known spells.
 Default key is \(oq+\(cq.
 .lp "#showtrap"
-Show the type of an adjacent trap.
+Describe an adjacent trap, possibly covered by objects or a monster.
+To be eligible, the trap must already be discovered.
+(The \(lq#terrain\(rq command can display your map with all objects and
+monsters temporarily removed, making it possible to see all discovered
+traps.)
 Default key is \(oq\(ha\(cq. \" 'hat' (circumflex character)
 .lp "#sit     "
 Sit down.
@@ -1496,10 +1502,17 @@ Autocompletes.
 Debug mode only.
 .lp "#version "
 Print compile time options for this version of NetHack.
+.lp ""
+The second paragraph lists the user interface(s) that are included.
+If there are more than one, you can use the
+.op window_type
+option in your run-time configuration file to select the one you want.
+.lp ""
 Autocompletes.
 Default key is \(oqM-v\(cq.
 .lp #versionshort
-Show version string.
+Show the program's version number, plus the date and time that the
+running copy was built from sources (not the version's release date).
 Default key is \(oqv\(cq.
 .lp "#vision  "
 Show vision array.
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 045329d68..236322d1b 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -45,7 +45,7 @@
 %.au
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.7 by Mike Stephenson and others)}
-\date{November 30, 2020}
+\date{December 9, 2020}
 
 \maketitle
 
@@ -1136,7 +1136,7 @@ Combines the preceding five type-specific
 commands into one.
 %.lp
 \item[\tb{\$}]
-Count your gold pieces.
+Report the gold you're carrying, possibly shop credit and/or debt too.
 %.lp
 \item[\tb{+}]
 List the spells you know.\\
@@ -1471,9 +1471,6 @@ Show the amulet currently worn. Default key is `{\tt "}'.
 \item[\tb{\#seearmor}]
 Show the armor currently worn. Default key is `{\tt [}'.
 %.lp
-\item[\tb{\#seegold}]
-Count your gold. Default key is `{\tt \$}'.
-%.lp
 \item[\tb{\#seerings}]
 Show the ring(s) currently worn. Default key is `{\tt =}'.
 %.lp
@@ -1491,12 +1488,22 @@ configuration file.
 Use the shell command `{\tt exit}' to return to the game.
 Default key is `{\tt !}'.
 %.lp
+\item[\tb{\#showgold}]
+Report the gold in your inventory and if you are inside a shop,
+report any credit or debt you have in that shop.
+Does not report on any gold inside containers you're carrying.
+Default key is `{\tt \$}'.
+%.lp
 \item[\tb{\#showspells}]
 List and reorder known spells.
 Default key is `{\tt +}'.
 %.lp
 \item[\tb{\#showtrap}]
-Show the type of an adjacent trap.
+Describe an adjacent trap, possibly covered by objects or a monster.
+To be eligible, the trap must already be discovered.
+(The ``{\tt \#terrain}'' command can display your map with all objects and
+monsters temporarily removed, making it possible to see all discovered
+traps.)
 Default key is `{\tt \^{}}'.
 %.lp
 \item[\tb{\#sit}]
@@ -1586,10 +1593,19 @@ Debug mode only.
 %.lp
 \item[\tb{\#version}]
 Print compile time options for this version of {\it NetHack\/}.
+
+%.lp
+The second paragraph lists the user interface(s) that are included.
+If there are more than one, you can use the {\it window\verb+_+type\/}
+option in your run-time configuration file to select the one you want.
+
+%.lp
 Autocompletes. Default key is `{\tt M-v}'.
 %.lp
 \item[\tb{\#versionshort}]
-Show version string. Default key is `{\tt v}'.
+Show the program's version number, plus the date and time that the
+running copy was built from sources (not the version's release date).
+Default key is `{\tt v}'.
 %.lp
 \item[\tb{\#vision}]
 Show vision array.