[6509] some rearrangement of Search Commands

[Gavin D. Smith]

Revision: 6509
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6509
Author:   gavin
Date:     2015-08-08 09:25:53 +0000 (Sat, 08 Aug 2015)
Log Message:
-----------
some rearrangement of Search Commands

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-08 08:13:18 UTC (rev 6508)
+++ trunk/ChangeLog     2015-08-08 09:25:53 UTC (rev 6509)
@@ -11,6 +11,20 @@
        (Stand-alone Info): Change "ASCII terminal" to "text terminal", 
        to cover e.g. UTF-8 and ISO-8859-1.
 
+       * doc/info-stnd.texi (Search Commands): Move mention of 
+       'min-search-length' to end.  Remove repeated information about 
+       '}' and '{'.  Remove mention that default search string is 
+       displayed between '[' and ']'.  Move paragraph about incremental 
+       searching to be next to paragraph about non-incremental 
+       searching.  Move description of 'search-next' and 
+       'search-previous' commands earlier, and mention that regex use 
+       (or not) is also maintained.  Remove unnecessary mention that 
+       lines in the same node are not skipped.  Rely more on 
+       description for 'search-next', and mention that 
+       'search-previous' usually goes back to the same match after a 
+       'search-next'.
+       (Index Commands) <i>: Remove mention of unreliable feature.
+
 2015-08-07  Gavin Smith  <address@hidden>
 
        * info/variables.c (info_variables): Help string for 

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2015-08-08 08:13:18 UTC (rev 6508)
+++ trunk/doc/info-stnd.texi    2015-08-08 09:25:53 UTC (rev 6509)
@@ -1145,10 +1145,6 @@
 @var{N}, search for @var{N}th occurrence of the string.  Negative
 arguments search backwards.
 
-Normally, the search pattern should not be shorter than some
-predefined limit.  By default, this limit is set to 1 character.
address@hidden, for more information on this.
-
 @item @kbd{M-x search-backward}
 @itemx @kbd{?}, vi-like operation
 @kindex ?, vi-like operation
@@ -1163,23 +1159,6 @@
 alternative is to first perform a forward search, and then use the
 @code{search-previous} command, described below.
 
address@hidden @kbd{R} (@code{toggle-regexp})
address@hidden R
address@hidden toggle-regexp
-Toggle between using regular expressions and literal strings for
-searching.  Info uses so-called `extended' regular expression syntax
-(@pxref{Regular Expressions,,, grep, GNU Grep}).
-
address@hidden @kbd{S} (@code{search-case-sensitively}
address@hidden S
address@hidden search-case-sensitively
address@hidden search, case-sensitive
address@hidden 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.
-
 @anchor{repeated-search}
 @item @kbd{C-x @kbd{n}} (@code{search-next})
 @itemx @address@hidden
@@ -1189,15 +1168,15 @@
 @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.
+Search forwards for the string used for the last search command.
+Case sensitivity and use of regular expressions are kept the same.  With
+a numeric argument of @var{n}, search for @var{n}th next occurrence.
 
 By default, the search starts at the position immediately following
 the cursor.  However, if the variable @code{search-skip-screen}
 (@pxref{Variables,, @code{search-skip-screen}}) is set, it starts at
 the beginning of the next page, thereby skipping all visibly displayed
-lines (but not any further lines in the current node).
+lines.
 
 @item @kbd{C-x @kbd{N}} (@code{search-previous})
 @itemx @address@hidden
@@ -1206,16 +1185,32 @@
 @kindex @{
 @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 the @var{n}th previous
-occurrence.
+Just like @code{search-next}, but in reverse.  You can use
address@hidden and @code{search-previous} together to move forward
+and backward through matches.  @code{search-previous} usually goes to
+the place in the file that was displayed before an immediately preceding
address@hidden, and vice address@hidden sometimes doesn't
+happen when @code{search-skip-screen} is @code{On}, and the search goes
+across nodes.}
 
-By default, the search starts at the position immediately preceding
-the cursor, but skips visible lines if the variable
address@hidden is set, as with @address@hidden (see preceding
-item).
 
address@hidden @kbd{R} (@code{toggle-regexp})
address@hidden R
address@hidden toggle-regexp
+Toggle between using regular expressions and literal strings for
+searching.  Info uses so-called `extended' regular expression syntax
+(@pxref{Regular Expressions,,, grep, GNU Grep}).
+
address@hidden @kbd{S} (@code{search-case-sensitively}
address@hidden S
address@hidden search-case-sensitively
address@hidden search, case-sensitive
address@hidden 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-s} (@code{isearch-forward})
 @kindex C-s
 @findex isearch-forward
@@ -1238,12 +1233,12 @@
 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.
+string; pressing @key{RET} instead of typing a new string will use the
+default search string.
 
-Using the @address@hidden or @address@hidden commands (or the @samp{n} or 
@samp{N}
-commands under @samp{--vi-keys}; @pxref{--vi-keys}), is a faster way of
-searching for the same string.
address@hidden 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.
 
 @vindex highlight-searches
 @findex clear-search
@@ -1251,10 +1246,6 @@
 commands will be highlighted.  @xref{Variables,, @code{highlight-searches}}.
 Use the @kbd{M-x clear-search} command to clear any search highlights.
 
address@hidden 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
@@ -1266,7 +1257,11 @@
 @samp{N} commands operate case-sensitively if the last search command
 was @samp{S}.
 
+Normally, the search pattern should not be shorter than some
+predefined limit.  By default, this limit is set to 1 character.
address@hidden, for more information on this.
 
+
 @node Index Commands
 @chapter Index Commands
 @cindex index
@@ -1284,8 +1279,7 @@
 @cindex index, searching
 @cindex searching, in the indices
 Look up a string in the indices for this Info file, and select a node
-to which the found index entry points.  If you press @key{RET} without
-giving a string, Info takes you to an index node in the file.
+to which the found index entry points.
 
 @item @kbd{I} (@code{virtual-index})
 @kindex I