diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 4e2e92c776b..1d24db8cae2 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -418,12 +418,11 @@ match in case.  If the value is @code{case-fold-search} (the default),
 then the variable @code{case-fold-search} controls whether to ignore
 case while searching for expansions (@pxref{Lax Search}).
 
-@vindex dabbrev-case-replace
   Normally, dynamic abbrev expansion preserves the case pattern
 @emph{of the dynamic abbrev you are expanding}, by converting the
 expansion to that case pattern.
 
-@vindex dabbrev-case-fold-search
+@vindex dabbrev-case-replace
   The variable @code{dabbrev-case-replace} controls whether to
 preserve the case pattern of the dynamic abbrev.  If it is @code{t},
 the dynamic abbrev's case pattern is preserved in most cases; if it is
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 5878e7da256..0bcb0cc14bc 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -109,8 +109,8 @@ just like digits.  Case is ignored.
 @cindex Unicode characters, inserting
 @cindex insert Unicode character
 @cindex characters, inserting by name or code-point
-@cindex curly quotes
-@cindex curved quotes
+@cindex curly quotes, inserting
+@cindex curved quotes, inserting
   A few common Unicode characters can be inserted via a command
 starting with @kbd{C-x 8}.  For example, @kbd{C-x 8 [} inserts @t{‘}
 which is Unicode code-point @code{U+2018} LEFT SINGLE QUOTATION MARK,
@@ -118,8 +118,8 @@ sometimes called a left single ``curved quote'' or ``curly quote''.
 Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the
 curved quotes @t{’}, @t{“} and @t{”}, respectively.  Also, a working
 Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [}
-and inserts @t{‘}.  To see which characters have @kbd{C-x 8}
-shorthands, type @kbd{C-x 8 C-h}.
+and inserts `.  To see which characters have @kbd{C-x 8} shorthands,
+type @kbd{C-x 8 C-h}.
 
   Alternatively, you can use the command @kbd{C-x 8 @key{RET}}
 (@code{insert-char}).  This prompts for the Unicode name or code-point
@@ -242,9 +242,7 @@ Move to the beginning of the line (@code{move-beginning-of-line}).
 Move to the end of the line (@code{move-end-of-line}).
 
 @item M-f
-@kindex M-f
-@findex forward-word
-Move forward one word (@code{forward-word}).
+Move forward one word (@code{forward-word}).  @xref{Words}.
 
 @item C-@key{RIGHT}
 @itemx M-@key{RIGHT}
@@ -256,9 +254,7 @@ moves @emph{backward} by one word if the current paragraph is
 right-to-left.  @xref{Bidirectional Editing}.
 
 @item M-b
-@kindex M-b
-@findex backward-word
-Move backward one word (@code{backward-word}).
+Move backward one word (@code{backward-word}).  @xref{Words}.
 
 @item C-@key{LEFT}
 @itemx M-@key{LEFT}
@@ -590,7 +586,6 @@ earlier, @kbd{C-n} (@code{next-line}) and @kbd{C-p}
 (@code{previous-line}) are special exceptions: they move point down
 and up, respectively, by one screen line (@pxref{Moving Point}).
 
-@cindex truncation
 @cindex line truncation, and fringes
   Emacs can optionally @dfn{truncate} long logical lines instead of
 continuing them.  This means that every logical line occupies a single
@@ -607,7 +602,6 @@ before they get too long, by inserting newlines.  If you prefer, you
 can make Emacs insert a newline automatically when a line gets too
 long, by using Auto Fill mode.  @xref{Filling}.
 
-@cindex word wrap
   Sometimes, you may need to edit files containing many long logical
 lines, and it may not be practical to break them all up by adding
 newlines.  In that case, you can use Visual Line mode, which enables
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 1a27fe877e0..9ed57263930 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -144,7 +144,7 @@ b} commands get the window and/or frame to display in.
 file, can also be used to switch to an existing file-visiting buffer.
 @xref{Visiting}.
 
-@findex goto-line
+@findex goto-line@r{, with an argument}
   @kbd{C-u M-g M-g}, that is @code{goto-line} with a plain prefix
 argument, reads a number @var{n} using the minibuffer, selects the
 most recently selected buffer other than the current buffer in another
@@ -454,7 +454,7 @@ Toggle the buffer's read-only status
 
 @item t
 @findex Buffer-menu-visit-tags-table
-@kindex % @r{(Buffer Menu)}
+@kindex t @r{(Buffer Menu)}
 Visit the buffer as a tags table
 (@code{Buffer-menu-visit-tags-table}).  @xref{Select Tags Table}.
 @end table
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 6b8be48d84a..8d199c9c38f 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -791,7 +791,7 @@ For example, an anniversary diary entry can insert
 the number of years since the anniversary date into the text of the
 diary entry.  Thus the @samp{%d} in this diary entry:
 
-@findex diary-anniversary
+@findex diary-anniversary@r{, and sexp diary entries}
 @smallexample
 %%(diary-anniversary 10 31 1948) Arthur's birthday (%d years old)
 @end smallexample
@@ -821,7 +821,7 @@ Arthur's 42nd birthday
   Similarly, cyclic diary entries can interpolate the number of repetitions
 that have occurred:
 
-@findex diary-cyclic
+@findex diary-cyclic@r{, and sexp diary entries}
 @smallexample
 %%(diary-cyclic 50 1 1 2012) Renew medication (%d%s time)
 @end smallexample
@@ -869,7 +869,7 @@ Rake leaves
 @noindent
 on October 22, November 22, and December 22 of every year.
 
-@findex diary-float
+@findex diary-float@r{, and sexp diary entries}
   The function @code{diary-float} allows you to describe diary entries
 that apply to dates like the third Friday of November, or the last
 Tuesday in April.  The parameters are the @var{month}, @var{dayname},
@@ -1006,7 +1006,7 @@ diary entries:
 @findex diary-hebrew-sabbath-candles
 @cindex omer count
 @findex diary-hebrew-omer
-@cindex yahrzeits
+@cindex yahrzeits, and sexp diary entries
 @findex diary-hebrew-yahrzeit
 @findex diary-hebrew-birthday
 @table @code
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 679bcb454f1..6f6efeddc97 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -119,7 +119,7 @@ moves to the same day in the previous week.
 @kindex C-x ] @r{(Calendar mode)}
 @findex calendar-forward-year
 @kindex C-x [ @r{(Calendar mode)}
-@findex calendar-forward-year
+@findex calendar-backward-year
   The commands for motion by months and years work like those for
 weeks, but move a larger distance.  The month commands @kbd{M-@}} and
 @kbd{M-@{} move forward or backward by an entire month.  The year
@@ -369,7 +369,7 @@ various page elements, header styles) via a stylesheet @file{cal.css} in
 the directory containing the HTML files (see the value of the variable
 @code{cal-html-css-default} for relevant style settings).
 
-@kindex t @r{(Calendar mode)}
+@kindex H @r{(Calendar mode)}
 @table @kbd
 @item H m
 Generate a one-month calendar (@code{cal-html-cursor-month}).
@@ -725,7 +725,7 @@ cycle, and to install a 10-day week in a rationalization measure similar to
 the metric system.  The French government officially abandoned this
 calendar at the end of 1805.
 
-@cindex Mayan calendar
+@cindex Mayan calendars
   The Maya of Central America used three separate, overlapping calendar
 systems, the @emph{long count}, the @emph{tzolkin}, and the @emph{haab}.
 Emacs knows about all three of these calendars.  Experts dispute the
@@ -847,7 +847,6 @@ other than Mayan; for the Mayan calendar, see the following section.
 
 @kindex g @var{char} @r{(Calendar mode)}
 @findex calendar-iso-goto-date
-@findex calendar-iso-goto-week
 @findex calendar-julian-goto-date
 @findex calendar-astro-goto-day-number
 @findex calendar-bahai-goto-date
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 618a05d451b..d6b0d567b5b 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -310,13 +310,12 @@ option does this too, but other options like @samp{-q} do not.
 
 @item --no-site-lisp
 @opindex --no-site-lisp
-@cindex @file{site-start.el} file, not loading
+@cindex @file{site-lisp} files, not loading
 Do not include the @file{site-lisp} directories in @code{load-path}
 (@pxref{Init File}).  The @samp{-Q} option does this too.
 
 @item --no-splash
 @opindex --no-splash
-@vindex inhibit-startup-screen
 @cindex splash screen
 @cindex startup message
 Do not display a startup screen.  You can also achieve this effect by
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 143b075f4f8..b069ab66a38 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -21,8 +21,6 @@ input.
 @cindex keyboard input
 @cindex character set (keyboard)
 @cindex @acronym{ASCII}
-@cindex C-
-@cindex Control
 
   GNU Emacs is primarily designed for use with the keyboard.  While it
 is possible to use the mouse to issue editing commands through the
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 3e17696342f..6afc5fb3e45 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -679,7 +679,7 @@ edit the variable values or face attributes in the same way as in a
 normal customization buffer.  To remove a face or variable from the
 theme, uncheck the checkbox next to its name.
 
-@vindex custom-theme-directory
+@vindex custom-theme-directory@r{, saving theme files}
   After specifying the Custom theme's faces and variables, type
 @kbd{C-x C-s} (@code{custom-theme-write}) or use the buffer's
 @samp{[Save Theme]} button.  This saves the theme file, named
@@ -915,7 +915,7 @@ customize the indentation of C code:
 @end example
 
 @cindex Prog mode
-@cindex program editing
+@cindex modes for editing programs
   Major mode hooks also apply to other major modes @dfn{derived} from
 the original mode (@pxref{Derived Modes,,, elisp, The Emacs Lisp
 Reference Manual}).  For instance, HTML mode is derived from Text mode
@@ -1775,7 +1775,7 @@ and @kbd{C-c p} in Texinfo mode:
 
 @node Modifier Keys
 @subsection Modifier Keys
-@cindex modifier keys
+@cindex modifier keys, and key rebinding
 
   The default key bindings in Emacs are set up so that modified
 alphabetical characters are case-insensitive.  In other words,
@@ -1915,7 +1915,7 @@ because the terminal sends the same character in both cases.
 @cindex click events
 @cindex drag events
 @cindex down events
-@cindex button down events
+@cindex button-down events
 
   Emacs uses Lisp symbols to designate mouse buttons, too.  The ordinary
 mouse events in Emacs are @dfn{click} events; these happen when you
@@ -2285,7 +2285,7 @@ buffer's local value, which is probably not what you want to do in an
 init file.
 
 @item
-@vindex user-mail-address
+@vindex user-mail-address@r{, in init file}
 Specify your own email address, if Emacs can't figure it out correctly.
 
 @example
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 0b7e0b6139e..e5ce9203cc7 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -122,7 +122,7 @@ use the @samp{--dired} option.
 frame.
 
 @kindex q @r{(Dired)}
-@findex quit-window
+@findex quit-window@r{, in Dired buffers}
   Typing @kbd{q} (@code{quit-window}) buries the Dired buffer, and
 deletes its window if the window was created just for that buffer.
 
@@ -246,7 +246,7 @@ directory you are asked for confirmation; if you answer @code{all},
 then all the remaining directories will be deleted without more
 questions.
 
-@vindex delete-by-moving-to-trash
+@vindex delete-by-moving-to-trash@r{, and Dired}
   If you change the variable @code{delete-by-moving-to-trash} to
 @code{t}, the above deletion commands will move the affected files or
 directories into the operating system's Trash, instead of deleting
@@ -757,7 +757,6 @@ marked file is compressed into its own archive.
 
 @findex dired-do-compress-to
 @kindex c @r{(Dired)}
-@cindex compressing files (in Dired)
 @item c
 Compress the specified files (@code{dired-do-compress-to}) into a
 single archive anywhere on the file system. The compression algorithm
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 28f6dae8ad0..c248421fecb 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1545,8 +1545,8 @@ characters more prominent on display.  @xref{Glyphless Chars,,
 Glyphless Character Display, elisp, The Emacs Lisp Reference Manual},
 for details.
 
-@cindex curly quotes
-@cindex curved quotes
+@cindex curly quotes, and terminal capabilities
+@cindex curved quotes, and terminal capabilities
 @cindex homoglyph face
 
 Emacs tries to determine if the curved quotes @samp{‘} and @samp{’}
@@ -1576,7 +1576,6 @@ cursor, and switches to it when you start or resume Emacs.  If the
 variable @code{visible-cursor} is @code{nil} when Emacs starts or
 resumes, it uses the normal cursor.
 
-@cindex cursor face
 @vindex cursor-type
   On a graphical display, many more properties of the text cursor can
 be altered.  To customize its color, change the @code{:background}
@@ -1645,7 +1644,7 @@ global-hl-line-mode} enables or disables the same mode globally.
 @section Line Truncation
 
 @cindex truncation
-@cindex line truncation, and fringes
+@cindex line truncation
   As an alternative to continuation (@pxref{Continuation Lines}),
 Emacs can display long lines by @dfn{truncation}.  This means that all
 the characters that do not fit in the width of the screen or window do
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 2c3312d7a83..9c2be47d289 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -235,9 +235,9 @@ Appendices
 Indexes (each index contains a large menu)
 * Key Index::           An item for each standard Emacs key sequence.
 * Option Index::        An item for every command-line option.
-* Command Index::       An item for each command name.
-* Variable Index::      An item for each documented variable.
-* Concept Index::       An item for each concept.
+* Command Index::       An item for each standard command name.
+* Variable Index::      An item for each variable documented in this manual.
+* Concept Index::       An item for concepts and other general subjects.
 
 @c Do NOT modify the following 3 lines!  They must have this form to
 @c be correctly identified by 'texinfo-multiple-files-update'.  In
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index b11f588b466..9653bad0d62 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -66,9 +66,8 @@ completing up to a nonexistent file name, Emacs prints
 Minibuffer history commands offer some special features for reading
 file names, see @ref{Minibuffer History}.
 
-@cindex default directory
+@cindex default directory, of a buffer
 @vindex default-directory
-@vindex insert-default-directory
   Each buffer has a @dfn{default directory}, stored in the
 buffer-local variable @code{default-directory}.  Whenever Emacs reads
 a file name using the minibuffer, it usually inserts the default
@@ -482,7 +481,6 @@ by simultaneous editing and requires your immediate attention.
 @subsection Backup Files
 @cindex backup file
 @vindex make-backup-files
-@vindex vc-make-backup-files
 
   On most operating systems, rewriting a file automatically destroys all
 record of what the file used to contain.  Thus, saving a file from Emacs
@@ -939,10 +937,10 @@ revert it automatically if it has changed---provided the buffer itself
 is not modified.  (If you have edited the text, it would be wrong to
 discard your changes.)
 
-@cindex Global Auto-Revert mode
-@cindex mode, Global Auto-Revert
-@cindex Auto-Revert mode
-@cindex mode, Auto-Revert
+@cindex Global Auto Revert mode
+@cindex mode, Global Auto Revert
+@cindex Auto Revert mode
+@cindex mode, Auto Revert
 @findex global-auto-revert-mode
 @findex auto-revert-mode
 @findex auto-revert-tail-mode
@@ -1765,13 +1763,6 @@ requires the appropriate uncompression program.
 
 @cindex Archive mode
 @cindex mode, archive
-@cindex @code{arc}
-@cindex @code{jar}
-@cindex @code{rar}
-@cindex @code{zip}
-@cindex @code{lzh}
-@cindex @code{zoo}
-@cindex @code{7z}
 @pindex arc
 @pindex jar
 @pindex zip
@@ -2071,7 +2062,7 @@ but Emacs should not).  To disable ImageMagick entirely, change
 @code{imagemagick-types-inhibit} to @code{t}.
 
 @findex thumbs-mode
-@findex mode, thumbs
+@cindex mode, Thumbs
   The Image-Dired package can also be used to view images as
 thumbnails.  @xref{Image-Dired}.
 
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 0c994078327..9dc2eef2d3c 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -388,7 +388,6 @@ make any window smaller than the minimum height.
 frame has only one window, it does nothing.
 
 @item C-mouse-2
-@kindex C-mouse-2 @r{(mode line)}
 @kbd{C-mouse-2} on a mode line splits that window, producing two
 side-by-side windows with the boundary running through the click
 position (@pxref{Split Window}).
@@ -465,7 +464,6 @@ error if there is only one frame.
 
 @item C-z
 @kindex C-z @r{(X windows)}
-@findex suspend-frame
 Minimize (or iconify) the selected Emacs frame
 (@code{suspend-frame}).  @xref{Exiting}.
 
@@ -1301,11 +1299,11 @@ Operation}.
   On graphical terminals, the mouse pointer may obscure the text in
 the Emacs frame.  Emacs provides two methods to avoid this problem.
 
-@vindex make-pointer-invisible
   Firstly, Emacs hides the mouse pointer each time you type a
 self-inserting character, if the pointer lies inside an Emacs frame;
 moving the mouse pointer makes it visible again.  To disable this
 feature, set the variable @code{make-pointer-invisible} to @code{nil}.
+@xref{Display Custom}.
 
 @vindex mouse-avoidance-mode
   Secondly, you can use Mouse Avoidance mode, a minor mode, to keep
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 9ef33dd4cf5..ef9073ff52d 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -451,7 +451,6 @@ you can go forward by using @kbd{C-c C-f} or @kbd{r}
 @cindex help, viewing web pages
 @cindex viewing web pages in help
 @cindex web pages, viewing in help
-@findex browse-url
   A help buffer can also contain hyperlinks to Info manuals, source
 code definitions, and URLs (web pages).  The first two are opened in
 Emacs, and the third using a web browser via the @code{browse-url}
@@ -493,10 +492,11 @@ buffer (@pxref{Package Menu}).
 @findex describe-package
 @kindex C-h P
   @kbd{C-h P} (@code{describe-package}) prompts for the name of a
-package, and displays a help buffer describing the attributes of the
-package and the features that it implements.  The buffer lists the
-keywords that relate to the package in the form of buttons.  Click on
-a button to see other packages related to that keyword.
+package (@pxref{Packages}, and displays a help buffer describing the
+attributes of the package and the features that it implements.  The
+buffer lists the keywords that relate to the package in the form of
+buttons.  Click on a button to see other packages related to that
+keyword.
 
 @node Language Help
 @section Help for International Language Support
@@ -666,7 +666,7 @@ Emacs (@code{describe-no-warranty}).
 @node Help Echo
 @section Help on Active Text and Tooltips
 
-@cindex tooltips
+@cindex tooltip help
 @cindex balloon help
 @cindex active text
   In Emacs, stretches of @dfn{active text} (text that does something
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 24a817fd674..3b18d17ab2b 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -21,7 +21,8 @@ documentation about indenting in programming modes.
   The simplest way to perform indentation is the @key{TAB} key.  In
 most major modes, this runs the command @code{indent-for-tab-command}.
 (In C and related modes, @key{TAB} runs the command
-@code{c-indent-line-or-region}, which behaves similarly).
+@code{c-indent-line-or-region}, which behaves similarly, @pxref{C
+Indent}).
 
 @table @key
 @item TAB
@@ -200,7 +201,6 @@ are always displayed as empty spaces extending to the next
 @node Just Spaces
 @section Tabs vs.@: Spaces
 
-@vindex tab-width
   Normally, indentation commands insert (or remove) an optimal mix of
 space characters and tab characters to align to the desired column.
 Tab characters are displayed as a stretch of empty space extending to
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 6de0a142cfa..9201da7d24d 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -200,8 +200,6 @@ key sequence @kbd{C-S-backspace}.
 
 @node Other Kill Commands
 @subsection Other Kill Commands
-@findex kill-region
-@kindex C-w
 
 @table @kbd
 @item C-w
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 112f1f4d9ed..638bbbfd891 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1207,7 +1207,6 @@ status.
 
 @ifnottex
 @vindex vc-stay-local
-@vindex vc-cvs-stay-local
   On CVS and Subversion, the @code{vc-dir} command normally contacts
 the repository, which may be on a remote machine, to check for
 updates.  If you change the variable @code{vc-stay-local} or
@@ -1906,7 +1905,6 @@ Display the reference on the current line in the other window
 @findex xref-quit-and-goto-xref
 Display the reference on the current line and bury the @file{*xref*}
 buffer (@code{xref-quit-and-goto-xref}).
-@findex xref-query-replace-in-results
 @item r @var{pattern} @key{RET} @var{replacement} @key{RET}
 Perform interactive query-replace on references that match
 @var{pattern} (@code{xref-query-replace-in-results}), replacing
@@ -2032,7 +2030,6 @@ Display a list of the identifiers defined in the program file
 Visit files recorded in the selected tags table.
 @end table
 
-@cindex completion (symbol names)
   In most programming language modes, you can type @kbd{C-M-i} or
 @kbd{M-@key{TAB}} (@code{completion-at-point}) to complete the symbol
 at point.  Some modes provide specialized completion for this command
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 80323bf0498..6bca2ffd816 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -131,7 +131,6 @@ mouse button (@kbd{mouse-3}) sets the mark at point and then moves
 point to where you clicked.  @xref{Mouse Commands}, for a more
 detailed description of these mouse commands.
 
-@cindex shift-selection
   Finally, you can set the mark by holding down the shift key while
 typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}},
 @kbd{S-C-f}, @kbd{S-C-n}, etc.).  This is called @dfn{shift-selection}.
@@ -139,7 +138,7 @@ It sets the mark at point before moving point, but only if there is no
 active mark set via shift-selection.  The mark set by mouse commands
 and by shift-selection behaves slightly differently from the usual
 mark: any subsequent unshifted cursor motion command deactivates it
-automatically.  For details, @xref{Shift Selection}.
+automatically.  For details, see @ref{Shift Selection}.
 
   Many commands that insert text, such as @kbd{C-y} (@code{yank}), set
 the mark at the other end of the inserted text, without activating it.
@@ -147,7 +146,7 @@ This lets you easily return to that position (@pxref{Mark Ring}).  You
 can tell that a command does this when it shows @samp{Mark set} in the
 echo area.
 
-@cindex primary selection
+@cindex primary selection, when active region changes
   Under X, every time the active region changes, Emacs saves the text
 in the region to the @dfn{primary selection}.  This lets you insert
 that text into other X applications with @kbd{mouse-2} clicks.
@@ -447,7 +446,7 @@ using @kbd{C-@key{SPC} C-@key{SPC}} or @kbd{C-u C-x C-x}.
 
 @table @kbd
 @item C-@key{SPC} C-@key{SPC}
-@kindex C-SPC C-SPC
+@kindex C-SPC C-SPC@r{, disabling Transient Mark}
 Set the mark at point (like plain @kbd{C-@key{SPC}}) and enable
 Transient Mark mode just once, until the mark is deactivated.  (This
 is not really a separate command; you are using the @kbd{C-@key{SPC}}
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 93f91420771..c149abe0e83 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -260,7 +260,7 @@ Completion}.
 @node Completion Example
 @subsection Completion Example
 
-@kindex TAB @r{(completion)}
+@kindex TAB @r{(completion example)}
   A simple example may help here.  @kbd{M-x} uses the minibuffer to
 read the name of a command, so completion works by matching the
 minibuffer text against the names of existing Emacs commands.  Suppose
@@ -298,7 +298,6 @@ when completion is allowed.
 
 @table @kbd
 @item @key{TAB}
-@findex minibuffer-complete
 Complete the text in the minibuffer as much as possible; if unable to
 complete, display a list of possible completions
 (@code{minibuffer-complete}).
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index e4be004ae52..8c190a3b43a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -151,12 +151,12 @@ List all subscribed and unsubscribed groups, but not killed or zombie
 groups.
 
 @kindex A k @r{(Gnus Group mode)}
-@findex gnus-group-list-all-groups
+@findex gnus-group-list-killed
 @item A k
 List killed groups.
 
 @kindex A z @r{(Gnus Group mode)}
-@findex gnus-group-list-all-groups
+@findex gnus-group-list-zombies
 @item A z
 List zombie groups.
 
@@ -183,13 +183,11 @@ Move point to the previous group containing unread articles.
 
 @kindex n @r{(Gnus Group mode)}
 @findex gnus-group-next-unread-group
-@findex gnus-summary-next-unread-article
 @item n
 Move point to the next unread group.
 
 @kindex p @r{(Gnus Group mode)}
 @findex gnus-group-prev-unread-group
-@findex gnus-summary-prev-unread-article
 @item p
 Move point to the previous unread group.
 
@@ -206,7 +204,7 @@ Update your Gnus settings, and quit Gnus.
 
 @table @kbd
 @kindex SPC @r{(Gnus Summary mode)}
-@findex gnus-group-read-group
+@findex gnus-summary-next-page
 @item @key{SPC}
 If there is no article selected, select the article on the current
 line and display its article buffer.  Otherwise, try scrolling the
@@ -222,13 +220,11 @@ Thus, you can read through all articles by repeatedly typing
 Scroll the text of the article backwards.
 
 @kindex n @r{(Gnus Summary mode)}
-@findex gnus-group-next-unread-group
 @findex gnus-summary-next-unread-article
 @item n
 Select the next unread article.
 
 @kindex p @r{(Gnus Summary mode)}
-@findex gnus-group-prev-unread-group
 @findex gnus-summary-prev-unread-article
 @item p
 Select the previous unread article.
@@ -412,7 +408,6 @@ is a hard requirement.  For DVI files, @code{dvipdf} or @code{dvipdfm}
 is needed.  For OpenDocument and Microsoft Office documents, the
 @code{unoconv} tool is needed.}, and displaying those images.
 
-@findex doc-view-toggle-display
 @findex doc-view-toggle-display
 @cindex doc-view-minor-mode
   When you visit a document file that can be displayed with DocView
@@ -875,7 +870,7 @@ in the shell buffer to submit the current line as input.
 
 @item @key{TAB}
 @kindex TAB @r{(Shell mode)}
-@findex completion-at-point
+@findex completion-at-point@r{, in Shell Mode}
 @cindex shell completion
 Complete the command name or file name before point in the shell
 buffer (@code{completion-at-point}).  This uses the usual Emacs
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index 876431aa9e9..8c9d04e57b0 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -103,13 +103,11 @@ for instance, programming language modes typically set a buffer-local
 value for the variable @code{comment-start}, which determines how
 source code comments are delimited (@pxref{Comments}).
 
-@findex describe-mode
-@kindex C-h m
   To view the documentation for the current major mode, including a
 list of its key bindings, type @code{C-h m} (@code{describe-mode}).
+@xref{Misc Help}.
 
 @cindex mode hook
-@vindex text-mode-hook
 @vindex prog-mode-hook
   Every major mode, apart from Fundamental mode, defines a @dfn{mode
 hook}, a customizable list of Lisp functions to run each time the mode
@@ -225,8 +223,6 @@ Font-Lock mode automatically highlights certain textual units found in
 programs.  It is enabled globally by default, but you can disable it
 in individual buffers.  @xref{Faces}.
 
-@findex display-line-numbers-mode
-@cindex display-line-numbers-mode
 @item
 Display Line Numbers mode is a convenience wrapper around
 @code{display-line-numbers}, setting it using the value of
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 78f77cb3003..5d16c196170 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -10,24 +10,9 @@
 @cindex multibyte characters
 @cindex encoding of characters
 
-@cindex Arabic
-@cindex Bengali
-@cindex Chinese
-@cindex Cyrillic
 @cindex Han
 @cindex Hindi
-@cindex Ethiopic
-@cindex Georgian
-@cindex Greek
 @cindex Hangul
-@cindex Hebrew
-@cindex Hindi
-@cindex IPA
-@cindex Japanese
-@cindex Korean
-@cindex Latin
-@cindex Thai
-@cindex Vietnamese
   Emacs supports a wide variety of international character sets,
 including European and Vietnamese variants of the Latin alphabet, as
 well as Arabic scripts, Brahmic scripts (for languages such as
@@ -149,8 +134,8 @@ language, which make it easier to type characters in the script.
   The prefix key @kbd{C-x @key{RET}} is used for commands that pertain
 to multibyte characters, coding systems, and input methods.
 
-@kindex C-x =
-@findex what-cursor-position
+@kindex C-x =@r{, and international characters}
+@findex what-cursor-position@r{, and international characters}
   The command @kbd{C-x =} (@code{what-cursor-position}) shows
 information about the character at point.  In addition to the
 character position, which was described in @ref{Position Info}, this
@@ -277,7 +262,7 @@ Supported language environments include:
 @c To work around, we group the language environments together, so
 @c that the blank that separates them triggers refill.
 @quotation
-@cindex ASCII
+@cindex ASCII (language environment)
 @cindex Arabic
 ASCII, Arabic,
 @cindex Belarusian
@@ -1692,7 +1677,6 @@ Meta to be converted to @key{ESC} and still be able type 8-bit
 characters present directly on the keyboard or using @key{Compose} or
 @key{AltGr} keys.  @xref{User Input}.
 
-@kindex C-x 8
 @cindex @code{iso-transl} library
 @cindex compose character
 @cindex dead character
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 215f50cb406..a70682e427e 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -7,7 +7,6 @@
 @cindex Package
 @cindex Emacs Lisp package archive
 @cindex Package archive
-@cindex Emacs Lisp package
 
 Emacs includes a facility that lets you easily download and install
 @dfn{packages} that implement additional features.  Each package is a
@@ -18,7 +17,6 @@ as an Info manual.
 with a list of all packages.  You can install or uninstall packages
 via this buffer.  @xref{Package Menu}.
 
-@findex describe-package
   The command @kbd{C-h P} (@code{describe-package}) prompts for the
 name of a package, and displays a help buffer describing the
 attributes of the package and the features that it implements.
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 811dab5cfa0..758434f39a3 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -107,7 +107,7 @@ deletes backward treating each tab as if it were the equivalent number
 of spaces, so that you can delete one column of indentation without
 worrying whether the whitespace consists of spaces or tabs.
 
-@cindex mode hook
+@cindex mode hook, and major modes
 @vindex c-mode-hook
 @vindex lisp-mode-hook
 @vindex emacs-lisp-mode-hook
@@ -375,9 +375,7 @@ Insert a newline, then adjust indentation of following line
 @end table
 
 @kindex TAB @r{(programming modes)}
-@findex c-indent-command
 @findex indent-line-function
-@findex indent-for-tab-command
   The basic indentation command is @key{TAB}
 (@code{indent-for-tab-command}), which was documented in
 @ref{Indentation}.  In programming language modes, @key{TAB} indents
@@ -711,9 +709,7 @@ argument moves the previous balanced expression backwards across those
 before it.  An argument of zero, rather than doing nothing, transposes
 the balanced expressions ending at or after point and the mark.
 
-@kindex C-M-@@
 @kindex C-M-SPC
-@findex mark-sexp
   To operate on balanced expressions with a command which acts on the
 region, type @kbd{C-M-@key{SPC}} (@code{mark-sexp}).  This sets the
 mark where @kbd{C-M-f} would move to.  While the mark is active, each
@@ -1169,9 +1165,7 @@ use in your program.
 @node Info Lookup
 @subsection Info Documentation Lookup
 
-@findex info-lookup-symbol
 @findex info-lookup-file
-@kindex C-h S
   For major modes that apply to languages which have documentation in
 Info, you can use @kbd{C-h S} (@code{info-lookup-symbol}) to view the
 Info documentation for a symbol used in the program.  You specify the
@@ -1309,7 +1303,6 @@ count as blocks.
 @findex hs-show-block
 @findex hs-show-region
 @findex hs-hide-level
-@findex hs-minor-mode
 @kindex C-c @@ C-h
 @kindex C-c @@ C-s
 @kindex C-c @@ C-M-h
@@ -1374,7 +1367,7 @@ for switching graphical windows, so you should type @kbd{C-M-i} or
 @kbd{@key{ESC} @key{TAB}} instead.
 
 @cindex tags-based completion
-@findex completion-at-point
+@findex completion-at-point@r{, in programming language modes}
 @cindex Lisp symbol completion
 @cindex completion (Lisp symbols)
   In most programming language modes, @kbd{C-M-i} (or
@@ -1406,7 +1399,7 @@ using case distinctions.)  Emacs has various features to make it easier
 to deal with such symbols.
 
 @cindex Glasses mode
-@findex mode, Glasses
+@cindex mode, Glasses
   Glasses mode is a buffer-local minor mode that makes it easier to read
 such symbols, by altering how they are displayed.  By default, it
 displays extra underscores between each lower-case letter and the
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 40e3e2c1c31..247f8c0f30f 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -106,7 +106,6 @@ Insert text from register @var{r} (@code{insert-register}).
 @item M-x append-to-register @key{RET} @var{r}
 Append region to text in register @var{r}.
 
-@kindex C-x r +
 When register @var{r} contains text, you can use @kbd{C-x r +}
 (@code{increment-register}) to append to that register.  Note that
 command @kbd{C-x r +} behaves differently if @var{r} contains a
@@ -302,15 +301,12 @@ Set the bookmark named @var{bookmark} at point (@code{bookmark-set}).
 Like @kbd{C-x r m}, but don't overwrite an existing bookmark.
 
 @item C-x r b @var{bookmark} @key{RET}
-@findex bookmark-jump
 Jump to the bookmark named @var{bookmark} (@code{bookmark-jump}).
 
 @item C-x r l
-@findex list-bookmarks
 List all bookmarks (@code{list-bookmarks}).
 
 @item M-x bookmark-save
-@findex bookmark-save
 Save all the current bookmark values in the default bookmark file.
 @end table
 
@@ -332,12 +328,14 @@ like @kbd{C-x r m}, but it signals an error if the specified bookmark
 already exists, instead of overwriting it.
 
 @kindex C-x r l
+@findex list-bookmarks
   To display a list of all your bookmarks in a separate buffer, type
 @kbd{C-x r l} (@code{list-bookmarks}).  If you switch to that buffer,
 you can use it to edit your bookmark definitions or annotate the
 bookmarks.  Type @kbd{C-h m} in the bookmark buffer for more
 information about its special editing commands.
 
+@findex bookmark-save
   When you kill Emacs, Emacs saves your bookmarks, if
 you have changed any bookmark values.  You can also save the bookmarks
 at any time with the @kbd{M-x bookmark-save} command.  Bookmarks are
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 6b9795834cf..c3c173a0d39 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -149,7 +149,6 @@ message line is added at the end.
   @xref{Display Custom}, for options that control how Emacs uses the
 echo area.
 
-@cindex minibuffer
   The echo area is also used to display the @dfn{minibuffer}, a
 special window where you can input arguments to commands, such as the
 name of a file to be edited.  When the minibuffer is in use, the text
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 5cc09eb9dff..d6589f6241c 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -396,7 +396,6 @@ messages for later sending.  See the commentary section in the file
 @file{feedmail.el} for details.
 @end table
 
-@vindex sendmail-coding-system
   When you send a message containing non-@acronym{ASCII} characters,
 they need to be encoded with a coding system (@pxref{Coding Systems}).
 Usually the coding system is specified automatically by your chosen
@@ -405,7 +404,7 @@ explicitly specify the coding system for outgoing mail by setting the
 variable @code{sendmail-coding-system} (@pxref{Recognize Coding}).  If
 the coding system thus determined does not handle the characters in a
 particular message, Emacs asks you to select the coding system to use,
-showing a list of possible coding systems.
+showing a list of possible coding systems.  @xref{Output Coding}.
 
 @node Header Editing
 @subsection Mail Header Editing
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 1f53992f10b..fb662642a84 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -34,10 +34,6 @@ many formats.
 See the Org Info manual, which is distributed with Emacs.
 @end ifnotinfo
 
-@cindex nXML mode
-@cindex mode, XML
-@cindex mode, nXML
-@findex nxml-mode
   Emacs has other major modes for text which contains embedded
 commands, such as @TeX{} and @LaTeX{} (@pxref{TeX Mode}); HTML and
 SGML (@pxref{HTML Mode}); XML
@@ -160,7 +156,6 @@ the words do not move.  For example, @w{@samp{FOO, BAR}} transposes into
 more on transposition.
 
 @kindex M-@@
-@findex mark-word
   To operate on words with an operation which acts on the region, use
 the command @kbd{M-@@} (@code{mark-word}).  This command sets the mark
 where @kbd{M-f} would move to.  @xref{Marking Objects}, for more
@@ -1341,8 +1336,8 @@ automatically by putting the following in your init file:
 @section Org Mode
 @cindex organizer
 @cindex planner
-@findex Org mode
-@findex mode, Org
+@cindex Org mode
+@cindex mode, Org
 
 @findex org-mode
   Org mode is a variant of Outline mode for using Emacs as an
@@ -2006,6 +2001,7 @@ used as a cheap preview (@code{sgml-tags-invisible}).
 
 @cindex nXML mode
 @cindex mode, nXML
+@cindex mode, XML
 @findex nxml-mode
 @cindex XML schema
   The major mode for editing XML documents is called nXML mode.  This
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index e98322d74e2..03de55069a9 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -17,7 +17,6 @@ also considered.
 
 @node Quitting
 @section Quitting and Aborting
-@cindex quitting
 
 @table @kbd
 @item C-g
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 00498399c79..1609a953ca0 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -236,7 +236,9 @@ relevant information into the version header.
 an exception, when using RCS, Emacs uses the version header, if there
 is one, to determine the file version, since it is often more reliable
 than the RCS master file.  To inhibit using the version header this
-way, change the variable @code{vc-consult-headers} to @code{nil}.
+way, change the variable @code{vc-consult-headers} to @code{nil}.  VC
+then always uses the file permissions (if it is supposed to trust
+them), or else checks the master file.
 
 @findex vc-insert-headers
 @vindex vc-@var{backend}-header
@@ -340,7 +342,6 @@ the master file can only tell you @emph{if} there's any lock on the
 file, but not whether your work file really contains that locked
 version.
 
-@vindex vc-consult-headers
   You can tell VC not to use version headers to determine the file
 status by setting @code{vc-consult-headers} to @code{nil}.  VC then
 always uses the file permissions (if it is supposed to trust them), or
@@ -359,7 +360,6 @@ operations in the variable @code{vc-cvs-global-switches}.  These
 switches are inserted immediately after the @code{cvs} command, before
 the name of the operation to invoke.
 
-@vindex vc-stay-local
 @vindex vc-cvs-stay-local
 @cindex remote repositories (CVS)
   When using a CVS repository on a remote machine, VC can try keeping
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 65454edf83f..04af59281ca 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -205,10 +205,9 @@ new window created by splitting the selected window.  @xref{Window
 Choice}, for how Emacs picks or creates the window to use.
 
 @table @kbd
-@findex switch-to-buffer-other-window
 @item C-x 4 b @var{bufname} @key{RET}
 Select buffer @var{bufname} in another window
-(@code{switch-to-buffer-other-window}).
+(@code{switch-to-buffer-other-window}).  @xref{Select Buffer}.
 
 @findex display-buffer @r{(command)}
 @item C-x 4 C-o @var{bufname} @key{RET}
@@ -217,12 +216,10 @@ Display buffer @var{bufname} in some window, without trying to select
 it (@code{display-buffer}).  @xref{Displaying Buffers}, for details
 about how the window is chosen.
 
-@findex find-file-other-window
 @item C-x 4 f @var{filename} @key{RET}
 Visit file @var{filename} and select its buffer in another window
 (@code{find-file-other-window}).  @xref{Visiting}.
 
-@findex dired-other-window
 @item C-x 4 d @var{directory} @key{RET}
 Select a Dired buffer for directory @var{directory} in another window
 (@code{dired-other-window}).  @xref{Dired}.
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index eaefcee21c3..857b7251c85 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -217,7 +217,7 @@ Width of the internal frame border, in pixels.
 Additional space between lines, in pixels.
 
 @item @code{menuBar} (class @code{MenuBar})
-@cindex menu bar
+@cindex menu bar (X resource)
 If the value of this resource is @samp{off} or @samp{false} or
 @samp{0}, Emacs disables Menu Bar mode at startup (@pxref{Menu Bars}).
 
@@ -251,7 +251,7 @@ Gamma correction for colors, equivalent to the frame parameter
 @code{screen-gamma}.
 
 @item @code{scrollBar} (class @code{ScrollBar})
-@cindex tool bar
+@cindex scroll bar
 If the value of this resource is @samp{off} or @samp{false} or
 @samp{0}, Emacs disables Scroll Bar mode at startup (@pxref{Scroll Bars}).
 
@@ -636,7 +636,7 @@ widget "*" style "my_style"
 
 @node GTK Names in Emacs
 @appendixsubsec GTK Widget Names in Emacs
-@cindex GTK widget names
+@cindex GTK widget names in Emacs
 @cindex GTK widget classes
 
   The GTK+ widgets used by an Emacs frame are listed below: