diff --git a/dat/hh b/dat/hh
index e61f564052..d917640d21 100644
--- a/dat/hh
+++ b/dat/hh
@@ -83,12 +83,12 @@ _       travel  move via a shortest-path algorithm to a point on the map
 Keyboards that have a meta key can also use these extended commands
 via the meta modifier instead of the # prefix:
 
-M-?             Display extended command help (if the platform allows this)
+M-?             display extended command help (if the platform allows this)
 M-2     twoweapon toggle two-weapon combat (unless number_pad is enabled)
 M-a     adjust  adjust inventory letters
 M-c     chat    talk to someone
 M-d     dip     dip an object into something
-M-e     enhance advance or check weapons skills
+M-e     enhance advance or check weapons or spell skills
 M-f     force   force a lock
 M-i     invoke  invoke an object's special powers
 M-j     jump    jump to another location
diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 6b66b8cfc8..b378b4de6b 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -678,7 +678,7 @@ option is ``on'').
 .lp #chat
 Talk to someone.
 .lp #conduct
-List which challenges you have adhered to.  See the section below entitled
+List voluntary challenges you have maintained.  See the section below entitled
 ``Conduct'' for details.
 .lp #dip
 Dip an object into something.
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 38546e4cba..b0a7cbc7fa 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -27,7 +27,7 @@
 \begin{document}
 %
 % input file: guidebook.mn
-% $Revision: 1.83 $ $Date: 2003/12/03 02:58:14 $
+% $Revision: 1.84 $ $Date: 2004/03/13 01:27:21 $
 %
 %.ds h0 "
 %.ds h1 %.ds h2 \%
@@ -899,7 +899,7 @@ \section{Commands}
 Talk to someone.
 %.lp
 \item[\tb{\#conduct}]
-List which challenges you have adhered to.  See the section below entitled
+List voluntary challenges you have maintained.  See the section below entitled
 ``Conduct'' for details.
 %.lp
 \item[\tb{\#dip}]
diff --git a/src/cmd.c b/src/cmd.c
index 301fb87c99..1df60d8efa 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)cmd.c	3.4	2004/01/09	*/
+/*	SCCS Id: @(#)cmd.c	3.4	2004/10/27	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1545,10 +1545,11 @@ static const struct func_tab cmdlist[] = {
 struct ext_func_tab extcmdlist[] = {
 	{"adjust", "adjust inventory letters", doorganize, TRUE},
 	{"chat", "talk to someone", dotalk, TRUE},	/* converse? */
-	{"conduct", "list which challenges you have adhered to", doconduct, TRUE},
+	{"conduct", "list voluntary challenges you have maintained",
+						doconduct, TRUE},
 	{"dip", "dip an object into something", dodip, FALSE},
-	{"enhance", "advance or check weapons skills", enhance_weapon_skill,
-							TRUE},
+	{"enhance", "advance or check weapons and spell skills",
+						enhance_weapon_skill, TRUE},
 	{"force", "force a lock", doforce, FALSE},
 	{"invoke", "invoke an object's powers", doinvoke, TRUE},
 	{"jump", "jump to a location", dojump, FALSE},