Improve index entries. Remove redundant one.

2 files changed, 10 insertions, 9 deletions

diff --git a/lispref/searching.texi b/lispref/searching.texi
index 782a92977ce..056e1bd51a5 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -106,7 +106,7 @@ leaves point at the beginning of the match.
 @end deffn
 
 @deffn Command word-search-forward string &optional limit noerror repeat
-@cindex word search
+@c  @cindex word search   Redundant
 This function searches forward from point for a ``word'' match for
 @var{string}.  If it finds a match, it sets point to the end of the
 match found, and returns the new value of point.
@@ -220,7 +220,7 @@ a regexp is a very powerful operation.  This section explains how to write
 regexps; the following section says how to search for them.
 
 @findex re-builder
-@cindex authoring regular expressions
+@cindex regular expressions, developing
   For convenient interactive development of regular expressions, you
 can use the @kbd{M-x re-builder} command.  It provides a convenient
 interface for creating regular expressions, by giving immediate visual
@@ -1186,7 +1186,7 @@ match data around it, to prevent it from being overwritten.
 
 @node Replacing Match
 @subsection Replacing the Text that Matched
-@cindex replace match
+@cindex replace matched text
 
   This function replaces all or part of the text matched by the last
 search.  It works by means of the match data.
@@ -1544,8 +1544,8 @@ associated with it still exists.
 
 @node Search and Replace
 @section Search and Replace
-@cindex replacement
-@cindex search and replace
+@cindex replacement after search
+@cindex searching and replacing
 
   If you want to find all matches for a regexp in part of the buffer,
 and replace them, the best way is to write an explicit loop using
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 33c9f1db149..9d9dc8260bb 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -102,9 +102,10 @@ x
 @section Variables that Never Change
 @kindex setting-constant
 @cindex keyword symbol
+@cindex variable with constant value
 @cindex constant variables
-@cindex symbols that evaluate to themselves
-@cindex symbols with constant values
+@cindex symbol that evaluates to itself
+@cindex symbol with constant value
 
   In Emacs Lisp, certain symbols normally evaluate to themselves.  These
 include @code{nil} and @code{t}, as well as any symbol whose name starts
@@ -1080,7 +1081,7 @@ use short names like @code{x}.
 
 @node Buffer-Local Variables
 @section Buffer-Local Variables
-@cindex variables, buffer-local
+@cindex variable, buffer-local
 @cindex buffer-local variables
 
   Global and local variable bindings are found in most programming
@@ -1721,7 +1722,7 @@ This function returns non-@code{nil} if it is safe to give @var{sym}
 the value @var{val}, based on the above criteria.
 @end defun
 
-@cindex risky local variable
+@c @cindex risky local variable   Duplicates risky-local-variable
   Some variables are considered @dfn{risky}.  A variable whose name
 ends in any of @samp{-command}, @samp{-frame-alist}, @samp{-function},
 @samp{-functions}, @samp{-hook}, @samp{-hooks}, @samp{-form},