Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-674
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-675
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-676
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-677
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-678
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-679
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-680
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-681
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-682
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-683
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-684
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-685
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-686
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-687
   Release ERC 5.2.

 * emacs@sv.gnu.org/emacs--devo--0--patch-688
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-689
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-690
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-691
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-692
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-693
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-694
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-695
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-696
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-697
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-698
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-699
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-700
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-701
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-209
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-211
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-212
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-214
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601

47 files changed, 713 insertions, 313 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 1510ec19e05..87aae706fc6 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,282 @@
+2007-04-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frames.texi (Multiple Displays): Add note about "multi-monitor"
+        setups.
+        (Display Feature Testing): Note that display refers to all
+        physical monitors for multi-monitor setups.
+
+2007-04-14  Richard Stallman  <rms@gnu.org>
+
+        * lists.texi (Sets And Lists): Clarify `delete' examples.
+        Remove spurious xref to same node.
+        Clarify xref for add-to-list.
+
+2007-04-12  Nick Roberts  <nickrob@snap.net.nz>
+
+        * keymaps.texi (Format of Keymaps): Remove spurious ")" from
+        value of lisp-mode-map.
+
+2007-04-11  Karl Berry  <karl@gnu.org>
+
+        * anti.texi (Antinews),
+        * display.texi (Overlay Properties) and (Defining Images),
+        * processes.texi (Synchronous Processes) and (Sentinels),
+        * syntax.texi (Syntax Table Internals),
+        * searching.texi (Regexp Special),
+        * nonascii.texi (Default Coding Systems),
+        * text.texi (Special Properties),
+        * minibuf.texi (Basic Completion): Wording to improve breaks in
+        8.5x11 format.
+        * elisp.texi (smallbook): new @set to more easily switch between
+        smallbook and 8.5x11.
+
+2007-04-11  Richard Stallman  <rms@gnu.org>
+
+        * text.texi (Lazy Properties): Minor fix.
+
+2007-04-08  Karl Berry  <karl@gnu.org>
+
+        * symbols.texi (Plists and Alists): Period after "vs" in index entries.
+        * macros.texi (Backquote): Downcase Backquote in index entries for
+        consistency.
+
+2007-04-08  Richard Stallman  <rms@gnu.org>
+
+        * text.texi (Adaptive Fill): Just describe default,
+        don't show it (since it contains non-ASCII chars).
+
+2007-04-07  Karl Berry  <karl@gnu.org>
+
+        * text.texi (Adaptive Fill) [@iftex]: Omit binary characters in
+        adaptive-fill-regexp's value, since they are not in the standard
+        TeX fonts.
+
+2007-04-07  Herbert Euler  <herberteuler@hotmail.com>
+
+        * display.texi (Defining Faces): Fix example.
+
+2007-04-07  Karl Berry  <karl@gnu.org>
+
+        * display.texi (Button Buffer Commands): Improve page break.
+
+2007-04-07  Richard Stallman  <rms@gnu.org>
+
+        * advice.texi (Activation of Advice): Remove redundant index entry.
+
+        * backups.texi: Improve index entries.  Remove redundant ones.
+
+        * compile.texi (Byte Compilation): Improve index entry.
+
+        * hash.texi (Creating Hash): Improve index entry.
+
+        * symbols.texi (Definitions): Improve index entry.
+
+        * edebug.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * maps.texi (Standard Keymaps): Remove useless index entry.
+
+        * help.texi (Documentation Basics): Remove redundant index entries.
+
+        * customize.texi: Improve index entries.
+        Remove redundant/useless ones.
+
+        * locals.texi (Standard Buffer-Local Variables): Clarify intro text.
+
+        * streams.texi (Output Variables): Improve index entry.
+
+        * abbrevs.texi (Abbrevs): Remove useless index entry.
+
+        * macros.texi (Expansion): Remove useless index entry.
+
+        * text.texi: Improve index entries.  Remove redundant/useless ones.
+        (Text Properties, Examining Properties)
+        (Special Properties): Use "property category" instead of "category"
+        to refer to the `category' property.
+
+        * positions.texi: Improve index entries.  Remove useless one.
+
+        * lists.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * os.texi: Improve index entries.
+        (Timers): Fix previous change.
+
+        * buffers.texi: Improve index entries.
+        (Modification Time): Get rid of term "obsolete buffer".
+
+        * debugging.texi: Improve index entries.
+        (Test Coverage): Add xref to other test coverage ftr.
+
+        * eval.texi: Improve index entry.  Remove redundant ones.
+
+        * numbers.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * files.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * objects.texi: Improve index entries.
+
+        * processes.texi: Improve index entries.
+
+        * modes.texi: Improve index entry.  Remove redundant one.
+
+        * nonascii.texi: Improve index entries.
+
+        * internals.texi: Improve index entries.
+
+        * syntax.texi: Improve index entries.
+
+        * keymaps.texi (Active Keymaps): Improve index entries.
+
+        * commands.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * frames.texi: Improve index entries.  Remove redundant/useless ones.
+
+        * markers.texi: Improve index entries.  Remove redundant ones.
+
+        * tips.texi: Improve index entries.
+
+        * loading.texi (Unloading): Improve index entry.
+
+        * variables.texi: Improve index entries.  Remove redundant one.
+
+        * sequences.texi: Improve index entry.
+
+        * display.texi: Improve index entries.  Remove redundant ones.
+
+        * windows.texi: Improve index entries.
+
+        * searching.texi: Improve index entries.  Remove redundant one.
+
+        * strings.texi (Case Tables): Improve last change.
+
+2007-04-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * strings.texi (Case Tables): Document with-case-table and
+        ascii-case-table.
+
+2007-04-03  Karl Berry  <karl@gnu.org>
+
+        * processes.texi (Network): Reword to improve page break.
+
+2007-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * functions.texi (Inline Functions): Describe more disadvantages
+        of defsubst, and make advice against it stronger.
+
+2007-04-02  Karl Berry  <karl@gnu.org>
+
+        * backups.texi (Backup Names): Avoid widow words.
+        * modes.texi (Example Major Modes): Align last comment.
+
+2007-04-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keymaps.texi (Remapping Commands): Document new arg to
+        command-remapping.
+
+2007-04-01  Karl Berry  <karl@gnu.org>
+
+        * processes.texi (Low-Level Network): typo.
+        * loading.texi (Hooks for Loading): avoid double "the".
+        * keymaps.texi (Key Sequences): no double "and".
+        (Changing Key Bindings): shorten to improve line break.
+
+2007-03-31  Glenn Morris  <rgm@gnu.org>
+
+        * os.texi (Timers): Fix description of run-at-time TIME formats.
+
+2007-03-31  Richard Stallman  <rms@gnu.org>
+
+        * display.texi (Invisible Text): Correct buffer-invisibility-spec
+        regarding ellipsis.
+
+2007-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * intro.texi (nil and t):
+        * symbols.texi (Plists and Alists):
+        * variables.texi (Variable Aliases, Constant Variables):
+        * functions.texi (Defining Functions):
+        * advice.texi (Advising Primitives):
+        * debugging.texi (Syntax Errors, Compilation Errors):
+        * minibuf.texi (Minibuffer Windows):
+        * commands.texi (Adjusting Point):
+        * modes.texi (Syntactic Font Lock, Faces for Font Lock)
+        (Auto Major Mode, Major Mode Conventions):
+        * help.texi (Describing Characters):
+        * files.texi (Create/Delete Dirs, Information about Files)
+        (File Locks, Writing to Files, Reading from Files)
+        (Saving Buffers):
+        * windows.texi (Resizing Windows, Cyclic Window Ordering):
+        * frames.texi (Finding All Frames):
+        * positions.texi (Buffer End, Motion):
+        * markers.texi (The Region):
+        * text.texi (Deletion, Near Point):
+        * display.texi (Displaying Messages, Truncation):
+        * os.texi (Processor Run Time):
+        * tips.texi (Key Binding Conventions, Programming Tips)
+        (Warning Tips, Documentation Tips, Comment Tips):
+        * internals.texi (Memory Usage): Improve indexing.
+
+        * variables.texi (Frame-Local Variables):
+        * functions.texi (Argument List):
+        * loading.texi (Library Search):
+        * streams.texi (Output Variables):
+        * keymaps.texi (Translation Keymaps, Searching Keymaps):
+        * searching.texi (Replacing Match, Search and Replace):
+        * processes.texi (Byte Packing, Decoding Output)
+        (Accepting Output, Network Servers, Shell Arguments):
+        * display.texi (Abstract Display, Image Cache, Scroll Bars):
+        * windows.texi (Window Point, Window Start):
+        * frames.texi (Management Parameters, Frame Parameters, Frame Titles):
+        * commands.texi (Reading Input, Keyboard Events):
+        * minibuf.texi (Reading File Names, Minibuffer Completion)
+        (Recursive Mini):
+        * positions.texi (List Motion):
+        * hash.texi (Hash Tables, Creating Hash, Defining Hash):
+        * numbers.texi (Arithmetic Operations, Math Functions)
+        (Predicates on Numbers, Comparison of Numbers):
+        (Numeric Conversions):
+        * locals.texi (Standard Buffer-Local Variables):
+        * maps.texi (Standard Keymaps):
+        * os.texi (User Identification, System Environment, Recording Input)
+        (X11 Keysyms):
+        * nonascii.texi (Non-ASCII Characters, Splitting Characters):
+        * backups.texi (Backups and Auto-Saving):
+        * customize.texi (Customization, Group Definitions)
+        (Variable Definitions):
+        * compile.texi (Byte Compilation): Improve index entries.
+
+2007-03-31  Karl Berry  <karl@gnu.org>
+
+        * macros.texi (Defining Macros): Avoid widow syllable.
+
+2007-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * elisp.texi (Top): Postscript -> PostScript.
+
+        * display.texi (Images, Postscript Images): Postscript -> PostScript.
+
+2007-03-31  Markus Triska  <markus.triska@gmx.at>
+
+        * internals.texi (Writing Emacs Primitives): Untabify `For'.
+
+2007-03-30  Karl Berry  <karl@gnu.org>
+
+        * lists.texi (List-related Predicates): Remove spurious @need.
+        (Setcdr): Use @smallexample to improve page break.
+        (Association Lists) <assoc>: Reword to improve page break.
+
+        * strings.texi (String Conversion): Insert blank line to improve
+        page break.
+
+        * numbers.texi (Random Numbers): Use @minus{}.
+        (Math Functions): Use @minus{}.
+
+        * intro.texi (Acknowledgements): Avoid line breaks before middle
+        initials.
+
+2007-03-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * errors.texi (Standard Errors): Add an index entry.
+
 2007-03-19  Richard Stallman  <rms@gnu.org>
 
         * os.texi (Recording Input): recent-keys now gives 300 keys.
diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi
index 53f6f194ee1..46e7c3739c4 100644
--- a/lispref/abbrevs.texi
+++ b/lispref/abbrevs.texi
@@ -7,7 +7,7 @@
 @node Abbrevs, Processes, Syntax Tables, Top
 @chapter Abbrevs and Abbrev Expansion
 @cindex abbrev
-@cindex abbrev table
+@c  @cindex abbrev table  Redundant with "abbrev".
 
   An abbreviation or @dfn{abbrev} is a string of characters that may be
 expanded to a longer string.  The user can insert the abbrev string and
diff --git a/lispref/advice.texi b/lispref/advice.texi
index 003e12ad833..4d580f9846d 100644
--- a/lispref/advice.texi
+++ b/lispref/advice.texi
@@ -384,7 +384,7 @@ activated advice for @var{function}, it activates the new advice.
 @deffn Command ad-deactivate function
 This command deactivates the advice for @var{function}.
 @cindex deactivating advice
-@cindex advice, deactivating
+@c @cindex advice, deactivating   "advice, activating" is just above
 @end deffn
 
 @deffn Command ad-update function &optional compile
@@ -673,6 +673,7 @@ Instead they are implemented specially by the advice mechanism.
 
 @node Advising Primitives
 @section Advising Primitives
+@cindex advising primitives
 
   Advising a primitive function (also called a ``subr'') is risky.
 Some primitive functions are used by the advice mechanism; advising
diff --git a/lispref/anti.texi b/lispref/anti.texi
index de07936d2f4..b258e959a46 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -433,11 +433,10 @@ The @code{table} argument to @code{translate-region} can no longer be
 a char-table; it has to be a string.
 
 @item
-The two functions @code{merge-coding-systems} and
-@code{decode-coding-inserted-region}, and the variable
-@code{auto-coding-functions}, have been deleted.  The
-@code{mime-text-unsuitable} coding system property no longer has any
-special meaning.
+The variable @code{auto-coding-functions} and the two functions
+@code{merge-coding-systems} and @code{decode-coding-inserted-region}
+have been deleted.  The coding system property
+@code{mime-text-unsuitable} no longer has any special meaning.
 
 @item
 If pure storage overflows while dumping, Emacs won't tell you how much
diff --git a/lispref/backups.texi b/lispref/backups.texi
index 893f6df4205..44795557f15 100644
--- a/lispref/backups.texi
+++ b/lispref/backups.texi
@@ -6,6 +6,7 @@
 @setfilename ../info/backups
 @node Backups and Auto-Saving, Buffers, Files, Top
 @chapter Backups and Auto-Saving
+@cindex backups and auto-saving
 
   Backup files and auto-save files are two methods by which Emacs tries
 to protect the user from the consequences of crashes or of the user's
@@ -25,10 +26,10 @@ current session.
 
   A @dfn{backup file} is a copy of the old contents of a file you are
 editing.  Emacs makes a backup file the first time you save a buffer
-into its visited file.  Normally, this means that the backup file
-contains the contents of the file as it was before the current editing
-session.  The contents of the backup file normally remain unchanged once
-it exists.
+into its visited file.  Thus, normally, the backup file contains the
+contents of the file as it was before the current editing session.
+The contents of the backup file normally remain unchanged once it
+exists.
 
   Backups are usually made by renaming the visited file to a new name.
 Optionally, you can specify that backup files should be made by copying
@@ -66,11 +67,11 @@ function returns @code{nil}.
 @end defun
 
 @defvar buffer-backed-up
-  This buffer-local variable indicates whether this buffer's file has
-been backed up on account of this buffer.  If it is non-@code{nil}, then
+  This buffer-local variable says whether this buffer's file has
+been backed up on account of this buffer.  If it is non-@code{nil},
 the backup file has been written.  Otherwise, the file should be backed
 up when it is next saved (if backups are enabled).  This is a
-permanent local; @code{kill-all-local-variables} does not alter it.
+permanent local; @code{kill-all-local-variables} does not alter@tie{}it.
 @end defvar
 
 @defopt make-backup-files
@@ -162,7 +163,7 @@ files.  If you define it, you may need to change
 
 @node Rename or Copy
 @subsection Backup by Renaming or by Copying?
-@cindex backup files, how to make them
+@cindex backup files, rename or copy
 
   There are two ways that Emacs can make a backup file:
 
@@ -268,12 +269,12 @@ automatically or it can ask the user whether to delete them.
 @defopt kept-new-versions
 The value of this variable is the number of newest versions to keep
 when a new numbered backup is made.  The newly made backup is included
-in the count.  The default value is 2.
+in the count.  The default value is@tie{}2.
 @end defopt
 
 @defopt kept-old-versions
 The value of this variable is the number of oldest versions to keep
-when a new numbered backup is made.  The default value is 2.
+when a new numbered backup is made.  The default value is@tie{}2.
 @end defopt
 
   If there are backups numbered 1, 2, 3, 5, and 7, and both of these
@@ -294,7 +295,7 @@ Otherwise, they are not deleted at all.
 This variable specifies how many of the newest backup versions to keep
 in the Dired command @kbd{.} (@code{dired-clean-directory}).  That's the
 same thing @code{kept-new-versions} specifies when you make a new backup
-file.  The default value is 2.
+file.  The default is@tie{}2.
 @end defopt
 
 @node Backup Names
@@ -306,8 +307,8 @@ If you change one, you probably need to change the rest.
 
 @defun backup-file-name-p filename
 This function returns a non-@code{nil} value if @var{filename} is a
-possible name for a backup file.  A file with the name @var{filename}
-need not exist; the function just checks the name.
+possible name for a backup file.  It just checks the name, not whether
+a file with the name @var{filename} exists.
 
 @smallexample
 @group
@@ -417,7 +418,7 @@ automatically compare a file with its most recent backup.
 
 @node Auto-Saving
 @section Auto-Saving
-@cindex auto-saving
+@c @cindex auto-saving   Lots of symbols starting with auto-save here.
 
   Emacs periodically saves all files that you are visiting; this is
 called @dfn{auto-saving}.  Auto-saving prevents you from losing more
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index a0c2d1aa566..e9cafb69fb5 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -593,16 +593,17 @@ current buffer is used.
 
 @node Modification Time
 @comment  node-name,  next,  previous,  up
-@section Comparison of Modification Time
-@cindex comparison of modification time
-@cindex modification time, comparison of
+@section Buffer Modification Time
+@cindex comparing file modification time
+@cindex modification time of buffer
 
   Suppose that you visit a file and make changes in its buffer, and
 meanwhile the file itself is changed on disk.  At this point, saving the
 buffer would overwrite the changes in the file.  Occasionally this may
 be what you want, but usually it would lose valuable information.  Emacs
 therefore checks the file's modification time using the functions
-described below before saving the file.
+described below before saving the file.  (@xref{File Attributes},
+for how to examine a file's modification time.)
 
 @defun verify-visited-file-modtime buffer
 This function compares what @var{buffer} has recorded for the
@@ -679,12 +680,11 @@ reason.
 @end defun
 
 @defun ask-user-about-supersession-threat filename
-@cindex obsolete buffer
 This function is used to ask a user how to proceed after an attempt to
-modify an obsolete buffer visiting file @var{filename}.  An
-@dfn{obsolete buffer} is an unmodified buffer for which the associated
-file on disk is newer than the last save-time of the buffer.  This means
-some other program has probably altered the file.
+modify an buffer visiting file @var{filename} when the file is newer
+than the buffer text.  Emacs detects this because the modification
+time of the file on disk is newer than the last save-time of the
+buffer.  This means some other program has probably altered the file.
 
 @kindex file-supersession
 Depending on the user's answer, the function may return normally, in
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 6cbf6e70099..8354346c35e 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -116,13 +116,13 @@ controls the reading of arguments for an interactive call.
 
 @node Using Interactive
 @subsection Using @code{interactive}
+@cindex arguments, interactive entry
 
   This section describes how to write the @code{interactive} form that
 makes a Lisp function an interactively-callable command, and how to
 examine a command's @code{interactive} form.
 
 @defspec interactive arg-descriptor
-@cindex argument descriptors
 This special form declares that the function in which it appears is a
 command, and that it may therefore be called interactively (via
 @kbd{M-x} or by entering a key sequence bound to it).  The argument
@@ -151,7 +151,6 @@ arguments.  This leads quickly to an error if the command requires one
 or more arguments.
 
 @item
-@cindex argument prompt
 It may be a string; then its contents should consist of a code character
 followed by a prompt (which some code characters use and some ignore).
 The prompt ends either with the end of the string or with a newline.
@@ -207,7 +206,6 @@ form that is evaluated to get a list of arguments to pass to the
 command.  Usually this form will call various functions to read input
 from the user, most often through the minibuffer (@pxref{Minibuffers})
 or directly from the keyboard (@pxref{Reading Input}).
-@cindex argument evaluation form
 
 Providing point or the mark as an argument value is also common, but
 if you do this @emph{and} read input (whether using the minibuffer or
@@ -865,6 +863,10 @@ If the last event came from a keyboard macro, the value is @code{macro}.
 
 @node Adjusting Point
 @section Adjusting Point After Commands
+@cindex adjusting point
+@cindex invisible/intangible text, and point
+@cindex @code{display} property, and point display
+@cindex @code{composition} property, and point display
 
   It is not easy to display a value of point in the middle of a
 sequence of text that has the @code{display}, @code{composition} or
@@ -933,6 +935,7 @@ the current Emacs session.  If a symbol has not yet been so used,
 
 @node Keyboard Events
 @subsection Keyboard Events
+@cindex keyboard events
 
 There are two kinds of input you can get from the keyboard: ordinary
 keys, and function keys.  Ordinary keys correspond to characters; the
@@ -1600,19 +1603,19 @@ command in the @code{special-event-map} (@pxref{Active Keymaps}).
 The command is called with no arguments, and the specific signal event is
 available in @code{last-input-event}.  For example:
 
-@example
+@smallexample
 (defun sigusr-handler ()
   (interactive)
   (message "Caught signal %S" last-input-event))
 
 (define-key special-event-map [sigusr1] 'sigusr-handler)
-@end example
+@end smallexample
 
 To test the signal handler, you can make Emacs send a signal to itself:
 
-@example
+@smallexample
 (signal-process (emacs-pid) 'sigusr1)
-@end example
+@end smallexample
 @end table
 
   If one of these events arrives in the middle of a key sequence---that
@@ -1776,8 +1779,7 @@ must be the last element of the list.  For example,
 
 @node Accessing Events
 @subsection Accessing Events
-@cindex mouse events, accessing the data
-@cindex accessing data of mouse events
+@cindex mouse events, data in
 
   This section describes convenient functions for accessing the data in
 a mouse button or motion event.
@@ -1892,7 +1894,6 @@ cons cell @code{(@var{width} . @var{height})}.  If the @var{position}
 is a buffer position, return the size of the character at that position.
 @end defun
 
-@cindex mouse event, timestamp
 @cindex timestamp of a mouse event
 @defun posn-timestamp position
 Return the timestamp in @var{position}.  This is the time at which the
@@ -2077,6 +2078,8 @@ following the recommendations at the beginning of this section.
 
 @node Reading Input
 @section Reading Input
+@cindex read input
+@cindex keyboard input
 
   The editor command loop reads key sequences using the function
 @code{read-key-sequence}, which uses @code{read-event}.  These and other
@@ -2106,7 +2109,6 @@ debugging terminal input.
 for example, @code{describe-key} uses it to read the key to describe.
 
 @defun read-key-sequence prompt &optional continue-echo dont-downcase-last switch-frame-ok command-loop
-@cindex key sequence
 This function reads a key sequence and returns it as a string or
 vector.  It keeps reading events until it has accumulated a complete key
 sequence; that is, enough to specify a non-prefix command using the
@@ -2539,7 +2541,6 @@ command's key sequence (as returned by e.g. @code{this-command-keys}),
 as the events will already have been added once as they were read for
 the first time.  An element of the form @code{(@code{t} . @var{event})}
 forces @var{event} to be added to the current command's key sequence.
-
 @end defvar
 
 @defun listify-key-sequence key
@@ -2613,9 +2614,9 @@ like this:
 @end defmac
 
 @defun discard-input
-@cindex flush input
-@cindex discard input
-@cindex terminate keyboard macro
+@cindex flushing input
+@cindex discarding input
+@cindex keyboard macro, terminating
 This function discards the contents of the terminal input buffer and
 cancels any keyboard macro that might be in the process of definition.
 It returns @code{nil}.
@@ -2661,7 +2662,6 @@ in the variable @code{special-event-map} (@pxref{Active Keymaps}).
 
 @node Waiting
 @section Waiting for Elapsed Time or Input
-@cindex pausing
 @cindex waiting
 
   The wait functions are designed to wait for a certain amount of time
@@ -2768,7 +2768,7 @@ about the special behavior of @kbd{C-g} in the command loop.  In the
 case of @code{read-quoted-char}, this is so that @kbd{C-q} can be used
 to quote a @kbd{C-g}.
 
-@cindex prevent quitting
+@cindex preventing quitting
   You can prevent quitting for a portion of a Lisp function by binding
 the variable @code{inhibit-quit} to a non-@code{nil} value.  Then,
 although @kbd{C-g} still sets @code{quit-flag} to @code{t} as usual, the
diff --git a/lispref/compile.texi b/lispref/compile.texi
index 4ed0eb8c1bf..8f5c047fd6b 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -6,8 +6,9 @@
 @setfilename ../info/compile
 @node Byte Compilation, Advising Functions, Loading, Top
 @chapter Byte Compilation
+@cindex byte compilation
 @cindex byte-code
-@cindex compilation
+@cindex compilation (Emacs Lisp)
 
   Emacs Lisp has a @dfn{compiler} that translates functions written
 in Lisp into a special representation called @dfn{byte-code} that can be
diff --git a/lispref/customize.texi b/lispref/customize.texi
index 3d7e9b00172..8b1b1a9b91f 100644
--- a/lispref/customize.texi
+++ b/lispref/customize.texi
@@ -186,9 +186,10 @@ choice is the official name of the package, such as MH-E or Gnus.
 @end defvar
 
 @node Group Definitions
-@section Defining Custom Groups
+@section Defining Customization Groups
+@cindex define customization group
+@cindex customization groups, defining
 
-@cindex custom groups, how to define
   Each Emacs Lisp package should have one main customization group which
 contains all the options, faces and other groups in the package.  If the
 package has a small number of options and faces, use just one group and
@@ -259,10 +260,10 @@ turn this feature back on, if someone would like to do the work.
 
 @node Variable Definitions
 @section Defining Customization Variables
-
+@cindex define customization options
 @cindex customization variables, how to define
-@cindex declare user-editable variables
-  Use @code{defcustom} to declare user-editable variables.
+
+  Use @code{defcustom} to declare user-customizable variables.
 
 @defmac defcustom option standard doc [keyword value]@dots{}
 This construct declares @var{option} as a customizable user option
@@ -701,7 +702,7 @@ The value must be a valid color name, and you can do completion with
 
 @node Composite Types
 @subsection Composite Types
-@cindex arguments (of composite type)
+@cindex Composite Types (customization)
 
   When none of the simple types is appropriate, you can use composite
 types, which build new types from other types or from specified data.
diff --git a/lispref/debugging.texi b/lispref/debugging.texi
index cce112a0aa0..a427e746b27 100644
--- a/lispref/debugging.texi
+++ b/lispref/debugging.texi
@@ -44,7 +44,7 @@ Afterward, you can examine the file to find out what input was used.
 
 @node Debugger
 @section The Lisp Debugger
-@cindex debugger
+@cindex debugger for Emacs Lisp
 @cindex Lisp debugger
 @cindex break
 
@@ -675,6 +675,7 @@ If @var{frame-number} is out of range, @code{backtrace-frame} returns
 
 @node Syntax Errors
 @section Debugging Invalid Lisp Syntax
+@cindex debugging invalid Lisp syntax
 
   The Lisp reader reports invalid syntax, but cannot say where the real
 problem is.  For example, the error ``End of file during parsing'' in
@@ -690,6 +691,8 @@ technique is to try @kbd{C-M-e} at the beginning of each defun, and see
 if it goes to the place where that defun appears to end.  If it does
 not, there is a problem in that defun.
 
+@cindex unbalanced parentheses
+@cindex parenthesis mismatch, debugging
   However, unmatched parentheses are the most common syntax errors in
 Lisp, and we can give further advice for those cases.  (In addition,
 just moving point through the code with Show Paren mode enabled might
@@ -796,8 +799,13 @@ Evaluate @var{form}, informing coverage testing that @var{form} should
 never return.  If it ever does return, you get a run-time error.
 @end defmac
 
+  Edebug also has a coverage testing feature (@pxref{Coverage
+Testing}).  These features partly duplicate each other, and it would
+be cleaner to combine them.
+
 @node Compilation Errors
 @section Debugging Problems in Compilation
+@cindex debugging byte compilation problems
 
   When an error happens during byte compilation, it is normally due to
 invalid syntax in the program you are compiling.  The compiler prints a
diff --git a/lispref/display.texi b/lispref/display.texi
index f485829725a..0d2a8da8753 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -126,6 +126,7 @@ Returns @code{t} if redisplay was performed, or @code{nil} otherwise.
 @node Truncation
 @section Truncation
 @cindex line wrapping
+@cindex line truncation
 @cindex continuation lines
 @cindex @samp{$} in display
 @cindex @samp{\} in display
@@ -216,6 +217,7 @@ explicitly.
 
 @node Displaying Messages
 @subsection Displaying Messages in the Echo Area
+@cindex display message in echo area
 
   This section describes the functions for explicitly producing echo
 area messages.  Many other Emacs features display messages there, too.
@@ -760,10 +762,9 @@ A character is invisible if its @code{invisible} property value
 is @var{atom} or if it is a list with @var{atom} as a member.
 
 @item (@var{atom} . t)
-A character is invisible if its @code{invisible} property value
-is @var{atom} or if it is a list with @var{atom} as a member.
-Moreover, if this character is at the end of a line and is followed
-by a visible newline, it displays an ellipsis.
+A character is invisible if its @code{invisible} property value is
+@var{atom} or if it is a list with @var{atom} as a member.  Moreover,
+a sequence of such characters displays as an ellipsis.
 @end table
 @end table
 @end defvar
@@ -839,7 +840,7 @@ make it invisible again.
 
 @node Selective Display
 @section Selective Display
-@cindex selective display
+@c @cindex selective display   Duplicates selective-display
 
   @dfn{Selective display} refers to a pair of related features for
 hiding certain lines on the screen.
@@ -1364,7 +1365,7 @@ specify a particular attribute for certain text.  @xref{Face
 Attributes}.
 
 @item
-A cons cell of the form @code{(foreground-color . @var{color-name})} or
+A cons cell, either of the form @code{(foreground-color . @var{color-name})} or
 @code{(background-color . @var{color-name})}.  These elements specify
 just the foreground color or just the background color.
 
@@ -1832,6 +1833,7 @@ frame must match one of the @var{value}s specified for it in
 
 @example
 @group
+(defface region
   '((((class color) (min-colors 88) (background dark))
      :background "blue3")
 @end group
@@ -2501,7 +2503,6 @@ makes @code{modeline} an alias for the @code{mode-line} face.
 @cindex automatic face assignment
 @cindex faces, automatic choice
 
-@cindex Font-Lock mode
   This hook is used for automatically assigning faces to text in the
 buffer.  It is part of the implementation of Font-Lock mode.
 
@@ -2743,7 +2744,7 @@ does that, this function's value may not be accurate.
 
 @node Fringes
 @section Fringes
-@cindex Fringes
+@cindex fringes
 
   The @dfn{fringes} of a window are thin vertical strips down the
 sides that are used for displaying bitmaps that indicate truncation,
@@ -3073,7 +3074,7 @@ bitmap's face controls the color to draw it in.
 
 @node Overlay Arrow
 @subsection The Overlay Arrow
-@cindex overlay arrow
+@c @cindex overlay arrow  Duplicates variable names
 
   The @dfn{overlay arrow} is useful for directing the user's attention
 to a particular line in a buffer.  For example, in the modes used for
@@ -3131,6 +3132,7 @@ is used.
 
 @node Scroll Bars
 @section Scroll Bars
+@cindex scroll bars
 
 Normally the frame parameter @code{vertical-scroll-bars} controls
 whether the windows in the frame have vertical scroll bars, and
@@ -3290,7 +3292,6 @@ display specifications and what they mean.
 @node Specified Space
 @subsection Specified Spaces
 @cindex spaces, specified height or width
-@cindex specified spaces
 @cindex variable-width spaces
 
   To display a space of specified width and/or height, use a display
@@ -3603,7 +3604,7 @@ libraries (though it is not possible to add new image formats).
 
   The supported image formats include XBM, XPM (this requires the
 libraries @code{libXpm} version 3.4k and @code{libz}), GIF (requiring
-@code{libungif} 4.1.0), Postscript, PBM, JPEG (requiring the
+@code{libungif} 4.1.0), PostScript, PBM, JPEG (requiring the
 @code{libjpeg} library version v6a), TIFF (requiring @code{libtiff}
 v3.4), and PNG (requiring @code{libpng} 1.0.2).
 
@@ -3658,7 +3659,7 @@ function always returns @code{t}; for other image types, it returns
 * XBM Images::          Special features for XBM format.
 * XPM Images::          Special features for XPM format.
 * GIF Images::          Special features for GIF format.
-* Postscript Images::   Special features for Postscript format.
+* PostScript Images::   Special features for PostScript format.
 * Other Image Types::   Various other formats are supported.
 * Defining Images::     Convenient ways to define an image for later use.
 * Showing Images::      Convenient ways to display an image once it is defined.
@@ -3980,11 +3981,11 @@ every 0.1 seconds.
     (run-with-timer 0.1 nil 'display-anim buffer file (1+ idx) max nil)))
 @end ignore
 
-@node Postscript Images
-@subsection Postscript Images
-@cindex Postscript images
+@node PostScript Images
+@subsection PostScript Images
+@cindex postscript images
 
-  To use Postscript for an image, specify image type @code{postscript}.
+  To use PostScript for an image, specify image type @code{postscript}.
 This works only if you have Ghostscript installed.  You must always use
 these three properties:
 
@@ -3999,15 +4000,15 @@ The value, @var{height}, specifies the height of the image in points
 
 @item :bounding-box @var{box}
 The value, @var{box}, must be a list or vector of four integers, which
-specifying the bounding box of the Postscript image, analogous to the
-@samp{BoundingBox} comment found in Postscript files.
+specifying the bounding box of the PostScript image, analogous to the
+@samp{BoundingBox} comment found in PostScript files.
 
 @example
 %%BoundingBox: 22 171 567 738
 @end example
 @end table
 
-  Displaying Postscript images from Lisp data is not currently
+  Displaying PostScript images from Lisp data is not currently
 implemented, but it may be implemented by the time you read this.
 See the @file{etc/NEWS} file to make sure.
 
@@ -4137,8 +4138,8 @@ should specify the image as follows:
 This function returns a suitable search path for images used by the
 Lisp package @var{library}.
 
-The function searches for @var{image} first in @code{image-load-path}
-(excluding @file{@code{data-directory}/images}) and then in
+The function searches for @var{image} first using @code{image-load-path},
+excluding @file{@code{data-directory}/images}, and then in
 @code{load-path}, followed by a path suitable for @var{library}, which
 includes @file{../../etc/images} and @file{../etc/images} relative to
 the library file itself, and finally in
@@ -4270,6 +4271,7 @@ cache, it can always be displayed, even if the value of
 
 @node Image Cache
 @subsection Image Cache
+@cindex image cache
 
   Emacs stores images in an image cache when it displays them, so it can
 display them again more efficiently.  It removes an image from the cache
@@ -4297,7 +4299,6 @@ are cleared.
 
 @node Buttons
 @section Buttons
-@cindex buttons
 @cindex buttons in buffers
 @cindex clickable buttons in buffers
 
@@ -4607,15 +4608,11 @@ is skipped over.  Returns the button found.
 @end deffn
 
 @defun next-button pos &optional count-current
-Return the next button after position @var{pos} in the current buffer.
-If @var{count-current} is non-@code{nil}, count any button at
-@var{pos} in the search, instead of starting at the next button.
-@end defun
-
-@defun previous-button pos &optional count-current
-Return the @var{n}th button before position @var{pos} in the current
-buffer.  If @var{count-current} is non-@code{nil}, count any button at
-@var{pos} in the search, instead of starting at the next button.
+@defunx previous-button pos &optional count-current
+Return the next button after (for @code{next-button} or before (for
+@code{previous-button}) position @var{pos} in the current buffer.  If
+@var{count-current} is non-@code{nil}, count any button at @var{pos}
+in the search, instead of starting at the next button.
 @end defun
 
 @node Abstract Display
@@ -4954,9 +4951,8 @@ ewoc is created to be either @code{nil} or an index into the vector
 @node Blinking
 @section Blinking Parentheses
 @cindex parenthesis matching
-@cindex blinking
+@cindex blinking parentheses
 @cindex balancing parentheses
-@cindex close parenthesis
 
   This section describes the mechanism by which Emacs shows a matching
 open parenthesis when the user inserts a close parenthesis.
@@ -5328,7 +5324,7 @@ display by sending @var{string} to the terminal.
 
 @node Beeping
 @section Beeping
-@cindex beeping
+@c  @cindex beeping   "beep" is adjacent
 @cindex bell
 
   This section describes how to make Emacs ring the bell (or blink the
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index 4082fdfe5c2..4be030896c5 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -12,9 +12,8 @@
 
 @node Edebug, Syntax Errors, Debugger, Debugging
 @section Edebug
-@cindex Edebug mode
+@cindex Edebug debugging facility
 
-@cindex Edebug
   Edebug is a source-level debugger for Emacs Lisp programs with which
 you can:
 
@@ -195,12 +194,6 @@ evaluates, even if not instrumenting it.  See also the @kbd{i} command
 (@pxref{Jumping}), which steps into the call after instrumenting the
 function.
 
-@cindex special forms (Edebug)
-@cindex interactive commands (Edebug)
-@cindex anonymous lambda expressions (Edebug)
-@cindex Common Lisp (Edebug)
-@pindex cl.el @r{(Edebug)}
-@pindex cl-specs.el
   Edebug knows how to instrument all the standard special forms,
 @code{interactive} forms with an expression argument, anonymous lambda
 expressions, and other defining forms.  However, Edebug cannot determine
@@ -441,9 +434,9 @@ breakpoints, the global break condition, and source breakpoints.
 @end menu
 
 @node Breakpoints
-@subsubsection Breakpoints
+@subsubsection Edebug Breakpoints
 
-@cindex breakpoints
+@cindex breakpoints (Edebug)
 While using Edebug, you can specify @dfn{breakpoints} in the program you
 are testing: these are places where execution should stop.  You can set a
 breakpoint at any stop point, as defined in @ref{Using Edebug}.  For
@@ -867,10 +860,10 @@ lines inserted.
 @node Coverage Testing
 @subsection Coverage Testing
 
-@cindex coverage testing
+@cindex coverage testing (Edebug)
 @cindex frequency counts
 @cindex performance analysis
-Edebug provides rudimentary coverage testing and display of execution
+  Edebug provides rudimentary coverage testing and display of execution
 frequency.
 
   Coverage testing works by comparing the result of each expression with
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index fa9f93208e1..546f1ca4f97 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -7,24 +7,29 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.96
+@set EMACSVER 22.0.98
 
 @dircategory Emacs
 @direntry
 * Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
 
-@c So that anyone making the printed manual gets the version we have
-@c tuned to avoid bad line breaks, etc.
+@c for full 8.5x11, comment this out.
+@set smallbook
+
+@ifset smallbook
 @smallbook
+@end ifset
 
 @c per rms and peterb, use 10pt fonts for the main text, mostly to
 @c save on paper cost.  Also, do not declare @setchapternewpage odd,
 @c for the same reason. Do this inside @tex for now, so the
 @c last-released makeinfo does not complain.
 @tex
+@ifset smallbook
 @fonttextsize 10
-\global\hbadness=6000 % don't worry about not-too-underfull boxes
+@end ifset
+\global\hbadness=6666 % don't worry about not-too-underfull boxes
 @end tex
 
 @c Combine indices.
@@ -61,7 +66,7 @@ Software Foundation raise funds for GNU development.''
 @titlepage
 @title GNU Emacs Lisp Reference Manual
 @subtitle For Emacs Version @value{EMACSVER}
-@subtitle Revision @value{VERSION}, January 2002
+@subtitle Revision @value{VERSION}, April 2007
 
 @author by Bil Lewis, Dan LaLiberte, Richard Stallman
 @author and the GNU Manual Group
@@ -1297,7 +1302,7 @@ Images
 * XBM Images::              Special features for XBM format.
 * XPM Images::              Special features for XPM format.
 * GIF Images::              Special features for GIF format.
-* Postscript Images::       Special features for Postscript format.
+* PostScript Images::       Special features for PostScript format.
 * Other Image Types::       Various other formats are supported.
 * Defining Images::         Convenient ways to define an image for later use.
 * Showing Images::          Convenient ways to display an image once
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 98c30fcd4a1..af2df791c39 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -6,6 +6,7 @@
 @setfilename ../info/errors
 @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top
 @appendix Standard Errors
+@cindex standard errors
 
   Here is the complete list of the error symbols in standard Emacs,
 grouped by concept.  The list includes each symbol's message (on the
diff --git a/lispref/eval.texi b/lispref/eval.texi
index d085491d2d2..772f502553c 100644
--- a/lispref/eval.texi
+++ b/lispref/eval.texi
@@ -233,7 +233,7 @@ Scheme.
 @node Function Indirection
 @subsection Symbol Function Indirection
 @cindex symbol function indirection
-@cindex indirection
+@cindex indirection for functions
 @cindex void function
 
   If the first element of the list is a symbol then evaluation examines
@@ -252,7 +252,6 @@ neither of these things happens, we eventually obtain a non-symbol,
 which ought to be a function or other suitable object.
 
 @kindex invalid-function
-@cindex invalid function
   More precisely, we should now have a Lisp function (a lambda
 expression), a byte-code function, a primitive function, a Lisp macro, a
 special form, or an autoload object.  Each of these types is a case
@@ -530,7 +529,6 @@ definition loaded from that file.  @xref{Autoload}.
 
 @node Quoting
 @section Quoting
-@cindex quoting
 
   The special form @code{quote} returns its single argument, as written,
 without evaluating it.  This provides a way to include constant symbols
diff --git a/lispref/files.texi b/lispref/files.texi
index f13888197c7..f357b1f3814 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -296,6 +296,7 @@ in the list @code{find-file-hook}.
 
 @node Saving Buffers
 @section Saving Buffers
+@cindex saving buffers
 
   When you edit a file in Emacs, you are actually working on a buffer
 that is visiting that file---that is, the contents of the file are
@@ -481,6 +482,7 @@ Name}).
 @node Reading from Files
 @comment  node-name,  next,  previous,  up
 @section Reading from Files
+@cindex reading from files
 
   You can copy a file from the disk and insert it into a buffer
 using the @code{insert-file-contents} function.  Don't use the user-level
@@ -544,6 +546,7 @@ program can read the file, use the function @code{file-local-copy}; see
 @node Writing to Files
 @comment  node-name,  next,  previous,  up
 @section Writing to Files
+@cindex writing to files
 
   You can write the contents of a buffer, or part of a buffer, directly
 to a file on disk using the @code{append-to-file} and
@@ -647,6 +650,7 @@ with-temp-buffer,, The Current Buffer}.
 @node File Locks
 @section File Locks
 @cindex file locks
+@cindex lock file
 
   When two users edit the same file at the same time, they are likely
 to interfere with each other.  Emacs tries to prevent this situation
@@ -736,6 +740,7 @@ for its usual definition is in @file{userlock.el}.
 
 @node Information about Files
 @section Information about Files
+@cindex file, information about
 
   The functions described in this section all operate on strings that
 designate file names.  With a few exceptions, all the functions have
@@ -1172,6 +1177,7 @@ value of @code{current-time}; see @ref{Time of Day}.)
 
 @item
 The time of last modification as a list of two integers (as above).
+@cindex modification time of file
 
 @item
 The time of last status change as a list of two integers (as above).
@@ -1262,13 +1268,13 @@ is on file system number -32252.
 
 @node Locating Files
 @subsection How to Locate Files in Standard Places
-@cindex locate files
-@cindex find files
+@cindex locate file in path
+@cindex find file in path
 
   This section explains how to search for a file in a list of
-directories.  One example is when you need to look for a program's
-executable file, e.g., to find out whether a given program is
-installed on the user's system.  Another example is the search for
+directories (a @dfn{path}).  One example is when you need to look for
+a program's executable file, e.g., to find out whether a given program
+is installed on the user's system.  Another example is the search for
 Lisp libraries (@pxref{Library Search}).  Such searches generally need
 to try various possible file name extensions, in addition to various
 possible directories.  Emacs provides a function for such a
@@ -1311,7 +1317,6 @@ For compatibility, @var{predicate} can also be one of the symbols
 a list of one or more of these symbols.
 @end defun
 
-@cindex find executable program
 @defun executable-find program
 This function searches for the executable file of the named
 @var{program} and returns the full absolute name of the executable,
@@ -1323,7 +1328,7 @@ in @code{exec-path} and tries all the file-name extensions in
 
 @node Changing Files
 @section Changing File Names and Attributes
-@cindex renaming files
+@c @cindex renaming files  Duplicates rename-file
 @cindex copying files
 @cindex deleting files
 @cindex linking files
@@ -2459,6 +2464,7 @@ which generate the listing with Lisp code.
 
 @node Create/Delete Dirs
 @section Creating and Deleting Directories
+@cindex creating and deleting directories
 @c Emacs 19 features
 
   Most Emacs Lisp file-manipulation functions get errors when used on
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 32f9e071f09..527f27385f3 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -150,6 +150,13 @@ screens belonging to one server, Emacs knows by the similarity in their
 names that they share a single keyboard, and it treats them as a single
 terminal.
 
+  Note that some graphical terminals can output to more than a one
+monitor (or other output device) at the same time.  On these
+``multi-monitor'' setups, a single @var{display} value controls the
+output to all the physical monitors.  In this situation, there is
+currently no platform-independent way for Emacs to distinguish between
+the different physical monitors.
+
 @deffn Command make-frame-on-display display &optional parameters
 This creates and returns a new frame on display @var{display}, taking
 the other frame parameters from @var{parameters}.  Aside from the
@@ -193,6 +200,7 @@ that display (@pxref{Deleting Frames}).
 
 @node Frame Parameters
 @section Frame Parameters
+@cindex frame parameters
 
   A frame has many parameters that control its appearance and behavior.
 Just what parameters a frame has depends on what display mechanism it
@@ -555,6 +563,7 @@ If non-@code{nil}, this frame's window is never split automatically.
 
 @node Management Parameters
 @subsubsection Window Management Parameters
+@cindex window manager, and frame parameters
 
   These frame parameters, meaningful only on window system displays,
 interact with the window manager.
@@ -885,6 +894,7 @@ Here is an example:
 
 @node Frame Titles
 @section Frame Titles
+@cindex frame title
 
   Every frame has a @code{name} parameter; this serves as the default
 for the frame title which window systems typically display at the top of
@@ -924,7 +934,7 @@ while processing @code{frame-title-format} or
 
 @node Deleting Frames
 @section Deleting Frames
-@cindex deletion of frames
+@cindex deleting frames
 
 Frames remain potentially visible until you explicitly @dfn{delete}
 them.  A deleted frame cannot appear on the screen, but continues to
@@ -956,6 +966,7 @@ calls the function @code{delete-frame}.  @xref{Misc Events}.
 
 @node Finding All Frames
 @section Finding All Frames
+@cindex frames, scanning all
 
 @defun frame-list
 The function @code{frame-list} returns a list of all the frames that
@@ -1077,7 +1088,7 @@ Displays}.
 @node Input Focus
 @section Input Focus
 @cindex input focus
-@cindex selected frame
+@c @cindex selected frame    Duplicates selected-frame
 
 At any time, one frame in Emacs is the @dfn{selected frame}.  The selected
 window always resides on the selected frame.
@@ -1260,7 +1271,7 @@ to ``lowest.''  Where two windows overlap, the one higher up covers
 the one underneath.  Even a window at the bottom of the stack can be
 seen if no other window overlaps it.
 
-@cindex raising a frame
+@c @cindex raising a frame  redundant with raise-frame
 @cindex lowering a frame
   A window's place in this ordering is not fixed; in fact, users tend
 to change the order frequently.  @dfn{Raising} a window means moving
@@ -1315,14 +1326,14 @@ unwanted frames are iconified instead.
 @node Mouse Tracking
 @section Mouse Tracking
 @cindex mouse tracking
-@cindex tracking the mouse
+@c @cindex tracking the mouse   Duplicates track-mouse
 
-Sometimes it is useful to @dfn{track} the mouse, which means to display
+  Sometimes it is useful to @dfn{track} the mouse, which means to display
 something to indicate where the mouse is and move the indicator as the
 mouse moves.  For efficient mouse tracking, you need a way to wait until
 the mouse actually moves.
 
-The convenient way to track the mouse is to ask for events to represent
+  The convenient way to track the mouse is to ask for events to represent
 mouse motion.  Then you can wait for motion by waiting for an event.  In
 addition, you can easily handle any other sorts of events that may
 occur.  That is useful, because normally you don't want to track the
@@ -2015,8 +2026,6 @@ a mouse.
 @end defun
 
 @defun display-graphic-p &optional display
-@cindex frames, more than one on display
-@cindex fonts, more than one on display
 This function returns @code{t} if @var{display} is a graphic display
 capable of displaying several frames and several different fonts at
 once.  This is true for displays that use a window system such as X, and
@@ -2087,11 +2096,19 @@ This function returns the number of screens associated with the display.
 @defun display-pixel-height &optional display
 This function returns the height of the screen in pixels.
 On a character terminal, it gives the height in characters.
+
+For graphical terminals, note that on ``multi-monitor'' setups this
+refers to the pixel width for all physical monitors associated with
+@var{display}.  @xref{Multiple Displays}.
 @end defun
 
 @defun display-pixel-width &optional display
 This function returns the width of the screen in pixels.
 On a character terminal, it gives the width in characters.
+
+For graphical terminals, note that on ``multi-monitor'' setups this
+refers to the pixel width for all physical monitors associated with
+@var{display}.  @xref{Multiple Displays}.
 @end defun
 
 @defun display-mm-height &optional display
diff --git a/lispref/functions.texi b/lispref/functions.texi
index 084f2a57d50..eedfa8c124f 100644
--- a/lispref/functions.texi
+++ b/lispref/functions.texi
@@ -293,6 +293,7 @@ variables.
 @kindex wrong-number-of-arguments
 @cindex argument binding
 @cindex binding arguments
+@cindex argument lists, features
 
   Our simple sample function, @code{(lambda (a b c) (+ a b c))},
 specifies three argument variables, so it must be called with three
@@ -583,6 +584,7 @@ defined is often done deliberately, and there is no way to distinguish
 deliberate redefinition from unintentional redefinition.
 @end defspec
 
+@cindex function aliases
 @defun defalias name definition &optional docstring
 @anchor{Definition of defalias}
 This special form defines the symbol @var{name} as a function, with
@@ -1191,17 +1193,22 @@ function except for one thing: when you compile a call to the function,
 the function's definition is open-coded into the caller.
 
 Making a function inline makes explicit calls run faster.  But it also
-has disadvantages.  For one thing, it reduces flexibility; if you change
-the definition of the function, calls already inlined still use the old
-definition until you recompile them.  Since the flexibility of
-redefining functions is an important feature of Emacs, you should not
-make a function inline unless its speed is really crucial.
+has disadvantages.  For one thing, it reduces flexibility; if you
+change the definition of the function, calls already inlined still use
+the old definition until you recompile them.
 
 Another disadvantage is that making a large function inline can increase
 the size of compiled code both in files and in memory.  Since the speed
 advantage of inline functions is greatest for small functions, you
 generally should not make large functions inline.
 
+Also, inline functions do not behave well with respect to debugging,
+tracing, and advising (@pxref{Advising Functions}).  Since ease of
+debugging and the flexibility of redefining functions are important
+features of Emacs, you should not make a function inline, even if it's
+small, unless its speed is really crucial, and you've timed the code
+to verify that using @code{defun} actually has performance problems.
+
 It's possible to define a macro to expand into the same code that an
 inline function would execute.  (@xref{Macros}.)  But the macro would be
 limited to direct use in expressions---a macro cannot be called with
diff --git a/lispref/hash.texi b/lispref/hash.texi
index 6a7fd26ae8b..c5b68e26d91 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -7,10 +7,11 @@
 @node Hash Tables, Symbols, Sequences Arrays Vectors, Top
 @chapter Hash Tables
 @cindex hash tables
+@cindex lookup tables
 
-  A hash table is a very fast kind of lookup table, somewhat like
-an alist in that it maps keys to corresponding values.  It differs
-from an alist in these ways:
+  A hash table is a very fast kind of lookup table, somewhat like an
+alist (@pxref{Association Lists}) in that it maps keys to
+corresponding values.  It differs from an alist in these ways:
 
 @itemize @bullet
 @item
@@ -55,6 +56,7 @@ of object and are used only for recording interned symbols
 
 @node Creating Hash
 @section Creating Hash Tables
+@cindex creating hash tables
 
   The principal function for creating a hash table is
 @code{make-hash-table}.
@@ -212,6 +214,7 @@ arguments---a @var{key} listed in @var{table}, and its associated
 @node Defining Hash
 @section Defining Hash Comparisons
 @cindex hash code
+@cindex define hash comparisons
 
   You can define new methods of key lookup by means of
 @code{define-hash-table-test}.  In order to use this feature, you need
diff --git a/lispref/help.texi b/lispref/help.texi
index 0939d384a4e..70c7a48c9c4 100644
--- a/lispref/help.texi
+++ b/lispref/help.texi
@@ -91,9 +91,7 @@ list under the property name @code{variable-documentation}.  The
 function @code{documentation-property} knows how to retrieve it.
 @end itemize
 
-@cindex @file{DOC} (documentation) file
-@cindex @file{emacs/etc/DOC-@var{version}}
-@cindex @file{etc/DOC-@var{version}}
+@cindex @file{DOC-@var{version}} (documentation) file
 To save space, the documentation for preloaded functions and variables
 (including primitive functions and autoloaded functions) is stored in
 the file @file{emacs/etc/DOC-@var{version}}---not inside Emacs.  The
@@ -388,6 +386,7 @@ C-g             abort-recursive-edit
 
 @node Describing Characters
 @section Describing Characters for Help Messages
+@cindex describe characters and events
 
   These functions convert events, key sequences, or characters to
 textual descriptions.  These descriptions are useful for including
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 60ea9769150..3cd42ed69ff 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -204,7 +204,7 @@ You should not change this flag in a running Emacs.
 
 @node Garbage Collection
 @appendixsec Garbage Collection
-@cindex garbage collector
+@cindex garbage collection
 
 @cindex memory allocation
   When a program creates a list or the user defines a new function (such
@@ -441,6 +441,7 @@ point number.
 
 @node Memory Usage
 @section Memory Usage
+@cindex memory usage
 
   These functions and variables give information about the total amount
 of memory allocation that Emacs has done, broken down by data type.
@@ -530,7 +531,7 @@ usage: (or CONDITIONS ...)  */)
     @{
       val = Feval (XCAR (args));
       if (!NILP (val))
-        break;
+        break;
       args = XCDR (args);
     @}
 @end group
@@ -715,7 +716,7 @@ with a value that is either @code{t} or @code{nil}.  Note that variables
 defined with @code{DEFVAR_BOOL} are automatically added to the list
 @code{byte-boolean-vars} used by the byte compiler.
 
-@cindex @code{staticpro}, protect file-scope variables from GC
+@cindex @code{staticpro}, protection from GC
   If you define a file-scope C variable of type @code{Lisp_Object},
 you must protect it from garbage-collection by calling @code{staticpro}
 in @code{syms_of_@var{filename}}, like this:
diff --git a/lispref/intro.texi b/lispref/intro.texi
index c919a46610d..35566603b7c 100644
--- a/lispref/intro.texi
+++ b/lispref/intro.texi
@@ -170,11 +170,11 @@ being described, are formatted like this: @var{first-number}.
 
 @node nil and t
 @subsection @code{nil} and @code{t}
-@cindex @code{nil}, uses of
 @cindex truth value
 @cindex boolean
-@cindex false
 
+@cindex @code{nil}
+@cindex false
   In Lisp, the symbol @code{nil} has three separate meanings: it
 is a symbol with the name @samp{nil}; it is the logical truth value
 @var{false}; and it is the empty list---the list of zero elements.
@@ -197,7 +197,7 @@ in Lisp programs also.
 (setq foo-flag nil)           ; @r{Emphasize the truth value @var{false}}
 @end example
 
-@cindex @code{t}, uses of
+@cindex @code{t}
 @cindex true
   In contexts where a truth value is expected, any non-@code{nil} value
 is considered to be @var{true}.  However, @code{t} is the preferred way
@@ -535,11 +535,12 @@ The minor version number of Emacs, as an integer.  For Emacs version
 @section Acknowledgements
 
   This manual was written by Robert Krawitz, Bil Lewis, Dan LaLiberte,
-Richard M. Stallman and Chris Welty, the volunteers of the GNU manual
-group, in an effort extending over several years.  Robert J. Chassell
-helped to review and edit the manual, with the support of the Defense
-Advanced Research Projects Agency, ARPA Order 6082, arranged by Warren
-A. Hunt, Jr.@: of Computational Logic, Inc.
+Richard@tie{}M. Stallman and Chris Welty, the volunteers of the GNU
+manual group, in an effort extending over several years.
+Robert@tie{}J. Chassell helped to review and edit the manual, with the
+support of the Defense Advanced Research Projects Agency, ARPA Order
+6082, arranged by Warren@tie{}A. Hunt, Jr.@: of Computational Logic,
+Inc.
 
   Corrections were supplied by Karl Berry, Jim Blandy, Bard Bloom,
 Stephane Boucher, David Boyes, Alan Carroll, Richard Davis, Lawrence
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 0cd653984e9..cd0ae7ec979 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -53,7 +53,7 @@ vector.  Unless otherwise stated, any Emacs Lisp function that accepts
 a key sequence as an argument can handle both representations.
 
   In the string representation, alphanumeric characters ordinarily
-stand for themselves; for example, @code{"a"} represents @kbd{a} and
+stand for themselves; for example, @code{"a"} represents @kbd{a}
 and @code{"2"} represents @kbd{2}.  Control character events are
 prefixed by the substring @code{"\C-"}, and meta characters by
 @code{"\M-"}; for example, @code{"\C-x"} represents the key @kbd{C-x}.
@@ -255,7 +255,7 @@ lisp-mode-map
      (24 . lisp-send-defun)
      keymap
      ;; @r{@kbd{M-C-q}, treated as @kbd{@key{ESC} C-q}}
-     (17 . indent-sexp)))
+     (17 . indent-sexp))
 @end group
 @group
  ;; @r{This part is inherited from @code{lisp-mode-shared-map}.}
@@ -697,6 +697,7 @@ An error is signaled if @var{key} is not a string or a vector.
 
 @node Searching Keymaps
 @section Searching the Active Keymaps
+@cindex searching active keymaps for keys
 
   After translation of event subsequences (@pxref{Translation
 Keymaps}) Emacs looks for them in the active keymaps.  Here is a
@@ -1277,7 +1278,7 @@ bindings in a keymap makes no difference for keyboard input, but it
 does matter for menu keymaps (@pxref{Menu Keymaps}).
 @end defun
 
-  Here is an example that creates a sparse keymap and makes a number of
+  This example creates a sparse keymap and makes a number of
 bindings in it:
 
 @smallexample
@@ -1488,17 +1489,22 @@ does not have the effect of remapping @code{kill-line} into
 if an ordinary binding specifies @code{my-kill-line}, this keymap will
 remap it to @code{my-other-kill-line}.
 
-@defun command-remapping command &optional position
+@defun command-remapping command &optional position keymaps
 This function returns the remapping for @var{command} (a symbol),
 given the current active keymaps.  If @var{command} is not remapped
 (which is the usual situation), or not a symbol, the function returns
 @code{nil}.  @code{position} can optionally specify a buffer position
 or an event position to determine the keymaps to use, as in
 @code{key-binding}.
+
+If the optional argument @code{keymaps} is non-@code{nil}, it
+specifies a list of keymaps to search in.  This argument is ignored if
+@code{position} is non-@code{nil}.
 @end defun
 
 @node Translation Keymaps
 @section Keymaps for Translating Sequences of Events
+@cindex keymaps for translating events
 
   This section describes keymaps that are used during reading a key
 sequence, to translate certain event sequences into others.
diff --git a/lispref/lists.texi b/lispref/lists.texi
index 24214bbc357..ffe4df2413d 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -6,7 +6,7 @@
 @setfilename ../info/lists
 @node Lists, Sequences Arrays Vectors, Strings and Characters, Top
 @chapter Lists
-@cindex list
+@cindex lists
 @cindex element (of list)
 
   A @dfn{list} represents a sequence of zero or more elements (which may
@@ -30,7 +30,6 @@ the whole list.
 @node Cons Cells
 @section Lists and Cons Cells
 @cindex lists and cons cells
-@cindex @code{nil} and lists
 
   Lists in Lisp are not a primitive data type; they are built up from
 @dfn{cons cells}.  A cons cell is a data object that represents an
@@ -104,7 +103,6 @@ otherwise.  @code{nil} is not a cons cell, although it @emph{is} a list.
 @end defun
 
 @defun atom object
-@cindex atoms
 This function returns @code{t} if @var{object} is an atom, @code{nil}
 otherwise.  All objects except cons cells are atoms.  The symbol
 @code{nil} is an atom and is also a list; it is the only Lisp object
@@ -159,7 +157,6 @@ considered a list and @code{not} when it is considered a truth value
 @end example
 @end defun
 
-@need 2000
 
 @node List Elements
 @section Accessing Elements of Lists
@@ -991,10 +988,9 @@ x1
 @end group
 @end example
 
-@need 4000
   Here is the result in box notation:
 
-@example
+@smallexample
 @group
                    --------------------
                   |                    |
@@ -1004,7 +1000,7 @@ x1
 |       |      |     |       |      |      |       |      |
  --------------       --------------        --------------
 @end group
-@end example
+@end smallexample
 
 @noindent
 The second cons cell, which previously held the element @code{b}, still
@@ -1307,7 +1303,7 @@ compare @var{object} against the elements of the list.  For example:
 @end defun
 
 @defun delq object list
-@cindex deletion of elements
+@cindex deleting list elements
 This function destructively removes all elements @code{eq} to
 @var{object} from @var{list}.  The letter @samp{q} in @code{delq} says
 that it uses @code{eq} to compare @var{object} against the elements of
@@ -1370,6 +1366,9 @@ and the @code{(4)} in the @code{sample-list} are not @code{eq}:
 (delq '(4) sample-list)
      @result{} (a c (4))
 @end group
+
+If you want to delete elements that are @code{equal} to a given value,
+use @code{delete} (see below).
 @end example
 
 @defun remq object list
@@ -1392,9 +1391,6 @@ sample-list
      @result{} (a b c a b c)
 @end group
 @end example
-@noindent
-The function @code{delq} offers a way to perform this operation
-destructively.  See @ref{Sets And Lists}.
 @end defun
 
 @defun memql object list
@@ -1452,8 +1448,8 @@ If @code{sequence} is a list, this function destructively removes all
 elements @code{equal} to @var{object} from @var{sequence}.  For lists,
 @code{delete} is to @code{delq} as @code{member} is to @code{memq}: it
 uses @code{equal} to compare elements with @var{object}, like
-@code{member}; when it finds an element that matches, it removes the
-element just as @code{delq} would.
+@code{member}; when it finds an element that matches, it cuts the
+element out just as @code{delq} would.
 
 If @code{sequence} is a vector or string, @code{delete} returns a copy
 of @code{sequence} with all elements @code{equal} to @code{object}
@@ -1463,8 +1459,22 @@ For example:
 
 @example
 @group
-(delete '(2) '((2) (1) (2)))
+(setq l '((2) (1) (2)))
+(delete '(2) l)
      @result{} ((1))
+l
+     @result{} ((2) (1))
+;; @r{If you want to change @code{l} reliably,}
+;; @r{write @code{(setq l (delete elt l))}.}
+@end group
+@group
+(setq l '((2) (1) (2)))
+(delete '(1) l)
+     @result{} ((2) (2))
+l
+     @result{} ((2) (2))
+;; @r{In this case, it makes no difference whether you set @code{l},}
+;; @r{but you should do so for the sake of the other case.}
 @end group
 @group
 (delete '(2) [(2) (1) (2)])
@@ -1474,7 +1484,7 @@ For example:
 @end defun
 
 @defun remove object sequence
-This function is the non-destructive counterpart of @code{delete}.  If
+This function is the non-destructive counterpart of @code{delete}.  It
 returns a copy of @code{sequence}, a list, vector, or string, with
 elements @code{equal} to @code{object} removed.  For example:
 
@@ -1513,7 +1523,8 @@ several @code{equal} occurrences of an element in @var{list},
 @end defun
 
   See also the function @code{add-to-list}, in @ref{List Variables},
-for another way to add an element to a list stored in a variable.
+for a way to add an element to a list stored in a variable and used as a
+set.
 
 @node Association Lists
 @section Association Lists
@@ -1589,7 +1600,7 @@ of property lists and association lists.
 
 @defun assoc key alist
 This function returns the first association for @var{key} in
-@var{alist}.  It compares @var{key} against the alist elements using
+@var{alist}, comparing @var{key} against the alist elements using
 @code{equal} (@pxref{Equality Predicates}).  It returns @code{nil} if no
 association in @var{alist} has a @sc{car} @code{equal} to @var{key}.
 For example:
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 092befff85a..058ed9c8984 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -64,22 +64,23 @@ forms in it, and closes the file.
 
 To find the file, @code{load} first looks for a file named
 @file{@var{filename}.elc}, that is, for a file whose name is
-@var{filename} with @samp{.elc} appended.  If such a file exists, it is
-loaded.  If there is no file by that name, then @code{load} looks for a
-file named @file{@var{filename}.el}.  If that file exists, it is loaded.
-Finally, if neither of those names is found, @code{load} looks for a
-file named @var{filename} with nothing appended, and loads it if it
-exists.  (The @code{load} function is not clever about looking at
-@var{filename}.  In the perverse case of a file named @file{foo.el.el},
-evaluation of @code{(load "foo.el")} will indeed find it.)
-
-If Auto Compression mode is enabled, as it is by default, then
-if @code{load} can not find a file, it searches for a compressed
-version of the file before trying other file names.  It decompresses
-and loads it if it exists.  It looks for compressed versions by
-appending the suffixes in @code{jka-compr-load-suffixes} to the file
-name.  The value of this variable must be a list of strings. Its
-standard value is @code{(".gz")}.
+@var{filename} with the extension @samp{.elc} appended.  If such a
+file exists, it is loaded.  If there is no file by that name, then
+@code{load} looks for a file named @file{@var{filename}.el}.  If that
+file exists, it is loaded.  Finally, if neither of those names is
+found, @code{load} looks for a file named @var{filename} with nothing
+appended, and loads it if it exists.  (The @code{load} function is not
+clever about looking at @var{filename}.  In the perverse case of a
+file named @file{foo.el.el}, evaluation of @code{(load "foo.el")} will
+indeed find it.)
+
+If Auto Compression mode is enabled, as it is by default, then if
+@code{load} can not find a file, it searches for a compressed version
+of the file before trying other file names.  It decompresses and loads
+it if it exists.  It looks for compressed versions by appending each
+of the suffixes in @code{jka-compr-load-suffixes} to the file name.
+The value of this variable must be a list of strings. Its standard
+value is @code{(".gz")}.
 
 If the optional argument @var{nosuffix} is non-@code{nil}, then
 @code{load} does not try the suffixes @samp{.elc} and @samp{.el}.  In
@@ -220,6 +221,8 @@ it skips the latter group.
 
 @node Library Search
 @section Library Search
+@cindex library search
+@cindex find library
 
   When Emacs loads a Lisp library, it searches for the library
 in a list of directories specified by the variable @code{load-path}.
@@ -844,7 +847,7 @@ rather than replacing that element.  @xref{Eval}.
 
 @node Unloading
 @section Unloading
-@cindex unloading
+@cindex unloading packages
 
 @c Emacs 19 feature
   You can discard the functions and variables loaded by a library to
@@ -956,7 +959,7 @@ element looks like this:
 
 The key @var{regexp-or-feature} is either a regular expression or a
 symbol, and the value is a list of forms.  The forms are evaluated when
-the key matches the the absolute true name of the file being
+the key matches the absolute true name of the file being
 @code{load}ed or the symbol being @code{provide}d.
 @end defvar
 
diff --git a/lispref/locals.texi b/lispref/locals.texi
index 712c8aa9701..4edbc2a815f 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -9,6 +9,7 @@
 @c The title "Standard Buffer-Local Variables" is too long for
 @c smallbook. --rjc 30mar92
 @cindex buffer-local variables, general-purpose
+@cindex standard buffer-local variables
 
   The table below lists the general-purpose Emacs variables that
 automatically become buffer-local in each buffer.  Most become
@@ -16,9 +17,9 @@ buffer-local only when set; a few of them are always local in every
 buffer.  Many Lisp packages define such variables for their internal
 use, but we don't try to list them all here.
 
-Each minor modes defines a buffer-local variable named
-@samp{@var{modename}-mode}.  @xref{Minor Mode Conventions}.  Minor
-mode variables will not be listed here.
+  Every buffer-specific minor mode defines a buffer-local variable
+named @samp{@var{modename}-mode}.  @xref{Minor Mode Conventions}.
+Minor mode variables will not be listed here.
 
 @table @code
 @item auto-fill-function
diff --git a/lispref/macros.texi b/lispref/macros.texi
index 80d8e9c0786..6dea53ac983 100644
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -140,7 +140,6 @@ uses this feature.
 
 
 @defun macroexpand-all form &optional environment
-@cindex macro expansion in entire form
 @code{macroexpand-all} expands macros like @code{macroexpand}, but
 will look for and expand all macros in @var{form}, not just at the
 top-level.  If no macros are expanded, the return value is @code{eq}
@@ -239,7 +238,7 @@ currently supported:
 @table @code
 @item (debug @var{edebug-form-spec})
 Specify how to step through macro calls for Edebug.
-@xref{Instrumenting Macro Calls}, for more details.
+@xref{Instrumenting Macro Calls}.
 
 @item (indent @var{indent-spec})
 Specify how to indent calls to this macro.  @xref{Indenting Macros},
@@ -287,7 +286,7 @@ two forms yield identical results:
 @end group
 @end example
 
-@findex , @r{(with Backquote)}
+@findex , @r{(with backquote)}
 The special marker @samp{,} inside of the argument to backquote
 indicates a value that isn't constant.  Backquote evaluates the
 argument of @samp{,} and puts the value in the list structure:
@@ -319,7 +318,7 @@ structure also.  For example:
 @end group
 @end example
 
-@findex ,@@ @r{(with Backquote)}
+@findex ,@@ @r{(with backquote)}
 @cindex splicing (with backquote)
   You can also @dfn{splice} an evaluated value into the resulting list,
 using the special marker @samp{,@@}.  The elements of the spliced list
diff --git a/lispref/maps.texi b/lispref/maps.texi
index c4d065c355a..724091970c3 100644
--- a/lispref/maps.texi
+++ b/lispref/maps.texi
@@ -6,6 +6,7 @@
 @setfilename ../info/maps
 @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
 @appendix Standard Keymaps
+@cindex standard keymaps
 
 The following symbols are used as the names for various keymaps.
 Some of these exist when Emacs is first started, others are
@@ -76,7 +77,6 @@ A full keymap used by Electric Command History mode.
 A sparse keymap used by Emacs Lisp mode.
 
 @item esc-map
-@vindex esc-map
 A full keymap for @kbd{ESC} (or @kbd{Meta}) commands.
 
 @item facemenu-menu
diff --git a/lispref/markers.texi b/lispref/markers.texi
index b955538fe03..519b8a1316a 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -176,7 +176,6 @@ buffer unless narrowing is in effect.  @xref{Narrowing}.
 @end defun
 
 @defun point-max-marker
-@cindex end of buffer marker
 This function returns a new marker that points to the end of the
 accessible portion of the buffer.  This will be the end of the buffer
 unless narrowing is in effect.  @xref{Narrowing}.
@@ -550,7 +549,7 @@ The return value is not meaningful.
 @end defun
 
 @defopt transient-mark-mode
-@cindex Transient Mark mode
+@c  @cindex Transient Mark mode  Redundant
 This variable if non-@code{nil} enables Transient Mark mode, in which
 every buffer-modifying primitive sets @code{deactivate-mark}.  The
 consequence of this is that commands that modify the buffer normally
@@ -629,7 +628,7 @@ more marks than this are pushed onto the @code{mark-ring},
 
 @node The Region
 @section The Region
-@cindex region, the
+@cindex region (between point and mark)
 
   The text between point and the mark is known as @dfn{the region}.
 Various functions operate on text delimited by point and the mark, but
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 1abbb148b85..98901df87f8 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -767,7 +767,7 @@ completion possibility specified by @var{collection} and
 strings, this is true if @var{string} appears in the list and
 @var{predicate} is satisfied.
 
-@code{test-completion} uses @code{completion-regexp-list} in the same
+This function uses @code{completion-regexp-list} in the same
 way that @code{try-completion} does.
 
 If @var{predicate} is non-@code{nil} and if @var{collection} contains
@@ -812,6 +812,8 @@ Here is an example of use:
 
 @node Minibuffer Completion
 @subsection Completion and the Minibuffer
+@cindex minibuffer completion
+@cindex reading from minibuffer with completion
 
   This section describes the basic interface for reading from the
 minibuffer with completion.
@@ -1222,6 +1224,8 @@ and @code{read-input-method-name}, in @ref{Input Methods}.
 
 @node Reading File Names
 @subsection Reading File Names
+@cindex read file names
+@cindex prompt for file name
 
   Here is another high-level completion function, designed for reading a
 file name.  It provides special features including automatic insertion
@@ -1782,6 +1786,7 @@ regular expression).
 
 @node Minibuffer Windows
 @section Minibuffer Windows
+@cindex minibuffer windows
 
   These functions access and select minibuffer windows
 and test whether they are active.
@@ -1872,6 +1877,7 @@ it erases the entire current buffer.
 
 @node Recursive Mini
 @section Recursive Minibuffers
+@cindex recursive minibuffers
 
   These functions and variables deal with recursive minibuffers
 (@pxref{Recursive Editing}):
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 6eba02d5a0b..5d91b238fca 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -252,6 +252,8 @@ Fundamental mode.  Rmail mode is a complicated and specialized mode.
 
 @node Major Mode Conventions
 @subsection Major Mode Conventions
+@cindex major mode conventions
+@cindex conventions for writing major modes
 
   The code for existing major modes follows various coding conventions,
 including conventions for local keymap and syntax table initialization,
@@ -495,6 +497,7 @@ Even if you never load the file more than once, someone else will.
 
 @node Auto Major Mode
 @subsection How Emacs Chooses a Major Mode
+@cindex major mode, automatic selection
 
   Based on information in the file name or in the file itself, Emacs
 automatically selects a major mode for the new buffer when a file is
@@ -1157,7 +1160,7 @@ if that value is non-nil."
 @group
   (setq imenu-case-fold-search t)
   (set-syntax-table lisp-mode-syntax-table)
-  (run-mode-hooks 'lisp-mode-hook))           ; @r{This permits the user to use a}
+  (run-mode-hooks 'lisp-mode-hook))      ; @r{This permits the user to use a}
                                          ;   @r{hook to customize the mode.}
 @end group
 @end smallexample
@@ -1697,7 +1700,6 @@ the information in another fashion.  This way, customizations made by
 the user or by Lisp programs (such as @code{display-time} and major
 modes) via changes to those variables remain effective.
 
-@cindex Shell mode @code{mode-line-format}
   Here is an example of a @code{mode-line-format} that might be
 useful for @code{shell-mode}, since it contains the host name and default
 directory.
@@ -2336,7 +2338,7 @@ Setting this variable makes it buffer-local in the current buffer.
 
 @node Font Lock Mode
 @section Font Lock Mode
-@cindex Font Lock Mode
+@cindex Font Lock mode
 
   @dfn{Font Lock mode} is a feature that automatically attaches
 @code{face} properties to certain parts of the buffer based on their
@@ -2855,6 +2857,8 @@ set the variable @code{font-lock-defaults}.
 
 @node Faces for Font Lock
 @subsection Faces for Font Lock
+@cindex faces for font lock
+@cindex font lock faces
 
   You can make Font Lock mode use any face, but several faces are
 defined specifically for Font Lock mode.  Each of these symbols is both
@@ -2927,6 +2931,7 @@ directives in C.
 
 @node Syntactic Font Lock
 @subsection Syntactic Font Lock
+@cindex syntactic font lock
 
 Syntactic fontification uses the syntax table to find comments and
 string constants (@pxref{Syntax Tables}).  It highlights them using
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 3661079c56e..dd0f15c817e 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -7,6 +7,7 @@
 @node Non-ASCII Characters, Searching and Matching, Text, Top
 @chapter Non-@acronym{ASCII} Characters
 @cindex multibyte characters
+@cindex characters, multi-byte
 @cindex non-@acronym{ASCII} characters
 
   This chapter covers the special issues relating to non-@acronym{ASCII}
@@ -374,7 +375,7 @@ This command displays a list of characters in the character set
 @section Characters and Bytes
 @cindex bytes and characters
 
-@cindex introduction sequence
+@cindex introduction sequence (of character)
 @cindex dimension (of character set)
   In multibyte representation, each character occupies one or more
 bytes.  Each character set has an @dfn{introduction sequence}, which is
@@ -407,6 +408,7 @@ set's introduction sequence:
 
 @node Splitting Characters
 @section Splitting Characters
+@cindex character as bytes
 
   The functions in this section convert between characters and the byte
 values used to represent them.  For most purposes, there is no need to
@@ -432,6 +434,7 @@ returns a list consisting of the symbol @code{unknown} and @var{character}.
 @end example
 @end defun
 
+@cindex generate characters in charsets
 @defun make-char charset &optional code1 code2
 This function returns the character in character set @var{charset} whose
 position codes are @var{code1} and @var{code2}.  This is roughly the
@@ -655,7 +658,9 @@ coding system, you'll get Unicode characters (of charset
 @code{iso-latin-2} and decode the result with the same coding system,
 you'll get Latin-2 characters.
 
-@cindex end of line conversion
+@cindex EOL conversion
+@cindex end-of-line conversion
+@cindex line end conversion
   @dfn{End of line conversion} handles three different conventions used
 on various systems for representing end of line in files.  The Unix
 convention is to use the linefeed character (also called newline).  The
@@ -808,9 +813,6 @@ If that is valid, it returns @var{coding-system}.
 Otherwise it signals an error with condition @code{coding-system-error}.
 @end defun
 
-@cindex EOL conversion
-@cindex end-of-line conversion
-@cindex line end conversion
 @defun coding-system-eol-type coding-system
 This function returns the type of end-of-line (a.k.a.@: @dfn{eol})
 conversion used by @var{coding-system}.  If @var{coding-system}
@@ -1103,11 +1105,11 @@ for decoding (in case @var{operation} does decoding), and
 @var{encoding-system} is the coding system for encoding (in case
 @var{operation} does encoding).
 
-The argument @var{operation} should be a symbol, any one of
-@code{insert-file-contents}, @code{write-region},
+The argument @var{operation} is a symbol, one of @code{write-region},
 @code{start-process}, @code{call-process}, @code{call-process-region},
-or @code{open-network-stream}.  These are the names of the Emacs I/O
-primitives that can do character code and eol conversion.
+@code{insert-file-contents}, or @code{open-network-stream}.  These are
+the names of the Emacs I/O primitives that can do character code and
+eol conversion.
 
 The remaining arguments should be the same arguments that might be given
 to the corresponding I/O primitive.  Depending on the primitive, one
@@ -1163,9 +1165,9 @@ of the right way to use the variable:
   (insert-file-contents filename))
 @end example
 
-When its value is non-@code{nil}, @code{coding-system-for-read} takes
-precedence over all other methods of specifying a coding system to use for
-input, including @code{file-coding-system-alist},
+When its value is non-@code{nil}, this variable takes precedence over
+all other methods of specifying a coding system to use for input,
+including @code{file-coding-system-alist},
 @code{process-coding-system-alist} and
 @code{network-coding-system-alist}.
 @end defvar
@@ -1190,8 +1192,8 @@ decoding functions (@pxref{Explicit Encoding}).
 
 @node Explicit Encoding
 @subsection Explicit Encoding and Decoding
-@cindex encoding text
-@cindex decoding text
+@cindex encoding in coding systems
+@cindex decoding in coding systems
 
   All the operations that transfer text in and out of Emacs have the
 ability to use a coding system to encode or decode the text.
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index 6e54af3319c..4d7f3e7578a 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -222,6 +222,7 @@ down to an integer.
 
 @node Predicates on Numbers
 @section Type Predicates for Numbers
+@cindex predicates for numbers
 
   The functions in this section test for numbers, or for a specific
 type of number.  The functions @code{integerp} and @code{floatp} can
@@ -267,7 +268,8 @@ if so, @code{nil} otherwise.  The argument must be a number.
 
 @node Comparison of Numbers
 @section Comparison of Numbers
-@cindex number equality
+@cindex number comparison
+@cindex comparing numbers
 
   To test numbers for numerical equality, you should normally use
 @code{=}, not @code{eq}.  There can be many distinct floating point
@@ -388,6 +390,8 @@ This function returns the absolute value of @var{number}.
 @node Numeric Conversions
 @section Numeric Conversions
 @cindex rounding in conversions
+@cindex number conversions
+@cindex converting numbers
 
 To convert an integer to floating point, use the function @code{float}.
 
@@ -480,6 +484,7 @@ depending on your machine.
 
 @node Arithmetic Operations
 @section Arithmetic Operations
+@cindex arithmetic operations
 
   Emacs Lisp provides the traditional four arithmetic operations:
 addition, subtraction, multiplication, and division.  Remainder and modulus
@@ -732,6 +737,8 @@ and returns that value as a floating point number.
 
 @node Bitwise Operations
 @section Bitwise Operations on Integers
+@cindex bitwise arithmetic
+@cindex logical arithmetic
 
   In a computer, an integer is represented as a binary number, a
 sequence of @dfn{bits} (digits which are either zero or one).  A bitwise
@@ -913,8 +920,6 @@ Here are other examples:
 @end defun
 
 @defun logand &rest ints-or-markers
-@cindex logical and
-@cindex bitwise and
 This function returns the ``logical and'' of the arguments: the
 @var{n}th bit is set in the result if, and only if, the @var{n}th bit is
 set in all the arguments.  (``Set'' means that the value of the bit is 1
@@ -966,8 +971,6 @@ because its binary representation consists entirely of ones.  If
 @end defun
 
 @defun logior &rest ints-or-markers
-@cindex logical inclusive or
-@cindex bitwise or
 This function returns the ``inclusive or'' of its arguments: the @var{n}th bit
 is set in the result if, and only if, the @var{n}th bit is set in at least
 one of the arguments.  If there are no arguments, the result is zero,
@@ -993,8 +996,6 @@ passed just one argument, it returns that argument.
 @end defun
 
 @defun logxor &rest ints-or-markers
-@cindex bitwise exclusive or
-@cindex logical exclusive or
 This function returns the ``exclusive or'' of its arguments: the
 @var{n}th bit is set in the result if, and only if, the @var{n}th bit is
 set in an odd number of the arguments.  If there are no arguments, the
@@ -1020,8 +1021,6 @@ result is 0, which is an identity element for this operation.  If
 @end defun
 
 @defun lognot integer
-@cindex logical not
-@cindex bitwise not
 This function returns the logical complement of its argument: the @var{n}th
 bit is one in the result if, and only if, the @var{n}th bit is zero in
 @var{integer}, and vice-versa.
@@ -1039,6 +1038,7 @@ bit is one in the result if, and only if, the @var{n}th bit is zero in
 @section Standard Mathematical Functions
 @cindex transcendental functions
 @cindex mathematical functions
+@cindex floating-point functions
 
   These mathematical functions allow integers as well as floating point
 numbers as arguments.
@@ -1066,7 +1066,7 @@ pi/2
 @math{\pi/2}
 @end tex
 (inclusive) whose sine is @var{arg}; if, however, @var{arg} is out of
-range (outside [-1, 1]), it signals a @code{domain-error} error.
+range (outside [@minus{}1, 1]), it signals a @code{domain-error} error.
 @end defun
 
 @defun acos arg
@@ -1078,7 +1078,7 @@ pi
 @math{\pi}
 @end tex
 (inclusive) whose cosine is @var{arg}; if, however, @var{arg} is out
-of range (outside [-1, 1]), it signals a @code{domain-error} error.
+of range (outside [@minus{}1, 1]), it signals a @code{domain-error} error.
 @end defun
 
 @defun atan y &optional x
@@ -1183,7 +1183,7 @@ generates the same sequence of numbers.  Emacs always starts with the
 same seed value, so the sequence of values of @code{random} is actually
 the same in each Emacs run!  For example, in one operating system, the
 first call to @code{(random)} after you start Emacs always returns
--1457731, and the second one always returns -7692030.  This
+@minus{}1457731, and the second one always returns @minus{}7692030.  This
 repeatability is helpful for debugging.
 
 If you want random numbers that don't always come out the same, execute
diff --git a/lispref/objects.texi b/lispref/objects.texi
index 3fc11631111..e75cde70202 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -288,7 +288,7 @@ you @emph{must} use a second @samp{\} to quote it: @samp{?\\}.
 @cindex @samp{\a}
 @cindex backspace
 @cindex @samp{\b}
-@cindex tab
+@cindex tab (ASCII character)
 @cindex @samp{\t}
 @cindex vertical tab
 @cindex @samp{\v}
@@ -296,11 +296,11 @@ you @emph{must} use a second @samp{\} to quote it: @samp{?\\}.
 @cindex @samp{\f}
 @cindex newline
 @cindex @samp{\n}
-@cindex return
+@cindex return (ASCII character)
 @cindex @samp{\r}
-@cindex escape
+@cindex escape (ASCII character)
 @cindex @samp{\e}
-@cindex space
+@cindex space (ASCII character)
 @cindex @samp{\s}
   You can express the characters control-g, backspace, tab, newline,
 vertical tab, formfeed, space, return, del, and escape as @samp{?\a},
@@ -661,7 +661,7 @@ empty list.  The empty list is actually the symbol @code{nil}.
 cells are used as part of lists, the phrase @dfn{list structure} has
 come to refer to any structure made out of cons cells.
 
-@cindex atom
+@cindex atoms
   Because cons cells are so central to Lisp, we also have a word for
 ``an object which is not a cons cell.''  These objects are called
 @dfn{atoms}.
@@ -753,7 +753,7 @@ buttercup)}, sketched in a different manner:
 @end group
 @end smallexample
 
-@cindex @code{nil} in lists
+@cindex @code{nil} as a list
 @cindex empty list
   A list with no elements in it is the @dfn{empty list}; it is identical
 to the symbol @code{nil}.  In other words, @code{nil} is both a symbol
@@ -1493,7 +1493,7 @@ uniquely).
 
 @node Window Configuration Type
 @subsection Window Configuration Type
-@cindex screen layout
+@cindex window layout in a frame
 
   A @dfn{window configuration} stores information about the positions,
 sizes, and contents of the windows in a frame, so you can recreate the
@@ -1507,6 +1507,7 @@ window configurations.
 @node Frame Configuration Type
 @subsection Frame Configuration Type
 @cindex screen layout
+@cindex window layout, all frames
 
   A @dfn{frame configuration} stores information about the positions,
 sizes, and contents of the windows in all frames.  It is actually
@@ -1998,7 +1999,6 @@ always true.
 @end group
 @end example
 
-@cindex equality of strings
 Comparison of strings is case-sensitive, but does not take account of
 text properties---it compares only the characters in the strings.  For
 technical reasons, a unibyte string and a multibyte string are
diff --git a/lispref/os.texi b/lispref/os.texi
index 9fde03b650c..498cc857eab 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -54,7 +54,7 @@ can customize these actions.
 
 @node Startup Summary
 @subsection Summary: Sequence of Actions at Startup
-@cindex initialization
+@cindex initialization of Emacs
 @cindex startup of Emacs
 @cindex @file{startup.el}
 
@@ -622,6 +622,7 @@ convenient way to test parts of this string is with
 @code{string-match}.
 @end defvar
 
+@cindex system type and name
 @defvar system-type
 The value of this variable is a symbol indicating the type of operating
 system Emacs is operating on.  Here is a table of the possible values:
@@ -885,6 +886,7 @@ indicating whether the privilege is currently enabled.
 
 @node User Identification
 @section User Identification
+@cindex user identification
 
 @defvar init-file-user
 This variable says which user's init files should be used by
@@ -1308,6 +1310,7 @@ the inverse conversion, use @code{float-time}.
 
 @node Processor Run Time
 @section Processor Run time
+@cindex processor run time
 
 @defun get-internal-run-time
 This function returns the processor run time used by Emacs as a list
@@ -1418,20 +1421,15 @@ the timer runs only once.
 
 @var{time} may specify an absolute or a relative time.
 
-Absolute times may be specified in a wide variety of formats; this
-function tries to accept all the commonly used date formats.  The most
-convenient formats are strings.  Valid such formats include these two,
-
-@example
-@var{year}-@var{month}-@var{day} @var{hour}:@var{min}:@var{sec} @var{timezone}
-
-@var{hour}:@var{min}:@var{sec} @var{timezone} @var{month}/@var{day}/@var{year}
-@end example
-
-@noindent
-where in both examples all fields are numbers; the format that
-@code{current-time-string} returns is also allowed, and many others
-as well.
+Absolute times may be specified using a string with a limited variety
+of formats, and are taken to be times @emph{today}, even if already in
+the past.  The recognized forms are @samp{@var{xxxx}},
+@samp{@var{x}:@var{xx}}, or @samp{@var{xx}:@var{xx}} (military time),
+and @samp{@var{xx}am}, @samp{@var{xx}AM}, @samp{@var{xx}pm},
+@samp{@var{xx}PM}, @samp{@var{xx}:@var{xx}am},
+@samp{@var{xx}:@var{xx}AM}, @samp{@var{xx}:@var{xx}pm}, or
+@samp{@var{xx}:@var{xx}PM}.  A period can be used instead of a colon
+to separate the hour and minute parts.
 
 To specify a relative time as a string, use numbers followed by units.
 For example:
@@ -1449,8 +1447,9 @@ For relative time values, Emacs considers a month to be exactly thirty
 days, and a year to be exactly 365.25 days.
 
 Not all convenient formats are strings.  If @var{time} is a number
-(integer or floating point), that specifies a relative time measured
-in seconds.
+(integer or floating point), that specifies a relative time measured in
+seconds.  The result of @code{encode-time} can also be used to specify
+an absolute value for @var{time}.
 
 In most cases, @var{repeat} has no effect on when @emph{first} call
 takes place---@var{time} alone specifies that.  There is one exception:
@@ -1695,6 +1694,7 @@ is the character Emacs currently uses for quitting, usually @kbd{C-g}.
 
 @node Recording Input
 @subsection Recording Input
+@cindex recording input
 
 @defun recent-keys
 This function returns a vector containing the last 300 input events from
@@ -1868,6 +1868,7 @@ is called with one argument, a property list that describes the sound.
 
 @node X11 Keysyms
 @section Operating on X11 Keysyms
+@cindex X11 keysyms
 
 To define system-specific X11 keysyms, set the variable
 @code{system-key-alist}.
@@ -1921,7 +1922,6 @@ how to swap the Meta and Alt modifiers within Emacs:
 @node Batch Mode
 @section Batch Mode
 @cindex batch mode
-@cindex noninteractive use
 
   The command-line option @samp{-batch} causes Emacs to run
 noninteractively.  In this mode, Emacs does not read commands from the
diff --git a/lispref/positions.texi b/lispref/positions.texi
index 993bc31511f..939b3f75fc1 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -123,6 +123,7 @@ size of @var{buffer}.
 
 @node Motion
 @section Motion
+@cindex motion by chars, words, lines, lists
 
   Motion functions change the value of point, either relative to the
 current value of point, relative to the beginning or end of the buffer,
@@ -235,6 +236,7 @@ If this variable is non-@code{nil}, certain motion functions including
 
 @node Buffer End Motion
 @subsection Motion to an End of the Buffer
+@cindex move to beginning or end of buffer
 
   To move point to the beginning of the buffer, write:
 
@@ -642,6 +644,7 @@ beginning of the first screen line.  @xref{Minibuffer Contents}.
 @cindex sexp motion
 @cindex Lisp expression motion
 @cindex list motion
+@cindex balanced parenthesis motion
 
   Here are several functions concerned with balanced-parenthesis
 expressions (also called @dfn{sexps} in connection with moving across
@@ -827,7 +830,6 @@ Configurations}).
 @defspec save-excursion body@dots{}
 @cindex mark excursion
 @cindex point excursion
-@cindex current buffer excursion
 The @code{save-excursion} special form saves the identity of the current
 buffer and the values of point and the mark in it, evaluates
 @var{body}, and finally restores the buffer and its saved values of
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 2bf545bc9f1..fbc8b785c11 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -146,6 +146,8 @@ file name.
 
 @node Shell Arguments
 @section Shell Arguments
+@cindex arguments for shell commands
+@cindex shell command arguments
 
   Lisp programs sometimes need to run a shell and give it a command
 that contains file names that were specified by the user.  These
@@ -347,7 +349,7 @@ handler could be different from the handler chosen for the
 @var{infile} is on another remote host.  Or @code{default-directory}
 could be non-special, whereas @var{infile} is on a remote host.)
 
-If @var{buffer} has the form @code{(@var{real-destination}
+If @var{buffer} is a list of the form @code{(@var{real-destination}
 @var{error-destination})}, and @var{error-destination} names a file,
 then the same remarks as for @var{infile} apply.
 
@@ -1236,6 +1238,7 @@ there is no filter function:
 
 @node Decoding Output
 @subsection Decoding Process Output
+@cindex decode process output
 
   When Emacs writes process output directly into a multibyte buffer,
 it decodes the output according to the process output coding system.
@@ -1285,6 +1288,7 @@ This function returns the filter multibyte flag of @var{process}.
 
 @node Accepting Output
 @subsection Accepting Output from Processes
+@cindex accept input from processes
 
   Output from asynchronous subprocesses normally arrives only while
 Emacs is waiting for some sort of external event, such as elapsed time
@@ -1328,7 +1332,7 @@ arrived.
 @node Sentinels
 @section Sentinels: Detecting Process Status Changes
 @cindex process sentinel
-@cindex sentinel
+@cindex sentinel (of process)
 
   A @dfn{process sentinel} is a function that is called whenever the
 associated process changes status for any reason, including signals
@@ -1624,7 +1628,7 @@ The associated value is the process filter function.
 @item :sentinel
 The associated value is the process sentinel function.
 @item :remote
-In a connection, this is the address in internal format of the remote peer.
+In a connection, the address in internal format of the remote peer.
 @item :local
 The local address, in internal format.
 @item :service
@@ -1643,6 +1647,7 @@ For an ordinary child process, this function always returns @code{t}.
 
 @node Network Servers
 @section Network Servers
+@cindex network servers
 
   You create a server by calling @code{make-network-process} with
 @code{:server t}.  The server will listen for connection requests from
@@ -1722,7 +1727,7 @@ sets its remote peer address to @var{address}.
 @section Low-Level Network Access
 
   You can also create network connections by operating at a lower
-level that that of @code{open-network-stream}, using
+level than that of @code{open-network-stream}, using
 @code{make-network-process}.
 
 @menu
@@ -2061,8 +2066,9 @@ number @var{p}.  @code{format-network-address} converts that to the
 string @code{"@var{a}.@var{b}.@var{c}.@var{d}:@var{p}"}.
 
 A nine-element vector @code{[@var{a} @var{b} @var{c} @var{d} @var{e}
-@var{f} @var{g} @var{h} @var{p}]} represents an IPv6 address and port
-number.  @code{format-network-address} converts that to the string
+@var{f} @var{g} @var{h} @var{p}]} represents an IPv6 address along
+with a port number.  @code{format-network-address} converts that to
+the string
 @code{"[@var{a}:@var{b}:@var{c}:@var{d}:@var{e}:@var{f}:@var{g}:@var{h}]:@var{p}"}.
 
 If the vector does not include the port number, @var{p}, or if
@@ -2072,6 +2078,7 @@ If the vector does not include the port number, @var{p}, or if
 
 @node Byte Packing
 @section Packing and Unpacking Byte Arrays
+@cindex byte packing and unpacking
 
   This section describes how to pack and unpack arrays of bytes,
 usually for binary network protocols.  These functions convert byte arrays
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 7fdbdb73d46..10e8c672962 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
@@ -309,17 +309,16 @@ first tries to match all three @samp{a}s; but the rest of the pattern is
 The next alternative is for @samp{a*} to match only two @samp{a}s.  With
 this choice, the rest of the regexp matches successfully.
 
-@strong{Warning:} Nested repetition operators take a long time,
-or even forever, if they
-lead to ambiguous matching.  For example, trying to match the regular
-expression @samp{\(x+y*\)*a} against the string
-@samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could take hours before it
-ultimately fails.  Emacs must try each way of grouping the 35
-@samp{x}s before concluding that none of them can work.  Even worse,
-@samp{\(x*\)*} can match the null string in infinitely many ways, so
-it causes an infinite loop.  To avoid these problems, check nested
-repetitions carefully, to make sure that they do not cause combinatorial
-explosions in backtracking.
+@strong{Warning:} Nested repetition operators can run for an
+indefinitely long time, if they lead to ambiguous matching.  For
+example, trying to match the regular expression @samp{\(x+y*\)*a}
+against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could
+take hours before it ultimately fails.  Emacs must try each way of
+grouping the @samp{x}s before concluding that none of them can work.
+Even worse, @samp{\(x*\)*} can match the null string in infinitely
+many ways, so it causes an infinite loop.  To avoid these problems,
+check nested repetitions carefully, to make sure that they do not
+cause combinatorial explosions in backtracking.
 
 @item @samp{+}
 @cindex @samp{+} in regexp
@@ -1186,6 +1185,7 @@ match data around it, to prevent it from being overwritten.
 
 @node Replacing Match
 @subsection Replacing the Text that Matched
+@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.
@@ -1543,7 +1543,8 @@ associated with it still exists.
 
 @node Search and Replace
 @section Search and Replace
-@cindex replacement
+@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/sequences.texi b/lispref/sequences.texi
index ac5a16e261f..7e66549412b 100644
--- a/lispref/sequences.texi
+++ b/lispref/sequences.texi
@@ -388,7 +388,7 @@ are often useful for objects known to be arrays.  @xref{Sequence Functions}.
 
 @node Vectors
 @section Vectors
-@cindex vector
+@cindex vector (type)
 
   Arrays in Lisp, like arrays in most languages, are blocks of memory
 whose elements can be accessed in constant time.  A @dfn{vector} is a
diff --git a/lispref/streams.texi b/lispref/streams.texi
index 9bb66378e5f..7356c119a1e 100644
--- a/lispref/streams.texi
+++ b/lispref/streams.texi
@@ -681,6 +681,7 @@ returns @code{"The buffer is foo"}.
 
 @node Output Variables
 @section Variables Affecting Output
+@cindex output-controlling variables
 
 @defvar standard-output
 The value of this variable is the default output stream---the stream
diff --git a/lispref/strings.texi b/lispref/strings.texi
index 23f679d5bb9..af5a2fa14d3 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -586,6 +586,7 @@ first character of @var{string} is the null character, @acronym{ASCII} code
 @example
 (string-to-char "ABC")
      @result{} 65
+
 (string-to-char "xyz")
      @result{} 120
 (string-to-char "")
@@ -1107,6 +1108,30 @@ This function returns the current buffer's case table.
 This sets the current buffer's case table to @var{table}.
 @end defun
 
+@defmac with-case-table table body@dots{}
+The @code{with-case-table} macro saves the current case table, makes
+@var{table} the current case table, evaluates the @var{body} forms,
+and finally restores the case table.  The return value is the value of
+the last form in @var{body}.  The case table is restored even in case
+of an abnormal exit via @code{throw} or error (@pxref{Nonlocal
+Exits}).
+@end defmac
+
+  Some language environments may modify the case conversions of
+@acronym{ASCII} characters; for example, in the Turkish language
+environment, the @acronym{ASCII} character @samp{I} is downcased into
+a Turkish ``dotless i''.  This can interfere with code that requires
+ordinary ASCII case conversion, such as implementations of
+@acronym{ASCII}-based network protocols.  In that case, use the
+@code{with-case-table} macro with the variable @var{ascii-case-table},
+which stores the unmodified case table for the @acronym{ASCII}
+character set.
+
+@defvar ascii-case-table
+The case table for the @acronym{ASCII} character set.  This should not be
+modified by any language environment settings.
+@end defvar
+
   The following three functions are convenient subroutines for packages
 that define non-@acronym{ASCII} character sets.  They modify the specified
 case table @var{case-table}; they also modify the standard syntax table.
diff --git a/lispref/symbols.texi b/lispref/symbols.texi
index 4cd4bd42594..7234a75bd59 100644
--- a/lispref/symbols.texi
+++ b/lispref/symbols.texi
@@ -139,7 +139,7 @@ symbol naming a function written in Lisp would have a lambda expression
 
 @node Definitions, Creating Symbols, Symbol Components, Symbols
 @section Defining Symbols
-@cindex definition of a symbol
+@cindex definitions of symbols
 
   A @dfn{definition} in Lisp is a special form that announces your
 intention to use a certain symbol in a particular way.  In Emacs Lisp,
@@ -436,6 +436,8 @@ names, and the other two elements are the corresponding values.
 
 @node Plists and Alists
 @subsection Property Lists and Association Lists
+@cindex plist vs. alist
+@cindex alist vs. plist
 
 @cindex property lists vs association lists
   Association lists (@pxref{Association Lists}) are very similar to
diff --git a/lispref/syntax.texi b/lispref/syntax.texi
index 47f09944880..340f74632bd 100644
--- a/lispref/syntax.texi
+++ b/lispref/syntax.texi
@@ -6,7 +6,7 @@
 @setfilename ../info/syntax
 @node Syntax Tables, Abbrevs, Searching and Matching, Top
 @chapter Syntax Tables
-@cindex parsing
+@cindex parsing buffer text
 @cindex syntax table
 @cindex text parsing
 
@@ -80,7 +80,7 @@ This function returns @code{t} if @var{object} is a syntax table.
 
 @node Syntax Descriptors
 @section Syntax Descriptors
-@cindex syntax classes
+@cindex syntax class
 
   This section describes the syntax classes and flags that denote the
 syntax of a character, and how they are represented as a @dfn{syntax
@@ -203,7 +203,7 @@ we do not want them to turn off the usual syntactic properties of
 other characters in the quotation.
 @end deffn
 
-@deffn {Syntax class} @w{escape}
+@deffn {Syntax class} @w{escape-syntax character}
 An @dfn{escape character} (designated by @samp{\}) starts an escape
 sequence such as is used in C string and character constants.  The
 character @samp{\} belongs to this class in both C and Lisp.  (In C, it
@@ -253,7 +253,7 @@ English text has no comment characters.  In Lisp, the semicolon
 (@samp{;}) starts a comment and a newline or formfeed ends one.
 @end deffn
 
-@deffn {Syntax class} @w{inherit}
+@deffn {Syntax class} @w{inherit standard syntax}
 This syntax class does not specify a particular syntax.  It says to look
 in the standard syntax table to find the syntax of this character.  The
 designator for this syntax class is @samp{@@}.
@@ -1011,8 +1011,9 @@ corresponds to each syntax flag.
 @end multitable
 
 @defun string-to-syntax @var{desc}
-This function returns the internal form @code{(@var{syntax-code} .
-@var{matching-char})} corresponding to the syntax descriptor @var{desc}.
+This function returns the internal form corresponding to the syntax
+descriptor @var{desc}, a cons cell @code{(@var{syntax-code}
+. @var{matching-char})}.
 @end defun
 
 @defun syntax-after pos
diff --git a/lispref/text.texi b/lispref/text.texi
index 11cf3cf2184..148bf0025a2 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -64,6 +64,7 @@ the character after point.
 
 @node Near Point
 @section Examining Text Near Point
+@cindex text near point
 
   Many functions are provided to look at the characters around point.
 Several simple functions are described here.  See also @code{looking-at}
@@ -537,8 +538,9 @@ newlines and tabs like any other characters).
 
 @node Deletion
 @section Deleting Text
+@cindex text deletion
 
-@cindex deletion vs killing
+@cindex deleting text vs killing
   Deletion means removing part of the text in a buffer, without saving
 it in the kill ring (@pxref{The Kill Ring}).  Deleted text can't be
 yanked, but can be reinserted using the undo mechanism (@pxref{Undo}).
@@ -594,7 +596,7 @@ The value returned is always @code{nil}.
 @end deffn
 
 @deffn Command delete-backward-char count &optional killp
-@cindex delete previous char
+@cindex deleting previous char
 This command deletes @var{count} characters directly before point, or
 after point if @var{count} is negative.  If @var{killp} is
 non-@code{nil}, then it saves the deleted characters in the kill ring.
@@ -1348,7 +1350,7 @@ You cannot specify any other buffer.
 @end deffn
 
 @deffn Command buffer-disable-undo &optional buffer-or-name
-@cindex disable undo
+@cindex disabling undo
 This function discards the undo list of @var{buffer-or-name}, and disables
 further recording of undo information.  As a result, it is no longer
 possible to undo either previous changes or any subsequent changes.  If
@@ -1400,7 +1402,7 @@ leak memory if the user waits too long before answering the question.
 @node Filling
 @comment  node-name,  next,  previous,  up
 @section Filling
-@cindex filling, explicit
+@cindex filling text
 
   @dfn{Filling} means adjusting the lengths of lines (by moving the line
 breaks) so that they are nearly (but no greater than) a specified
@@ -1431,7 +1433,6 @@ as @code{full}.
 argument implies the value @code{full} for @var{justify}.
 
 @deffn Command fill-paragraph justify
-@cindex filling a paragraph
 This command fills the paragraph at or after point.  If
 @var{justify} is non-@code{nil}, each line is justified as well.
 It uses the ordinary paragraph motion commands to find paragraph
@@ -1678,7 +1679,7 @@ non-@code{nil}, then the line won't be broken there.
 
 @node Adaptive Fill
 @section Adaptive Fill Mode
-@cindex Adaptive Fill mode
+@c @cindex Adaptive Fill mode  "adaptive-fill-mode" is adjacent.
 
   When @dfn{Adaptive Fill Mode} is enabled, Emacs determines the fill
 prefix automatically from the text in each paragraph being filled
@@ -1740,11 +1741,8 @@ Adaptive Fill mode matches this regular expression against the text
 starting after the left margin whitespace (if any) on a line; the
 characters it matches are that line's candidate for the fill prefix.
 
-@w{@code{"[ \t]*\\([-!|#%;>*·•‣⁃◦]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*"}} is the
-default value.  This matches a number enclosed in parentheses or
-followed by a period, or certain punctuation characters, or any
-sequence of these intermingled with whitespace.  In particular, it
-matches a sequence of whitespace, possibly empty.
+The default value matches whitespace with certain punctuation
+characters intermingled.
 @end defopt
 
 @defopt adaptive-fill-first-line-regexp
@@ -2563,8 +2561,9 @@ property @code{face} specifies the faces for displaying the character
 list is to specify a name and ask what value corresponds to it.
 
   If a character has a @code{category} property, we call it the
-@dfn{category} of the character.  It should be a symbol.  The properties
-of the symbol serve as defaults for the properties of the character.
+@dfn{property category} of the character.  It should be a symbol.  The
+properties of the symbol serve as defaults for the properties of the
+character.
 
   Copying text between strings and buffers preserves the properties
 along with the characters; this includes such diverse functions as
@@ -2611,7 +2610,7 @@ string).  The argument @var{object} is optional and defaults to the
 current buffer.
 
 If there is no @var{prop} property strictly speaking, but the character
-has a category that is a symbol, then @code{get-text-property} returns
+has a property category that is a symbol, then @code{get-text-property} returns
 the @var{prop} property of that symbol.
 @end defun
 
@@ -2958,12 +2957,13 @@ names that control filling and property inheritance.  All other names
 have no standard meaning, and you can use them as you like.
 
 @table @code
-@cindex category of text character
+@cindex property category of text character
 @kindex category @r{(text property)}
 @item category
 If a character has a @code{category} property, we call it the
-@dfn{category} of the character.  It should be a symbol.  The properties
-of the symbol serve as defaults for the properties of the character.
+@dfn{property category} of the character.  It should be a symbol.  The
+properties of this symbol serve as defaults for the properties of the
+character.
 
 @item face
 @cindex face codes of text
@@ -2987,13 +2987,13 @@ time you want to specify a particular attribute for certain text.
 @xref{Face Attributes}.
 
 @item
-A cons cell of the form @code{(foreground-color . @var{color-name})} or
+A cons cell with the form @code{(foreground-color . @var{color-name})} or
 @code{(background-color . @var{color-name})}.  These elements specify
 just the foreground color or just the background color.  @xref{Color
 Names}, for the supported forms of @var{color-name}.
 
-@code{(foreground-color . @var{color-name})} is equivalent to
-specifying @code{(:foreground @var{color-name})}, and likewise for the
+A cons cell of @code{(foreground-color . @var{color-name})} is equivalent to
+specifying @code{(:foreground @var{color-name})}; likewise for the
 background.
 @end itemize
 
@@ -3044,7 +3044,6 @@ The character's @code{face} property, or absence of one, is valid.
 @end table
 
 @item display
-@kindex display @r{(text property)}
 This property activates various features that change the
 way text is displayed.  For example, it can make text appear taller
 or shorter, higher or lower, wider or narrow, or replaced with an image.
@@ -3471,7 +3470,7 @@ once for the same part of the buffer, you can use the variable
 @code{buffer-access-fontified-property}.
 
 @defvar buffer-access-fontified-property
-If this value's variable is non-@code{nil}, it is a symbol which is used
+If this variable's value is non-@code{nil}, it is a symbol which is used
 as a text property name.  A non-@code{nil} value for that text property
 means, ``the other text properties for this character have already been
 computed.''
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 5f4479a5fd3..ee8caf4953b 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -6,7 +6,7 @@
 @setfilename ../info/tips
 @node Tips, GNU Emacs Internals, GPL, Top
 @appendix Tips and Conventions
-@cindex tips
+@cindex tips for writing Lisp
 @cindex standards of coding style
 @cindex coding standards
 
@@ -148,7 +148,7 @@ to store a list of functions (i.e., the variable is a hook), please
 follow the naming conventions for hooks.  @xref{Hooks}.
 
 @item
-@cindex unloading packages
+@cindex unloading packages, preparing for
 If loading the file adds functions to hooks, define a function
 @code{@var{feature}-unload-hook}, where @var{feature} is the name of
 the feature the package provides, and make it undo any such changes.
@@ -295,6 +295,7 @@ Otherwise, use your name.  See also @xref{Library Headers}.
 
 @node Key Binding Conventions
 @section Key Binding Conventions
+@cindex key binding, conventions for
 
 @itemize @bullet
 @item
@@ -374,6 +375,7 @@ after @key{ESC}.  In these states, you should define @kbd{@key{ESC}
 
 @node Programming Tips
 @section Emacs Programming Tips
+@cindex programming conventions
 
   Following these conventions will make your program fit better
 into Emacs when it runs.
@@ -559,6 +561,7 @@ the speed.  @xref{Inline Functions}.
 
 @node Warning Tips
 @section Tips for Avoiding Compiler Warnings
+@cindex byte compiler warnings, how to avoid
 
 @itemize @bullet
 @item
@@ -599,6 +602,7 @@ is to put a call to @code{with-no-warnings} around it.
 
 @node Documentation Tips
 @section Tips for Documentation Strings
+@cindex documentation strings, conventions and tips
 
 @findex checkdoc-minor-mode
   Here are some tips and conventions for the writing of documentation
@@ -863,6 +867,7 @@ describe the most important commands in your major mode, and then use
 
 @node Comment Tips
 @section Tips on Writing Comments
+@cindex comments, Lisp convention for
 
   We recommend these conventions for where to put comments and how to
 indent them:
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 56732d22db6..9d9dc8260bb 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -100,10 +100,12 @@ x
 
 @node Constant Variables
 @section Variables that Never Change
-@vindex nil
-@vindex t
 @kindex setting-constant
 @cindex keyword symbol
+@cindex variable with constant value
+@cindex constant variables
+@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
@@ -1079,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
@@ -1520,6 +1522,7 @@ an ordinary evaluated argument.
 
 @node Frame-Local Variables
 @section Frame-Local Variables
+@cindex frame-local variables
 
   Just as variables can have buffer-local bindings, they can also have
 frame-local bindings.  These bindings belong to one frame, and are in
@@ -1719,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},
@@ -1778,6 +1781,7 @@ properties from string values specified for file local variables.
 
 @node Variable Aliases
 @section Variable Aliases
+@cindex variable aliases
 
   It is sometimes useful to make two variables synonyms, so that both
 variables always have the same value, and changing either one also
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 5f21b1977bd..22bb43ecaa0 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -430,7 +430,7 @@ This function always returns @code{nil}.
 
 @node Selecting Windows
 @section Selecting Windows
-@cindex selecting windows
+@cindex selecting a window
 
   When a window is selected, the buffer in the window becomes the current
 buffer, and the cursor will appear in it.
@@ -572,7 +572,7 @@ In general, within each set of siblings at any level in the window tree,
 the order is left to right, or top to bottom.
 
 @defun next-window &optional window minibuf all-frames
-@cindex minibuffer window
+@cindex minibuffer window, and @code{next-window}
 This function returns the window following @var{window} in the cyclic
 ordering of windows.  This is the window that @kbd{C-x o} would select
 if typed when @var{window} is selected.  If @var{window} is the only
@@ -1195,6 +1195,7 @@ point and the buffer's point always move together; they remain equal.
 @noindent
 @xref{Positions}, for more details on buffer positions.
 
+@cindex cursor
   As far as the user is concerned, point is where the cursor is, and
 when the user switches to another buffer, the cursor jumps to the
 position of point in that buffer.
@@ -1223,6 +1224,7 @@ this simply does @code{goto-char}.
 
 @node Window Start
 @section The Window Start Position
+@cindex window start position
 
   Each window contains a marker used to keep track of a buffer position
 that specifies where in the buffer display should start.  This position
@@ -1621,7 +1623,7 @@ Replaces three keystroke sequence C-u 0 C-l."
 
 @node Vertical Scrolling
 @section Vertical Fractional Scrolling
-@cindex Vertical Fractional Scrolling
+@cindex vertical fractional scrolling
 
   @dfn{Vertical fractional scrolling} means shifting the image in the
 window up or down by a specified multiple or fraction of a line.
@@ -1985,6 +1987,7 @@ in character lines and columns.
 @node Resizing Windows
 @section Changing the Size of a Window
 @cindex window resizing
+@cindex resize window
 @cindex changing window size
 @cindex window size, changing
 
@@ -2355,6 +2358,7 @@ configurations.
 
 @node Window Hooks
 @section Hooks for Window Scrolling and Changes
+@cindex hooks for window operations
 
 This section describes how a Lisp program can take action whenever a
 window displays a different part of its buffer or a different buffer.