[7674] remove documentation of --vi-keys bindings from main text

[gavinsmith0123]

Revision: 7674
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7674
Author:   gavin
Date:     2017-02-19 08:03:57 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
remove documentation of --vi-keys bindings from main text

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/info-stnd.texi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-02-19 12:39:37 UTC (rev 7673)
+++ trunk/ChangeLog     2017-02-19 13:03:57 UTC (rev 7674)
@@ -1,5 +1,12 @@
 2017-02-19  Gavin Smith  <address@hidden>
 
+       * doc/info-stnd.texi (Cursor Commands, Scrolling Commands)
+       (Node Commands, Selecting Xrefs, Miscellaneous):
+       Remove documentation of --vi-keys key bindings, except for
+       M-1 ... M-9 as these can't be specified in .infokey.
+
+2017-02-19  Gavin Smith  <address@hidden>
+
        * doc/info-stnd.texi (infokey format): Document the --vi-keys 
        key bindings here.
        (Invoking Info) <--vi-keys>: Refer to 'infokey format' node.

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2017-02-19 12:39:37 UTC (rev 7673)
+++ trunk/doc/info-stnd.texi    2017-02-19 13:03:57 UTC (rev 7674)
@@ -19,7 +19,7 @@
 
 Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001,
 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014, 2015, 2016 Free Software Foundation, Inc.
+2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -658,11 +658,9 @@
 @item @kbd{M-<} (@code{beginning-of-node})
 @itemx @address@hidden (on DOS/Windows only)
 @itemx @kbd{b}
address@hidden @kbd{M-b}, vi-like operation
 @kindex b, in Info windows
 @kindex M-<
 @kindex C-Home
address@hidden M-b, vi-like operation
 @findex beginning-of-node
 Move the cursor to the start of the current node.
 
@@ -694,12 +692,6 @@
 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 is in effect (@pxref{--vi-keys}).  These key bindings are
-designated with ``vi-like operation''.  @xref{Custom Key Bindings}
-for information on arbitrarily customizing key bindings and variable
-settings.
-
 @table @asis
 @item @key{SPC} (@code{scroll-forward})
 @kindex SPC, in Info windows
@@ -717,29 +709,18 @@
 the end of a node, @key{SPC} takes you to the ``next'' node, so that you can
 read an entire manual from start to finish by repeating @key{SPC}.
 
-The default scroll size is one screenful, but it can be changed by
-invoking the (@code{scroll-forward-page-only-set-window}) command,
address@hidden under @samp{--vi-keys}, with a numeric argument.
-
 @kindex PageDown
 The @key{NEXT} key is known as the @key{PageDown} key on some
 keyboards.
 
 @item @kbd{C-v} (@code{scroll-forward-page-only})
address@hidden @kbd{C-f}, vi-like operation
address@hidden @kbd{f}, vi-like operation
address@hidden @kbd{M-SPC}, vi-like operation
 @kindex C-v
address@hidden C-f, vi-like operation
address@hidden f, vi-like operation
address@hidden M-SPC, vi-like operation
 @findex scroll-forward-page-only
 Shift the text in this window up.  This is identical to the @key{SPC}
 operation above, except that it never scrolls beyond the end of the
 current node.
 
address@hidden @kbd{z} (@code{scroll-forward-page-only-set-window}, vi-like 
operation)
address@hidden z, vi-like operation
address@hidden @code{M-x scroll-forward-page-only-set-window}
 @findex scroll-forward-page-only-set-window
 Scroll forward, like with @kbd{C-v}, but if a numeric argument is
 specified, it becomes the default scroll size for subsequent
@@ -756,8 +737,8 @@
 If you are at the start of a node, @key{DEL} takes you to the
 ``previous'' node, so that you can read an entire manual from finish to
 start by repeating @key{DEL}.  The default scroll size can be changed by
-invoking the (@code{scroll-backward-page-only-set-window}) command,
address@hidden under @samp{--vi-keys}, with a numeric argument.
+invoking the (@code{scroll-backward-page-only-set-window}) command with
+a numeric argument.
 
 @kindex BS (backspace)
 If your keyboard lacks the @key{DEL} key, look for a key called
@@ -769,73 +750,43 @@
 refers to it by the name @key{PRIOR}.
 
 @item @kbd{M-v} (@code{scroll-backward-page-only})
address@hidden @kbd{b}, vi-like operation
address@hidden @kbd{C-b}, vi-like operation
 @kindex M-v
