Virgin import of GNU texinfo 4.0

1 files changed, 772 insertions, 220 deletions

diff --git a/contrib/texinfo/doc/info-stnd.texi b/contrib/texinfo/doc/info-stnd.texi
index 9eb6836d..c08a8a5 100644
--- a/contrib/texinfo/doc/info-stnd.texi
+++ b/contrib/texinfo/doc/info-stnd.texi
@@ -2,18 +2,17 @@
 @comment %**start of header
 @setfilename info-stnd.info
 @settitle GNU Info
-@set InfoProgVer 2.11
-@paragraphindent none
-@footnotestyle end
 @synindex vr cp
 @synindex fn cp
 @synindex ky cp
 @comment %**end of header
-@comment $Id: info-stnd.texi,v 1.3 1997/07/06 21:49:30 karl Exp $
+@comment $Id: info-stnd.texi,v 1.23 1999/06/25 21:57:04 karl Exp $
+
+@include version.texi
 
 @dircategory Texinfo documentation system
 @direntry
-* info program: (info-stnd).    Standalone Info-reading program.
+* Standalone info program: (info-stnd).    Standalone Info-reading program.
 @end direntry
 
 @ifinfo
@@ -23,7 +22,7 @@ documentation for the Info reader that is part of GNU Emacs.  If you do
 not know how to use Info, but have a working Info reader, you should
 read that documentation first.
 
-Copyright @copyright{} 1992, 93, 96, 97 Free Software Foundation, Inc.
+Copyright @copyright{} 1992, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -50,12 +49,14 @@ approved by the Free Software Foundation.
 @end ifinfo
 
 @titlepage
-@title GNU Info User's Guide
-@subtitle For GNU Info version @value{InfoProgVer}
-@author Brian J. Fox (bfox@@ai.mit.edu)
+@title GNU Info
+@subtitle for version @value{VERSION}, @value{UPDATED}
+@author Brian J. Fox (bfox@@gnu.org)
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1997 Free Software Foundation
+Copyright @copyright{} 1992, 93, 97, 98, 99 Free Software Foundation
+
+This manual is for GNU Info version @value{VERSION}, @value{UPDATED}.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -74,21 +75,23 @@ except that this permission notice may be stated in a translation
 approved by the Free Software Foundation.
 @end titlepage
 
-@ifinfo
-@node Top, What is Info, , (dir)
-@top The GNU Info Program
+@ifnottex
+@node Top
+@top GNU Info
 
 This file documents GNU Info, a program for viewing the on-line
-formatted versions of Texinfo files, version @value{InfoProgVer}.  This
+formatted versions of Texinfo files, version @value{VERSION}.  This
 documentation is different from the documentation for the Info reader
 that is part of GNU Emacs.
-@end ifinfo
+
+This manual is for Info version @value{VERSION}, updated @value{UPDATED}.
+@end ifnottex
 
 @menu
-* What is Info::                
-* Options::                     Options you can pass on the command line.
+* What is Info::                What is Info?
+* Invoking Info::               Options you can pass on the command line.
 * Cursor Commands::             Commands which move the cursor within a node.
-* Scrolling Commands::          Commands for moving the node around 
+* Scrolling Commands::          Commands for moving the node around
                                   in a window.
 * Node Commands::               Commands for selecting a new node.
 * Searching Commands::          Commands for searching an Info file.
@@ -97,30 +100,29 @@ that is part of GNU Emacs.
 * Printing Nodes::              How to print out the contents of a node.
 * Miscellaneous Commands::      A few commands that defy categories.
 * Variables::                   How to change the default behavior of Info.
-* GNU Info Global Index::       Global index containing keystrokes, 
-                                  command names, variable names, 
+* GNU Info Global Index::       Global index containing keystrokes,
+                                  command names, variable names,
                                   and general concepts.
 @end menu
 
-@node What is Info, Options, Top, Top
-@chapter What is Info?
 
-@iftex
-This file documents GNU Info, a program for viewing the on-line formatted
-versions of Texinfo files, version @value{InfoProgVer}.
-@end iftex
+@node What is Info
+@chapter What is Info?
 
 @dfn{Info} is a program which is used to view Info files on an ASCII
 terminal.  @dfn{Info files} are the result of processing Texinfo files
 with the program @code{makeinfo} or with one of the Emacs commands, such
 as @code{M-x texinfo-format-buffer}.  Texinfo itself is a documentation
 system that uses a single source file to produce both on-line
-information and printed output.  You can typeset and print the
-files that you read in Info.@refill
+information and printed output.  You can typeset and print the files
+that you read in Info.
 
-@node Options, Cursor Commands, What is Info, Top
-@chapter Command Line Options
+
+@node Invoking Info
+@chapter Invoking Info
+@cindex invoking info
 @cindex command line options
+@cindex options, command line
 @cindex arguments, command line
 
 GNU Info accepts several options to control the initial node being
@@ -128,24 +130,46 @@ viewed, and to specify which directories to search for Info files.  Here
 is a template showing an invocation of GNU Info from the shell:
 
 @example
-info [--@var{option-name} @var{option-value}] @var{menu-item}@dots{}
+info [@var{option}]@dots{} [@var{menu-item}@dots{}]
 @end example
 
-The following @var{option-names} are available when invoking Info from
-the shell:
+The program accepts the following options:
 
 @table @code
+@item --apropos=@var{string}
+@cindex Searching all indices
+@cindex Info files@r{, searching all indices}
+@cindex Apropos@r{, in Info files}
+Specify a string to search in every index of every Info file installed
+on your system.  Info looks up the named @var{string} in all the indices
+it can find, prints the results to standard output, and then exits.  If
+you are not sure which Info file explains certain issues, this option is
+your friend.  Note that if your system has a lot of Info files
+installed, searching all of them might take some time.
+
 @cindex directory path
 @item --directory @var{directory-path}
 @itemx -d @var{directory-path}
-Add @var{directory-path} to the list of directory paths searched when
-Info needs to find a file.  You may issue @code{--directory} multiple
-times; once for each directory which contains Info files.
-Alternatively, you may specify a value for the environment variable
-@code{INFOPATH}; if @code{--directory} is not given, the value of
-@code{INFOPATH} is used.  The value of @code{INFOPATH} is a colon
-separated list of directory names.  If you do not supply @code{INFOPATH}
-or @code{--directory-path}, Info uses a default path.
+Prepend @var{directory-path} to the list of directory paths searched
+when Info needs to find a file.  You may issue @code{--directory}
+multiple times; once for each directory which contains Info files.  The
+list of directories searched by Info is constructed from the value of
+the environment variable @code{INFOPATH}; @code{--directory} causes the
+named @var{directory-path} to be prepended to that list.  The value of
+@code{INFOPATH} is a list of directories usually separated by a colon;
+on MS-DOS/MS-Windows systems, the semicolon is used.  If you do not
+define @code{INFOPATH}, Info uses a default path defined when Info was
+built as the initial list of directories.  If the value of
+@code{INFOPATH} ends with a colon (or semicolon on MS-DOS/MS-Windows),
+the initial list of directories is constructed by appending the
+build-time default to the value of @code{INFOPATH}.
+
+@cindex keystrokes, recording
+@cindex remembering user keystrokes
+@item --dribble=@var{dribble-file}
+Specify a file where all user keystrokes will be recorded.  This file
+can be used later to replay the same sequence of commands, see the
+@samp{--restore} option below.
 
 @item --file @var{filename}
 @itemx -f @var{filename}
@@ -154,23 +178,66 @@ Specify a particular Info file to visit.  By default, Info visits
 the file @code{dir}; if you use this option, Info will start with
 @code{(@var{filename})Top} as the first file and node.
 
+@cindex relative Info file names
+@cindex file names, relative
+@cindex Info files, relative
+If @var{filename} is an absolute file name, or begins with @file{./} or
+@file{../}, Info looks for @var{filename} only in the directory of the
+specified @var{filename}, and adds the directory of @var{filename} to
+the value of @code{INFOPATH}.  In contrast, if @var{filename} is in the
+form of a relative file name, but without the @file{./} or @file{../}
+prefix, Info will only look for it in the directories specified in
+@code{INFOPATH}.  In other words, Info does @emph{not} treat file names
+which lack @file{./} and @file{../} prefix as relative to the current
+directory.
+
+@cindex compressed Info files
+@cindex files, compressed
+@cindex Info files, compressed
+In every directory Info tries, if @var{filename} is not found, Info
+looks for it with a number of known extensions of Info files@footnote{
+@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}.  For every
+known extension, Info looks for a compressed file, if a regular file
+isn't found.  Info supports files compressed with @code{gzip},
+@code{bzip2}, @code{compress} and @code{yabba} programs; it calls
+@code{gunzip}, @code{bunzip2}, @code{uncompress} and @code{unyabba},
+accordingly, to decompress such files.  Compressed Info files are
+assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or
+@file{.Y} extensions, possibly in addition to one of the known Info
+files extensions@footnote{The MS-DOS version allows for the Info
+extension, such as @code{.inf}, and the short compressed file
+extensions, such as @file{.z} and @file{.gz}, to be merged into a single
+extension, since DOS doesn't allow more than a single dot in the
+basename of a file.  Thus, on MS-DOS, if Info looks for @file{bison},
+file names like @file{bison.igz} and @file{bison.inz} will be found and
+decompressed by @code{gunzip}.}.
+
+@item --help
+@itemx -h
+Produces a relatively brief description of the available Info options.
+
 @item --index-search @var{string}
