Merged from miles@gnu.org--gnu-2005 (patch 14-16, 95-106)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
   Move Gnus images into etc/images

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-98
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-99
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-100
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-101
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-102
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-103
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-104
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-106
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
   Update from CVS: lisp/imap.el (imap-log): Doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
   Merge from emacs--cvs-trunk--0

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

17 files changed, 393 insertions, 283 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index c2dc393be1d..bcba521884c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,76 @@
+2005-02-16  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * emacs.texi (Top): Update menu for splitting of node in
+        msdog.texi.
+        * frames.texi (Frames): Update xref for splitting of node in
+        msdog.texi.
+        * trouble.texi (Quitting): Ditto.
+
+2005-02-16  Richard M. Stallman  <rms@gnu.org>
+
+        * windows.texi (Split Window): Simplify line truncation info
+        and xref to Display Custom.
+
+        * trouble.texi (Quitting): Emergency escape only for text terminal.
+        (Screen Garbled): C-l for ungarbling is only for text terminal.
+
+        * text.texi (Text Mode): ESC TAB alternative for M-TAB.
+
+        * sending.texi (Header Editing): ESC TAB alternative for M-TAB.
+
+        * programs.texi (Program Modes): Mention Python mode.
+        (Moving by Defuns): Repeating C-M-h extends region.
+        (Basic Indent): Clarify.
+        (Custom C Indent): Clarify.
+        (Expressions): Repeating C-M-@ extends region.
+        (Info Lookup): Clarify for C-h S.
+        (Symbol Completion): ESC TAB alternative for M-TAB.
+        (Electric C): Clarify.
+
+        * emacs.texi (Top): Update display.texi and frames.texi submenu data.
+
+        * msdog.texi (MS-DOS Keyboard, MS-DOS Mouse): Split from
+        MS-DOS Input node.
+        (MS-DOS Keyboard): Start with explaining DEL and BREAK.
+        (MS-DOS and MULE): Clarify.
+        (MS-DOS Processes, Windows Processes): Fix typos.
+
+        * major.texi (Choosing Modes): Clarify.
+
+        * kmacro.texi (Basic Keyboard Macro): Doc F3, F4.
+        (Keyboard Macro Step-Edit): Clarify.
+
+        * indent.texi (Indentation): Clarifications.
+
+        * help.texi (Help): Correct error about C-h in query-replace.
+        Clarify apropos vs C-h a.  Fix how to search in FAQ.
+        (Key Help): Describe C-h w here.
+        (Name Help): Minor cleanup.  C-h w moved to Key Help.
+        Clarify the "object" joke.
+        (Apropos): Clarify.  Mouse-1 like Mouse-2.
+        (Help Mode): Mouse-1 like Mouse-2.
+
+        * fixit.texi (Spelling): Mention ESC TAB as alt. for M-TAB.
+
+        * display.texi (Display): Reorder menu.
+        (Faces): Cleanup.
+        (Font Lock): Cleanup.  Mention Options menu.
+        Delete obsolete text.
+        (Scrolling): For C-l, don't presume text terminal.
+        (Horizontal Scrolling): Simplify intro.
+        (Follow Mode): Clarify.
+        (Cursor Display): Moved before Display Custom.
+        (Display Custom): Explain no-redraw-on-reenter is for text terminals.
+        Doc default-tab-width.  Doc line truncation more thoroughly.
+
+        * dired.texi (Dired Enter): C-x C-f can run Dired.
+        (Dired Visiting): Comment out `a' command.
+        Mouse-1 is like Mouse-2.
+        (Shell Commands in Dired): ? can be used more than once.
+
+        * basic.texi (Continuation Lines): Simplify description of truncation,
+        and refer to Display Custom for the rest of it.
+
 2005-02-10  Jay Belanger  <belanger@truman.edu>
 
         * calc.texi:  Change @LaTeX to La@TeX throughout.
diff --git a/man/basic.texi b/man/basic.texi
index 6a8ffc0000f..487e9579ece 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -544,25 +544,16 @@ character that indicates continuation.
 a line gets too long.  Continuation on the screen does not do that.  Use
 Auto Fill mode (@pxref{Filling}) if that's what you want.
 
-@vindex truncate-lines
 @cindex truncation
 @cindex line truncation, and fringes
   As an alternative to continuation, Emacs can display long lines by
 @dfn{truncation}.  This means that all the characters that do not fit
-in the width of the screen or window do not appear at all.  They
-remain in the buffer, temporarily invisible.  On terminals, @samp{$}
-in the last column informs you that the line has been truncated on the
-display.  On window systems, a small straight arrow in the fringe to
-the right of the window indicates a truncated line.
-
-@findex toggle-truncate-lines
-  Truncation instead of continuation happens whenever horizontal
-scrolling is in use, and optionally in all side-by-side windows
-(@pxref{Windows}).  You can enable or disable truncation for a
-particular buffer with the command @kbd{M-x toggle-truncate-lines}.
-
-  @xref{Display Custom}, for additional variables that affect how text is
-displayed.
+in the width of the screen or window do not appear at all.  @samp{$}
+in the last column or a small straight arrow in the fringe to the
+right of the window indicates a truncated line.
+
+  @xref{Display Custom}, for more information about line truncation,
+and other variables that affect how text is displayed.
 
 @node Position Info
 @section Cursor Position Information
diff --git a/man/dired.texi b/man/dired.texi
index 0390848faf6..3ce58f2b460 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -48,14 +48,15 @@ files.
 @findex dired
 @kindex C-x d
 @vindex dired-listing-switches
-  To invoke Dired, do @kbd{C-x d} or @kbd{M-x dired}.  The command reads
-a directory name or wildcard file name pattern as a minibuffer argument
-to specify which files to list.  Where @code{dired} differs from
-@code{list-directory} is in putting the buffer into Dired mode so that
-the special commands of Dired are available.
+  To invoke Dired, do @kbd{C-x d} or @kbd{M-x dired}.  The command
+reads a directory name or wildcard file name pattern as a minibuffer
+argument to specify which files to list.  @kbd{C-x C-f} given a
+directory name also invokes Dired.  Where @code{dired} differs from
+@code{list-directory} is that it puts the buffer into Dired mode, so
+that the special commands of Dired are available.
 
   The variable @code{dired-listing-switches} specifies the options to
-give to @code{ls} for listing directory; this string @emph{must} contain
+give to @code{ls} for listing the directory; this string @emph{must} contain
 @samp{-l}.  If you use a numeric prefix argument with the @code{dired}
 command, you can specify the @code{ls} switches with the minibuffer
 before you enter the directory specification.  No matter how they are
@@ -255,11 +256,13 @@ and supplying that file name (@code{dired-find-file}).  @xref{Visiting}.
 @kindex e @r{(Dired)}
 Equivalent to @kbd{f}.
 
+@ignore  @c This command seems too risky to document at all.
 @item a
 @kindex a @r{(Dired)}
 @findex dired-find-alternate-file
 Like @kbd{f}, but replaces the contents of the Dired buffer with
 that of an alternate file or directory (@code{dired-find-alternate-file}).
+@end ignore
 
 @item o
 @kindex o @r{(Dired)}
@@ -275,7 +278,8 @@ file.  @xref{Windows}.
 Visit the file described on the current line, and display the buffer in
 another window, but do not select that window (@code{dired-display-file}).
 
-@item Mouse-2
+@item Mouse-1
+@itemx Mouse-2
 @findex dired-mouse-find-file-other-window
 Visit the file named by the line you click on
 (@code{dired-mouse-find-file-other-window}).  This uses another window
@@ -697,10 +701,10 @@ For example, @kbd{! uudecode @key{RET}} runs @code{uudecode} on each
 file.
 
 @item
-If the command string contains @samp{?} surrounded by whitespace, the
-current file name is substituted for @samp{?}.  You can use @samp{?}
-this way more than once in the command, and each occurrence is
-replaced.
+However, if the command string contains @samp{?} surrounded by
+whitespace, the current file name is substituted for @samp{?}  (rather
+than added at the end).  You can use @samp{?} this way more than once
+in the command, and the same file name replaces each occurrence.
 @end itemize
 
 To iterate over the file names in a more complicated fashion, use an
diff --git a/man/display.texi b/man/display.texi
index 23b79d1703e..c652b47787a 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -23,20 +23,20 @@ display it.
 * Selective Display::      Hiding lines with lots of indentation.
 * Optional Mode Line::     Optional mode line display features.
 * Text Display::           How text characters are normally displayed.
-* Display Custom::         Information on variables for customizing display.
 * Cursor Display::         Features for displaying the cursor.
+* Display Custom::         Information on variables for customizing display.
 @end menu
 
 @node Faces
 @section Using Multiple Typefaces
 @cindex faces
 
-  Emacs supports using multiple styles of displaying characters.  Each
-style is called a @dfn{face}.  Each face can specify various @dfn{face
-attributes}, such as the font family, the height, weight and slant of
-the characters, the foreground and background color, and underlining
-or overlining.  A face does not have to specify all of these
-attributes; often it inherits many of them from another face.
+  You can specify various styles for displaying text using
+@dfn{faces}.  Each face can specify various @dfn{face attributes},
+such as the font family, the height, weight and slant of the
+characters, the foreground and background color, and underlining or
+overlining.  A face does not have to specify all of these attributes;
+often it inherits most of them from another face.
 
   On a window system, all the Emacs face attributes are meaningful.
 On a character terminal, only some of them work.  Some character
@@ -196,7 +196,7 @@ on your screen using the command @code{ps-print-buffer-with-faces}.
 @cindex syntax highlighting and coloring
 
   Font Lock mode is a minor mode, always local to a particular buffer,
-which highlights (or ``fontifies'') using various faces according to
+which highlights (or ``fontifies'') the buffer contents according to
 the syntax of the text you are editing.  It can recognize comments and
 strings in most languages; in several languages, it can also recognize
 and properly highlight various other important constructs---for
@@ -227,6 +227,10 @@ this:
 (global-font-lock-mode 1)
 @end example
 
+@noindent
+You can also specify this using the menu bar Options menu, specifying
+first Syntax Highlighting and then Save Options.
+
   Font Lock mode uses several specifically named faces to do its job,
 including @code{font-lock-string-face}, @code{font-lock-comment-face},
 and others.  The easiest way to find them all is to use completion
@@ -248,10 +252,6 @@ Customize the faces interactively with @kbd{M-x customize-face}, as
 described in @ref{Face Customization}.
 @end itemize
 
-  To get the full benefit of Font Lock mode, you need to choose a
-default font which has bold, italic, and bold-italic variants; or else
-you need to have a color or gray-scale screen.
-
 @vindex font-lock-maximum-decoration
   The variable @code{font-lock-maximum-decoration} specifies the
 preferred level of fontification, for modes that provide multiple
@@ -447,9 +447,10 @@ Scroll heuristically to bring useful information onto the screen
 @kindex C-l
 @findex recenter
   The most basic scrolling command is @kbd{C-l} (@code{recenter}) with
-no argument.  It clears the entire screen and redisplays all windows.
-In addition, it scrolls the selected window so that point is halfway
-down from the top of the window.
+no argument.  It scrolls the selected window so that point is halfway
+down from the top of the window.  On a text terminal, it also clears
+the screen and redisplays all windows.  That is useful in case the
+screen is garbled (@pxref{Screen Garbled}).
 
 @kindex C-v
 @kindex M-v
@@ -566,17 +567,12 @@ window, Emacs recenters the window.  By default, @code{scroll-margin} is
 
   @dfn{Horizontal scrolling} means shifting all the lines sideways
 within a window---so that some of the text near the left margin is not
-displayed at all.  Emacs does this automatically in any window that
-uses line truncation rather than continuation: whenever point moves
-off the left or right edge of the screen, Emacs scrolls the buffer
-horizontally to make point visible.
-
-  When a window has been scrolled horizontally, text lines are truncated
-rather than continued (@pxref{Continuation Lines}), with a @samp{$}
-appearing in the first column when there is text truncated to the left,
-and in the last column when there is text truncated to the right.
-
-  You can use these commands to do explicit horizontal scrolling.
+displayed at all.  When the text in a window is scrolled horizontally,
+text lines are truncated rather than continued (@pxref{Display
+Custom}).  Whenever a window shows truncated lines, Emacs
+automatically updates its horizontal scrolling whenever point moves
+off the left or right edge of the screen.  You can also use these
+commands to do explicit horizontal scrolling.
 
 @table @kbd
 @item C-x <
@@ -602,10 +598,10 @@ attempting to do so has no effect.  This means that you don't have to
 calculate the argument precisely for @w{@kbd{C-x >}}; any sufficiently large
 argument will restore the normal display.
 
-  If you scroll a window horizontally by hand, that sets a lower bound
-for automatic horizontal scrolling.  Automatic scrolling will continue
-to scroll the window, but never farther to the right than the amount
-you previously set by @code{scroll-left}.
+  If you use those commands to scroll a window horizontally, that sets
+a lower bound for automatic horizontal scrolling.  Automatic scrolling
+will continue to scroll the window, but never farther to the right
+than the amount you previously set by @code{scroll-left}.
 
 @vindex hscroll-margin
   The value of the variable @code{hscroll-margin} controls how close
@@ -708,12 +704,12 @@ currently doesn't work on character terminals.)
 @cindex windows, synchronizing
 @cindex synchronizing windows
 
-  @dfn{Follow mode} is a minor mode that makes two windows showing the
-same buffer scroll as one tall ``virtual window.''  To use Follow mode,
-go to a frame with just one window, split it into two side-by-side
-windows using @kbd{C-x 3}, and then type @kbd{M-x follow-mode}.  From
-then on, you can edit the buffer in either of the two windows, or scroll
-either one; the other window follows it.
+  @dfn{Follow mode} is a minor mode that makes two windows, both
+showing the same buffer, scroll as a single tall ``virtual window.''
+To use Follow mode, go to a frame with just one window, split it into
+two side-by-side windows using @kbd{C-x 3}, and then type @kbd{M-x
+follow-mode}.  From then on, you can edit the buffer in either of the
+two windows, or scroll either one; the other window follows it.
 
   In Follow mode, if you move point outside the portion visible in one
 window and into the portion visible in the other window, that selects
@@ -756,6 +752,9 @@ the three dots.
 precedes hidden lines.  Then there is no visible indication of the
 hidden lines.  This variable becomes local automatically when set.
 
+  See also @ref{Outline Mode} for another way to hide part of
+the text in a buffer.
+
 @node Optional Mode Line
 @section Optional Mode Line Features
 
@@ -914,6 +913,46 @@ they are displayed using their graphics (assuming your terminal supports
 them), otherwise as escape sequences.  @xref{Single-Byte Character
 Support}.
 
+@node Cursor Display
+@section Displaying the Cursor
+
+@findex blink-cursor-mode
+@vindex blink-cursor-alist
+@cindex cursor, locating visually
+@cindex cursor, blinking
+  You can customize the cursor's color, and whether it blinks, using
+the @code{cursor} Custom group (@pxref{Easy Customization}).  On
+graphical terminals, the command @kbd{M-x blink-cursor-mode} enables
+or disables the blinking of the cursor.  (On text terminals, the
+terminal itself blinks the cursor, and Emacs has no control over it.)
+You can control how the cursor appears when it blinks off by setting
+the variable @code{blink-cursor-alist}.
+
+@cindex cursor in non-selected windows
+@vindex cursor-in-non-selected-windows
+  Normally, the cursor appears in non-selected windows in the ``off''
+state, with the same appearance as when the blinking cursor blinks
+``off''.  For a box cursor, this is a hollow box; for a bar cursor,
+this is a thinner bar.  To turn off cursors in non-selected windows,
+customize the variable @code{cursor-in-non-selected-windows} and assign
+it a @code{nil} value.
+
+@vindex x-stretch-cursor
+@cindex wide block cursor
+  On graphical terminals, Emacs can optionally draw the block cursor
+as wide as the character under the cursor---for example, if the cursor
+is on a tab character, it would cover the full width occupied by that
+tab character.  To enable this feature, set the variable
+@code{x-stretch-cursor} to a non-@code{nil} value.
+
+@findex hl-line-mode
+@findex global-hl-line-mode
+@cindex highlight current line
+  If you find it hard to see the cursor, you might like HL Line mode,
+a minor mode that highlights the line containing point.  Use @kbd{M-x
+hl-line-mode} to enable or disable it in the current buffer.  @kbd{M-x
+global-hl-line-mode} enables or disables the same mode globally.
+
 @node Display Custom
 @section Customization of Display
 
@@ -937,18 +976,19 @@ to invert all the lines of the display from what they normally are.
   If the variable @code{visible-bell} is non-@code{nil}, Emacs attempts
 to make the whole screen blink when it would normally make an audible bell
 sound.  This variable has no effect if your terminal does not have a way
-to make the screen blink.@refill
+to make the screen blink.
 
 @vindex no-redraw-on-reenter
-  When you reenter Emacs after suspending, Emacs normally clears the
-screen and redraws the entire display.  On some terminals with more than
-one page of memory, it is possible to arrange the termcap entry so that
-the @samp{ti} and @samp{te} strings (output to the terminal when Emacs
-is entered and exited, respectively) switch between pages of memory so
-as to use one page for Emacs and another page for other output.  Then
-you might want to set the variable @code{no-redraw-on-reenter}
-non-@code{nil}; this tells Emacs to assume, when resumed, that the
-screen page it is using still contains what Emacs last wrote there.
+  On a text terminal, when you reenter Emacs after suspending, Emacs
+normally clears the screen and redraws the entire display.  On some
+terminals with more than one page of memory, it is possible to arrange
+the termcap entry so that the @samp{ti} and @samp{te} strings (output
+to the terminal when Emacs is entered and exited, respectively) switch
+between pages of memory so as to use one page for Emacs and another
+page for other output.  Then you might want to set the variable
+@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
+assume, when resumed, that the screen page it is using still contains
+what Emacs last wrote there.
 
 @vindex echo-keystrokes
   The variable @code{echo-keystrokes} controls the echoing of multi-character
@@ -964,6 +1004,7 @@ default is initially @code{t}.  @xref{Display Tables,, Display Tables,
 elisp, The Emacs Lisp Reference Manual}.
 
 @vindex tab-width
+@vindex default-tab-width
   Normally, a tab character in the buffer is displayed as whitespace which
 extends to the next display tab stop position, and display tab stops come
 at intervals equal to eight spaces.  The number of spaces per tab is
@@ -971,18 +1012,31 @@ controlled by the variable @code{tab-width}, which is made local by
 changing it, just like @code{ctl-arrow}.  Note that how the tab character
 in the buffer is displayed has nothing to do with the definition of
 @key{TAB} as a command.  The variable @code{tab-width} must have an
-integer value between 1 and 1000, inclusive.
-
-@c @vindex truncate-lines  @c No index entry here, because we have one
-@c in the continuation section.
-  If the variable @code{truncate-lines} is non-@code{nil}, then each
-line of text gets just one screen line for display; if the text line is
-too long, display shows only the part that fits.  If
-@code{truncate-lines} is @code{nil}, then long text lines display as
-more than one screen line, enough to show the whole text of the line.
-@xref{Continuation Lines}.  Altering the value of @code{truncate-lines}
-makes it local to the current buffer; until that time, the default value
-is in effect.  The default is initially @code{nil}.
+integer value between 1 and 1000, inclusive.  The variable
+@code{default-tab-width} controls the default value of this variable
+for buffers where you have not set it locally.
+
+@cindex truncation
+@cindex line truncation, and fringes
+  As an alternative to continuation, Emacs can display long lines by
+@dfn{truncation}.  This means that all the characters that do not fit
+in the width of the screen or window do not appear at all.  On
+graphical terminals, a small straight arrow in the fringe indicates
+truncation at either end of the line.  On text terminals, @samp{$}
+appears in the first column when there is text truncated to the left,
+and in the last column when there is text truncated to the right.
+
+@vindex truncate-lines
+@findex toggle-truncate-lines
+  Horizontal scrolling automatically causes line truncation
+(@pxref{Horizontal Scrolling}).  You can explicitly enable line
+truncation for a particular buffer with the command @kbd{M-x
+toggle-truncate-lines}.  This works by locally changing the variable
+@code{truncate-lines}.  If that variable is non-@code{nil}, long lines
+are truncated; if it is @code{nil}, they are continued onto multiple
+screen lines.  Setting the variable @code{truncate-lines} in any way
+makes it local to the current buffer; until that time, the default
+value is in effect.  The default value is normally @code{nil}.
 
 @c @vindex truncate-partial-width-windows  @c Idx entry is in Split Windows.
   If the variable @code{truncate-partial-width-windows} is
@@ -1066,46 +1120,6 @@ result in text that is hard to read.  Call the function
 @code{tty-suppress-bold-inverse-default-colors} with a non-@code{nil}
 argument to suppress the effect of bold-face in this case.
 
-@node Cursor Display
-@section Displaying the Cursor
-
-@findex blink-cursor-mode
-@vindex blink-cursor-alist
-@cindex cursor, locating visually
-@cindex cursor, blinking
-  You can customize the cursor's color, and whether it blinks, using
-the @code{cursor} Custom group (@pxref{Easy Customization}).  On
-graphical terminals, the command @kbd{M-x blink-cursor-mode} enables
-or disables the blinking of the cursor.  (On text terminals, the
-terminal itself blinks the cursor, and Emacs has no control over it.)
-You can control how the cursor appears when it blinks off by setting
-the variable @code{blink-cursor-alist}.
-
-@cindex cursor in non-selected windows
-@vindex cursor-in-non-selected-windows
-  Normally, the cursor appears in non-selected windows in the ``off''
-state, with the same appearance as when the blinking cursor blinks
-``off''.  For a box cursor, this is a hollow box; for a bar cursor,
-this is a thinner bar.  To turn off cursors in non-selected windows,
-customize the variable @code{cursor-in-non-selected-windows} and assign
-it a @code{nil} value.
-
-@vindex x-stretch-cursor
-@cindex wide block cursor
-  On graphical terminals, Emacs can optionally draw the block cursor
-as wide as the character under the cursor---for example, if the cursor
-is on a tab character, it would cover the full width occupied by that
-tab character.  To enable this feature, set the variable
-@code{x-stretch-cursor} to a non-@code{nil} value.
-
-@findex hl-line-mode
-@findex global-hl-line-mode
-@cindex highlight current line
-  If you find it hard to see the cursor, you might like HL Line mode,
-a minor mode that highlights the line containing point.  Use @kbd{M-x
-hl-line-mode} to enable or disable it in the current buffer.  @kbd{M-x
-global-hl-line-mode} enables or disables the same mode globally.
-
 @ignore
    arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
 @end ignore
diff --git a/man/emacs.texi b/man/emacs.texi
index 3bfc95aac5a..dea25cdaa29 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -305,12 +305,19 @@ Registers
 
 Controlling the Display
 
+* Faces::                  How to change the display style using faces.
+* Font Lock::              Minor mode for syntactic highlighting using faces.
+* Highlight Changes::      Using colors to show where you changed the buffer.
+* Highlight Interactively:: Tell Emacs what text to highlight.
 * Scrolling::              Moving text up and down in a window.
 * Horizontal Scrolling::   Moving text left and right in a window.
+* Fringes::                Enabling or disabling window fringes.
+* Useless Whitespace::     Showing possibly-spurious trailing whitespace.
 * Follow Mode::            Follow mode lets two windows scroll as one.
 * Selective Display::      Hiding lines with lots of indentation.
 * Optional Mode Line::     Optional mode line display features.
-* Text Display::           How text is normally displayed.
+* Text Display::           How text characters are normally displayed.
+* Cursor Display::         Features for displaying the cursor.
 * Display Custom::         Information on variables for customizing display.
 
 Searching and Replacement
@@ -418,15 +425,11 @@ Frames and X Windows
 * Frame Parameters::    Changing the colors and other modes of frames.
 * Scroll Bars::         How to enable and disable scroll bars; how to use them.
 * Wheeled Mice::        Using mouse wheels for scrolling.
+* Drag and Drop::       Using drag and drop to open files and insert text.
 * Menu Bars::           Enabling and disabling the menu bar.
 * Tool Bars::           Enabling and disabling the tool bar.
 * Dialog Boxes::        Controlling use of dialog boxes.
-* Faces::               How to change the display style using faces.
-* Font Lock::           Minor mode for syntactic highlighting using faces.
-* Highlight Changes::   Using colors to show where you changed the buffer.
-* Highlight Interactively:: Tell Emacs what text to highlight.
-* Useless Whitespace::  Showing possibly-spurious trailing whitespace.
-* Tooltips::            Showing "tooltips", AKA "ballon help" for active text.
+* Tooltips::            Showing "tooltips", AKA "balloon help" for active text.
 * Mouse Avoidance::     Moving the mouse pointer out of the way.
 * Non-Window Terminals::  Multiple frames on terminals that show only one.
 * XTerm Mouse::         Using the mouse in an XTerm terminal emulator.
@@ -828,7 +831,8 @@ Environment Variables
 
 MS-DOS and Windows 95/98/NT
 
-* MS-DOS Input::        Keyboard and mouse usage on MS-DOS.
+* MS-DOS Keyboard::     Keyboard usage on MS-DOS.
+* MS-DOS Mouse::        Mouse usage on MS-DOS.
 * MS-DOS Display::      Fonts, frames and display size on MS-DOS.
 * MS-DOS File Names::   File-name conventions on MS-DOS.
 * Text and Binary::     Text files on MS-DOS use CRLF to separate lines.
diff --git a/man/fixit.texi b/man/fixit.texi
index 04fa823e76e..0982b0856ef 100644
--- a/man/fixit.texi
+++ b/man/fixit.texi
@@ -302,10 +302,11 @@ frame).
   The command @code{ispell-complete-word}, which is bound to the key
 @kbd{M-@key{TAB}} in Text mode and related modes, shows a list of
 completions based on spelling correction.  Insert the beginning of a
-word, and then type @kbd{M-@key{TAB}}; the command displays a completion
-list window.  To choose one of the completions listed, click
-@kbd{Mouse-2} on it, or move the cursor there in the completions window
-and type @key{RET}.  @xref{Text Mode}.
+word, and then type @kbd{M-@key{TAB}}; the command displays a
+completion list window.  (If your window manager intercepts
+@kbd{M-@key{TAB}}, type @kbd{@key{ESC} @key{TAB}}.)  To choose one of
+the completions listed, click @kbd{Mouse-2} on it, or move the cursor
+there in the completions window and type @key{RET}.  @xref{Text Mode}.
 
 @ignore
 @findex reload-ispell
diff --git a/man/frames.texi b/man/frames.texi
index 5c0c42b3d8b..a3f71e64bab 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -27,7 +27,7 @@ frame.
 
   Emacs compiled for MS-DOS emulates some aspects of the window system
 so that you can use many of the features described in this chapter.
-@xref{MS-DOS Input}, for more information.
+@xref{MS-DOS Mouse}, for more information.
 
 @menu
 * Mouse Commands::      Moving, cutting, and pasting, with the mouse.
diff --git a/man/help.texi b/man/help.texi
index fb14eb150a2..d546440e114 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -25,11 +25,10 @@ help options, each with a brief description.  Before you type a help
 option, you can use @key{SPC} or @key{DEL} to scroll through the list.
 
   @kbd{C-h} or @key{F1} means ``help'' in various other contexts as
-well.  For example, in the middle of @code{query-replace}, it describes
-the options available for how to operate on the current match.  After a
-prefix key, it displays a list of the alternatives that can follow the
-prefix key.  (A few prefix keys don't support @kbd{C-h}, because they
-define other meanings for it, but they all support @key{F1}.)
+well.  After a prefix key, it displays a list of the alternatives that
+can follow the prefix key.  (A few prefix keys don't support
+@kbd{C-h}, because they define other meanings for it, but they all
+support @key{F1}.)
 
   Most help buffers use a special major mode, Help mode, which lets you
 scroll conveniently with @key{SPC} and @key{DEL}.  It also offers
@@ -51,9 +50,8 @@ be a regular expression (@pxref{Regexps}).  Browse the buffer that this
 command displays to find what you are looking for.  @xref{Apropos}.
 
 @item M-x apropos @key{RET} @var{topic} @key{RET}
-This works like @kbd{C-h a}, but it also searches for variables,
-in case the feature you are looking for is controlled by a variable
-rather than a command.  @xref{Apropos}.
+This works like @kbd{C-h a}, but it also searches for noninteractive
+functions and for variables.  @xref{Apropos}.
 
 @item M-x apropos-documentation @key{RET} @var{topic} @key{RET}
 This searches the @emph{documentation strings} (the built-in short
@@ -72,8 +70,8 @@ expression) in the @emph{text} of the manual rather than in its
 indices.
 
 @item C-h C-f
-This brings up the Emacs FAQ, where you can use the usual search
-commands (@pxref{Search}) to find the information.
+This brings up the Emacs FAQ.  You can use the Info commands
+to browse it.
 
 @item C-h p
 Finally, you can try looking up a suitable package using keywords
@@ -198,6 +196,13 @@ This is too big for the echo area, so a window is used for the display.
   @kbd{C-h c} and @kbd{C-h k} work for any sort of key sequences,
 including function keys and mouse events.
 
+@kindex C-h w
+@findex where-is
+  @kbd{C-h w @var{command} @key{RET}} tells you what keys are bound to
+@var{command}.  It displays a list of the keys in the echo area.  If it
+says the command is not on any key, you must use @kbd{M-x} to run it.
+@kbd{C-h w} runs the command @code{where-is}.
+
 @node Name Help
 @section Help by Command or Variable Name
 
@@ -217,15 +222,15 @@ displays the documentation of @code{auto-fill-mode}.  This is the only
 way to get the documentation of a command that is not bound to any key
 (one which you would normally run using @kbd{M-x}).
 
-  @kbd{C-h f} is also useful for Lisp functions that you are planning to
-use in a Lisp program.  For example, if you have just written the
-expression @code{(make-vector len)} and want to check that you are using
-@code{make-vector} properly, type @kbd{C-h f make-vector @key{RET}}.
-Because @kbd{C-h f} allows all function names, not just command names,
-you may find that some of your favorite abbreviations that work in
-@kbd{M-x} don't work in @kbd{C-h f}.  An abbreviation may be unique
-among command names yet fail to be unique when other function names are
-allowed.
+  @kbd{C-h f} is also useful for Lisp functions that you are planning
+to use in a Lisp program.  For example, if you have just written the
+expression @code{(make-vector len)} and want to check that you are
+using @code{make-vector} properly, type @kbd{C-h f make-vector
+@key{RET}}.  Because @kbd{C-h f} allows all function names, not just
+command names, you may find that some of your favorite completion
+abbreviations that work in @kbd{M-x} don't work in @kbd{C-h f}.  An
+abbreviation may be unique among command names, yet fail to be unique
+when other function names are allowed.
 
   The default function name for @kbd{C-h f} to describe, if you type
 just @key{RET}, is the name of the function called by the innermost Lisp
@@ -241,13 +246,6 @@ buffer as the default, that name must be defined as a Lisp function.  If
 that is all you want to know, just type @kbd{C-g} to cancel the @kbd{C-h
 f} command, then go on editing.
 
-@kindex C-h w
-@findex where-is
-  @kbd{C-h w @var{command} @key{RET}} tells you what keys are bound to
-@var{command}.  It displays a list of the keys in the echo area.  If it
-says the command is not on any key, you must use @kbd{M-x} to run it.
-@kbd{C-h w} runs the command @code{where-is}.
-
   @kbd{C-h v} (@code{describe-variable}) is like @kbd{C-h f} but describes
 Lisp variables instead of Lisp functions.  Its default is the Lisp symbol
 around or before point, but only if that is the name of a known Lisp
@@ -257,8 +255,9 @@ variable.  @xref{Variables}.@refill
 normally have hyperlinks to the Lisp definition, if you have the Lisp
 source files installed.  If you know Lisp, this provides the ultimate
 documentation.  If you don't know Lisp, you should learn it.  If you
-are treating Emacs as an object file, then you are just @emph{using}
-Emacs.  For real intimacy with Emacs, you must read the source code.
+are just @emph{using} Emacs, treating Emacs as an object (file), then
+you don't really love it.  For true intimacy with your editor, you
+need to read the source code.
 
 @node Apropos
 @section Apropos
@@ -278,11 +277,11 @@ example, it would say that you can invoke @code{find-file} by typing
 normally checks only commands (interactive functions); if you specify a
 prefix argument, it checks noninteractive functions as well.
 
-  Because @kbd{C-h a} looks only for functions whose names contain the
-string you specify, you must use ingenuity in choosing the
-string.  If you are looking for commands for killing backwards and
-@kbd{C-h a kill-backwards @key{RET}} doesn't reveal any, don't give up.
-Try just @kbd{kill}, or just @kbd{backwards}, or just @kbd{back}.  Be
+  Because @kbd{C-h a} looks only for commands whose names contain the
+string you specify, you must use ingenuity in choosing the string.  If
+you are looking for commands for killing backwards and @kbd{C-h a
+kill-backwards @key{RET}} doesn't reveal any, don't give up.  Try just
+@kbd{kill}, or just @kbd{backwards}, or just @kbd{back}.  Be
 persistent.  Also note that you can use a regular expression as the
 argument, for more flexibility (@pxref{Regexps}).
 
@@ -330,7 +329,7 @@ above all behave as if they had been given a prefix argument.
 
   If you want more information about a function definition, variable or
 symbol property listed in the Apropos buffer, you can click on it with
-@kbd{Mouse-2} or move there and type @key{RET}.
+@kbd{Mouse-1} or @kbd{Mouse-2}, or move there and type @key{RET}.
 
 @node Library Keywords
 @section Keyword Search for Lisp Libraries
@@ -421,16 +420,17 @@ Follow a cross reference at point.
 Move point forward to the next cross reference.
 @item S-@key{TAB}
 Move point back to the previous cross reference.
-@item Mouse-2
+@item Mouse-1
+@itemx Mouse-2
 Follow a cross reference that you click on.
 @end table
 
-  When a command name (@pxref{M-x,, Running Commands by Name}) or
+  When a function name (@pxref{M-x,, Running Commands by Name}) or
 variable name (@pxref{Variables}) appears in the documentation, it
-normally appears inside paired single-quotes.  You can click on the name
-with @kbd{Mouse-2}, or move point there and type @key{RET}, to view the
-documentation of that command or variable.  Use @kbd{C-c C-b} to retrace
-your steps.
+normally appears inside paired single-quotes.  You can click on the
+name with @kbd{Mouse-1} or @kbd{Mouse-2}, or move point there and type
+@key{RET}, to view the documentation of that command or variable.  Use
+@kbd{C-c C-b} to retrace your steps.
 
 @kindex @key{TAB} @r{(Help mode)}
 @findex help-next-ref
diff --git a/man/indent.texi b/man/indent.texi
index ab640e76462..48a54747714 100644
--- a/man/indent.texi
+++ b/man/indent.texi
@@ -16,7 +16,7 @@ Indent the current line ``appropriately'' in a mode-dependent fashion.
 Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
 @item M-^
 Merge the previous and the current line (@code{delete-indentation}).
-This would cancel out the effect of @kbd{C-j}.
+This would cancel the effect of a preceding @kbd{C-j}.
 @item C-M-o
 Split the current line at point; text on the line after point becomes a
 new line indented to the same column where point is located
@@ -25,9 +25,9 @@ new line indented to the same column where point is located
 Move (forward or back) to the first nonblank character on the current
 line (@code{back-to-indentation}).
 @item C-M-\
-Indent several lines to the same column (@code{indent-region}).
+Indent lines in the region to the same column (@code{indent-region}).
 @item C-x @key{TAB}
-Shift a block of lines rigidly right or left (@code{indent-rigidly}).
+Shift lines in the region rigidly right or left (@code{indent-rigidly}).
 @item M-i
 Indent from point to the next prespecified tab stop column
 (@code{tab-to-tab-stop}).
@@ -47,11 +47,11 @@ to the next display tab stop position, and the default width of a tab
 stop is eight.  @xref{Display Custom}, for more details.
 
 @item
-Advance to the next tab stop.  You can set tab stops at your choice of
-column positions, then type @kbd{M-i} to advance to the next tab stop.
-The default is to have tab stops every eight columns, which means by
-default @kbd{M-i} inserts a tab character.  To set the tab stops, use
-@kbd{M-x edit-tab-stops}.
+Insert whitespace up to the next tab stop.  You can set tab stops at
+your choice of column positions, then type @kbd{M-i} to advance to the
+next tab stop.  The default tab stop settings have a tab stop every
+eight columns, which means by default @kbd{M-i} inserts a tab
+character.  To set the tab stops, use @kbd{M-x edit-tab-stops}.
 
 @item
 Align a line with the previous line.  More precisely, the command
@@ -72,15 +72,11 @@ of the preceding lines.  No matter where in the line you are when you
 type @key{TAB}, it aligns the line as a whole.
 @end enumerate
 
-  Normally, all of the above methods insert an optimal mix of tabs and
+  Normally, most of the above methods insert an optimal mix of tabs and
 spaces to align to the desired column.  @xref{Just Spaces}, for how to
 disable use of tabs.  However, @kbd{C-q @key{TAB}} always inserts a
 tab, even when tabs are disabled for the indentation commands.
 
-@c   In Text mode, @key{TAB} runs the command @code{tab-to-tab-stop}, which
-@c indents to the next tab stop column.  You can set the tab stops with
-@c @kbd{M-x edit-tab-stops}.
-
 @menu
 * Indentation Commands::  Various commands and techniques for indentation.
 * Tab Stops::             You can set arbitrary "tab stops" and then
diff --git a/man/kmacro.texi b/man/kmacro.texi
index 459752d3c4b..5ef34f6c929 100644
--- a/man/kmacro.texi
+++ b/man/kmacro.texi
@@ -46,6 +46,7 @@ intelligent or general.  For such things, Lisp must be used.
 
 @table @kbd
 @item C-x (
+@itemx @key{F3}
 Start defining a keyboard macro (@code{kmacro-start-macro}).
 @item C-x )
 End the definition of a keyboard macro (@code{kmacro-end-macro}).
@@ -53,6 +54,10 @@ End the definition of a keyboard macro (@code{kmacro-end-macro}).
 Execute the most recent keyboard macro (@code{kmacro-end-and-call-macro}).
 First end the definition of the keyboard macro, if currently defining it.
 To immediately execute the keyboard macro again, just repeat the @kbd{e}.
+@item @key{F4}
+If a keyboard macro is being defined, end the definition; otherwise,
+execute the most recent keyboard macro
+(@code{kmacro-end-or-call-macro}).
 @item C-u C-x (
 Re-execute last keyboard macro, then add more keys to its definition.
 @item C-u C-u C-x (
@@ -120,6 +125,10 @@ of zero to @kbd{C-x e} or @kbd{C-x )} means repeat the macro
 indefinitely (until it gets an error or you type @kbd{C-g} or, on
 MS-DOS, @kbd{C-@key{BREAK}}).
 
+  The key @key{F4} is like a combination of @kbd{C-x )} and @kbd{C-x
+e}.  If you're defining a macro, @key{F4} ends the definition.
+Otherwise it executes the last macro.
+
   If you wish to repeat an operation at regularly spaced places in the
 text, define a macro and include as part of the macro the commands to move
 to the next place you want to use it.  For example, if you want to change
@@ -490,18 +499,16 @@ keyboard input that you would use to invoke the macro---@kbd{C-x e} or
 
 @findex kmacro-step-edit-macro
 @kindex C-x C-k SPC
-  You can interactively and stepwise replay and edit the last keyboard
-macro one command at a time by typing @kbd{C-x C-k SPC}
+  You can interactively replay and edit the last keyboard
+macro, one command at a time, by typing @kbd{C-x C-k SPC}
 (@code{kmacro-step-edit-macro}).  Unless you quit the macro using
 @kbd{q} or @kbd{C-g}, the edited macro replaces the last macro on the
 macro ring.
 
-This shows the last macro in the minibuffer together with the first
-(or next) command to be executed, and prompts you for an action.
-You can enter @kbd{?} to get a command summary.
-
-The following commands are available in the step-edit mode and relate
-to the first (or current) command in the keyboard macro:
+  This macro editing feature shows the last macro in the minibuffer
+together with the first (or next) command to be executed, and prompts
+you for an action.  You can enter @kbd{?} to get a summary of your
+options.  These actions are available:
 
 @itemize @bullet{}
 @item
diff --git a/man/major.texi b/man/major.texi
index a7c3a9062cf..fa44b873031 100644
--- a/man/major.texi
+++ b/man/major.texi
@@ -92,14 +92,14 @@ For example, one element normally found in the list has the form
 @code{(@t{"\\.c\\'"} . c-mode)}, and it is responsible for selecting C
 mode for files whose names end in @file{.c}.  (Note that @samp{\\} is
 needed in Lisp syntax to include a @samp{\} in the string, which must
-be used to suppress the special meaning of @samp{.} in regexps.)  If the
-element has the form @code{(@var{regexp} @var{mode-function}
+be used to suppress the special meaning of @samp{.} in regexps.)  If
+the element has the form @code{(@var{regexp} @var{mode-function}
 @var{flag})} and @var{flag} is non-@code{nil}, then after calling
-@var{mode-function}, the suffix that matched @var{regexp} is discarded
-and the list is searched again for another match.
+@var{mode-function}, Emacs discards the suffix that matched
+@var{regexp} and searches the list again for another match.
 
-  You can specify which major mode should be used for editing a certain
-file by a special sort of text in the first nonblank line of the file.  The
+  You can specify the major mode to use for editing a certain file by
+special text in the first nonblank line of the file.  The
 mode name should appear in this line both preceded and followed by
 @samp{-*-}.  Other text may appear on the line as well.  For example,
 
@@ -166,6 +166,7 @@ the file's local variables list (if any).
 @vindex change-major-mode-with-file-name
   The commands @kbd{C-x C-w} and @code{set-visited-file-name} change to
 a new major mode if the new file name implies a mode (@pxref{Saving}).
+(@kbd{C-x C-s} does this too, if the buffer wasn't visiting a file.)
 However, this does not happen if the buffer contents specify a major
 mode, and certain ``special'' major modes do not allow the mode to
 change.  You can turn off this mode-changing feature by setting
diff --git a/man/msdog.texi b/man/msdog.texi
index dec258ec672..a1d7647a95d 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -24,7 +24,8 @@ sections at the end of this chapter which apply specifically for the
 Windows version.
 
 @menu
-* Input: MS-DOS Input.         Keyboard and mouse usage on MS-DOS.
+* Keyboard: MS-DOS Keyboard.   Keyboard conventions on MS-DOS.
+* Mouse: MS-DOS Mouse.         Mouse conventions on MS-DOS.
 * Display: MS-DOS Display.     Fonts, frames and display size on MS-DOS.
 * Files: MS-DOS File Names.    File name conventions on MS-DOS.
 * Text and Binary::            Text files on MS-DOS use CRLF to separate lines.
@@ -35,8 +36,28 @@ Windows version.
 * Windows System Menu::        Controlling what the ALT key does.
 @end menu
 
-@node MS-DOS Input
-@section Keyboard and Mouse on MS-DOS
+@node MS-DOS Keyboard
+@section Keyboard Usage on MS-DOS
+
+@kindex DEL @r{(MS-DOS)}
+@kindex BS @r{(MS-DOS)}
+  The key that is called @key{DEL} in Emacs (because that's how it is
+designated on most workstations) is known as @key{BS} (backspace) on a
+PC.  That is why the PC-specific terminal initialization remaps the
+@key{BS} key to act as @key{DEL}; the @key{DELETE} key is remapped to act
+as @kbd{C-d} for the same reasons.
+
+@kindex C-g @r{(MS-DOS)}
+@kindex C-BREAK @r{(MS-DOS)}
+@cindex quitting on MS-DOS
+  Emacs built for MS-DOS recognizes @kbd{C-@key{BREAK}} as a quit
+character, just like @kbd{C-g}.  This is because Emacs cannot detect
+that you have typed @kbd{C-g} until it is ready for more input.  As a
+consequence, you cannot use @kbd{C-g} to stop a running command
+(@pxref{Quitting}).  By contrast, @kbd{C-@key{BREAK}} @emph{is} detected
+as soon as you type it (as @kbd{C-g} is on other systems), so it can be
+used to stop a running command and for emergency escape
+(@pxref{Emergency Escape}).
 
 @cindex Meta (under MS-DOS)
 @cindex Hyper (under MS-DOS)
@@ -68,25 +89,8 @@ following line into your @file{_emacs} file:
 (define-key function-key-map [kp-enter] [?\C-j])
 @end smallexample
 
-@kindex DEL @r{(MS-DOS)}
-@kindex BS @r{(MS-DOS)}
-  The key that is called @key{DEL} in Emacs (because that's how it is
-designated on most workstations) is known as @key{BS} (backspace) on a
-PC.  That is why the PC-specific terminal initialization remaps the
-@key{BS} key to act as @key{DEL}; the @key{DEL} key is remapped to act
-as @kbd{C-d} for the same reasons.
-
-@kindex C-g @r{(MS-DOS)}
-@kindex C-BREAK @r{(MS-DOS)}
-@cindex quitting on MS-DOS
-  Emacs built for MS-DOS recognizes @kbd{C-@key{BREAK}} as a quit
-character, just like @kbd{C-g}.  This is because Emacs cannot detect
-that you have typed @kbd{C-g} until it is ready for more input.  As a
-consequence, you cannot use @kbd{C-g} to stop a running command
-(@pxref{Quitting}).  By contrast, @kbd{C-@key{BREAK}} @emph{is} detected
-as soon as you type it (as @kbd{C-g} is on other systems), so it can be
-used to stop a running command and for emergency escape
-(@pxref{Emergency Escape}).
+@node MS-DOS Mouse
+@section Mouse Usage on MS-DOS
 
 @cindex mouse support under MS-DOS
   Emacs on MS-DOS supports a mouse (on the default terminal only).
@@ -281,7 +285,7 @@ only see their short 8+3 aliases.
 
 @cindex @env{HOME} directory under MS-DOS
   MS-DOS has no notion of home directory, so Emacs on MS-DOS pretends
-that the directory where it is installed is the value of @env{HOME}
+that the directory where it is installed is the value of the @env{HOME}
 environment variable.  That is, if your Emacs binary,
 @file{emacs.exe}, is in the directory @file{c:/utils/emacs/bin}, then
 Emacs acts as if @env{HOME} were set to @samp{c:/utils/emacs}.  In
@@ -603,11 +607,11 @@ etc.
 MS-DOS normally doesn't allow use of several codepages in a single
 session.  MS-DOS was designed to load a single codepage at system
 startup, and require you to reboot in order to change
-it@footnote{Normally, one particular codepage is burnt into the display
-memory, while other codepages can be installed by modifying system
-configuration files, such as @file{CONFIG.SYS}, and rebooting.  While
-third-party software is known to exist that allows to change the
-codepage without rebooting, we describe here how a stock MS-DOS system
+it@footnote{Normally, one particular codepage is burnt into the
+display memory, while other codepages can be installed by modifying
+system configuration files, such as @file{CONFIG.SYS}, and rebooting.
+While there is third-party software that allows changing the codepage
+without rebooting, we describe here how a stock MS-DOS system
 behaves.}.  Much the same limitation applies when you run DOS
 executables on other systems such as MS-Windows.
 
@@ -749,7 +753,7 @@ asynchronous invocation on other platforms
 the @kbd{M-x eshell} command.  This invokes the Eshell package that
 implements a Posix-like shell entirely in Emacs Lisp.
 
-  By contrast, Emacs compiled as native Windows application
+  By contrast, Emacs compiled as a native Windows application
 @strong{does} support asynchronous subprocesses.  @xref{Windows
 Processes}.
 
@@ -782,7 +786,7 @@ the @code{dired-listing-switches} variable.  The options that work are
 @node Windows Processes
 @section Subprocesses on Windows 9X/ME and Windows NT/2K
 
-Emacs compiled as a native Windows application (as opposed to the DOS
+  Emacs compiled as a native Windows application (as opposed to the DOS
 version) includes full support for asynchronous subprocesses.
 In the Windows version, synchronous and asynchronous subprocesses work
 fine on both
diff --git a/man/programs.texi b/man/programs.texi
index 67b19c2e5e4..f884e019d22 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -73,6 +73,7 @@ and you can select it by typing @kbd{M-x @var{l}-mode @key{RET}}.
 @cindex Metafont mode
 @cindex Modula2 mode
 @cindex Prolog mode
+@cindex Python mode
 @cindex Simula mode
 @cindex VHDL mode
 @cindex M4 mode
@@ -84,7 +85,7 @@ variant of Lisp) and the Scheme-based DSSSL expression language, Ada,
 ASM, AWK, C, C++, Delphi (Object Pascal), Fortran (free format and fixed
 format), Icon, IDL (CORBA), IDLWAVE, Java, Metafont (@TeX{}'s
 companion for font creation), Modula2, Objective-C, Octave, Pascal,
-Perl, Pike, PostScript, Prolog, Simula, Tcl, and VHDL.  There is
+Perl, Pike, PostScript, Prolog, Python, Simula, Tcl, and VHDL.  There is
 also a major mode for makefiles, called Makefile mode.  An alternative
 mode for Perl is called CPerl mode.  Modes are available for the
 scripting languages of the common GNU and Unix shells, VMS DCL, and
@@ -241,6 +242,9 @@ which puts point at the beginning and mark at the end of the current
 defun.  This is the easiest way to get ready to kill the defun in
 order to move it to a different place in the file.  If you use the
 command while point is between defuns, it uses the following defun.
+Successive uses of @kbd{C-M-h}, or using it in Transient Mark mode
+when the mark is active, includes an additional defun in the region
+each time.
 
   In C mode, @kbd{C-M-h} runs the function @code{c-mark-function},
 which is almost the same as @code{mark-defun}; the difference is that
@@ -375,7 +379,7 @@ whitespace at the beginning of the line, @key{TAB} puts it at the end of
 that whitespace; otherwise, @key{TAB} keeps point fixed with respect to
 the characters around it.
 
-  Use @kbd{C-q @key{TAB}} to insert a tab at point.
+  Use @kbd{C-q @key{TAB}} to insert a tab character at point.
 
 @kindex C-j
 @findex newline-and-indent
@@ -384,12 +388,13 @@ the characters around it.
 followed by a @key{TAB}.  @kbd{C-j} at the end of a line creates a
 blank line and then gives it the appropriate indentation.
 
-  @key{TAB} indents lines that start within a parenthetical grouping
-each under the preceding line (or the text after the parenthesis).
-Therefore, if you manually give one of these lines a nonstandard
-indentation, the lines below will tend to follow it.  This behavior is
-convenient in cases where you have overridden the standard result of
-@key{TAB} because you find it unaesthetic for a particular line.
+  @key{TAB} indents a line that starts within a parenthetical grouping
+under the preceding line within the grouping, or the text after the
+parenthesis.  Therefore, if you manually give one of these lines a
+nonstandard indentation, the lines below will tend to follow it.  This
+behavior is convenient in cases where you have overridden the standard
+result of @key{TAB} because you find it unaesthetic for a particular
+line.
 
   Remember that an open-parenthesis, open-brace or other opening delimiter
 at the left margin is assumed by Emacs (including the indentation routines)
@@ -586,10 +591,11 @@ example,
 
 @noindent
 specifies an explicit choice for Java mode, and the default @samp{gnu}
-style for the other C-like modes.  This variable takes effect when you
-select one of the C-like major modes; thus, if you specify a new
-default style for Java mode, you can make it take effect in an
-existing Java mode buffer by typing @kbd{M-x java-mode} there.
+style for the other C-like modes.  (These settings are actually the
+defaults.)  This variable takes effect when you select one of the
+C-like major modes; thus, if you specify a new default style for Java
+mode, you can make it take effect in an existing Java mode buffer by
+typing @kbd{M-x java-mode} there.
 
   The @code{gnu} style specifies the formatting recommended by the GNU
 Project for C; it is the default, so as to encourage use of our
@@ -712,8 +718,10 @@ at or after point and the mark.
 use @kbd{C-M-@@} (@code{mark-sexp}), which sets mark at the same place
 that @kbd{C-M-f} would move to.  @kbd{C-M-@@} takes arguments like
 @kbd{C-M-f}.  In particular, a negative argument is useful for putting
-the mark at the beginning of the previous balanced expression.
-The alias @kbd{C-M-@key{SPC}} is equivalent to @kbd{C-M-@@}.
+the mark at the beginning of the previous balanced expression.  The
+alias @kbd{C-M-@key{SPC}} is equivalent to @kbd{C-M-@@}.  If you use
+this command repeatedly, or in Transient Mark mode whenever the mark
+is active, it extends the region by one sexp each time.
 
   In languages that use infix operators, such as C, it is not possible
 to recognize all balanced expressions as such because there can be
@@ -1066,9 +1074,10 @@ use in your program.
 @kindex C-h S
   For C, Lisp, and other languages that have documentation in Info,
 you can use @kbd{C-h S} (@code{info-lookup-symbol}) to view the Info
-documentation for a symbol.  You specify the symbol with the
-minibuffer; the default is the symbol appearing in the buffer at
-point.
+documentation for a symbol used in the program.  You specify the
+symbol with the minibuffer; the default is the symbol appearing in the
+buffer at point.  For example, in C mode this looks for the symbol in
+the C Library Manual.
 
   The major mode determines where to look for documentation for the
 symbol---which Info files to look in, and which indices to search.
@@ -1316,7 +1325,9 @@ symbol names.
   The character @kbd{M-@key{TAB}} runs a command to complete the
 partial symbol before point against the set of meaningful symbol
 names.  This command inserts at point any additional characters that
-it can determine from the partial name.
+it can determine from the partial name.  (If your window manager
+defines @kbd{M-@key{TAB}} to switch windows, you can type this Emacs
+command as @kbd{@key{ESC} @key{TAB}}.)
 
   If the partial name in the buffer has multiple possible completions
 that differ in the very next character, so that it is impossible to
@@ -1513,10 +1524,10 @@ With prefix argument @var{n}, move @var{n} times.
 
   In C mode and related modes, certain printing characters are
 ``electric''---in addition to inserting themselves, they also reindent
-the current line and may insert newlines.  This feature is controlled by
-the variable @code{c-auto-newline}.  The ``electric'' characters are
-@kbd{@{}, @kbd{@}}, @kbd{:}, @kbd{#}, @kbd{;}, @kbd{,}, @kbd{<},
-@kbd{>}, @kbd{/}, @kbd{*}, @kbd{(}, and @kbd{)}.
+the current line, and optionally also insert newlines.  The
+``electric'' characters are @kbd{@{}, @kbd{@}}, @kbd{:}, @kbd{#},
+@kbd{;}, @kbd{,}, @kbd{<}, @kbd{>}, @kbd{/}, @kbd{*}, @kbd{(}, and
+@kbd{)}.
 
   Electric characters insert newlines only when the @dfn{auto-newline}
 feature is enabled (indicated by @samp{/a} in the mode line after the
diff --git a/man/sending.texi b/man/sending.texi
index a1564d4fc01..bb1ac2864ac 100644
--- a/man/sending.texi
+++ b/man/sending.texi
@@ -496,13 +496,15 @@ edit.
 
 @findex mail-complete
 @kindex M-TAB @r{(Mail mode)}
-  While editing a header field that contains mailing addresses, such as
-@samp{To:}, @samp{CC:} and @samp{BCC:}, you can complete a mailing
-address by typing @kbd{M-@key{TAB}} (@code{mail-complete}).  It inserts
-the full name corresponding to the address, if it can determine the full
-name.  The variable @code{mail-complete-style} controls whether to insert
-the full name, and what style to use, as in @code{mail-from-style}
-(@pxref{Mail Headers}).
+  While editing a header field that contains mailing addresses, such
+as @samp{To:}, @samp{CC:} and @samp{BCC:}, you can complete a mailing
+address by typing @kbd{M-@key{TAB}} (@code{mail-complete}).  It
+inserts the full name corresponding to the address, if it can
+determine the full name.  The variable @code{mail-complete-style}
+controls whether to insert the full name, and what style to use, as in
+@code{mail-from-style} (@pxref{Mail Headers}).  (If your window
+manager defines @kbd{M-@key{TAB}} to switch windows, you can type this
+Emacs command as @kbd{@key{ESC} @key{TAB}}.)
 
   For completion purposes, the valid mailing addresses are taken to be
 the local users' names plus your personal mail aliases.  You can
diff --git a/man/text.texi b/man/text.texi
index 8eaa6178a8d..7b262e11abe 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -852,10 +852,12 @@ paragraph-indent-minor-mode} to enter an equivalent minor mode, for
 instance during mail composition.
 
 @kindex M-TAB @r{(Text mode)}
-  Text mode, and all the modes based on it, define @kbd{M-@key{TAB}} as
-the command @code{ispell-complete-word}, which performs completion of
-the partial word in the buffer before point, using the spelling
-dictionary as the space of possible words.  @xref{Spelling}.
+  Text mode, and all the modes based on it, define @kbd{M-@key{TAB}}
+as the command @code{ispell-complete-word}, which performs completion
+of the partial word in the buffer before point, using the spelling
+dictionary as the space of possible words.  @xref{Spelling}.  If your
+window manager defines @kbd{M-@key{TAB}} to switch windows, you can
+type this Emacs command as @kbd{@key{ESC} @key{TAB}}.
 
 @vindex text-mode-hook
   Entering Text mode runs the hook @code{text-mode-hook}.  Other major
diff --git a/man/trouble.texi b/man/trouble.texi
index 142560c1fe8..ac9697eeeb5 100644
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -57,7 +57,7 @@ successive @kbd{C-g} characters to get out of a search
 like @kbd{C-g}.  The reason is that it is not feasible, on MS-DOS, to
 recognize @kbd{C-g} while a command is running, between interactions
 with the user.  By contrast, it @emph{is} feasible to recognize
-@kbd{C-@key{BREAK}} at all times.  @xref{MS-DOS Input}.
+@kbd{C-@key{BREAK}} at all times.  @xref{MS-DOS Keyboard}.
 
 @findex keyboard-quit
   @kbd{C-g} works by setting the variable @code{quit-flag} to @code{t}
@@ -66,9 +66,9 @@ frequently and quits if it is non-@code{nil}.  @kbd{C-g} is only
 actually executed as a command if you type it while Emacs is waiting for
 input.  In that case, the command it runs is @code{keyboard-quit}.
 
-  If you quit with @kbd{C-g} a second time before the first @kbd{C-g} is
-recognized, you activate the ``emergency escape'' feature and return to
-the shell.  @xref{Emergency Escape}.
+  On a text terminal, if you quit with @kbd{C-g} a second time before
+the first @kbd{C-g} is recognized, you activate the ``emergency
+escape'' feature and return to the shell.  @xref{Emergency Escape}.
 
 @cindex NFS and quitting
   There may be times when you cannot quit.  When Emacs is waiting for
@@ -237,11 +237,11 @@ back to top level.  @xref{Recursive Edit}.
 @node Screen Garbled
 @subsection Garbage on the Screen
 
-  If the data on the screen looks wrong, the first thing to do is see
-whether the text is really wrong.  Type @kbd{C-l} to redisplay the
-entire screen.  If the screen appears correct after this, the problem
-was entirely in the previous screen update.  (Otherwise, see the following
-section.)
+  If the text on a text terminal looks wrong, the first thing to do is
+see whether it is wrong in the buffer.  Type @kbd{C-l} to redisplay
+the entire screen.  If the screen appears correct after this, the
+problem was entirely in the previous screen update.  (Otherwise, see
+the following section.)
 
   Display updating problems often result from an incorrect termcap entry
 for the terminal you are using.  The file @file{etc/TERMS} in the Emacs
diff --git a/man/windows.texi b/man/windows.texi
index 0d90a3b2e0c..092a678901b 100644
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -109,15 +109,15 @@ scroll bar, the mode line of the split window is side by side with
 your click.
 
 @vindex truncate-partial-width-windows
-  When a window is less than the full width, text lines too long to fit are
-frequent.  Continuing all those lines might be confusing.  The variable
-@code{truncate-partial-width-windows} can be set non-@code{nil} to force
-truncation in all windows less than the full width of the screen,
-independent of the buffer being displayed and its value for
-@code{truncate-lines}.  @xref{Continuation Lines}.@refill
+  When a window is less than the full width, text lines too long to
+fit are frequent.  Continuing all those lines might be confusing, so
+if the variable @code{truncate-partial-width-windows} is
+non-@code{nil}, that forces truncation in all windows less than the
+full width of the screen, independent of the buffer being displayed
+and its value for @code{truncate-lines}.  @xref{Display Custom}.
 
   Horizontal scrolling is often used in side-by-side windows.
-@xref{Display}.
+@xref{Horizontal Scrolling}.
 
 @vindex split-window-keep-point
   If @code{split-window-keep-point} is non-@code{nil}, the default,