address@hidden b, vi-like operation
address@hidden C-b, vi-like operation
 @findex scroll-backward-page-only
 Shift the text in this window down.  The inverse of
 @code{scroll-forward-page-only}.  Does not scroll beyond the start of
 the current node.  The default scroll size can be changed by invoking
-the @code{scroll-backward-page-only-set-window} command, @samp{w} under
address@hidden, with a numeric argument.
+the @code{scroll-backward-page-only-set-window} command with a numeric
+argument.
 
address@hidden @kbd{w} (@code{scroll-backward-page-only-set-window}, vi-like 
operation)
address@hidden w, vi-like operation
address@hidden @code{M-x scroll-backward-page-only-set-window}
 @findex scroll-backward-page-only-set-window
 Scroll backward, like with @kbd{M-v}, but if a numeric argument is
 specified, it becomes the default scroll size for subsequent
 @code{scroll-forward} and @code{scroll-backward} commands.
 
address@hidden @kbd{C-n} (@code{down-line}, vi-like operation)
address@hidden @kbd{C-e}, vi-like operation
address@hidden @key{RET}, vi-like operation
address@hidden @key{LFD}, vi-like operation
address@hidden @key{DOWN}, vi-like operation
address@hidden C-n, vi-like operation
address@hidden C-e, vi-like operation
address@hidden RET, vi-like operation
address@hidden LFD, vi-like operation
address@hidden DOWN, vi-like operation
address@hidden @code{M-x down-line}
 @findex down-line
 Scroll forward by one line.  With a numeric argument, scroll forward
 that many lines.
 
address@hidden @kbd{C-p} (@code{up-line}, vi-like operation)
address@hidden @key{UP}, vi-like operation
address@hidden @kbd{y}, vi-like operation
address@hidden @kbd{k}, vi-like operation
address@hidden @kbd{C-k}, vi-like operation
address@hidden @kbd{C-y}, vi-like operation
address@hidden C-p, vi-like operation
address@hidden UP, vi-like operation
address@hidden y, vi-like operation
address@hidden k, vi-like operation
address@hidden C-k, vi-like operation
address@hidden C-y, vi-like operation
address@hidden @code{M-x up-line}
 @findex up-line
 Scroll backward one line.  With a numeric argument, scroll backward that
 many lines.
 
address@hidden @kbd{d} (@code{scroll-half-screen-down}, vi-like operation)
address@hidden @kbd{C-d}, vi-like operation
address@hidden d, vi-like operation
address@hidden C-d, vi-like operation
address@hidden @code{M-x scroll-half-screen-down}
 @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.
+default number of lines to scroll for subsequent
address@hidden and @code{scroll-half-screen-up} commands.
 
address@hidden @kbd{u} (@code{scroll-half-screen-up}, vi-like operation)
address@hidden @kbd{C-u}, vi-like operation
address@hidden u, vi-like operation
address@hidden C-u, vi-like operation
address@hidden @code{M-x scroll-half-screen-up}
 @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}
+default number of lines to scroll for subsequent
address@hidden and @code{scroll-half-screen-up} 
 commands.
 @end table
 
@@ -883,9 +834,7 @@
 to view in the current window.
 
 The most basic node commands are @samp{n}, @samp{p}, @samp{u}, and
address@hidden  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''.
address@hidden
 
 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
@@ -895,10 +844,8 @@
 @table @asis
 @item @kbd{n} (@code{next-node})
 @itemx @address@hidden (on DOS/Windows only)
address@hidden @kbd{C-x @kbd{n}}, vi-like operation
 @kindex n
 @kindex C-NEXT
address@hidden C-x n, vi-like operation
 @findex next-node
 Select the `Next' node.
 
@@ -919,10 +866,8 @@
 
 @item @kbd{u} (@code{up-node})
 @itemx @address@hidden (an arrow key on DOS/Windows only)
address@hidden @kbd{C-x @kbd{u}}, vi-like operation
 @kindex u
 @kindex C-UP
address@hidden C-x u, vi-like operation
 @findex up-node
 Select the `Up' node.
 @end table
@@ -941,10 +886,8 @@
 @table @asis
 @item @kbd{l} (@code{history-node})
 @itemx @address@hidden (on DOS/Windows only)