-@cindex index search, selecting
+@cindex index search, selecting from the command line
 @cindex online help, using Info as
-Go to the index entry @var{string} in the Info file specified with
-@samp{--file}.  If no such entry, print @samp{no entries found} and exit
-with nonzero status.  This can used from another program as a way to
-provide online help.
+After processing all command-line arguments, go to the index in the Info
+file and search for index entries which matche @var{string}.  If such an
+entry is found, the Info session begins with displaying the node pointed
+to by the first matching index entry; press @kbd{,} to step through the
+rest of the matching entries.  If no such entry exists, print @samp{no
+entries found} and exit with nonzero status.  This can be used from
+another program as a way to provide online help, or as a quick way of
+starting to read an Info file at a certain node when you don't know the
+exact name of that node.
 
 @item --node @var{nodename}
 @itemx -n @var{nodename}
-@cindex node, selecting
+@cindex node, selecting from the command line
 Specify a particular node to visit in the initial file that Info
 loads.  This is especially useful in conjunction with
 @code{--file}@footnote{Of course, you can specify both the file and node
 in a @code{--node} command; but don't forget to escape the open and
-close parentheses from the shell as in: @code{info --node
-"(emacs)Buffers"}}.  You may specify @code{--node} multiple times; for
+close parentheses and whitespace from the shell as in: @code{info --node
+"(emacs)Buffers"}.}.  You may specify @code{--node} multiple times; for
 an interactive Info, each @var{nodename} is visited in its own window,
 for a non-interactive Info (such as when @code{--output} is given) each
 @var{nodename} is processed sequentially.
@@ -184,6 +251,36 @@ Each node that Info visits will be output to @var{filename} instead of
 interactively viewed.  A value of @code{-} for @var{filename} specifies
 the standard output.
 
+@cindex replaying recorded keystrokes
+@item --restore=@var{dribble-file}
+Read keystrokes from @var{dribble-file}, presumably recorded during
+previous Info session (see the description of the @samp{--dribble}
+option above).  When the keystrokes in the files are all read, Info
+reverts its input to the usual interactive operation.
+
+@anchor{--show-options}
+@cindex command-line options, how to find
+@cindex invocation description, how to find
+@item --show-options
+@itemx --usage
+@itemx -O
+This option causes Info to look for the node that describes how to
+invoke the program and its command-line options, and begin the session
+by displaying that node.  It is provided to make it easier to find the
+most important usage information in a manual without the need to wade
+through complex menu hierarchies.  The effect is similar to the
+@code{M-x goto-invocation} command (@pxref{goto-invocation}) from inside
+Info.
+
+@cindex speech synthesizers
+@item --speech-friendly
+@itemx -b
+On MS-DOS/MS-Windows only, this option causes Info to use standard file
+I/O functions for screen writes.  (By default, Info uses direct writes
+to the video memory on these systems, for faster operation and colored
+display support.)  This allows the speech synthesizers used by blind
+persons to catch the output and convert it to audible speech.
+
 @item --subnodes
 @cindex @code{--subnodes}, command line option
 This option only has meaning when given in conjunction with
@@ -192,21 +289,26 @@ the menus of each node being output.  Menu items which resolve to
 external Info files are not output, and neither are menu items which are
 members of an index.  Each node is only output once.
 
-@item --help
-@itemx -h
-Produces a relatively brief description of the available Info options.
-
 @item --version
 @cindex version information
 Prints the version information of Info and exits.
 
+@anchor{--vi-keys}
+@cindex vi-like key bindings
+@cindex Less-like key bindings
+@item --vi-keys
+This option binds functions to keys differently, to emulate the key
+bindings of @code{vi} and Less.  The default key bindings are generally
+modeled after Emacs.
+
 @item @var{menu-item}
 @cindex menu, following
+@anchor{command-line menu items}
 Info treats its remaining arguments as the names of menu items.  The
-first argument is a menu item in the initial node visited, while
-the second argument is a menu item in the first argument's node.
-You can easily move to the node of your choice by specifying the menu
-names which describe the path to that node.  For example,
+first argument is a menu item in the initial node visited (generally
+@code{dir}), the second argument is a menu item in the first argument's
+node, etc.  You can easily move to the node of your choice by specifying
+the menu names which describe the path to that node.  For example,
 
 @example
 info emacs buffers
@@ -218,9 +320,23 @@ and then selects the menu item @samp{Buffers} in the node
 @samp{(emacs)Top}.
 @end table
 
-@node Cursor Commands, Scrolling Commands, Options, Top
+To avoid searching the @file{dir} files and just show some arbitrary
+file, use @samp{-f} and the filename, as in @samp{info -f ./foo.info}.
+
+The index search and the search for the node which describes program
+invocation and command-line options begins @emph{after} processing all
+the command-line menu items.  Therefore, the Info file searched for the
+index or the invocation node is the file where Info finds itself after
+following all the menu items given on the command line.  This is so
+@samp{info emacs --show-options} does what you'd expect.
+
+@c FIXME: the feature with lowercasing the file name isn't documented
+
+
+@node Cursor Commands
 @chapter Moving the Cursor
 @cindex cursor, moving
+@cindex moving the cursor
 
 Many people find that reading screens of text page by page is made
 easier when one is able to indicate particular pieces of text with some
@@ -230,7 +346,12 @@ move the cursor about the screen.  The notation used in this manual to
 describe keystrokes is identical to the notation used within the Emacs
 manual, and the GNU Readline manual.  @xref{Characters, , Character
 Conventions, emacs, the GNU Emacs Manual}, if you are unfamiliar with the
-notation.
+notation@footnote{
+Here's a short summary.  @kbd{C-@var{x}} means press the @kbd{CTRL} key
+and the key @var{x}.  @kbd{M-@var{x}} means press the @kbd{META} key and
+the key @var{x}.  On many terminals th @kbd{META} key is known as the
+@kbd{ALT} key.  @kbd{SPC} is the space bar.  The other keys are usually
+called by the names imprinted on them.}.
 
 The following table lists the basic cursor movement commands in Info.
 Each entry consists of the key sequence you should type to execute the
@@ -239,8 +360,8 @@ invokes @code{execute-extended-command}.  @xref{M-x, , Executing an
 extended command, emacs, the GNU Emacs Manual}, for more detailed
 information.} command name (displayed in parentheses), and a short
 description of what the command does.  All of the cursor motion commands
