quaffing documentation

some of the places quaff was documented tried to be general about what it
applied to, but other places, including the Guidebook, were not.

diff --git a/dat/cmdhelp b/dat/cmdhelp
index 790c528d0598295ee8402ca074fc644c9077199e..af4b50e0fa23cd1bb95bbc60fd7cbefe0778b601 100644 (file)
--- a/dat/cmdhelp
+++ b/dat/cmdhelp
@@ -53,7 +53,7 @@ o       Open a door
 O       Show option settings, possibly change them
 p       Pay your shopping bill
 P       Put on an accessory (ring, amulet, etc)
-q       Quaff (drink) something
+q       Quaff (drink) something (potion, water, etc)
 Q       Select ammunition for quiver
 r       Read a scroll or spellbook
 R       Remove an accessory (ring, amulet, etc)

diff --git a/dat/help b/dat/help
index f70b287087de591aa02ba81ee7768c3ffc0ee98b..00abe24398a8e22a07c8a91a6fb7000075392a77 100644 (file)
--- a/dat/help
+++ b/dat/help
@@ -125,7 +125,7 @@ Commands:
         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) a potion.
+        q       Drink (quaff) something (potion, water, etc).
         Q       Select ammunition for quiver.
         r       Read a scroll or spellbook.
         R       Remove an accessory (ring, amulet, etc).

diff --git a/dat/hh b/dat/hh
index ddd6f185df1fb88dd37de303fbe61e2f0d988e00..e61f56405252d9a197e2b5e97ba1efc888900ad1 100644 (file)
--- a/dat/hh
+++ b/dat/hh
@@ -54,7 +54,7 @@ I       Invent  list selected parts of your inventory
 o       open    open a door
 p       pay     pay your bill (in a shop)
 P       puton   put on an accessory (ring, amulet, etc)
-q       quaff   drink a potion
+q       quaff   drink something (potion, water, etc)
 Q       quiver  select ammunition for quiver
 r       read    read a scroll or spellbook
 R       remove  remove an accessory (ring, amulet, etc)

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index aa995b3595250f78c22bcb86f03e995a67114eaa..05faf0b7c722c172a880c2df3c2bd353570b0430 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -5,7 +5,7 @@
 .ds vr "NetHack 3.4
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "April 2, 2003
+.ds f2 "April 4, 2003
 .mt
 A Guide to the Mazes of Menace
 (Guidebook for NetHack)
@@ -573,7 +573,7 @@ Put on a ring or other accessory (amulet, blindfold).
 Repeat previous message.  Subsequent ^P's repeat earlier messages.
 The behavior can be varied via the msg_window option.
 .lp q
-Quaff (drink) a potion.
+Quaff (drink) something (potion, water, etc).
 .lp Q
 Select an object for your quiver.  You can then throw this using
 the `f' command.  (In versions prior to 3.3 this was the command to quit

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index eb49989cbe6740b56ec8f6291a2168bf33c0fe11..5b6a3398a789c00a489ac312ea363cfe6d4ec786 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -27,7 +27,7 @@
 \begin{document}
 %
 % input file: guidebook.mn
-% $Revision: 1.62 $ $Date: 2003/03/14 13:50:58 $
+% $Revision: 1.63 $ $Date: 2003/04/03 10:56:39 $
 %
 %.ds h0 "
 %.ds h1 %.ds h2 \%
@@ -40,7 +40,7 @@
 %.au
 \author{Eric S. Raymond\\
 (Extensively edited and expanded for 3.4)}
-\date{April 2, 2003}
+\date{April 4, 2003}
 
 \maketitle
 
@@ -757,7 +757,7 @@ Repeat previous message.  Subsequent {\tt \^{}P}'s repeat earlier messages.
 The behavior can be varied via the msg_window option.
 %.lp
 \item[\tb{q}]
-Quaff (drink) a potion.
+Quaff (drink) something (potion, water, etc).
 %.lp
 \item[\tb{Q}]
 Select an object for your quiver.  You can then throw this using

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 04aea105d4a30a5c6f5d9a878b5d8bf53d2b8fb0..6682421d8ac66a782b1708ec400d9ee72c0f3077 100644 (file)
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -34,6 +34,7 @@ don't let arrow, rock or dart traps provide an infinite number of objects
 dropping from height or throwing a normal container may damage contents
 some Magicbane messages treated "erinys" as plural
 initialize artifacts before processing $WIZKIT
+clean up inconsistency between various places quaff is documented
 
 
 Platform- and/or Interface-Specific Fixes