address@hidden @kbd{'}, vi-like operation
 @kindex l
 @kindex C-CENTER
address@hidden ', vi-like operation
 @findex history-node
 Pop the most recently selected node in this window from the node
 history.
@@ -955,16 +898,12 @@
 
 @table @asis
 @item @kbd{t} (@code{top-node})
address@hidden @kbd{M-t}, vi-like operation
 @kindex t
address@hidden M-t, vi-like operation
 @findex top-node
 Select the node @samp{Top} in the current Info file.
 
 @item @kbd{d} (@code{dir-node})
address@hidden @kbd{M-d}, vi-like operation
 @kindex d
address@hidden M-d, vi-like operation
 @findex dir-node
 Select the directory node (i.e., the node @samp{(dir)}).
 @end table
@@ -974,9 +913,7 @@
 
 @table @asis
 @item @kbd{<} (@code{first-node})
address@hidden @kbd{g}, vi-like operation
 @kindex <
address@hidden 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.  With a numeric argument
@@ -984,9 +921,7 @@
 argument of zero is the same as the argument of 1.
 
 @item @kbd{>} (@code{last-node})
address@hidden @kbd{G}, vi-like operation
 @kindex >
address@hidden G, vi-like operation
 @findex last-node
 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
@@ -1018,9 +953,7 @@
 @table @asis
 @anchor{goto-node}
 @item @kbd{g} (@code{goto-node})
address@hidden @kbd{C-x @kbd{g}}, vi-like operation
 @kindex g
address@hidden C-x g, vi-like operation
 @findex goto-node
 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
@@ -1038,9 +971,7 @@
 
 @anchor{goto-invocation}
 @item @kbd{O} (@code{goto-invocation})
address@hidden @kbd{I}, vi-like operation
 @kindex O
address@hidden I, vi-like operation
 @findex goto-invocation
 @cindex finding the Invocation node
 Read the name of a program and look for a node in the current Info file
@@ -1159,10 +1090,8 @@
 @anchor{repeated-search}
 @item @kbd{C-x @kbd{n}} (@code{search-next})
 @itemx @address@hidden
address@hidden @kbd{n}, vi-like operation
 @kindex C-x n
 @kindex @}
address@hidden n, vi-like operation
 @findex search-next
 @cindex repeated search
 Search forwards for the string used for the last search command.
@@ -1177,10 +1106,8 @@
 
 @item @kbd{C-x @kbd{N}} (@code{search-previous})
 @itemx @address@hidden