-can take an @dfn{numeric} argument (@pxref{Miscellaneous Commands,
-@code{universal-argument}}), to find out how to supply them.  With a
+can take a @dfn{numeric} argument (see @ref{Miscellaneous Commands,
+@code{universal-argument}, to find out how to supply them}.  With a
 numeric argument, the motion commands are simply executed that
 many times; for example, a numeric argument of 4 given to
 @code{next-line} causes the cursor to move down 4 lines.  With a
@@ -249,59 +370,83 @@ given to the @code{next-line} command would cause the cursor to move
 @emph{up} 4 lines.
 
 @table @asis
-@item @code{C-n} (@code{next-line})
+@item @key{C-n} (@code{next-line})
+@itemx @key{DOWN} (an arrow key)
 @kindex C-n
+@kindex DOWN (an arrow key)
 @findex next-line
 Move the cursor down to the next line.
 
-@item @code{C-p} (@code{prev-line})
+@item @key{C-p} (@code{prev-line})
+@itemx @key{UP} (an arrow key)
 @kindex C-p
+@kindex UP (an arrow key)
 @findex prev-line
 Move the cursor up to the previous line.
 
-@item @code{C-a} (@code{beginning-of-line})
+@item @key{C-a} (@code{beginning-of-line})
+@itemx @key{Home} (on DOS/Windows only)
 @kindex C-a, in Info windows
+@kindex Home
 @findex beginning-of-line
 Move the cursor to the start of the current line.
 
-@item @code{C-e} (@code{end-of-line})
+@item @key{C-e} (@code{end-of-line})
+@itemx @key{End} (on DOS/Windows only)
 @kindex C-e, in Info windows
+@kindex End
 @findex end-of-line
 Move the cursor to the end of the current line.
 
-@item @code{C-f} (@code{forward-char})
+@item @key{C-f} (@code{forward-char})
+@itemx @key{RIGHT} (an arrow key)
 @kindex C-f, in Info windows
+@kindex RIGHT (an arrow key)
 @findex forward-char
 Move the cursor forward a character.
 
-@item @code{C-b} (@code{backward-char})
+@item @key{C-b} (@code{backward-char})
+@itemx @key{LEFT} (an arrow key)
 @kindex C-b, in Info windows
+@kindex LEFT (an arrow key)
 @findex backward-char
 Move the cursor backward a character.
 
-@item @code{M-f} (@code{forward-word})
+@item @key{M-f} (@code{forward-word})
+@itemx @kbd{C-@key{RIGHT}} (on DOS/Windows only)
 @kindex M-f, in Info windows
+@kindex C-RIGHT
 @findex forward-word
 Move the cursor forward a word.
 
-@item @code{M-b} (@code{backward-word})
+@item @key{M-b} (@code{backward-word})
+@itemx @kbd{C-@key{LEFT}} (on DOS/Windows only)
 @kindex M-b, in Info windows
+@kindex C-LEFT
 @findex backward-word
 Move the cursor backward a word.
 
-@item @code{M-<} (@code{beginning-of-node})
-@itemx @code{b}
+@item @key{M-<} (@code{beginning-of-node})
+@itemx @key{C-@key{Home}} (on DOS/Windows only)
+@itemx @key{b}
+@itemx @key{M-b}, vi-like operation
 @kindex b, in Info windows
 @kindex M-<
+@kindex C-Home
+@kindex M-b, vi-like operation
 @findex beginning-of-node
 Move the cursor to the start of the current node.
 
-@item @code{M->} (@code{end-of-node})
+@item @key{M->} (@code{end-of-node})
+@itemx @key{C-@key{End}} (on DOS/Windows only)
+@itemx @key{e}
 @kindex M->
+@kindex e, in Info windows
+@kindex C-End
 @findex end-of-node
 Move the cursor to the end of the current node.
 
-@item @code{M-r} (@code{move-to-window-line})
+@item @key{M-r} (@code{move-to-window-line})
 @kindex M-r
 @findex move-to-window-line
 Move the cursor to a specific line of the window.  Without a numeric
@@ -319,11 +464,23 @@ current paragraph you are reading is visible on the screen.  The
 commands detailed in this section are used to shift which part of the
 current node is visible on the screen.
 
+Scrolling commands are bound differently when @samp{--vi-keys} operation
+(@pxref{--vi-keys}) is in effect.  These key bindings are designated
+with ``vi-like operation''.
+
 @table @asis
-@item @code{SPC} (@code{scroll-forward})
-@itemx @code{C-v}
+@item @key{SPC} (@code{scroll-forward})
+@itemx @key{NEXT} (an arrow key)
+@itemx @key{C-v}
+@itemx @key{C-f}, vi-like operation
+@itemx @key{f}, vi-like operation
+@itemx @key{M-SPC}, vi-like operation
 @kindex SPC, in Info windows
+@kindex NEXT
 @kindex C-v
+@kindex C-f, vi-like operation
+@kindex f, vi-like operation
+@kindex M-SPC, vi-like operation
 @findex scroll-forward
 Shift the text in this window up.  That is, show more of the node which
 is currently below the bottom of the window.  With a numeric argument,
@@ -332,15 +489,99 @@ argument of 4 would shift all of the text in the window up 4 lines
 (discarding the top 4 lines), and show you four new lines at the bottom
 of the window.  Without a numeric argument, @key{SPC} takes the bottom
 two lines of the window and places them at the top of the window,
-redisplaying almost a completely new screenful of lines.
-
-@item @code{DEL} (@code{scroll-backward})
-@itemx @code{M-v}
+redisplaying almost a completely new screenful of lines.  If you are at
+the end of a node, SPC takes you to the ``next'' node, so that you can
+read an entire manual from start to finish by repeating SPC.
+
+The default scroll size is one screen-full, but it can be changed by
+invoking the (@code{scroll-forward-set-window}) command, @samp{z} under
+@samp{--vi-keys}, with a numeric argument.
+
+@kindex PageDown
+The @key{NEXT} key is known as the @key{PageDown} key on some
+keyboards.  When you use @key{NEXT} or @key{PageDown} to scroll, Info
+never scrolls beyond the end of the current node.
+
+@item @key{z} (@code{scroll-forward-set-window}, vi-like operation)
+@kindex z, vi-like operation
+@findex scroll-forward-set-window
+Scroll forward, like with @key{SPC}, but if a numeric argument is
+specified, it becomes the default scroll size for subsequent
+@code{scroll-forward} and @code{scroll-backward} commands.
+
+@item @key{DEL} (@code{scroll-backward})
+@itemx @key{PREVIOUS} (arrow key)
+@itemx @key{PRIOR} (arrow key)
+@itemx @key{M-v}
+@itemx @key{b}, vi-like operation
+@itemx @key{C-b}, vi-like operation
 @kindex DEL, in Info windows
+@kindex PREVIOUS
 @kindex M-v
+@kindex b, vi-like operation
+@kindex C-b, vi-like operation
 @findex scroll-backward
 Shift the text in this window down.  The inverse of
-@code{scroll-forward}.
+@code{scroll-forward}.  The default scroll size can be changed by
+invoking the(@code{scroll-backward-set-window}) command, @samp{w} under
+@samp{--vi-keys}, with a numeric argument.
+
+@item @key{w} (@code{scroll-backward-set-window}, vi-like operation)
+@kindex w, vi-like operation
+@findex scroll-backward-set-window
+Scroll backward, like with @key{DEL}, but if a numeric argument is
+specified, it becomes the default scroll size for subsequent
+@code{scroll-forward} and @code{scroll-backward} commands.
+
+@item @key{C-n} (@code{down-line}, vi-like operation)
+@itemx @key{C-e}, vi-like operation
+@itemx @key{RET}, vi-like operation
+@itemx @key{LFD}, vi-like operation
+@itemx @key{DOWN}, vi-like operation
+@kindex C-n, vi-like operation
+@kindex C-e, vi-like operation
+@kindex RET, vi-like operation
+@kindex LFD, vi-like operation
+@kindex DOWN, vi-like operation
+@findex down-line
+Scroll forward by one line.  With a numeric argument, scroll forward
+that many lines.
+
+@item @key{C-p} (@code{up-line}, vi-like operation)
+@itemx @key{UP}, vi-like operation
+@itemx @key{y}, vi-like operation
+@itemx @key{k}, vi-like operation
+@itemx @key{C-k}, vi-like operation
+@itemx @key{C-y}, vi-like operation
+@kindex C-p, vi-like operation
+@kindex UP, vi-like operation
+@kindex y, vi-like operation
+@kindex k, vi-like operation
+@kindex C-k, vi-like operation
+@kindex C-y, vi-like operation
+@findex up-line
+Scroll backward one line.  With a numeric argument, scroll backward that
+many lines.
+
+@item @key{d} (@code{scroll-half-screen-down}, vi-like operation)
+@itemx @key{C-d}, vi-like operation
+@kindex d, vi-like operation
+@kindex C-d, vi-like operation
+@findex scroll-half-screen-down
+Scroll forward by half of the screen size.  With a numeric argument,
+scroll that many lines.  If an argument is specified, it becomes the new
+default number of lines to scroll for subsequent @samp{d} and @samp{u}
+commands.
+
+@item @key{u} (@code{scroll-half-screen-up}, vi-like operation)
+@itemx @key{C-u}, vi-like operation
+@kindex u, vi-like operation
+@kindex C-u, vi-like operation
+@findex scroll-half-screen-up
+Scroll back by half of the screen size.  With a numeric argument,
+scroll that many lines.  If an argument is specified, it becomes the new
+default number of lines to scroll for subsequent @samp{u} and @samp{d}
+commands.
 @end table
 
 @cindex scrolling through node structure
@@ -351,8 +592,19 @@ viewing the beginning of a node, what happens is controlled by the
 variable @code{scroll-behavior}.  @xref{Variables,
 @code{scroll-behavior}}, for more information.
 
+@kindex PageUp
+The @key{PREVIOUS} key is the @key{PageUp} key on many keyboards.  Emacs
+refers to it by the name @key{PRIOR}.  When you use @key{PRIOR} or
+@key{PageUp} to scroll, Info never scrolls beyond the beginning of the
+current node.
+
+@kindex BS (backspace)
+If your keyboard lacks the @key{DEL} key, look for a key called
+@key{BS}, or @samp{BackSpace}, sometimes designated with an arrow which
+points to the left, which should perform the same function.
+
 @table @asis
-@item @code{C-l} (@code{redraw-display})
+@item @key{C-l} (@code{redraw-display})
 @kindex C-l
 @findex redraw-display
 Redraw the display from scratch, or shift the line containing the cursor
@@ -361,7 +613,7 @@ the screen, and then redraws its entire contents.  Given a numeric
 argument of @var{n}, the line containing the cursor is shifted so that
 it is on the @var{n}th line of the window.
 
-@item @code{C-x w} (@code{toggle-wrap})
+@item @kbd{C-x @key{w}} (@code{toggle-wrap})
 @kindex C-w
 @findex toggle-wrap
 Toggles the state of line wrapping in the current window.  Normally,
@@ -372,7 +624,8 @@ terminated at the rightmost column by changing the state of line
 wrapping in the window with @code{C-x w}.  When a line which needs more
 space than one screen width to display is displayed, a @samp{$} appears
 in the rightmost column of the screen, and the remainder of the line is
-invisible.
+invisible.  When long lines are truncated, the modeline displays the
+@samp{$} character near its left edge.
 @end table
 
 @node Node Commands, Searching Commands, Scrolling Commands, Top
@@ -383,7 +636,9 @@ This section details the numerous Info commands which select a new node
 to view in the current window.
 
 The most basic node commands are @samp{n}, @samp{p}, @samp{u}, and
-@samp{l}.
+@samp{l}.  Note that the commands to select nodes are mapped differently
+when @samp{--vi-keys} is in effect; these keybindings are designated
+below as ``vi-like operation''.
 
 When you are viewing a node, the top line of the node contains some Info
 @dfn{pointers} which describe where the next, previous, and up nodes
@@ -391,47 +646,78 @@ are.  Info uses this line to move about the node structure of the file
 when you use the following commands:
 
 @table @asis
-@item @code{n} (@code{next-node})
+@item @key{n} (@code{next-node})
+@itemx @kbd{C-@key{NEXT}} (on DOS/Windows only)
+@itemx @kbd{C-x @key{n}}, vi-like operation
 @kindex n
+@kindex C-NEXT
+@kindex C-x n, vi-like operation
 @findex next-node
-Select the `Next' node.  
+Select the `Next' node.
 
-@item @code{p} (@code{prev-node})
+@kindex C-PgDn
+The @key{NEXT} key is known as the @key{PgDn} key on some
+keyboards.
+
+@item @key{p} (@code{prev-node})
+@itemx @kbd{C-@key{PREVIOUS}} (on DOS/Windows only)
 @kindex p
+@kindex C-PREVIOUS
 @findex prev-node
 Select the `Prev' node.
 
-@item @code{u} (@code{up-node})
+@kindex C-PgUp
+The @key{PREVIOUS} key is known as the @key{PgUp} key on some
+keyboards.
+
+@item @key{u} (@code{up-node})
+@itemx @kbd{C-@key{UP}} (an arrow key on DOS/Windows only)
+@itemx @kbd{C-x @key{u}}, vi-like operation
 @kindex u
+@kindex C-UP
+@kindex C-x u, vi-like operation
 @findex up-node
 Select the `Up' node.
 @end table
 
 You can easily select a node that you have already viewed in this window
 by using the @samp{l} command -- this name stands for "last", and
-actually moves through the list of already visited nodes for this
-window.  @samp{l} with a negative numeric argument moves forward through
-the history of nodes for this window, so you can quickly step between
-two adjacent (in viewing history) nodes.
+actually moves backwards through the history of visited nodes for this
+window.  This is handy when you followed a reference to another node,
+possibly to read about a related issue, and would like then to resume
+reading at the same place where you started the excursion.
+
+Each node where you press @samp{l} is discarded from the history.  Thus,
+by the time you get to the first node you visited in a window, the
+entire history of that window is discarded.
 
 @table @asis
-@item @code{l} (@code{history-node})
+@item @key{l} (@code{history-node})
+@itemx @key{C-@key{CENTER}} (on DOS/Windows only)
+@itemx @key{'}, vi-like operation
 @kindex l
+@kindex C-CENTER
+@kindex ', vi-like operation
 @findex history-node
-Select the most recently selected node in this window.
+Pop the most recently selected node in this window from the node
+history.
 @end table
 
 Two additional commands make it easy to select the most commonly
 selected nodes; they are @samp{t} and @samp{d}.
 
 @table @asis
-@item @code{t} (@code{top-node})
+@item @key{t} (@code{top-node})
+@itemx @key{M-t}, vi-like operation
 @kindex t
+@kindex M-t, vi-like operation
 @findex top-node
 Select the node @samp{Top} in the current Info file.
 
-@item @code{d} (@code{dir-node})
+@item @key{d} (@code{dir-node})
+@itemx @key{M-d}, vi-like operation
 @kindex d
+@kindex M-d, vi-like operation
 @findex dir-node
 Select the directory node (i.e., the node @samp{(dir)}).
 @end table
@@ -440,18 +726,27 @@ Here are some other commands which immediately result in the selection
 of a different node in the current window:
 
 @table @asis
-@item @code{<} (@code{first-node})
+@item @key{<} (@code{first-node})
+@itemx @key{g}, vi-like operation
 @kindex <
+@kindex g, vi-like operation
 @findex first-node
 Selects the first node which appears in this file.  This node is most
-often @samp{Top}, but it does not have to be.
+often @samp{Top}, but it does not have to be.  With a numeric argument
+@var{N}, select the @var{N}th node (the first node is node 1).  An
+argument of zero is the same as the argument of 1.
 
-@item @code{>} (@code{last-node})
+@item @key{>} (@code{last-node})
+@itemx @key{G}, vi-like operation
 @kindex >
+@kindex G, vi-like operation
 @findex last-node
-Select the last node which appears in this file.
+Select the last node which appears in this file.  With a numeric argument
+@var{N}, select the @var{N}th node (the first node is node 1).  An
+argument of zero is the same as no argument, i.e., it selects the last
+node.
 
-@item @code{]} (@code{global-next-node})
+@item @key{]} (@code{global-next-node})
 @kindex ]
 @findex global-next-node
 Move forward or down through node structure.  If the node that you are
