diff --git a/doc/basic.texi b/doc/basic.texi
index b3b23ca..0f7bec9 100644
--- a/doc/basic.texi
+++ b/doc/basic.texi
@@ -15,8 +15,8 @@
 daemons.
 
 @menu
-* Terminal Mode Commands::      Common commands used in a VTY
 * Config Commands::             Commands used in config files
+* Terminal Mode Commands::      Common commands used in a VTY
 * Common Invocation Options::   Starting the daemons
 * Virtual Terminal Interfaces:: Interacting with the daemons
 @end menu
@@ -580,8 +580,8 @@
 @kindex @key{TAB}
 Use command line completion by typing @key{TAB}.
 
-@item
-@kindex ?
+@item ?
+@kindex @key{?}
 You can use command line help by typing @code{help} at the beginning of
 the line.  Typing @kbd{?} at any point in the line will show possible
 completions.