address@hidden @kbd{N}, vi-like operation
 @kindex C-x N
 @kindex @{
address@hidden n, vi-like operation
 @findex search-previous
 Just like @code{search-next}, but in reverse.  You can use
 @code{search-next} and @code{search-previous} together to move forward
@@ -1439,12 +1366,8 @@
 @table @asis
 @item @kbd{f} (@code{xref-item})
 @itemx @kbd{r}
address@hidden @kbd{M-f}, vi-like operation
address@hidden @kbd{C-x @kbd{r}}, vi-like operation
 @kindex f
 @kindex r
address@hidden M-f, vi-like operation
address@hidden 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
@@ -1475,9 +1398,7 @@
 @address@hidden 
 
 @item @key{RET} (@code{select-reference-this-line})
address@hidden @kbd{M-g}, vi-like operation
 @kindex RET, in Info windows
address@hidden M-g, vi-like operation
 @findex select-reference-this-line
 Select the menu item or note reference appearing on this line.
 @end table
@@ -1633,41 +1554,31 @@
 @table @asis
 @item @kbd{C-f} (@code{echo-area-forward})
 @itemx @key{RIGHT} (an arrow key)
address@hidden @kbd{M-h}, vi-like operation
 @kindex C-f, in the echo area
 @kindex RIGHT, in the echo area
address@hidden M-h, in the echo area, vi-like operation
 @findex echo-area-forward
 Move forward a character.
 
 @item @kbd{C-b} (@code{echo-area-backward})
 @itemx @key{LEFT} (an arrow key)
address@hidden @kbd{M-l}, vi-like operation
 @kindex LEFT, in the echo area
 @kindex C-b, in the echo area
address@hidden M-l, in the echo area, vi-like operation
 @findex echo-area-backward
 Move backward a character.
 
 @item @kbd{C-a} (@code{echo-area-beg-of-line})
address@hidden @kbd{M-0}, vi-like operation
 @kindex C-a, in the echo area
address@hidden M-0, in the echo area, vi-like operation
 @findex echo-area-beg-of-line
 Move to the start of the input line.
 
 @item @kbd{C-e} (@code{echo-area-end-of-line})
address@hidden @kbd{M-$}, vi-like operation
 @kindex C-e, in the echo area
address@hidden M-$, vi-like operation
 @findex echo-area-end-of-line
 Move to the end of the input line.
 
 @item @kbd{M-f} (@code{echo-area-forward-word})
 @itemx @address@hidden (DOS/Windows only)
address@hidden @kbd{M-w}, vi-like operation
 @kindex M-f, in the echo area
address@hidden M-w, in the echo area, vi-like operation
 @findex echo-area-forward-word
 Move forward a word.
 
@@ -1684,9 +1595,7 @@
 On DOS/Windows, @address@hidden moves backward by words.
 
 @item @kbd{C-d} (@code{echo-area-delete})
address@hidden @kbd{M-x}, vi-like operation
 @kindex C-d, in the echo area
address@hidden M-x, in the echo area, vi-like operation
 @findex echo-area-delete
 Delete the character under the cursor.
 
@@ -1700,9 +1609,7 @@
 echo area to @code{echo-area-delete}.
 
 @item @kbd{C-g} (@code{echo-area-abort})
address@hidden @kbd{C-u}, vi-like operation
 @kindex C-g, in the echo area
address@hidden C-u, in the echo area, vi-like operation
 @findex echo-area-abort
 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
@@ -1714,9 +1621,7 @@
 Accept (or forces completion of) the current input line.
 
 @item @kbd{C-q} (@code{echo-area-quoted-insert})
address@hidden @kbd{C-v}, vi-like operation
 @kindex C-q, in the echo area
address@hidden 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, or the @samp{?} character
@@ -1754,9 +1659,7 @@
 
 @table @asis
 @item @kbd{M-d} (@code{echo-area-kill-word})
address@hidden @kbd{M-X}, vi-like operation
 @kindex M-d, in the echo area
address@hidden M-X, in the echo area, vi-like operation
 @findex echo-area-kill-word
 Kill the word following the cursor.
 
@@ -1916,11 +1819,9 @@
 
 @item @kbd{H} (@code{get-help-window})
 @itemx @key{F1} (on DOS/Windows only)
address@hidden @kbd{h} and @kbd{H}, vi-like operation
 @kindex C-h
 @kindex ?, in Info windows
 @kindex F1
address@hidden 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
@@ -1927,9 +1828,7 @@
 the most concise information about GNU Info available.
 
 @item @kbd{h} (@code{get-info-help-node})
address@hidden @kbd{M-h}, vi-like operation
 @kindex h
address@hidden 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 Emacs contains
@@ -1940,7 +1839,6 @@
 @cindex current file, information about
 @findex display-file-info
 @kindex =, in Info windows
address@hidden C-g, vi-like operation
 Show information about what's currently being viewed in the echo area:
 the Info file name, and current line number and percentage within the
 current node.
@@ -2007,34 +1905,27 @@
 if you need to specify negative arguments in the echo area.
 @end table
 
address@hidden (@kbd{C-c} in vi-like mode) is used to abort the reading of
-a multi-character key sequence, to cancel lengthy operations (such as
-multi-file searches) and to cancel reading input in the echo area.
address@hidden is used to abort the reading of a multi-character key 
+sequence, to cancel lengthy operations (such as multi-file searches) and 
+to cancel reading input in the echo area.
 
 @table @asis
 @item @kbd{C-g} (@code{abort-key})
address@hidden @kbd{C-c}, vi-like operation
 @cindex cancelling typeahead
 @cindex cancelling the current operation
 @kindex C-g, in Info windows
address@hidden C-c, vi-like operation
 @findex abort-key
 Cancel current operation.
 @end table
 
-The @samp{q} command of Info simply quits running Info.  Under
address@hidden (@pxref{--vi-keys}), you can also exit with @samp{:q}
-or @samp{ZZ}.
+The @samp{q} command of Info simply quits running Info.
 
 @table @asis
 @item @kbd{q} (@code{quit})
 @itemx @kbd{C-x C-c}
address@hidden @kbd{:q}, vi-like operation
address@hidden @kbd{ZZ}, vi-like operation
 @cindex quitting
 @kindex q
 @kindex C-x C-c
address@hidden ZZ, vi-like operation
 @findex quit
 Exit GNU Info.
 @end table