@@ -460,7 +755,7 @@ Otherwise, if this node has a menu, the first menu item is selected.  If
 there is no @samp{Next} and no menu, the same process is tried with the
 @samp{Up} node of this node.
 
-@item @code{[} (@code{global-prev-node})
+@item @key{[} (@code{global-prev-node})
 @kindex [
 @findex global-prev-node
 Move backward or up through node structure.  If the node that you are
@@ -475,13 +770,18 @@ You can get the same behavior as @code{global-next-node} and
 more information.
 
 @table @asis
-@item @code{g} (@code{goto-node})
+@anchor{goto-node}
+@item @key{g} (@code{goto-node})
+@itemx @kbd{C-x @key{g}}, vi-like operation
 @kindex g
+@kindex C-x g, vi-like operation
 @findex goto-node
-Read the name of a node and select it.  No completion is done while
-reading the node name, since the desired node may reside in a separate
-file.  The node must be typed exactly as it appears in the Info file.  A
-file name may be included as with any node specification, for example
+Read the name of a node and select it.  While reading the node name,
+completion (@pxref{The Echo Area, completion}) is only done for the
+nodes which reside in one of the Info files that were loaded in the
+current Info session; if the desired node resides in some other file,
+you must type the node exactly as it appears in that Info file, and you
+must include the Info file of the other file.  For example,
 
 @example
 @code{g(emacs)Buffers}
@@ -489,7 +789,61 @@ file name may be included as with any node specification, for example
 
 finds the node @samp{Buffers} in the Info file @file{emacs}.
 
-@item @code{C-x k} (@code{kill-node})
+@anchor{goto-invocation}
+@item @key{O} (@code{goto-invocation}
+@itemx @key{I}
+@kindex O
+@kindex I
+@findex goto-invocation
+@cindex finding the Invocation node
+Read the name of a program and look for a node in the current Info file
+which describes the invocation and the command-line options for that
+program.  The default program name is derived from the name of the
+current Info file.  This command does the same as the
+@samp{--show-options} command-line option (@pxref{--show-options}), but
+it also allows to specify the program name; this is important for those
+manuals which describe several programs.
+
+If you need to find the Invocation node of a program that is documented
+in another Info file, you need to visit that file before invoking
+@samp{I}.  For example, if you are reading the Emacs manual and want to
+see the command-line options of the @code{makeinfo} program, type @kbd{g
+(texinfo) @key{RET}} and then @kbd{I makeinfo @key{RET}}.  If you don't
+know what Info file documents the command, or if invoking @samp{I}
+doesn't display the right node, go to the @samp{(dir)} node (using the
+@samp{d} command) and invoke @samp{I} from there.
+
+@item @key{G} (@code{menu-sequence})
+@kindex G
+@findex menu-sequence
+@cindex menu, following, from inside Info
+Read a sequence of menu entries and follow it.  Info prompts for a
+sequence of menu items separated by commas.  (Since commas are not
+allowed in a node name, they are a natural choice for a delimiter in a
+list of menu items.)  Info then looks up the first item in the menu of
+the node @samp{(dir)} (if the @samp{(dir)} node cannot be found, Info
+uses @samp{Top}).  If such an entry is found, Info goes to the node it
+points to and looks up the second item in the menu of that node, etc.
+In other words, you can specify a complete path which descends through
+the menu hierarchy of a particular Info file starting at the
+@samp{(dir)} node.  This has the same effect as if you typed the menu
+item sequence on Info's command line, see @ref{command-line menu items,,
+Info command-line arguments processing}.  For example,
+
+@example
+ @kbd{G Texinfo,Overview,Reporting Bugs @key{RET}}
+@end example
+
+@noindent
+displays the node @samp{Reporting Bugs} in the Texinfo manual.  (You
+don't actually need to type the menu items in their full length, or in
+their exact letter-case.  However, if you do type the menu items
+exactly, Info will find it faster.)
+
+If any of the menu items you type are not found, Info stops at the last
+entry it did find and reports an error.
+
+@item @kbd{C-x @key{k}} (@code{kill-node})
 @kindex C-x k
 @findex kill-node
 Kill a node.  The node name is prompted for in the echo area, with a
@@ -498,7 +852,7 @@ hard to forget about it, removing it from the list of history nodes kept
 for the window where that node is found.  Another node is selected in
 the window which contained the killed node.
 
-@item @code{C-x C-f} (@code{view-file})
+@item @kbd{C-x C-f} (@code{view-file})
 @kindex C-x C-f
 @findex view-file
 Read the name of a file and selects the entire file.  The command
@@ -510,14 +864,14 @@ is equivalent to typing
 @code{g(@var{filename})*}
 @end example
 
-@item @code{C-x C-b} (@code{list-visited-nodes})
+@item @kbd{C-x C-b} (@code{list-visited-nodes})
 @kindex C-x C-b
 @findex list-visited-nodes
 Make a window containing a menu of all of the currently visited nodes.
 This window becomes the selected window, and you may use the standard
 Info commands within it.
 
-@item @code{C-x b} (@code{select-visited-node})
+@item @kbd{C-x @key{b}} (@code{select-visited-node})
 @kindex C-x b
 @findex select-visited-node
 Select a node which has been previously visited in a visible window.
@@ -534,49 +888,111 @@ entire Info file, search through the indices of an Info file, or find
 areas within an Info file which discuss a particular topic.
 
 @table @asis
-@item @code{s} (@code{search})
+@item @key{s} (@code{search})
+@itemx @key{/}
 @kindex s
+@kindex /
 @findex search
-Read a string in the echo area and search for it.
-
-@item @code{C-s} (@code{isearch-forward})
+Read a string in the echo area and search for it.  If the string
+includes upper-case characters, the Info file is searched
+case-sensitively; otherwise Info ignores the letter case.  With a
+numeric argument of @var{N}, search for @var{N}th occurrence of the
+string.  Negative arguments search backwards.
+
+@item @key{?} (@code{search-backward}, vi-like operation)
+@kindex ?, vi-like operation
+@findex search-backward
+Read a string in the echo area and search backward through the Info file
+for that string.  If the string includes upper-case characters, the Info
+file is searched case-sensitively; otherwise Info ignores the letter
+case.  With a numeric argument of @var{N}, search for @var{N}th
+occurrence of the string.  Negative arguments search forward.
+
+@item @key{S} (@code{search-case-sensitively}
+@kindex S
+@findex search-case-sensitively
+@cindex search, case-sensitive
+@cindex case-sensitive search
+Read a string in the echo area and search for it case-sensitively, even
+if the string includes only lower-case letters.  With a numeric argument
+of @var{N}, search for @var{N}th occurrence of the string.  Negative
+arguments search backwards.
+
+@item @kbd{C-x @key{n}} (@code{search-next})
+@itemx @key{n}, vi-like operation
+@kindex C-x n
+@kindex n, vi-like operation
+@findex search-next
+@cindex repeated search
+Search for the same string used in the last search command, in the same
+direction, and with the same case-sensitivity option.  With a numeric
+argument of @var{N}, search for @var{N}th next occurrence.
+
+@item @kbd{C-x @key{N}} (@code{search-previous})
+@itemx @key{N}, vi-like operation
+@kindex C-x N
+@kindex n, vi-like operation
+@findex search-previous
+Search for the same string used in the last search command, and with the
+same case-sensitivity option, but in the reverse direction.  With a
+numeric argument of @var{N}, search for @var{N}th previous occurrence.
+
+@item @key{C-s} (@code{isearch-forward})
 @kindex C-s
 @findex isearch-forward
+@cindex incremental search
 Interactively search forward through the Info file for a string as you
-type it.
+type it.  If the string includes upper-case characters, the search is
+case-sensitive; otherwise Info ignores the letter case.
 
-@item @code{C-r} (@code{isearch-backward})
+@item @key{C-r} (@code{isearch-backward})
 @kindex C-r
 @findex isearch-backward
 Interactively search backward through the Info file for a string as
-you type it.
+you type it.  If the string includes upper-case characters, the search
+is case-sensitive; otherwise Info ignores the letter case.
 
-@item @code{i} (@code{index-search})
+@item @key{i} (@code{index-search})
 @kindex i
 @findex index-search
+@cindex index, searching
+@cindex searching, in the indices
 Look up a string in the indices for this Info file, and select a node
 where the found index entry points to.
 
-@item @code{,} (@code{next-index-match})
+@item @key{,} (@code{next-index-match})
 @kindex ,
 @findex next-index-match
 Move to the node containing the next matching index item from the last
 @samp{i} command.
 @end table
 
-The most basic searching command is @samp{s} (@code{search}).  The
-@samp{s} command prompts you for a string in the echo area, and then
-searches the remainder of the Info file for an occurrence of that string.
-If the string is found, the node containing it is selected, and the
-cursor is left positioned at the start of the found string.  Subsequent
-@samp{s} commands show you the default search string within @samp{[} and
-@samp{]}; pressing @key{RET} instead of typing a new string will use the
-default search string.
+The most basic searching command is @samp{s} or @samp{/}
+(@code{search}).  The @samp{s} command prompts you for a string in the
+echo area, and then searches the remainder of the Info file for an
+occurrence of that string.  If the string is found, the node containing
+it is selected, and the cursor is left positioned at the start of the
+found string.  Subsequent @samp{s} commands show you the default search
+string within @samp{[} and @samp{]}; pressing @key{RET} instead of
+typing a new string will use the default search string.  Under
+@samp{--vi-keys} (@pxref{--vi-keys}), using the @samp{n} or @samp{N}
+commands is a faster way of searching for the same string.
 
 @dfn{Incremental searching} is similar to basic searching, but the
 string is looked up while you are typing it, instead of waiting until
 the entire search string has been specified.
 
+@cindex search, and case-sensitivity
+@cindex case-sensitivity, and search
+Both incremental and non-incremental search by default ignore the case
+of letters when comparing the Info file text with the search string.
+However, an uppercase letter in the search string makes the search
+case-sensitive.  You can force a case-sensitive non-incremental search,
+even for a string that includes only lower-case letters, by using the
+@samp{S} command (@code{search-case-sensitively}).  The @samp{n} and
+@samp{N} commands operate case-sensitively if the last search command
+was @samp{S}.
+
 @node Xref Commands, Window Commands, Searching Commands, Top
 @chapter Selecting Cross References
 
@@ -645,63 +1061,85 @@ references.
 The following table lists the Info commands which operate on menu items.
 
 @table @asis
-@item @code{1} (@code{menu-digit})
-@itemx @code{2} @dots{} @code{9}
+@item @key{1} (@code{menu-digit})
+@itemx @key{2} @dots{} @key{9}
+@itemx @key{M-1}, vi-like operation
+@itemx @key{M-2} @dots{} @key{M-9}, vi-like operation
 @cindex 1 @dots{} 9, in Info windows
+@cindex M-1 @dots{} M-9, vi-like operation
 @kindex 1 @dots{} 9, in Info windows
+@kindex M-1 @dots{} M-9, vi-like operation
 @findex menu-digit
 Within an Info window, pressing a single digit, (such as @samp{1}),
 selects that menu item, and places its node in the current window.
 For convenience, there is one exception; pressing @samp{0} selects the
-@emph{last} item in the node's menu.
+@emph{last} item in the node's menu.  When @samp{--vi-keys} is in
+effect, digits set the numeric argument, so these commands are remapped
+to their @samp{M-} varieties.  For example, to select the last menu
+item, press @key{M-0}.
 
-@item @code{0} (@code{last-menu-item})
+@item @key{0} (@code{last-menu-item})
+@itemx @key{M-0}, vi-like operation
 @kindex 0, in Info windows
+@kindex M-0, vi-like operation
 @findex last-menu-item
 Select the last item in the current node's menu.
 
-@item @code{m} (@code{menu-item})
+@item @key{m} (@code{menu-item})
 @kindex m
 @findex menu-item
 Reads the name of a menu item in the echo area and selects its node.
-Completion is available while reading the menu label.
+Completion is available while reading the menu label.  @xref{The Echo
+Area, completion}.
 
-@item @code{M-x find-menu}
+@item @kbd{M-x find-menu}
 @findex find-menu
 Move the cursor to the start of this node's menu.
 @end table
 
-This table lists the Info commands which operate on note cross references.
+This table lists the Info commands which operate on cross references.
 
 @table @asis
-@item @code{f} (@code{xref-item})
-@itemx @code{r}
+@item @key{f} (@code{xref-item})
+@itemx @key{r}
+@item @key{M-f}, vi-like operation
+@itemx @kbd{C-x @key{r}}, vi-like operation
 @kindex f
 @kindex r
+@kindex M-f, vi-like operation
+@kindex C-x r, vi-like operation
 @findex xref-item
 Reads the name of a note cross reference in the echo area and selects
 its node.  Completion is available while reading the cross reference
-label.
+label.  @xref{The Echo Area, completion}.
 @end table
 
 Finally, the next few commands operate on menu or note references alike:
 
 @table @asis
-@item @code{TAB} (@code{move-to-next-xref})
+@item @key{TAB} (@code{move-to-next-xref})
 @kindex TAB, in Info windows
 @findex move-to-next-xref
 Move the cursor to the start of the next nearest menu item or note
 reference in this node.  You can then use @key{RET}
 (@code{select-reference-this-line}) to select the menu or note reference.
 
-@item @code{M-TAB} (@code{move-to-prev-xref})
+@item @key{M-TAB} (@code{move-to-prev-xref})
+@itemx @key{Shift-@key{TAB}} (on DOS/Windows only)
 @kindex M-TAB, in Info windows
 @findex move-to-prev-xref
 Move the cursor the start of the nearest previous menu item or note
 reference in this node.
 
-@item @code{RET} (@code{select-reference-this-line})
+@kindex Shift-TAB, in Info windows
+@kindex BackTab, in Info windows
+On DOS/Windows only, the @kbd{Shift-@key{TAB}} key is an alias for
+@kbd{M-@key{TAB}}.  This key is sometimes called @samp{BackTab}.
+
+@item @key{RET} (@code{select-reference-this-line})
+@itemx @key{M-g}, vi-like operation
 @kindex RET, in Info windows
+@kindex M-g, vi-like operation
 @findex select-reference-this-line
 Select the menu item or note reference appearing on this line.
 @end table
@@ -744,7 +1182,7 @@ named @file{dir}, showing the node @samp{Top}.
 
 @example
 @group
------Info: (dir)Top, 40 lines --Top---------------------------------------
+-----Info: (dir)Top, 40 lines --Top-------------------------------------
             ^^   ^   ^^^        ^^
           (file)Node #lines    where
 @end group
@@ -756,8 +1194,16 @@ the Info file containing the node has been split into subfiles, the name
 of the subfile containing the node appears in the modeline as well:
 
 @example
---zz-Info: (emacs)Top, 291 lines --Top-- Subfile: emacs-1.Z---------------
-@end example 
+--zz-Info: (emacs)Top, 291 lines --Top-- Subfile: emacs-1.Z-------------
+@end example
+
+Truncation of long lines (as opposed to wrapping them to the next
+display line, @pxref{Scrolling Commands, toggle-wrap}) is indicated by a
+@samp{$} at the left edge of the mode line:
+
+@example
+--$--Info: (texinfo)Top, 480 lines --Top-- Subfile: texinfo-1-----------
+@end example
 
 When Info makes a node internally, such that there is no corresponding
 info file on disk, the name of the node is surrounded by asterisks
@@ -766,7 +1212,7 @@ are; the sample mode line below shows an internally constructed node
 showing possible completions:
 
 @example
------Info: *Completions*, 7 lines --All-----------------------------------
+-----Info: *Completions*, 7 lines --All---------------------------------
 @end example
 
 @node Basic Windows, The Echo Area, The Mode Line, Window Commands
@@ -778,7 +1224,7 @@ own mode line (@pxref{The Mode Line}) and history of nodes viewed in that
 window (@pxref{Node Commands, , @code{history-node}}).
 
 @table @asis
-@item @code{C-x o} (@code{next-window})
+@item @kbd{C-x @key{o}} (@code{next-window})
 @cindex windows, selecting
 @kindex C-x o
 @findex next-window
@@ -790,12 +1236,12 @@ window on the screen.  Given a numeric argument, @samp{C-x o} moves over
 that many windows.  A negative argument causes @samp{C-x o} to select
 the previous window on the screen.
 
-@item @code{M-x prev-window}
+@item @kbd{M-x prev-window}
 @findex prev-window
 Select the previous window on the screen.  This is identical to
 @samp{C-x o} with a negative argument.
 
-@item @code{C-x 2} (@code{split-window})
+@item @kbd{C-x @key{2}} (@code{split-window})
 @cindex windows, creating
 @kindex C-x 2
 @findex split-window
@@ -806,7 +1252,7 @@ can cause all of the windows on the screen to be resized for you
 automatically, please @pxref{Variables, , automatic-tiling} for more
 information.
 
-@item @code{C-x 0} (@code{delete-window})
+@item @kbd{C-x @key{0}} (@code{delete-window})
 @cindex windows, deleting
 @kindex C-x 0
 @findex delete-window
@@ -814,26 +1260,26 @@ Delete the current window from the screen.  If you have made too many
 windows and your screen appears cluttered, this is the way to get rid of
 some of them.
 
-@item @code{C-x 1} (@code{keep-one-window})
+@item @kbd{C-x @key{1}} (@code{keep-one-window})
 @kindex C-x 1
 @findex keep-one-window
 Delete all of the windows excepting the current one.
 
-@item @code{ESC C-v} (@code{scroll-other-window})
+@item @kbd{ESC @key{C-v}} (@code{scroll-other-window})
 @kindex ESC C-v, in Info windows
 @findex scroll-other-window
 Scroll the other window, in the same fashion that @samp{C-v} might
 scroll the current window.  Given a negative argument, scroll the
 "other" window backward.
 
-@item @code{C-x ^} (@code{grow-window})
+@item @kbd{C-x @key{^}} (@code{grow-window})
 @kindex C-x ^
 @findex grow-window
 Grow (or shrink) the current window.  Given a numeric argument, grow
 the current window that many lines; with a negative numeric argument,
 shrink the window instead.
 
-@item @code{C-x t} (@code{tile-windows})
+@item @kbd{C-x @key{t}} (@code{tile-windows})
 @cindex tiling
 @kindex C-x t
 @findex tile-windows
@@ -858,117 +1304,170 @@ table briefly lists the commands that are available while input is being
 read in the echo area:
 
 @table @asis
-@item @code{C-f} (@code{echo-area-forward})
+@item @key{C-f} (@code{echo-area-forward})
+@itemx @key{RIGHT} (an arrow key)
+@itemx @key{M-h}, vi-like operation
 @kindex C-f, in the echo area
+@kindex RIGHT, in the echo area
+@kindex M-h, in the echo area, vi-like operation
 @findex echo-area-forward
 Move forward a character.
 
-@item @code{C-b} (@code{echo-area-backward})
+@item @key{C-b} (@code{echo-area-backward})
+@itemx @key{LEFT} (an arrow key)
+@itemx @key{M-l}, vi-like operation
+@kindex LEFT, in the echo area
 @kindex C-b, in the echo area
+@kindex M-l, in the echo area, vi-like operation
 @findex echo-area-backward
 Move backward a character.
 
-@item @code{C-a} (@code{echo-area-beg-of-line})
+@item @key{C-a} (@code{echo-area-beg-of-line})
+@itemx @key{M-0}, vi-like operation
 @kindex C-a, in the echo area
+@kindex M-0, in the echo area, vi-like operation
 @findex echo-area-beg-of-line
 Move to the start of the input line.
 
-@item @code{C-e} (@code{echo-area-end-of-line})
+@item @key{C-e} (@code{echo-area-end-of-line})
+@itemx @key{M-$}, vi-like operation
 @kindex C-e, in the echo area
+@kindex M-$, vi-like operation
 @findex echo-area-end-of-line
 Move to the end of the input line.
 
-@item @code{M-f} (@code{echo-area-forward-word})
+@item @key{M-f} (@code{echo-area-forward-word})
+@itemx @key{C-@key{RIGHT}} (DOS/Windows only)
+@itemx @key{M-w}, vi-like operation
 @kindex M-f, in the echo area
+@kindex M-w, in the echo area, vi-like operation
 @findex echo-area-forward-word
 Move forward a word.
 
-@item @code{M-b} (@code{echo-area-backward-word})
+@kindex C-RIGHT, in the echo area
+On DOS/Windows, @kbd{C-@key{RIGHT}} moves forward by words.
+
+@item @key{M-b} (@code{echo-area-backward-word})
+@itemx @key{C-@key{LEFT}} (DOS/Windows only)
 @kindex M-b, in the echo area
 @findex echo-area-backward-word
 Move backward a word.
 
-@item @code{C-d} (@code{echo-area-delete})
+@kindex C-LEFT, in the echo area
+On DOS/Windows, @kbd{C-@key{LEFT}} moves backward by words.
+
+@item @key{C-d} (@code{echo-area-delete})
+@itemx @key{M-x}, vi-like operation
 @kindex C-d, in the echo area
+@kindex M-x, in the echo area, vi-like operation
 @findex echo-area-delete
 Delete the character under the cursor.
 
-@item @code{DEL} (@code{echo-area-rubout})
+@item @key{DEL} (@code{echo-area-rubout})
 @kindex DEL, in the echo area
 @findex echo-area-rubout
 Delete the character behind the cursor.
 
-@item @code{C-g} (@code{echo-area-abort})
+On some keyboards, this key is designated @key{BS}, for
+@samp{BackSpace}.  Those keyboards will usually bind @key{DEL} in the
+echo area to @code{echo-area-delete}.
+
+@item @key{C-g} (@code{echo-area-abort})
+@itemx @key{C-u}, vi-like operation
 @kindex C-g, in the echo area
+@kindex C-u, in the echo area, vi-like operation
 @findex echo-area-abort
-Cancel or quit the current operation.  If completion is being read,
-@samp{C-g} discards the text of the input line which does not match any
-completion.  If the input line is empty, @samp{C-g} aborts the calling
-function.
+Cancel or quit the current operation.  If completion is being read, this
+command discards the text of the input line which does not match any
+completion.  If the input line is empty, it aborts the calling function.
 
-@item @code{RET} (@code{echo-area-newline})
+@item @key{RET} (@code{echo-area-newline})
 @kindex RET, in the echo area
 @findex echo-area-newline
 Accept (or forces completion of) the current input line.
 
-@item @code{C-q} (@code{echo-area-quoted-insert})
+@item @key{C-q} (@code{echo-area-quoted-insert})
+@itemx @key{C-v}, vi-like operation
 @kindex C-q, in the echo area
+@kindex C-v, in the echo area, vi-like operation
 @findex echo-area-quoted-insert
 Insert the next character verbatim.  This is how you can insert control
-characters into a search string, for example.
+characters into a search string, for example, or the @samp{?} character
+when Info prompts with completion.
 
 @item @var{printing character} (@code{echo-area-insert})
 @kindex printing characters, in the echo area
 @findex echo-area-insert
-Insert the character.
+Insert the character.  Characters that have their 8th bit set, and not
+bound to @samp{M-} commands, are also inserted verbatim; this is useful
+for terminals which support Latin scripts.
 
-@item @code{M-TAB} (@code{echo-area-tab-insert})
+@item @key{M-TAB} (@code{echo-area-tab-insert})
+@itemx @key{Shift-@key{TAB}} (on DOS/Windows only)
 @kindex M-TAB, in the echo area
+@kindex Shift-TAB, in the echo area
 @findex echo-area-tab-insert
 Insert a TAB character.
 
-@item @code{C-t} (@code{echo-area-transpose-chars})
+@kindex Shift-TAB, in the echo area
+@kindex BackTab, in the echo area
+On DOS/Windows only, the @kbd{Shift-@key{TAB}} key is an alias for
+@kbd{M-@key{TAB}}.  This key is sometimes called @samp{BackTab}.
+
+@item @key{C-t} (@code{echo-area-transpose-chars})
 @kindex C-t, in the echo area
 @findex echo-area-transpose-chars
 Transpose the characters at the cursor.
 @end table
 
 The next group of commands deal with @dfn{killing}, and @dfn{yanking}
-text.  For an in depth discussion of killing and yanking,
-@pxref{Killing, , Killing and Deleting, emacs, the GNU Emacs Manual}
+text@footnote{
+Some people are used to calling these operations @dfn{cut} and
+@dfn{paste}, respectively.}.   For an in depth discussion of killing and
+yanking, @pxref{Killing, , Killing and Deleting, emacs, the GNU Emacs
+Manual}
 
 @table @asis
-@item @code{M-d} (@code{echo-area-kill-word})
+@item @key{M-d} (@code{echo-area-kill-word})
+@itemx @key{M-X}, vi-like operation
 @kindex M-d, in the echo area
+@kindex M-X, in the echo area, vi-like operation
 @findex echo-area-kill-word
 Kill the word following the cursor.
 
-@item @code{M-DEL} (@code{echo-area-backward-kill-word})
+@item @key{M-DEL} (@code{echo-area-backward-kill-word})
+@itemx @key{M-@key{BS}}
 @kindex M-DEL, in the echo area
 @findex echo-area-backward-kill-word
 Kill the word preceding the cursor.
 
-@item @code{C-k} (@code{echo-area-kill-line})
+@kindex M-BS, in the echo area
+On some keyboards, the @code{Backspace} key is used instead of
+@code{DEL}, so @code{M-@key{Backspace}} has the same effect as
+@code{M-@key{DEL}}.
+
+@item @key{C-k} (@code{echo-area-kill-line})
 @kindex C-k, in the echo area
 @findex echo-area-kill-line
 Kill the text from the cursor to the end of the line.
 
-@item @code{C-x DEL} (@code{echo-area-backward-kill-line})
+@item @kbd{C-x @key{DEL}} (@code{echo-area-backward-kill-line})
 @kindex C-x DEL, in the echo area
 @findex echo-area-backward-kill-line
 Kill the text from the cursor to the beginning of the line.
 
-@item @code{C-y} (@code{echo-area-yank})
+@item @key{C-y} (@code{echo-area-yank})
 @kindex C-y, in the echo area
 @findex echo-area-yank
 Yank back the contents of the last kill.
 
-@item @code{M-y} (@code{echo-area-yank-pop})
+@item @key{M-y} (@code{echo-area-yank-pop})
 @kindex M-y, in the echo area
 @findex echo-area-yank-pop
 Yank back a previous kill, removing the last yanked text first.
 @end table
 
+@cindex completion
 Sometimes when reading input in the echo area, the command that needed
 input will only accept one of a list of several choices.  The choices
 represent the @dfn{possible completions}, and you must respond with one
@@ -981,14 +1480,14 @@ is called @dfn{completion}.
 The following commands are available when completing in the echo area:
 
 @table @asis
-@item @code{TAB} (@code{echo-area-complete})
-@itemx @code{SPC}
+@item @key{TAB} (@code{echo-area-complete})
+@itemx @key{SPC}
 @kindex TAB, in the echo area
 @kindex SPC, in the echo area
 @findex echo-area-complete
 Insert as much of a completion as is possible.
 
-@item @code{?} (@code{echo-area-possible-completions})
+@item @key{?} (@code{echo-area-possible-completions})
 @kindex ?, in the echo area
 @findex echo-area-possible-completions
 Display a window containing a list of the possible completions of what
@@ -1004,13 +1503,14 @@ forget
 @end example
 
 @noindent
-and you have typed an @samp{f}, followed by @samp{?}, the possible
-completions would contain:
+and you have typed an @samp{f}, followed by @samp{?}, Info will pop up a
+window showing a node called @samp{*Completions*} which lists the
+possible completions like this:
 
 @example
 @group
-foliate
-food
+3 completions:
+foliate         food
 forget
 @end group
 @end example
@@ -1023,7 +1523,7 @@ Now, typing @samp{l} followed by @samp{TAB} results in @samp{foliate}
 appearing in the echo area, since that is the only choice which begins
 with @samp{fol}.
 
-@item @code{ESC C-v} (@code{echo-area-scroll-completions-window})
+@item @key{ESC C-v} (@code{echo-area-scroll-completions-window})
 @kindex ESC C-v, in the echo area
 @findex echo-area-scroll-completions-window
 Scroll the completions window, if that is visible, or the "other"
@@ -1034,19 +1534,29 @@ window if not.
 @chapter Printing Out Nodes
 @cindex printing
 
-You may wish to print out the contents of a node as  a quick reference
-document for later use.  Info provides you with a command for doing
-this.  In general, we recommend that you use @TeX{} to format the
-document and print sections of it, by running @code{tex} on the Texinfo
-source file.
+In general, we recommend that you use @TeX{} to format the document and
+print sections of it, by running @code{tex} on the Texinfo source file.
+However, you may wish to print out the contents of a node as a quick
+reference document for later use, or if you don't have @TeX{} installed.
+Info provides you with a command for doing this.
 
 @table @asis
-@item @code{M-x print-node}
+@item @kbd{M-x print-node}
 @findex print-node
 @cindex INFO_PRINT_COMMAND, environment variable
 Pipe the contents of the current node through the command in the
 environment variable @code{INFO_PRINT_COMMAND}.  If the variable does not
-exist, the node is simply piped to @code{lpr}.
+exist, the node is simply piped to @code{lpr} (on DOS/Windows, the
+default is to print the node to the local printer device, @file{PRN}).
+
+@cindex printing nodes to the local printer
+@cindex local printer device
+The value of @code{INFO_PRINT_COMMAND} may begin with the @samp{>}
+character, as in @samp{>/dev/printer}, in which case Info treats the
+rest as the name of a file or a device.  Instead of piping to a command,
+Info opens the file, writes the node contents, and closes the file,
+under the assumption that text written to that file will be printed by
+the underlying OS.
 @end table
 
 @node Miscellaneous Commands, Variables, Printing Nodes, Top
@@ -1055,39 +1565,45 @@ exist, the node is simply piped to @code{lpr}.
 GNU Info contains several commands which self-document GNU Info:
 
 @table @asis
-@item @code{M-x describe-command}
+@item @kbd{M-x describe-command}
 @cindex functions, describing
 @cindex commands, describing
 @findex describe-command
 Read the name of an Info command in the echo area and then display a
 brief description of what that command does.
 
-@item @code{M-x describe-key}
+@item @kbd{M-x describe-key}
 @cindex keys, describing
 @findex describe-key
 Read a key sequence in the echo area, and then display the name and
 documentation of the Info command that the key sequence invokes.
 
-@item @code{M-x describe-variable}
+@item @kbd{M-x describe-variable}
 Read the name of a variable in the echo area and then display a brief
 description of what the variable affects.
 
-@item @code{M-x where-is}
+@item @kbd{M-x where-is}
 @findex where-is
 Read the name of an Info command in the echo area, and then display
 a key sequence which can be typed in order to invoke that command.
 
-@item @code{C-h} (@code{get-help-window})
-@itemx @code{?}
+@item @key{C-h} (@code{get-help-window})
+@itemx @key{?}
+@itemx @key{F1} (on DOS/Windows only)
+@itemx h, vi-like operation
 @kindex C-h
 @kindex ?, in Info windows
+@kindex F1
+@kindex h, vi-like operation
 @findex get-help-window
 Create (or Move into) the window displaying @code{*Help*}, and place
 a node containing a quick reference card into it.  This window displays
 the most concise information about GNU Info available.
 
-@item @code{h} (@code{get-info-help-node})
+@item @key{h} (@code{get-info-help-node})
+@itemx @key{M-h}, vi-like operation
 @kindex h
+@kindex M-h, vi-like operation
 @findex get-info-help-node
 Try hard to visit the node @code{(info)Help}.  The Info file
 @file{info.texi} distributed with GNU Info contains this node.  Of
@@ -1098,18 +1614,25 @@ placed into the location of your Info directory.
 Here are the commands for creating a numeric argument:
 
 @table @asis
-@item @code{C-u} (@code{universal-argument})
+@item @key{C-u} (@code{universal-argument})
 @cindex numeric arguments
 @kindex C-u
 @findex universal-argument
 Start (or multiply by 4) the current numeric argument.  @samp{C-u} is
 a good way to give a small numeric argument to cursor movement or
 scrolling commands; @samp{C-u C-v} scrolls the screen 4 lines, while
-@samp{C-u C-u C-n} moves the cursor down 16 lines.
-
-@item @code{M-1} (@code{add-digit-to-numeric-arg})
-@itemx @code{M-2} @dots{} @code{M-9}
-@kindex M-1 @dots{} M-9
+@samp{C-u C-u C-n} moves the cursor down 16 lines.  @samp{C-u} followed
+by digit keys sets the numeric argument to the number thus typed:
+@kbd{C-u 1 2 0} sets the argument to 120.
+
+@item @key{M-1} (@code{add-digit-to-numeric-arg})
+@itemx @key{1}, vi-like operation
+@itemx @key{M-2} @dots{} @key{M-9}
+@itemx @key{2} @dots{} @key{9}, vi-like operation
+@itemx @key{M-0}
+@itemx @key{0}, vi-like operation
+@kindex M-0 @dots{} M-9
+@kindex 0 @dots{} 9, vi-like operation
 @findex add-digit-to-numeric-arg
 Add the digit value of the invoking key to the current numeric
 argument.  Once Info is reading a numeric argument, you may just type
@@ -1126,6 +1649,22 @@ or
 @example
 @kbd{M-3 2 C-l}
 @end example
+
+@item @key{M--} (@code{add-digit-to-numeric-arg}
+@itemx @key{-}
+@kindex M--
+@kindex -
+@cindex negative arguments
+@cindex arguments, negative
+@cindex numeric arguments, negative
+To make a negative argument, type @kbd{-}.  Typing @kbd{-} alone makes a
+negative argument with a value of -1.  If you continue to type digit or
+Meta-digit keys after @kbd{-}, the result is a negative number produced
+by those digits.
+
+@kbd{-} doesn't work when you type in the echo area, because you need to
+be able to insert the @samp{-} character itself; use @kbd{M--} instead,
+if you need to specify negative arguments in the echo area.
 @end table
 
 @samp{C-g} is used to abort the reading of a multi-character key
@@ -1133,20 +1672,29 @@ sequence, to cancel lengthy operations (such as multi-file searches) and
 to cancel reading input in the echo area.
 
 @table @asis
-@item @code{C-g} (@code{abort-key})
+@item @key{C-g} (@code{abort-key})
+@itemx @key{C-u}, vi-like operation
 @cindex cancelling typeahead
 @cindex cancelling the current operation
 @kindex C-g, in Info windows
+@kindex C-u cancels typeahead, vi-like operation
 @findex abort-key
 Cancel current operation.
 @end table
 
-The @samp{q} command of Info simply quits running Info.
+The @samp{q} command of Info simply quits running Info.  Under
+@samp{--vi-keys} (@pxref{--vi-keys}), you can also exit with @samp{:q}
+or @samp{ZZ}.
 
 @table @asis
-@item @code{q} (@code{quit})
+@item @key{q} (@code{quit})
+@itemx @kbd{C-x C-c}
+@itemx @kbd{:q}, vi-like operation
+@itemx @kbd{ZZ}, vi-like operation
 @cindex quitting
 @kindex q
+@kindex C-x C-c
+@kindex ZZ, vi-like operation
 @findex quit
 Exit GNU Info.
 @end table
@@ -1156,18 +1704,22 @@ and it is actually only 40 lines tall, here is a way to tell Info that
 the operating system is correct.
 
 @table @asis
-@item @code{M-x set-screen-height}
+@item @kbd{M-x set-screen-height}
 @findex set-screen-height
 @cindex screen, changing the height of
 Read a height value in the echo area and set the height of the
 displayed screen to that value.
 @end table
 
+On MS-DOS/MS-Windows, this command actually tries to change the
+dimensions of the visible screen to the value you type in the echo
+area.
+
 Finally, Info provides a convenient way to display footnotes which might
 be associated with the current node that you are viewing:
 
 @table @asis
-@item @code{ESC C-f} (@code{show-footnotes})
+@item @key{ESC C-f} (@code{show-footnotes})
 @kindex ESC C-f
 @findex show-footnotes
 @cindex footnotes, displaying
@@ -1186,17 +1738,17 @@ and thus change the behavior of Info to more closely match your
 environment and Info file reading manner.
 
 @table @asis
-@item @code{M-x set-variable}
+@item @kbd{M-x set-variable}
 @cindex variables, setting
 @findex set-variable
 Read the name of a variable, and the value for it, in the echo area and
 then set the variable to that value.  Completion is available when
-reading the variable name; often, completion is available when reading
-the value to give to the variable, but that depends on the variable
-itself.  If a variable does @emph{not} supply multiple choices to
-complete over, it expects a numeric value.
+reading the variable name (@pxref{The Echo Area, completion}); often,
+completion is available when reading the value to give to the variable,
+but that depends on the variable itself.  If a variable does @emph{not}
+supply multiple choices to complete over, it expects a numeric value.
 
-@item @code{M-x describe-variable}
+@item @kbd{M-x describe-variable}
 @cindex variables, describing
 @findex describe-variable
 Read the name of a variable in the echo area and then display a brief