25 files changed, 934 insertions, 927 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 15b84c27075..a1310e87b15 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,76 @@
+2011-10-24  Chong Yidong  <cyd@gnu.org>
+
+        * display.texi (Scrolling): Document scroll-up-line and
+        scroll-down-line.  Document scroll-command property.
+        (Recentering): New node, split off from Scrolling.
+
+2011-10-23  Chong Yidong  <cyd@gnu.org>
+
+        * frames.texi (Scroll Bars): GTK uses right scroll bars now.
+        (Tool Bars): Copyedits.
+
+        * buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only.
+
+2011-10-22  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Displaying Buffers): Fix broken lispref link.
+
+2011-10-22  Chong Yidong  <cyd@gnu.org>
+
+        * mini.texi (Minibuffer Exit): Rename from Strict Completion.
+        Move confirm-nonexistent-file-or-buffer discussion here.
+
+        * files.texi (File Names, Visiting): Move detailed discussion of
+        minibuffer confirmation to Minibuffer Exit.
+
+        * buffers.texi (Buffers): Tweak mention of mail buffer name.
+        (Select Buffer): Move confirmation discussion to Minibuffer Exit.
+
+2011-10-21  Chong Yidong  <cyd@gnu.org>
+
+        * files.texi (File Names, Visiting, Interlocking): Copyedits.
+        (Backup Copying): backup-by-copying-when-mismatch is now t.
+        (Customize Save): Fix description of require-final-newline.
+        (Reverting): Note that revert-buffer can't be undone.  Mention VC.
+        (Auto Save Control): Clarify.
+        (File Archives): Add 7z.
+        (Remote Files): ange-ftp-make-backup-files defaults to nil.
+
+        * arevert-xtra.texi (Autorevert): Copyedits.
+
+2011-10-20  Chong Yidong  <cyd@gnu.org>
+
+        * custom.texi (Hooks, Init Examples):
+        * display.texi (Font Lock):
+        * fixit.texi (Spelling):
+        * rmail.texi (Rmail Display): Minor mode function with no arg now
+        enables it.
+
+        * fixit.texi (Spelling): Fix description of inline completion.
+
+2011-10-19  Chong Yidong  <cyd@gnu.org>
+
+        * search.texi (Repeat Isearch, Error in Isearch): Add kindex
+        entries.
+        (Isearch Yank): Document isearch-yank-pop.
+        (Isearch Scroll): Refer to C-l instead of unbound `recenter'.
+        (Other Repeating Search): Document Occur Edit mode.
+
+2011-10-18  Chong Yidong  <cyd@gnu.org>
+
+        * display.texi (Fringes): Move overflow-newline-into-fringe here,
+        from Line Truncation node.
+        (Standard Faces): Note that only the background of the cursor face
+        has an effect.
+        (Cursor Display): Fix descriptions of cursor face
+        and bar cursor blinking.
+        (Text Display): Document nobreak-char-display more clearly.
+        (Line Truncation): Add xref to Split Window node.
+        (Display Custom): Don't bother documenting baud-rate or
+        no-redraw-on-reenter.
+
+        * search.texi (Slow Isearch): Node removed.
+
 2011-10-18  Glenn Morris  <rgm@gnu.org>
 
         * maintaining.texi (Registering): Remove vc-initial-comment.  (Bug#9745)
diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi
index 374886cd956..6a24646b5f7 100644
--- a/doc/emacs/arevert-xtra.texi
+++ b/doc/emacs/arevert-xtra.texi
@@ -8,11 +8,11 @@
 @section Auto Reverting Non-File Buffers
 
 Global Auto Revert Mode normally only reverts file buffers.  There are
-two ways to auto-revert certain non-file buffers: enabling Auto Revert
-Mode in those buffers (using @kbd{M-x auto-revert-mode}); and setting
-@code{global-auto-revert-non-file-buffers} non-@code{nil}.  The latter
-enables Auto Reverting for all types of buffers for which it is
-implemented (listed in the menu below).
+two ways to auto-revert certain non-file buffers: by enabling Auto
+Revert Mode in those buffers (using @kbd{M-x auto-revert-mode}); and
+by setting @code{global-auto-revert-non-file-buffers} to a
+non-@code{nil} value.  The latter enables Auto Reverting for all types
+of buffers for which it is implemented (listed in the menu below).
 
 Like file buffers, non-file buffers should normally not revert while
 you are working on them, or while they contain information that might
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 714e03720bc..abb65982873 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -367,7 +367,7 @@ the preceding newline, joining this line to the previous one.
   If, however, the region is active, @kbd{@key{DEL}} instead deletes
 the text in the region.  @xref{Mark}, for a description of the region.
 
-  On most keyboards, @key{DEL} is labelled @key{Backspace}, but we
+  On most keyboards, @key{DEL} is labeled @key{Backspace}, but we
 refer to it as @key{DEL} in this manual.  (Do not confuse @key{DEL}
 with the @key{Delete} key; we will discuss @key{Delete} momentarily.)
 On some text-only terminals, Emacs may not recognize the @key{DEL} key
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index b82f3fac7d4..302693aecef 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -7,11 +7,11 @@
 
 @cindex buffers
   The text you are editing in Emacs resides in an object called a
-@dfn{buffer}.  Each time you visit a file, a buffer is created to hold the
-file's text.  Each time you invoke Dired, a buffer is created to hold the
-directory listing.  If you send a message with @kbd{C-x m}, a buffer named
-@samp{*mail*} is used to hold the text of the message.  When you ask for a
-command's documentation, that appears in a buffer called @samp{*Help*}.
+@dfn{buffer}.  Each time you visit a file, a buffer is used to hold
+the file's text.  Each time you invoke Dired, a buffer is used to hold
+the directory listing.  If you send a message with @kbd{C-x m}, a
+buffer is used to hold the text of the message.  When you ask for a
+command's documentation, that appears in a buffer named @samp{*Help*}.
 
   Each buffer has a unique name, which can be of any length.  When a
 buffer is displayed in a window, its name is shown in the mode line
@@ -19,35 +19,34 @@ buffer is displayed in a window, its name is shown in the mode line
 matters in buffer names.  Most buffers are made by visiting files, and
 their names are derived from the files' names; however, you can also
 create an empty buffer with any name you want.  A newly started Emacs
-has a buffer named @samp{*scratch*}, which is not associated with any
-file and can be used for evaluating Lisp expressions in Emacs
-(@pxref{Lisp Interaction}).
+has several buffers, including one named @samp{*scratch*}, which can
+be used for evaluating Lisp expressions and is not associated with any
+file (@pxref{Lisp Interaction}).
 
 @cindex selected buffer
 @cindex current buffer
-  At any time, one and only one buffer is @dfn{current}.  This is also
-called the @dfn{selected buffer}.  We often say that a command
-operates on ``the buffer''; this really means that the command
-operates on the current buffer (most commands do).  When there is only
-one Emacs window, the buffer displayed in that window is current.
-When there are multiple windows present, the buffer displayed in the
-@dfn{selected window} is current.  @xref{Windows}.
-
-  Each buffer records individually what file it is visiting (if any),
-whether it is modified, and what major mode and minor modes are in
-effect (@pxref{Major Modes}).  Any Emacs variable can be made
-@dfn{local to} a particular buffer, meaning its value in that buffer
-can be different from the value in other buffers.  @xref{Locals}.
+  At any time, one and only one buffer is @dfn{selected}; we call it
+the @dfn{current buffer}.  We sometimes say that a command operates on
+``the buffer''; this really means that it operates on the current
+buffer.  When there is only one Emacs window, the buffer displayed in
+that window is current.  When there are multiple windows, the buffer
+displayed in the @dfn{selected window} is current.  @xref{Windows}.
+
+  Aside from its textual contents, each buffer records several pieces
+of information, such as what file it is visiting (if any), whether it
+is modified, and what major mode and minor modes are in effect
+(@pxref{Modes}).  These are stored in @dfn{buffer-local
+variables}---variables that can have a different value in each buffer.
+@xref{Locals}.
 
 @cindex buffer size, maximum
   A buffer's size cannot be larger than some maximum, which is defined
-by the largest buffer position representable by the @dfn{Emacs
-integer} data type.  This is because Emacs tracks buffer positions
-using that data type.  For typical 64-bit machines, the maximum buffer size
-enforced by the data types is @math{2^61 - 2} bytes, or about 2 EiB.
-For typical 32-bit machines, the maximum is @math{2^29 - 2} bytes, or
-about 512 MiB.  Buffer sizes are also limited by the size of Emacs's
-virtual memory.
+by the largest buffer position representable by @dfn{Emacs integers}.
+This is because Emacs tracks buffer positions using that data type.
+For typical 64-bit machines, this maximum buffer size is @math{2^61 -
+2} bytes, or about 2 EiB.  For typical 32-bit machines, the maximum is
+usually @math{2^29 - 2} bytes, or about 512 MiB.  Buffer sizes are
+also limited by the amount of memory present in the system.
 
 @menu
 * Select Buffer::       Creating a new buffer or reselecting an old one.
@@ -76,9 +75,9 @@ Similar, but select @var{buffer} in another window
 Similar, but select @var{buffer} in a separate frame
 (@code{switch-to-buffer-other-frame}).
 @item C-x @key{LEFT}
-Select the previous buffer in the list of existing buffers.
+Select the previous buffer in the buffer list (@code{previous-buffer}).
 @item C-x @key{RIGHT}
-Select the next buffer in the list of existing buffers.
+Select the next buffer in the buffer list (@code{next-buffer}).
 @item C-u M-g M-g
 @itemx C-u M-g g
 Read a number @var{n} and move to line @var{n} in the most recently
@@ -87,28 +86,21 @@ selected buffer other than the current buffer.
 
 @kindex C-x b
 @findex switch-to-buffer
-  To select the buffer named @var{bufname}, type @kbd{C-x b
-@var{bufname} @key{RET}}.  This runs the command
-@code{switch-to-buffer} with argument @var{bufname}.  While entering
-the buffer name, you can use the usual minibuffer completion and
-history commands (@pxref{Minibuffer}).  An empty input specifies the
-buffer that was current most recently among those not now displayed in
-any window.
-
-@cindex minibuffer confirmation
-@cindex confirming in the minibuffer
-  If you specify a buffer that does not exist, @kbd{C-x b} creates a
-new, empty buffer that is not visiting any file, and selects it for
-editing.  First, however, Emacs might prompt you for confirmation, in
-case you entered the wrong buffer name.  Emacs asks for confirmation
-only if the last key you typed, before submitting the minibuffer input
-with @key{RET}, was @key{TAB} (@code{minibuffer-complete}).  This
-catches a common mistake, in which one types @key{RET} before
-realizing that @key{TAB} did not complete far enough to yield the
-desired buffer name (@pxref{Completion}).  Emacs asks for confirmation
-by putting the message @samp{[Confirm]} in the minibuffer; type
-@key{RET} again to confirm and visit the buffer.  @xref{Visiting}, for
-information about modifying this behavior.
+  The @kbd{C-x b} (@code{switch-to-buffer}) command reads a buffer
+name using the minibuffer.  Then it makes that buffer current, and
+displays it in the currently-selected window.  An empty input
+specifies the buffer that was current most recently among those not
+now displayed in any window.  If you specify a buffer that does not
+exist, @kbd{C-x b} creates a new, empty buffer that is not visiting
+any file, and selects it for editing.
+
+  While entering the buffer name, you can use the usual completion and
+history commands (@pxref{Minibuffer}).  Note that @kbd{C-x b}, and
+related commands, use ``permissive completion with confirmation'' for
+minibuffer completion: if you type @key{RET} immediately after
+completing up to a nonexistent buffer name, Emacs prints
+@samp{[Confirm]} and you must type a second @key{RET} to submit that
+buffer name.  @xref{Completion Exit}, for details.
 
   One reason to create a new buffer is to use it for making temporary
 notes.  If you try to save it, Emacs asks for the file name to use.
@@ -237,15 +229,11 @@ have special commands to operate on the text; also by visiting a file
 whose access control says you cannot write it.
 
 @findex toggle-read-only
-  If you wish to make changes in a read-only buffer, use the command
-@kbd{C-x C-q} (@code{toggle-read-only}).  It makes a read-only buffer
-writable, and makes a writable buffer read-only.  This
-works by setting the variable @code{buffer-read-only}, which has a local
-value in each buffer and makes the buffer read-only if its value is
-non-@code{nil}.  If you have files under version control, you may find
-it convenient to bind @kbd{C-x C-q} to @code{vc-toggle-read-only}
-instead.  This will guard you against an operation that will confuse
-most modern version-conmtrol systems. @xref{Version Control}.
+ The command @kbd{C-x C-q} (@code{toggle-read-only}) makes a read-only
+buffer writable, and makes a writable buffer read-only.  This works by
+setting the variable @code{buffer-read-only}, which has a local value
+in each buffer and makes the buffer read-only if its value is
+non-@code{nil}.
 
 @findex rename-buffer
   @kbd{M-x rename-buffer} changes the name of the current buffer.  You
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 71a2dba7d08..4a09d6e3d9c 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -893,11 +893,12 @@ Move to a date specified in the Ethiopic calendar
 (@code{calendar-ethiopic-goto-date}).
 @end table
 
-  These commands ask you for a date on the other calendar, move point to
-the Gregorian calendar date equivalent to that date, and display the
-other calendar's date in the echo area.  Emacs uses strict completion
-(@pxref{Strict Completion}) whenever it asks you to type a month name, so you
-don't have to worry about the spelling of Hebrew, Islamic, or French names.
+  These commands ask you for a date on the other calendar, move point
+to the Gregorian calendar date equivalent to that date, and display
+the other calendar's date in the echo area.  Emacs uses strict
+completion (@pxref{Completion Exit}) whenever it asks you to type a
+month name, so you don't have to worry about the spelling of Hebrew,
+Islamic, or French names.
 
 @c FIXME move?
 @findex calendar-hebrew-list-yahrzeits
@@ -993,7 +994,7 @@ occurrence of that combination.  Use @kbd{g m n c} to move point to the
 next occurrence of a combination.  These commands signal an error if the
 haab/tzolkin date combination you have typed is impossible.
 
-  Emacs uses strict completion (@pxref{Strict Completion}) whenever it
+  Emacs uses strict completion (@pxref{Completion Exit}) whenever it
 asks you to type a Mayan name, so you don't have to worry about
 spelling.
 
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index de6e7539c27..817cfc369d1 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -46,7 +46,7 @@ are certain characters found on non-English keyboards
 @cindex M-
   Emacs also recognizes control characters that are entered using
 @dfn{modifier keys}.  Two commonly-used modifier keys are
-@key{Control} (usually labelled @key{Ctrl}), and @key{Meta} (usually
+@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually
 labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
 historical reasons.}.  For example, @kbd{Control-a} is entered by
 holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 6af77374d07..d87c22ec28e 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -770,7 +770,7 @@ here's how to set up a hook to turn on Auto Fill mode when entering
 Text mode and other modes based on Text mode:
 
 @example
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
+(add-hook 'text-mode-hook 'auto-fill-mode)
 @end example
 
   Here is another example, showing how to use a hook to customize the
@@ -2174,8 +2174,7 @@ Turn off Line Number mode, a global minor mode.
 Turn on Auto Fill mode automatically in Text mode and related modes.
 
 @example
-(add-hook 'text-mode-hook
-  '(lambda () (auto-fill-mode 1)))
+(add-hook 'text-mode-hook 'auto-fill-mode)
 @end example
 
 This shows how to add a hook function to a normal hook variable
@@ -2183,19 +2182,9 @@ This shows how to add a hook function to a normal hook variable
 @code{lambda}, with a single-quote in front of it to make it a list
 constant rather than an expression.
 
-It's beyond the scope of this manual to explain Lisp functions, but for
-this example it is enough to know that the effect is to execute
-@code{(auto-fill-mode 1)} when Text mode is entered.  You can replace
-that with any other expression that you like, or with several
-expressions in a row.
-
-Emacs comes with a function named @code{turn-on-auto-fill} whose
-definition is @code{(lambda () (auto-fill-mode 1))}.  Thus, a simpler
-way to write the above example is as follows:
-
-@example
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-@end example
+It's beyond the scope of this manual to explain Lisp functions, but
+for this example it is enough to know that the effect is to execute
+the @code{auto-fill-mode} function when Text mode is entered.
 
 @item
 Load the installed Lisp library named @file{foo} (actually a file
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 68b2209ffba..8995b1242b1 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -13,6 +13,7 @@ the text is displayed.
 
 @menu
 * Scrolling::              Commands to move text up and down in a window.
+* Recentering::            A scroll command that centers the current line.
 * Auto Scrolling::         Redisplay scrolls text automatically when needed.
 * Horizontal Scrolling::   Moving text left and right in a window.
 * Narrowing::              Restricting display and editing to a portion
@@ -48,15 +49,15 @@ portion of the buffer is displayed.
   Scrolling ``forward'' or ``up'' advances the portion of the buffer
 displayed in the window; equivalently, it moves the buffer text
 upwards relative to the window.  Scrolling ``backward'' or ``down''
-moves the displayed portion backwards, and moves the text downwards
-relative to the window.  In Emacs, scrolling ``up'' or ``down'' refers
-to the direction that the text moves in the window, @emph{not} the
-direction that the window moves relative to the text; this terminology
-was taken up by Emacs before the modern meaning of ``scrolling up''
-and ``scrolling down'' became widely adopted.  Hence the strange
-result that @key{PageDown} scrolls ``up'' in the Emacs sense.  In this
-manual, we refer to scrolling ``forward'' and ``backward'' where
-possible, in order to minimize confusion.
+displays an earlier portion of the buffer, and moves the text
+downwards relative to the window.
+
+  In Emacs, scrolling ``up'' or ``down'' refers to the direction that
+the text moves in the window, @emph{not} the direction that the window
+moves relative to the text.  This terminology was adopted by Emacs
+before the modern meaning of ``scrolling up'' and ``scrolling down''
+became widespread.  Hence, the strange result that @key{PageDown}
+scrolls ``up'' in the Emacs sense.
 
   The portion of a buffer displayed in a window always contains point.
 If you move point past the bottom or top of the window, scrolling
@@ -64,11 +65,6 @@ occurs automatically to bring it back onscreen (@pxref{Auto
 Scrolling}).  You can also scroll explicitly with these commands:
 
 @table @kbd
-@item C-l
-Scroll the selected window so that the current line is the center-most
-text line; on subsequent consecutive invocations, make the current
-line the top-most line, the bottom-most line, and so on in cyclic
-order; also, maybe redisplay the screen (@code{recenter-top-bottom}).
 @item C-v
 @itemx @key{next}
 @itemx @key{PageDown}
@@ -77,6 +73,86 @@ Scroll forward by nearly a full window (@code{scroll-up-command}).
 @itemx @key{prior}
 @itemx @key{PageUp}
 Scroll backward (@code{scroll-down-command}).
+@end table
+
+@kindex C-v
+@kindex M-v
+@kindex next
+@kindex prior
+@kindex PageDown
+@kindex PageUp
+@findex scroll-up-command
+@findex scroll-down-command
+  @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the
+whole window height.  The effect is to take the two lines at the
+bottom of the window and put them at the top, followed by lines that
+were not previously visible.  If point was in the text that scrolled
+off the top, it ends up on the window's new topmost line.  The
+@key{next} (or @key{PageDown}) key is equivalent to @kbd{C-v}.
+
+  @kbd{M-v} (@code{scroll-down-command}) scrolls backward in a similar
+way.  The @key{prior} (or @key{PageUp}) key is equivalent to
+@kbd{M-v}.
+
+@vindex next-screen-context-lines
+  The number of lines of overlap left by these scroll commands is
+controlled by the variable @code{next-screen-context-lines}, whose
+default value is 2.  You can supply the commands with a numeric prefix
+argument, @var{n}, to scroll by @var{n} lines; Emacs attempts to leave
+point unchanged, so that the text and point move up or down together.
+@kbd{C-v} with a negative argument is like @kbd{M-v} and vice versa.
+
+@vindex scroll-error-top-bottom
+  By default, these commands signal an error (by beeping or flashing
+the screen) if no more scrolling is possible, because the window has
+reached the beginning or end of the buffer.  If you change the
+variable @code{scroll-error-top-bottom} to @code{t}, the command moves
+point to the farthest possible position.  If point is already there,
+the command signals an error.
+
+@vindex scroll-preserve-screen-position
+@cindex @code{scroll-command} property
+  Some users like scroll commands to keep point at the same screen
+position, so that scrolling back to the same screen conveniently
+returns point to its original position.  You can enable this behavior
+via the variable @code{scroll-preserve-screen-position}.  If the value
+is @code{t}, Emacs adjusts point to keep the cursor at the same screen
+position whenever a scroll command moves it off-window, rather than
+moving it to the topmost or bottommost line.  With any other
+non-@code{nil} value, Emacs adjusts point this way even if the scroll
+command leaves point in the window.  This variable affects all the
+scroll commands documented in this section, as well as scrolling with
+the mouse wheel (@pxref{Wheeled Mice}); in general, it affects any
+command that has a non-@code{nil} @code{scroll-command} property.
+@xref{Property Lists,,, elisp, The Emacs Lisp Reference Manual}.
+
+@vindex scroll-up
+@vindex scroll-down
+@findex scroll-up-line
+@findex scroll-down-line
+  The commands @kbd{M-x scroll-up} and @kbd{M-x scroll-down} behave
+similarly to @code{scroll-up-command} and @code{scroll-down-command},
+except they do not obey @code{scroll-error-top-bottom}.  Prior to
+Emacs 24, these were the default commands for scrolling up and down.
+The commands @kbd{M-x scroll-up-line} and @kbd{M-x scroll-down-line}
+scroll the current window by one line at a time.  If you intend to use
+any of these commands, you might want to give them key bindings
+(@pxref{Init Rebinding}).
+
+@node Recentering
+@section Recentering
+
+@table @kbd
+@item C-l
+Scroll the selected window so the current line is the center-most text
+line; on subsequent consecutive invocations, make the current line the
+top line, the bottom line, and so on in cyclic order.  Possibly
+redisplay the screen too (@code{recenter-top-bottom}).
+
+@item M-x recenter
+Scroll the selected window so the current line is the center-most text
+line.  Possibly redisplay the screen too.
+
 @item C-M-l
 Scroll heuristically to bring useful information onto the screen
 (@code{reposition-window}).
@@ -107,14 +183,13 @@ non-zero value @var{n}, @kbd{C-l} always leaves at least @var{n}
 screen lines between point and the top or bottom of the window
 (@pxref{Auto Scrolling}).
 
-  You can also supply @kbd{C-l} with a prefix argument.  With a plain
-prefix argument, @kbd{C-u C-l}, Emacs simply recenters point.  With a
-positive argument @var{n}, it scrolls to place point @var{n} lines
-down from the top of the window.  An argument of zero puts point on
-the topmost line.  A negative argument @var{-n} puts point @var{n}
-lines from the bottom of the window.  When given an argument,
-@kbd{C-l} does not clear the screen or cycle through different screen
-positions.
+  You can also give @kbd{C-l} a prefix argument.  A plain prefix
+argument, @kbd{C-u C-l}, simply recenters point.  A positive argument
+@var{n} puts point @var{n} lines down from the top of the window.  An
+argument of zero puts point on the topmost line.  A negative argument
+@var{-n} puts point @var{n} lines from the bottom of the window.  When
+given an argument, @kbd{C-l} does not clear the screen or cycle
+through different screen positions.
 
 @vindex recenter-redisplay
   If the variable @code{recenter-redisplay} has a non-@code{nil}
@@ -127,62 +202,6 @@ becomes garbled for any reason (@pxref{Screen Garbled}).
   The more primitive command @kbd{M-x recenter} behaves like
 @code{recenter-top-bottom}, but does not cycle among screen positions.
 
-@kindex C-v
-@kindex M-v
-@kindex next
-@kindex prior
-@kindex PageDown
-@kindex PageUp
-@findex scroll-up-command
-@findex scroll-down-command
-  @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the
-whole window height.  The effect is to take the two lines at the
-bottom of the window and put them at the top, followed by lines that
-were not previously visible.  If point was in the text that scrolled
-off the top, it ends up on the window's new topmost line.
-
-  Similarly, @kbd{M-v} (@code{scroll-down-command}) scrolls backward.
-
-  We refer to @kbd{C-v} and @kbd{M-v} as @dfn{full-screen scroll
-commands}.  The function key @key{next}, or @key{PageDown}, is
-equivalent to @kbd{C-v}; the function key @key{prior}, or
-@key{PageUp}, is equivalent to @kbd{M-v}.
-
-@vindex next-screen-context-lines
-  The variable @code{next-screen-context-lines} controls the number of
-lines of overlap left by the full-screen scroll commands; by default,
-it is 2.  You can supply these commands with a numeric prefix argument
-@var{n}.  This scrolls the window by @var{n} lines, while attempting
-to leave point unchanged (so that the text and point move up or down
-together).  @kbd{C-v} with a negative argument is like @kbd{M-v} and
-vice versa.
-
-@vindex scroll-error-top-bottom
-  By default, the full-screen scroll commands signal an error (by
-beeping or flashing the screen) if no more scrolling is possible,
-because the window has reached the beginning or end of the buffer.  If
-you change the variable @code{scroll-error-top-bottom} to @code{t},
-Emacs instead moves point to the farthest possible position.  If point
-is already there, the command signals an error.
-
-@vindex scroll-preserve-screen-position
-  Some users like scroll commands to keep point at the same screen
-position.  Then, scrolling back to the same screen also conveniently
-returns point to its original position.  You can enable this via the
-variable @code{scroll-preserve-screen-position}.  If the value is
-@code{t}, Emacs adjusts point to keep it at the same vertical position
-within the window, rather than the window edge, whenever a scroll
-command moves it off the window.  With any other non-@code{nil} value,
-Emacs adjusts point this way even if the scroll command leaves point
-in the window.
-
-@vindex scroll-up
-@vindex scroll-down
-  The commands @code{scroll-up} and @code{scroll-down} behave
-similarly to @code{scroll-up-command} and @code{scroll-down-command},
-except they do not obey @code{scroll-error-top-bottom}.  Prior to
-Emacs 24, these were the default commands for scrolling up and down.
-
 @kindex C-M-l
 @findex reposition-window
   @kbd{C-M-l} (@code{reposition-window}) scrolls the current window
@@ -554,7 +573,7 @@ Whitespace}).
 The face for displaying control characters and escape sequences
 (@pxref{Text Display}).
 @item nobreak-space
-The face for displaying ``non-breaking'' space characters (@pxref{Text
+The face for displaying ``no-break'' space characters (@pxref{Text
 Display}).
 @end table
 
@@ -599,7 +618,8 @@ displays.  (The fringes are the narrow portions of the Emacs frame
 between the text area and the window's right and left borders.)
 @xref{Fringes}.
 @item cursor
-This face determines the color of the text cursor.
+The @code{:background} attribute of this face specifies the color of
+the text cursor.  @xref{Cursor Display}.
 @item tooltip
 This face is used for tooltip text.  By default, if Emacs is built
 with GTK support, tooltips are drawn via GTK and this face has no
@@ -702,16 +722,14 @@ file:
 (global-font-lock-mode 0)
 @end example
 
-@findex turn-on-font-lock
 @noindent
 If you have disabled Global Font Lock mode, you can still enable Font
 Lock for specific major modes by adding the function
-@code{turn-on-font-lock} to the mode hooks (@pxref{Hooks}).  For
-example, to enable Font Lock mode for editing C files, you can do
-this:
+@code{font-lock-mode} to the mode hooks (@pxref{Hooks}).  For example,
+to enable Font Lock mode for editing C files, you can do this:
 
 @example
-(add-hook 'c-mode-hook 'turn-on-font-lock)
+(add-hook 'c-mode-hook 'font-lock-mode)
 @end example
 
   Font Lock mode uses several specifically named faces to do its job,
@@ -901,9 +919,14 @@ mode's symbol is a member of the list @code{hi-lock-exclude-modes}.
 @section Window Fringes
 @cindex fringes
 
-  On a graphical display, each Emacs window normally has narrow
+@findex set-fringe-style
+@findex fringe-mode
+  On graphical displays, each Emacs window normally has narrow
 @dfn{fringes} on the left and right edges.  The fringes are used to
 display symbols that provide information about the text in the window.
+You can type @kbd{M-x fringe-mode} to disable the fringes, or modify
+their width.  This command affects fringes in all frames; to modify
+fringes on the selected frame only, use @kbd{M-x set-fringe-style}.
 
   The most common use of the fringes is to indicate a continuation
 line (@pxref{Continuation Lines}).  When one line of text is split
@@ -924,17 +947,18 @@ scrolls the display horizontally in the direction of the arrow.
 boundaries (@pxref{Displaying Boundaries}), and where a program you
 are debugging is executing (@pxref{Debuggers}).
 
-@findex set-fringe-style
-@findex fringe-mode
-  You can enable and disable the fringes for all frames using
-@kbd{M-x fringe-mode}.  To enable and disable the fringes
-for the selected frame, use @kbd{M-x set-fringe-style}.
+@vindex overflow-newline-into-fringe
+  The fringe is also used for drawing the cursor, if the current line
+is exactly as wide as the window and point is at the end of the line.
+To disable this, change the variable
+@code{overflow-newline-into-fringe} to @code{nil}; this causes Emacs
+to continue or truncate lines that are exactly as wide as the window.
 
 @node Displaying Boundaries
 @section Displaying Boundaries
 
 @vindex indicate-buffer-boundaries
-  On a graphical display, Emacs can indicate the buffer boundaries in
+  On graphical displays, Emacs can indicate the buffer boundaries in
 the fringes.  If you enable this feature, the first line and the last
 line are marked with angle images in the fringes.  This can be
 combined with up and down arrow images which say whether it is
@@ -1127,14 +1151,15 @@ set the variable @code{display-time-24hr-format} to @code{t}.
 @vindex display-time-mail-file
 @vindex display-time-mail-directory
   The word @samp{Mail} appears after the load level if there is mail
-for you that you have not read yet.  On a graphical display you can use
-an icon instead of @samp{Mail} by customizing
-@code{display-time-use-mail-icon}; this may save some space on the mode
-line.  You can customize @code{display-time-mail-face} to make the mail
-indicator prominent.  Use @code{display-time-mail-file} to specify
-the mail file to check, or set @code{display-time-mail-directory}
-to specify the directory to check for incoming mail (any nonempty regular
-file in the directory is considered as ``newly arrived mail'').
+for you that you have not read yet.  On graphical displays, you can
+use an icon instead of @samp{Mail} by customizing
+@code{display-time-use-mail-icon}; this may save some space on the
+mode line.  You can customize @code{display-time-mail-face} to make
+the mail indicator prominent.  Use @code{display-time-mail-file} to
+specify the mail file to check, or set
+@code{display-time-mail-directory} to specify the directory to check
+for incoming mail (any nonempty regular file in the directory is
+considered as ``newly arrived mail'').
 
 @cindex mail (on mode line)
 @findex display-battery-mode
@@ -1152,7 +1177,7 @@ percentage of the total charge.
 @cindex mode line, 3D appearance
 @cindex attributes of mode line, changing
 @cindex non-integral number of lines in a window
-  On a graphical display, the mode line is drawn as a 3D box.  If you
+  On graphical displays, the mode line is drawn as a 3D box.  If you
 don't like this effect, you can disable it by customizing the
 @code{mode-line} face and setting its @code{box} attribute to
 @code{nil}.  @xref{Face Customization}.
@@ -1218,17 +1243,23 @@ If you change the buffer-local variable @code{ctl-arrow} to
 octal escape sequences instead of caret escape sequences.
 
 @vindex nobreak-char-display
-@cindex non-breaking space, display
-@cindex non-breaking hyphen, display
-@cindex soft hyphen, display
-  There are two special ``non-breaking'' versions of the space and
-hyphen characters, which are used where a line should not be broken.
-Emacs normally displays these characters with special faces
-(respectively, @code{nobreak-space} and @code{escape-glyph}) to
-distinguish them from ordinary spaces and hyphens.  You can turn off
-this feature by setting the variable @code{nobreak-char-display} to
-@code{nil}.  If you set the variable to any other value, that means to
-prefix these characters with an escape character.
+@cindex non-breaking space
+@cindex non-breaking hyphen
+@cindex soft hyphen
+  Some non-@acronym{ASCII} characters have the same appearance as an
+@acronym{ASCII} space or hyphen (minus) character.  Such characters
+can cause problems if they are entered into a buffer without your
+realization, e.g. by yanking; for instance, source code compilers
+typically do not treat non-@acronym{ASCII} spaces as whitespace
+characters.  To deal with this problem, Emacs displays such characters
+specially: it displays @code{U+00A0} (no-break space) with the
+@code{nobreak-space} face, and it displays @code{U+00AD} (soft
+hyphen), @code{U+2010} (hyphen), and @code{U+2011} (non-breaking
+hyphen) with the @code{escape-glyph} face.  To disable this, change
+the variable @code{nobreak-char-display} to @code{nil}.  If you give
+this variable a non-@code{nil} and non-@code{t} value, Emacs instead
+displays such characters as a highlighted backslash followed by a
+space or hyphen.
 
   You can customize the way any particular character code is displayed
 by means of a display table.  @xref{Display Tables,, Display Tables,
@@ -1246,48 +1277,61 @@ for details.
 
 @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
-a graphical display, 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}.
-
-@vindex cursor-type
-  You can change the shape of the cursor from the default ``box'' look
-to a bar by altering the @code{cursor-type} variable.
+@cindex text cursor
 
 @vindex visible-cursor
-  Some text terminals offer two different cursors: the normal cursor
-and the very visible cursor, where the latter may be e.g. bigger or
-blinking.  By default Emacs uses the very visible cursor, and switches
-to it when you start or resume Emacs.  If the variable
-@code{visible-cursor} is @code{nil} when Emacs starts or resumes, it
-doesn't switch, so it uses the normal cursor.
+  On a text terminal, the cursor's appearance is controlled by the
+terminal, largely out of the control of Emacs.  Some terminals offer
+two different cursors: a ``visible'' static cursor, and a ``very
+visible'' blinking cursor.  By default, Emacs uses the very visible
+cursor, and switches to it when you start or resume Emacs.  If the
+variable @code{visible-cursor} is @code{nil} when Emacs starts or
+resumes, it uses the normal cursor.
+
+@cindex cursor face
+@vindex cursor-type
+  On a graphical display, many more properties of the text cursor can
+be altered.  To customize its color, change the @code{:background}
+attribute of the face named @code{cursor} (@pxref{Face
+Customization}).  (The other attributes of this face have no effect;
+the text shown under the cursor is drawn using the frame's background
+color.)  To change its shape, customize the buffer-local variable
+@code{cursor-type}; possible values are @code{box} (the default),
+@code{hollow} (a hollow box), @code{bar} (a vertical bar), @code{(bar
+. @var{n})} (a vertical bar @var{n} pixels wide), @code{hbar} (a
+horizontal bar), @code{(hbar . @var{n})} (a horizontal bar @var{n}
+pixels tall), or @code{nil} (no cursor at all).
 
-@cindex cursor in non-selected windows
-@vindex cursor-in-non-selected-windows
-  Normally, the cursor appears in non-selected windows without
-blinking, 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.
+@findex blink-cursor-mode
+@cindex cursor, blinking
+@cindex blinking cursor
+@vindex blink-cursor-alist
+  To disable cursor blinking, change the variable
+@code{blink-cursor-mode} to @code{nil} (@pxref{Easy Customization}),
+or add the line @code{(blink-cursor-mode 0)} to your init file.
+Alternatively, you can change how the cursor looks when it ``blinks
+off'' by customizing the list variable @code{blink-cursor-alist}.
+Each element in the list should have the form @code{(@var{on-type}
+. @var{off-type})}; this means that if the cursor is displayed as
+@var{on-type} when it blinks on (where @var{on-type} is one of the
+cursor types described above), then it is displayed as @var{off-type}
+when it blinks off.
 
 @vindex x-stretch-cursor
 @cindex wide block cursor
-  On graphical displays, 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
+  Some characters, such as tab characters, are ``extra wide''.  When
+the cursor is positioned over such a character, it is normally drawn
+with the default character width.  You can make the cursor stretch to
+cover wide characters, by changing the variable
 @code{x-stretch-cursor} to a non-@code{nil} value.
 
+@cindex cursor in non-selected windows
+@vindex cursor-in-non-selected-windows
+  The cursor normally appears in non-selected windows as a
+non-blinking hollow box.  (For a bar cursor, it instead appears as a
+thinner bar.)  To turn off cursors in non-selected windows, change the
+variable @code{cursor-in-non-selected-windows} to @code{nil}.
+
 @findex hl-line-mode
 @findex global-hl-line-mode
 @cindex highlight current line
@@ -1297,18 +1341,17 @@ 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 Line Truncation
-@section Truncation of Lines
+@section Line Truncation
 
 @cindex truncation
 @cindex line truncation, and fringes
-  As an alternative to continuation (@pxref{Continuation Lines}), Emacs
-can display long lines by @dfn{truncation}.  This means that all the
-characters that do not fit in the width of the screen or window do not
-appear at all.  On graphical displays, a small straight arrow in the
-fringe indicates truncation at either end of the line.  On text-only
-terminals, @samp{$} appears in the leftmost column when there is text
-truncated to the left, and in the rightmost column when there is text
-truncated to the right.
+  As an alternative to continuation (@pxref{Continuation Lines}),
+Emacs can display long lines by @dfn{truncation}.  This means that all
+the characters that do not fit in the width of the screen or window do
+not appear at all.  On graphical displays, a small straight arrow in
+the fringe indicates truncation at either end of the line.  On
+text-only terminals, this is indicated with @samp{$} signs in the
+leftmost and/or rightmost columns.
 
 @vindex truncate-lines
 @findex toggle-truncate-lines
@@ -1320,21 +1363,12 @@ toggle-truncate-lines}.  This works by locally changing the variable
 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}.
+value, which is normally @code{nil}, is in effect.
 
-@c @vindex truncate-partial-width-windows  @c Idx entry is in Split Windows.
-  If the variable @code{truncate-partial-width-windows} is
-non-@code{nil}, it forces truncation rather than continuation in any
-window less than the full width of the screen or frame, regardless of
-the value of @code{truncate-lines}.  See also @ref{Display,, Display,
-elisp, The Emacs Lisp Reference Manual}.
-
-@vindex overflow-newline-into-fringe
-  If the variable @code{overflow-newline-into-fringe} is
-non-@code{nil} on a graphical display, then Emacs does not continue or
-truncate a line which is exactly as wide as the window.  Instead, the
-newline overflows into the right fringe, and the cursor appears in the
-fringe when positioned on that newline.
+@vindex truncate-partial-width-windows
+  If a split window becomes too narrow, Emacs may automatically enable
+line truncation.  @xref{Split Window}, for the variable
+@code{truncate-partial-width-windows} which controls this.
 
 @node Visual Line Mode
 @section Visual Line Mode
@@ -1387,11 +1421,8 @@ variable @code{visual-line-fringe-indicators}.
 @node Display Custom
 @section Customization of Display
 
-  This section describes variables (@pxref{Variables}) that you can
-change to customize how Emacs displays.  Beginning users can skip
-it.
-@c the reason for that pxref is because an xref early in the
-@c ``echo area'' section leads here.
+  This section describes variables that control miscellaneous aspects
+of the appearance of the Emacs screen.  Beginning users can skip it.
 
 @vindex visible-bell
   If the variable @code{visible-bell} is non-@code{nil}, Emacs attempts
@@ -1403,19 +1434,7 @@ to make the screen blink.
   The variable @code{echo-keystrokes} controls the echoing of multi-character
 keys; its value is the number of seconds of pause required to cause echoing
 to start, or zero, meaning don't echo at all.  The value takes effect when
-there is someting to echo.  @xref{Echo Area}.
-
-@vindex baud-rate
-  The variable @anchor{baud-rate}@code{baud-rate} holds the output
-speed of the terminal.  Setting this variable does not change the
-speed of actual data transmission, but the value is used for
-calculations.  On text-only terminals, it affects padding, and
-decisions about whether to scroll part of the screen or redraw it
-instead.  It also affects the behavior of incremental search.  On
-graphical displays, @code{baud-rate} is only used to determine how
-frequently to look for pending input during display updating.  A
-higher value of @code{baud-rate} means that check for pending input
-will be done less frequently.
+there is something to echo.  @xref{Echo Area}.
 
 @cindex mouse pointer
 @cindex hourglass pointer display
@@ -1458,15 +1477,3 @@ itself, in pixels; the default is 2.
 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.
-
-@vindex no-redraw-on-reenter
-  On a text-only 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.  On such terminals, 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.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 44f1aed134e..b25c09aa29d 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -281,7 +281,7 @@ Completion
 
 * Completion Example::  Examples of using completion.
 * Completion Commands:: A list of completion commands.
-* Strict Completion::   Different types of completion.
+* Completion Exit::     Completion and minibuffer text submission.
 * Completion Styles::   How completion matches are chosen.
 * Completion Options::  Options for completion.
 
@@ -342,6 +342,7 @@ Registers
 Controlling the Display
 
 * Scrolling::              Commands to move text up and down in a window.
+* Recentering::            A scrolling command that centers the current line.
 * Auto Scrolling::         Redisplay scrolls text automatically when needed.
 * Horizontal Scrolling::   Moving text left and right in a window.
 * Narrowing::              Restricting display and editing to a portion
@@ -388,7 +389,6 @@ Incremental Search
                           or else edit the search string.
 * Isearch Scroll::      Scrolling during an incremental search.
 * Isearch Minibuffer::  Incremental search of the minibuffer history.
-* Slow Isearch::        Incremental search features for slow terminals.
 
 Replacement Commands
 
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 433bf617598..2317f876b08 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -47,58 +47,58 @@ on file directories.
 @section File Names
 @cindex file names
 
-  Many Emacs commands that operate on a file require you to specify
-the file name, using the minibuffer (@pxref{Minibuffer}).  You can use
-@dfn{completion} to specify long file names (@pxref{Completion}).
-Note that file name completion ignores file names whose extensions
-appear in the variable @code{completion-ignored-extensions}
-(@pxref{Completion Options}).
-
 @cindex default file name
-  For most operations, there is a @dfn{default file name} which is
-used if you type just @key{RET} to enter an empty argument.  Normally,
-the default file name is the name of the file visited in the current
-buffer.
+  Many Emacs commands that operate on a file require you to specify
+the file name, using the minibuffer (@pxref{Minibuffer File}).
+
+  While in the minibuffer, you can use the usual completion and
+history commands (@pxref{Minibuffer}).  Note that file name completion
+ignores file names whose extensions appear in the variable
+@code{completion-ignored-extensions} (@pxref{Completion Options}).
+Note also that most commands use ``permissive completion with
+confirmation'' for reading file names: you are allowed to submit a
+nonexistent file name, but if you type @key{RET} immediately after
+completing up to a nonexistent file name, Emacs prints
+@samp{[Confirm]} and you must type a second @key{RET} to confirm.
+@xref{Completion Exit}, for details.
 
 @cindex default directory
 @vindex default-directory
 @vindex insert-default-directory
-  Each buffer has a @dfn{default directory} which is normally the same
-as the directory of the file visited in that buffer.  For example, if
-the default file name is @file{/u/rms/gnu/gnu.tasks}, the default
-directory is normally @file{/u/rms/gnu/}.  The default directory is
-kept in the variable @code{default-directory}, which has a separate
-value in every buffer.  When a command reads a file name using the
-minibuffer, the default directory usually serves as the initial
-contents of the minibuffer.  To inhibit the insertion of the default
-directory, set the variable @code{insert-default-directory} to
-@code{nil}.
+  Each buffer has a @dfn{default directory}, stored in the
+buffer-local variable @code{default-directory}.  Whenever Emacs reads
+a file name using the minibuffer, it usually inserts the default
+directory into the minibuffer as the initial contents.  You can
+inhibit this insertion by changing the variable
+@code{insert-default-directory} to @code{nil} (@pxref{Minibuffer
+File}).  Regardless, Emacs always assumes that any relative file name
+is relative to the default directory, e.g. entering a file name
+without a directory specifies a file in the default directory.
 
-  If you enter a file name without a directory, that specifies a file
-in the default directory.  If you specify a directory in a relative
-fashion, with a name that does not start with a slash, it is
-interpreted with respect to the default directory.  For example,
-suppose the default directory is @file{/u/rms/gnu/}.  Entering just
-@samp{foo} in the minibuffer, with a directory omitted, specifies the
-file @file{/u/rms/gnu/foo}; entering @samp{../.login} specifies
+@findex cd
+@findex pwd
+  When you visit a file, Emacs sets @code{default-directory} in the
+visiting buffer to the directory of its file.  When you create a new
+buffer that is not visiting a file, via a command like @kbd{C-x b},
+its default directory is usually copied from the buffer that was
+current at the time (@pxref{Select Buffer}).  You can use the command
+@kbd{M-x pwd} to see the value of @code{default-directory} in the
+current buffer.  The command @kbd{M-x cd} prompts for a directory
+name, and sets the buffer's @code{default-directory} to that directory
+(doing this does not change the buffer's file name, if any).
+
+  As an example, when you visit the file @file{/u/rms/gnu/gnu.tasks},
+the default directory is set to @file{/u/rms/gnu/}.  If you invoke a
+command that reads a file name, entering just @samp{foo} in the
+minibuffer, with a directory omitted, specifies the file
+@file{/u/rms/gnu/foo}; entering @samp{../.login} specifies
 @file{/u/rms/.login}; and entering @samp{new/foo} specifies
 @file{/u/rms/gnu/new/foo}.
 
   When typing a file name into the minibuffer, you can make use of a
 couple of shortcuts: a double slash is interpreted as ``ignore
 everything before the second slash in the pair,'' and @samp{~/} is
-interpreted as your home directory.  @xref{Minibuffer File}, for more
-information about these shortcuts.
-
-@findex cd
-@findex pwd
-  The command @kbd{M-x pwd} displays the default directory, and the
-command @kbd{M-x cd} sets it to a value read using the minibuffer.  A
-buffer's default directory changes only when the @code{cd} command is
-used.  A file-visiting buffer's default directory is initialized to
-the directory of the file it visits.  If you create a buffer with
-@kbd{C-x b}, its default directory is copied from that of the buffer
-that was current at the time (@pxref{Select Buffer}).
+interpreted as your home directory.  @xref{Minibuffer File}.
 
 @cindex environment variables in file names
 @cindex expansion of environment variables
@@ -113,10 +113,8 @@ the @samp{$}; alternatively, it can be enclosed in braces after the
 @file{/u/$@{FOO@}/test.c} are abbreviations for
 @file{/u/rms/hacks/test.c}.  If the environment variable is not
 defined, no substitution occurs, so that the character @samp{$} stands
-for itself.
-
-  Note that environment variables affect Emacs only if they are
-applied before Emacs is started.
+for itself.  Note that environment variables affect Emacs only if they
+are applied before Emacs is started.
 
   To access a file with @samp{$} in its name, if the @samp{$} causes
 expansion, type @samp{$$}.  This pair is converted to a single
@@ -125,8 +123,7 @@ a single @samp{$}.  Alternatively, quote the whole file name with
 @samp{/:} (@pxref{Quoted File Names}).  File names which begin with a
 literal @samp{~} should also be quoted with @samp{/:}.
 
-  You can include non-@acronym{ASCII} characters in file names if you set the
-variable @code{file-name-coding-system} to a non-@code{nil} value.
+  You can include non-@acronym{ASCII} characters in file names.
 @xref{File Name Coding}.
 
 @node Visiting
@@ -159,48 +156,43 @@ Visit a file with no conversion of the contents.
 buffer so you can edit them.  Emacs makes a new buffer for each file
 that you visit.
 
-  Emacs normally constructs the buffer name from the file name,
-omitting the directory name.  For example, a file named
-@file{/usr/rms/emacs.tex} is visited in a buffer named
-@samp{emacs.tex}.  If there is already a buffer with that name, Emacs
-constructs a unique name; the normal method is to append @samp{<2>},
-@samp{<3>}, and so on, but you can select other methods.
+@kindex C-x C-f
+@findex find-file
+  To visit a file, type @kbd{C-x C-f} (@code{find-file}) and use the
+minibuffer to enter the name of the desired file.  While in the
+minibuffer, you can abort the command by typing @kbd{C-g}.  @xref{File
+Names}, for details about entering file names into minibuffers.
+
+  If the specified file exists but the system does not allow you to
+read it, an error message is displayed in the echo area.  Otherwise,
+you can tell that @kbd{C-x C-f} has completed successfully by the
+appearance of new text on the screen, and by the buffer name shown in
+the mode line (@pxref{Mode Line}).  Emacs normally constructs the
+buffer name from the file name, omitting the directory name.  For
+example, a file named @file{/usr/rms/emacs.tex} is visited in a buffer
+named @samp{emacs.tex}.  If there is already a buffer with that name,
+Emacs constructs a unique name; the normal method is to append
+@samp{<2>}, @samp{<3>}, and so on, but you can select other methods.
 @xref{Uniquify}.
 
-  Each window's mode line shows the name of the buffer that is being
-displayed in that window, so you can always tell what buffer you are
-editing.  @pxref{Mode Line}.
-
-  The changes you make with editing commands are made in the Emacs
-buffer.  They do not take effect in the file that you visited, or any
-permanent place, until you @dfn{save} the buffer (@pxref{Saving}).
+@cindex creating files
+  To create a new file, just visit it using the same command, @kbd{C-x
+C-f}.  Emacs displays @samp{(New file)} in the echo area, but in other
+respects behaves as if you had visited an existing empty file.
 
 @cindex modified (buffer)
-  If a buffer contains changes that have not been saved, we say the
-buffer is @dfn{modified}.  This implies that some changes will be lost
-if the buffer is not saved.  The mode line displays two stars near the
-left margin to indicate that the buffer is modified.
-
-@kindex C-x C-f
-@findex find-file
-  To visit a file, type @kbd{C-x C-f} (@code{find-file}) and use the
-minibuffer to enter the name of the desired file.  The usual
-defaulting and completion behavior is available in this minibuffer
-(@pxref{Minibuffer File}).  Note, also, that completion ignores
-certain file names (@pxref{Completion Options}).  While in the
-minibuffer, you can abort @kbd{C-x C-f} by typing @kbd{C-g}.
-
-  Your can tell that @kbd{C-x C-f} has completed successfully by the
-appearance of new text on the screen and a new buffer name in the mode
-line.  If the specified file does not exist and you could not create
-it, or exists but you can't read it, an error message is displayed in
-the echo area.
-
-  If you visit a file that is already in Emacs, @kbd{C-x C-f} does not make
-another copy.  It selects the existing buffer containing that file.
-However, before doing so, it checks whether the file itself has changed
-since you visited or saved it last.  If the file has changed, Emacs offers
-to reread it.
+  After visiting a file, the changes you make with editing commands are
+made in the Emacs buffer.  They do not take effect in the visited
+file, until you @dfn{save} the buffer (@pxref{Saving}).  If a buffer
+contains changes that have not been saved, we say the buffer is
+@dfn{modified}.  This implies that some changes will be lost if the
+buffer is not saved.  The mode line displays two stars near the left
+margin to indicate that the buffer is modified.
+
+  If you visit a file that is already in Emacs, @kbd{C-x C-f} switches
+to the existing buffer instead of making another copy.  Before doing
+so, it checks whether the file has changed since you last visited or
+saved it.  If the file has changed, Emacs offers to reread it.
 
 @vindex large-file-warning-threshold
 @cindex file, warning when size is large
@@ -211,10 +203,10 @@ to reread it.
 about 10 megabytes), Emacs asks you for confirmation first.  You can
 answer @kbd{y} to proceed with visiting the file.  Note, however, that
 Emacs cannot visit files that are larger than the maximum Emacs buffer
-size, which is limited by the amount of memory Emacs can allocate
-and by the integers that Emacs can represent
-(@pxref{Buffers}).  If you try, Emacs will display an error message
-saying that the maximum buffer size has been exceeded.
+size, which is limited by the amount of memory Emacs can allocate and
+by the integers that Emacs can represent (@pxref{Buffers}).  If you
+try, Emacs displays an error message saying that the maximum buffer
+size has been exceeded.
 
 @cindex wildcard characters in file names
 @vindex find-file-wildcards
@@ -228,63 +220,21 @@ File Names}, for information on how to visit a file whose name
 actually contains wildcard characters.  You can disable the wildcard
 feature by customizing @code{find-file-wildcards}.
 
-@cindex file selection dialog
-  On graphical displays, there are two additional methods for visiting
-files.  Firstly, when Emacs is built with a suitable GUI toolkit,
-commands invoked with the mouse (by clicking on the menu bar or tool
-bar) use the toolkit's standard ``File Selection'' dialog instead of
-prompting for the file name in the minibuffer.  On GNU/Linux and Unix
-platforms, Emacs does this when built with GTK, LessTif, and Motif
-toolkits; on MS-Windows and Mac, the GUI version does that by default.
-For information on how to customize this, see @ref{Dialog Boxes}.
-
-  Secondly, Emacs supports ``drag and drop'': dropping a file into an
-ordinary Emacs window visits the file using that window.  As an
-exception, dropping a file into a window displaying a Dired buffer
-moves or copies the file into the displayed directory.  For details,
-see @ref{Drag and Drop}, and @ref{Misc Dired Features}.
-
-@cindex creating files
-  What if you want to create a new file?  Just visit it.  Emacs
-displays @samp{(New file)} in the echo area, but in other respects
-behaves as if you had visited an existing empty file.  If you make
-changes and save them, the file is created.
-
-@cindex minibuffer confirmation
-@cindex confirming in the minibuffer
-@vindex confirm-nonexistent-file-or-buffer
-  When @key{TAB} completion results in a nonexistent file name and you
-type @key{RET} immediately to visit it, Emacs asks for confirmation;
-this is because it's possible that you expected completion to go
-further and give you an existing file's name.  The string
-@samp{[Confirm]} appears for a short time after the file name to
-indicate the need to confirm in this way.  Type @key{RET} to confirm
-and visit the nonexistent file.  The variable
-@code{confirm-nonexistent-file-or-buffer} controls whether Emacs asks
-for confirmation before visiting a new file.  The default value,
-@code{after-completion}, gives the behavior we have just described.
-If the value is @code{nil}, Emacs never asks for confirmation; for any
-other non-@code{nil} value, Emacs always asks for confirmation.  This
-variable also affects the @code{switch-to-buffer} command
-(@pxref{Select Buffer}).  @xref{Completion}, for more information
-about completion.
-
 @kindex C-x C-v
 @findex find-alternate-file
-  If you visit a nonexistent file unintentionally (because you typed
-the wrong file name), type @kbd{C-x C-v} (@code{find-alternate-file})
-to visit the file you really wanted.  @kbd{C-x C-v} is similar to
-@kbd{C-x C-f}, but it kills the current buffer (after first offering
-to save it if it is modified).  When @kbd{C-x C-v} reads the file name
-to visit, it inserts the entire default file name in the buffer, with
-point just after the directory part; this is convenient if you made a
-slight error in typing the name.
+  If you visit the wrong file unintentionally by typing its name
+incorrectly, type @kbd{C-x C-v} (@code{find-alternate-file}) to visit
+the file you really wanted.  @kbd{C-x C-v} is similar to @kbd{C-x
+C-f}, but it kills the current buffer (after first offering to save it
+if it is modified).  When @kbd{C-x C-v} reads the file name to visit,
+it inserts the entire default file name in the buffer, with point just
+after the directory part; this is convenient if you made a slight
+error in typing the name.
 
 @vindex find-file-run-dired
   If you ``visit'' a file that is actually a directory, Emacs invokes
-Dired, the Emacs directory browser; this lets you ``edit'' the
-contents of the directory.  @xref{Dired}.  You can disable this
-behavior by setting the variable @code{find-file-run-dired} to
+Dired, the Emacs directory browser.  @xref{Dired}.  You can disable
+this behavior by setting the variable @code{find-file-run-dired} to
 @code{nil}; in that case, it is an error to try to visit a directory.
 
   Files which are actually collections of other files, or @dfn{file
@@ -321,17 +271,28 @@ new frame, or makes visible any existing frame showing the file you
 seek.  This feature is available only when you are using a window
 system.  @xref{Frames}.
 
-  Emacs recognizes from the contents of a file which end-of-line
-convention it uses to separate lines---newline (used on GNU/Linux and
-on Unix), carriage-return linefeed (used on Microsoft systems), or
-just carriage-return (used on the Macintosh)---and automatically
-converts the contents to the normal Emacs convention, which is that
-the newline character separates lines.  This is a part of the general
-feature of coding system conversion (@pxref{Coding Systems}), and
-makes it possible to edit files imported from different operating
-systems with equal convenience.  If you change the text and save the
-file, Emacs performs the inverse conversion, changing newlines back
-into carriage-return linefeed or just carriage-return if appropriate.
+@cindex file selection dialog
+  On graphical displays, there are two additional methods for visiting
+files.  Firstly, when Emacs is built with a suitable GUI toolkit,
+commands invoked with the mouse (by clicking on the menu bar or tool
+bar) use the toolkit's standard ``File Selection'' dialog instead of
+prompting for the file name in the minibuffer.  On GNU/Linux and Unix
+platforms, Emacs does this when built with GTK, LessTif, and Motif
+toolkits; on MS-Windows and Mac, the GUI version does that by default.
+For information on how to customize this, see @ref{Dialog Boxes}.
+
+  Secondly, Emacs supports ``drag and drop'': dropping a file into an
+ordinary Emacs window visits the file using that window.  As an
+exception, dropping a file into a window displaying a Dired buffer
+moves or copies the file into the displayed directory.  For details,
+see @ref{Drag and Drop}, and @ref{Misc Dired Features}.
+
+  Each time you visit a file, Emacs automatically scans its contents
+to detect what character encoding and end-of-line convention it uses,
+and converts these to Emacs' internal encoding and end-of-line
+convention within the buffer.  When you save the buffer, Emacs
+performs the inverse conversion, writing the file to disk with its
+original encoding and end-of-line convention.  @xref{Coding Systems}.
 
 @findex find-file-literally
   If you wish to edit a file as a sequence of @acronym{ASCII}
@@ -346,17 +307,17 @@ command asks you whether to visit it literally instead.
 
 @vindex find-file-hook
 @vindex find-file-not-found-functions
-  Two special hook variables allow extensions to modify the operation of
-visiting files.  Visiting a file that does not exist runs the functions
-in the list @code{find-file-not-found-functions}; this variable holds a list
-of functions, and the functions are called one by one (with no
-arguments) until one of them returns non-@code{nil}.  This is not a
-normal hook, and the name ends in @samp{-functions} rather than @samp{-hook}
-to indicate that fact.
+  Two special hook variables allow extensions to modify the operation
+of visiting files.  Visiting a file that does not exist runs the
+functions in @code{find-file-not-found-functions}; this variable holds
+a list of functions, which are called one by one (with no arguments)
+until one of them returns non-@code{nil}.  This is not a normal hook,
+and the name ends in @samp{-functions} rather than @samp{-hook} to
+indicate that fact.
 
   Successful visiting of any file, whether existing or not, calls the
-functions in the list @code{find-file-hook}, with no arguments.
-This variable is a normal hook.  In the case of a nonexistent file, the
+functions in @code{find-file-hook}, with no arguments.  This variable
+is a normal hook.  In the case of a nonexistent file, the
 @code{find-file-not-found-functions} are run first.  @xref{Hooks}.
 
   There are several ways to specify automatically the major mode for
@@ -386,9 +347,9 @@ that was visited in the buffer.
 
 @table @kbd
 @item C-x C-s
-Save the current buffer in its visited file on disk (@code{save-buffer}).
+Save the current buffer to its file (@code{save-buffer}).
 @item C-x s
-Save any or all buffers in their visited files (@code{save-some-buffers}).
+Save any or all buffers to their files (@code{save-some-buffers}).
 @item M-~
 Forget that the current buffer has been changed (@code{not-modified}).
 With prefix argument (@kbd{C-u}), mark the current buffer as changed.
@@ -409,10 +370,10 @@ Wrote /u/rms/gnu/gnu.tasks
 @end example
 
 @noindent
-If the selected buffer is not modified (no changes have been made in it
-since the buffer was created or last saved), saving is not really done,
-because it would have no effect.  Instead, @kbd{C-x C-s} displays a message
-like this in the echo area:
+If the current buffer is not modified (no changes have been made in it
+since the buffer was created or last saved), saving is not really
+done, because it would have no effect.  Instead, @kbd{C-x C-s}
+displays a message like this in the echo area:
 
 @example
 (No changes need to be saved)
@@ -597,8 +558,8 @@ Never make numbered backups; always make single backups.
 @end table
 
 @noindent
-The usual way to set this variable is globally, through your
-@file{.emacs} file or the customization buffer.  However, you can set
+The usual way to set this variable is globally, through your init file
+or the customization buffer.  However, you can set
 @code{version-control} locally in an individual buffer to control the
 making of backups for that buffer's file (@pxref{Locals}).  You can
 have Emacs set @code{version-control} locally whenever you visit a
@@ -679,34 +640,38 @@ and group.  If copying is used, these do not change.  If renaming is used,
 you become the file's owner, and the file's group becomes the default
 (different operating systems have different defaults for the group).
 
-  Having the owner change is usually a good idea, because then the owner
-always shows who last edited the file.  Also, the owners of the backups
-show who produced those versions.  Occasionally there is a file whose
-owner should not change; it is a good idea for such files to contain
-local variable lists to set @code{backup-by-copying-when-mismatch}
-locally (@pxref{File Variables}).
-
 @vindex backup-by-copying
 @vindex backup-by-copying-when-linked
 @vindex backup-by-copying-when-mismatch
 @vindex backup-by-copying-when-privileged-mismatch
 @cindex file ownership, and backup
 @cindex backup, and user-id
-  The choice of renaming or copying is controlled by four variables.
-Renaming is the default choice.  If the variable
-@code{backup-by-copying} is non-@code{nil}, copying is used.  Otherwise,
-if the variable @code{backup-by-copying-when-linked} is non-@code{nil},
-then copying is used for files that have multiple names, but renaming
-may still be used when the file being edited has only one name.  If the
-variable @code{backup-by-copying-when-mismatch} is non-@code{nil}, then
-copying is used if renaming would cause the file's owner or group to
-change.  @code{backup-by-copying-when-mismatch} is @code{t} by default
-if you start Emacs as the superuser.  The fourth variable,
-@code{backup-by-copying-when-privileged-mismatch}, gives the highest
-numeric user-id for which @code{backup-by-copying-when-mismatch} will be
-forced on.  This is useful when low-numbered user-ids are assigned to
-special system users, such as @code{root}, @code{bin}, @code{daemon},
-etc., which must maintain ownership of files.
+  The choice of renaming or copying is made as follows:
+
+@itemize
+@item
+If the variable @code{backup-by-copying} is non-@code{nil} (the
+default is @code{nil}), use copying.
+
+@item
+Otherwise, if the variable @code{backup-by-copying-when-linked} is
+non-@code{nil} (the default is @code{nil}), and the file has multiple
+names, use copying.
+
+@item
+Otherwise, if the variable @code{backup-by-copying-when-mismatch} is
+non-@code{nil} (the default is @code{t}), and renaming would change
+the file's owner or group, use copying.
+
+If you change @code{backup-by-copying-when-mismatch} to @code{nil},
+Emacs checks the numeric user-id of the file's owner.  If this is
+higher than @code{backup-by-copying-when-privileged-mismatch}, then it
+behaves as though @code{backup-by-copying-when-mismatch} is
+non-@code{nil} anyway.
+
+@item
+Otherwise, renaming is the default choice.
+@end itemize
 
   When a file is managed with a version control system (@pxref{Version
 Control}), Emacs does not normally make backups in the usual way for
@@ -725,28 +690,28 @@ Emacs---the version control system does it.
 if there isn't already one there.  If the value is @code{visit}, Emacs
 adds a newline at the end of any file that doesn't have one, just
 after it visits the file.  (This marks the buffer as modified, and you
-can undo it.)  If the value is @code{visit-save}, that means to add
+can undo it.)  If the value is @code{visit-save}, Emacs adds such
 newlines both on visiting and on saving.  If the value is @code{nil},
-Emacs leaves the end of the file unchanged; if it's neither @code{nil}
-nor @code{t}, Emacs asks you whether to add a newline.  The default is
+Emacs leaves the end of the file unchanged; any other non-@code{nil}
+value means to asks you whether to add a newline.  The default is
 @code{nil}.
 
 @vindex mode-require-final-newline
-  Many major modes are designed for specific kinds of files that are
-always supposed to end in newlines.  These major modes set the
-variable @code{require-final-newline} according to
-@code{mode-require-final-newline}.  By setting the latter variable,
-you can control how these modes handle final newlines.
+  Some major modes are designed for specific kinds of files that are
+always supposed to end in newlines.  Such major modes set the variable
+@code{require-final-newline} to the value of
+@code{mode-require-final-newline}, which defaults to @code{t}.  By
+setting the latter variable, you can control how these modes handle
+final newlines.
 
 @vindex write-region-inhibit-fsync
   When Emacs saves a file, it invokes the @code{fsync} system call to
 force the data immediately out to disk.  This is important for safety
 if the system crashes or in case of power outage.  However, it can be
-disruptive on laptops using power saving, because it requires the disk
-to spin up each time you save a file.  Setting
-@code{write-region-inhibit-fsync} to a non-@code{nil} value disables
-this synchronization.  Be careful---this means increased risk of data
-loss.
+disruptive on laptops using power saving, as it may force a disk
+spin-up each time you save a file.  If you accept an increased risk of
+data loss, you can set @code{write-region-inhibit-fsync} to a
+non-@code{nil} value to disable the synchronization.
 
 @node Interlocking
 @subsection Protection against Simultaneous Editing
@@ -754,9 +719,9 @@ loss.
 @cindex file dates
 @cindex simultaneous editing
   Simultaneous editing occurs when two users visit the same file, both
-make changes, and then both save them.  If nobody were informed that
-this was happening, whichever user saved first would later find that his
-changes were lost.
+make changes, and then both save them.  If nobody is informed that
+this is happening, whichever user saves first would later find that
+his changes were lost.
 
   On some systems, Emacs notices immediately when the second user starts
 to change the file, and issues an immediate warning.  On all systems,
@@ -794,38 +759,28 @@ contents remain unchanged---the modification you were trying to make
 does not actually take place.
 @end table
 
-  Note that locking works on the basis of a file name; if a file has
-multiple names, Emacs does not realize that the two names are the same file
-and cannot prevent two users from editing it simultaneously under different
-names.  However, basing locking on names means that Emacs can interlock the
-editing of new files that will not really exist until they are saved.
-
-  Some systems are not configured to allow Emacs to make locks, and
-there are cases where lock files cannot be written.  In these cases,
-Emacs cannot detect trouble in advance, but it still can detect the
-collision when you try to save a file and overwrite someone else's
-changes.  Every time Emacs saves a buffer, it first checks the
-last-modification date of the existing file on disk to verify that it
-has not changed since the file was last visited or saved.  If the date
-does not match, it implies that changes were made in the file in some
-other way, and these changes are about to be lost if Emacs actually
-does save.  To prevent this, Emacs displays a warning message and asks
-for confirmation before saving.  Occasionally you will know why the
-file was changed and know that it does not matter; then you can answer
-@kbd{yes} and proceed.  Otherwise, you should cancel the save with
-@kbd{C-g} and investigate the situation.
-
   If Emacs or the operating system crashes, this may leave behind lock
 files which are stale, so you may occasionally get warnings about
-spurious collisions.  When you determine that the collision is spurious,
-just use @kbd{p} to tell Emacs to go ahead anyway.
+spurious collisions.  When you determine that the collision is
+spurious, just use @kbd{p} to tell Emacs to go ahead anyway.
 
-  The first thing you should do when notified that simultaneous editing
-has already taken place is to list the directory with @kbd{C-u C-x C-d}
-(@pxref{Directories}).  This shows the file's current author.  You
-should attempt to contact him to warn him not to continue editing.
-Often the next step is to save the contents of your Emacs buffer under a
-different name, and use @code{diff} to compare the two files.@refill
+  Note that locking works on the basis of a file name; if a file has
+multiple names, Emacs does not prevent two users from editing it
+simultaneously under different names.
+
+  A lock file cannot be written in some circumstances, e.g. if Emacs
+lacks the system permissions or the system does not support symbolic
+links.  In these cases, Emacs can still detect the collision when you
+try to save a file, by checking the file's last-modification date.  If
+the file has changed since the last time Emacs visited or saved it,
+that implies that changes have been made in some other way, and will
+be lost if Emacs proceeds with saving.  Emacs then displays a warning
+message and asks for confirmation before saving; answer @kbd{yes} to
+save, and @kbd{no} or @kbd{C-g} cancel the save.
+
+  If you are notified that simultaneous editing has already taken
+place, one way to compare the buffer to its file is the @kbd{M-x
+diff-buffer-with-file} command.  @xref{Comparing Files}.
 
 @node File Shadowing
 @subsection Shadowing Files
@@ -881,10 +836,10 @@ shadow-define-cluster}.
 @cindex modification dates
 @cindex locale, date format
 
-You can arrange to put a time stamp in a file, so that it will be updated
+You can arrange to put a time stamp in a file, so that it is updated
 automatically each time you edit and save the file.  The time stamp
-has to be in the first eight lines of the file, and you should
-insert it like this:
+must be in the first eight lines of the file, and you should insert it
+like this:
 
 @example
 Time-stamp: <>
@@ -898,13 +853,13 @@ Time-stamp: " "
 @end example
 
 @findex time-stamp
-  Then add the hook function @code{time-stamp} to the hook
-@code{before-save-hook}; that hook function will automatically update
-the time stamp, inserting the current date and time when you save the
-file.  You can also use the command @kbd{M-x time-stamp} to update the
-time stamp manually.  For other customizations, see the Custom group
-@code{time-stamp}.  Note that non-numeric fields in the time stamp are
-formatted according to your locale setting (@pxref{Environment}).
+  Then add the function @code{time-stamp} to the hook
+@code{before-save-hook} (@pxref{Hooks}).  When you save the file, this
+function then automatically updates the time stamp with the current
+date and time.  You can also use the command @kbd{M-x time-stamp} to
+update the time stamp manually.  For other customizations, see the
+Custom group @code{time-stamp}.  Note that the time stamp is formatted
+according to your locale setting (@pxref{Environment}).
 
 @node Reverting
 @section Reverting a Buffer
@@ -912,18 +867,21 @@ formatted according to your locale setting (@pxref{Environment}).
 @cindex drastic changes
 @cindex reread a file
 
-  If you have made extensive changes to a file and then change your mind
-about them, you can get rid of them by reading in the previous version
-of the file.  To do this, use @kbd{M-x revert-buffer}, which operates on
-the current buffer.  Since reverting a buffer unintentionally could lose
-a lot of work, you must confirm this command with @kbd{yes}.
+  If you have made extensive changes to a file-visiting buffer and
+then change your mind, you can @dfn{revert} the changes and go back to
+the saved version of the file.  To do this, type @kbd{M-x
+revert-buffer}.  Since reverting unintentionally could lose a lot of
+work, Emacs asks for confirmation first.
 
-  @code{revert-buffer} tries to position point in such a way that, if
-the file was edited only slightly, you will be at approximately the
-same piece of text after reverting as before.  However, if you have made
-drastic changes, point may wind up in a totally different piece of text.
+  The @code{revert-buffer} command tries to position point in such a
+way that, if the file was edited only slightly, you will be at
+approximately the same part of the text as before.  But if you have
+made major changes, point may end up in a totally different location.
 
-  Reverting marks the buffer as ``not modified''.
+  Reverting marks the buffer as ``not modified''.  It also clears the
+buffer's undo history (@pxref{Undo}).  Thus, the reversion cannot be
+undone---if you change your mind yet again, you can't use the undo
+commands to bring the reverted changes back.
 
   Some kinds of buffers that are not associated with files, such as
 Dired buffers, can also be reverted.  For them, reverting means
@@ -950,15 +908,14 @@ discard your changes.)
 @findex auto-revert-mode
 @findex auto-revert-tail-mode
 @vindex auto-revert-interval
-
-  In addition, you can tell Emacs to periodically revert a buffer by
-typing @kbd{M-x auto-revert-mode}.  This turns on Auto-Revert mode, a
-minor mode that makes Emacs automatically revert the current buffer
-every five seconds.  You can change this interval through the variable
-@code{auto-revert-interval}.  Typing @kbd{M-x global-auto-revert-mode}
-enables Global Auto-Revert mode, which does the same for all file
-buffers.  Auto-Revert mode and Global Auto-Revert modes do not check
-or revert remote files, because that is usually too slow.
+  You can also tell Emacs to revert buffers periodically.  To do this
+for a specific buffer, enable the minor mode Auto-Revert mode by
+typing @kbd{M-x auto-revert-mode}.  This automatically reverts the
+current buffer every five seconds; you can change the interval through
+the variable @code{auto-revert-interval}.  To do the same for all file
+buffers, type @kbd{M-x global-auto-revert-mode} to enable Global
+Auto-Revert mode.  These minor modes do not check or revert remote
+files, because that is usually too slow.
 
   One use of Auto-Revert mode is to ``tail'' a file such as a system
 log, so that changes made to that file by other programs are
@@ -969,8 +926,9 @@ the end, use Auto-Revert Tail mode instead
 (@code{auto-revert-tail-mode}).  It is more efficient for this.
 Auto-Revert Tail mode works also for remote files.
 
-  @xref{VC Mode Line}, for Auto Revert peculiarities in buffers that
-visit files under version control.
+  @xref{VC Undo}, for commands to revert to earlier versions of files
+under version control.  @xref{VC Mode Line}, for Auto Revert
+peculiarities when visiting files under version control.
 
 @ifnottex
 @include arevert-xtra.texi
@@ -1061,40 +1019,41 @@ any auto-save file to go with the new visited name.
 @vindex auto-save-default
 @findex auto-save-mode
   Each time you visit a file, auto-saving is turned on for that file's
-buffer if the variable @code{auto-save-default} is non-@code{nil} (but not
-in batch mode; @pxref{Entering Emacs}).  The default for this variable is
-@code{t}, so auto-saving is the usual practice for file-visiting buffers.
-Auto-saving can be turned on or off for any existing buffer with the
-command @kbd{M-x auto-save-mode}.  Like other minor mode commands, @kbd{M-x
-auto-save-mode} turns auto-saving on with a positive argument, off with a
-zero or negative argument; with no argument, it toggles.
+buffer if the variable @code{auto-save-default} is non-@code{nil} (but
+not in batch mode; @pxref{Initial Options}).  The default for this
+variable is @code{t}, so auto-saving is the usual practice for
+file-visiting buffers.  To toggle auto-saving in the current buffer,
+type @kbd{M-x auto-save-mode}.  Auto Save mode acts as a buffer-local
+minor mode (@pxref{Minor Modes}).
 
 @vindex auto-save-interval
-  Emacs does auto-saving periodically based on counting how many characters
-you have typed since the last time auto-saving was done.  The variable
-@code{auto-save-interval} specifies how many characters there are between
-auto-saves.  By default, it is 300.  Emacs doesn't accept values that are
-too small: if you customize @code{auto-save-interval} to a value less
-than 20, Emacs will behave as if the value is 20.
+  Emacs auto-saves periodically based on how many characters you have
+typed since the last auto-save.  The variable
+@code{auto-save-interval} specifies how many characters there are
+between auto-saves.  By default, it is 300.  Emacs doesn't accept
+values that are too small: if you customize @code{auto-save-interval}
+to a value less than 20, Emacs will behave as if the value is 20.
 
 @vindex auto-save-timeout
-  Auto-saving also takes place when you stop typing for a while.  The
-variable @code{auto-save-timeout} says how many seconds Emacs should
-wait before it does an auto save (and perhaps also a garbage
-collection).  (The actual time period is longer if the current buffer is
-long; this is a heuristic which aims to keep out of your way when you
-are editing long buffers, in which auto-save takes an appreciable amount
-of time.)  Auto-saving during idle periods accomplishes two things:
-first, it makes sure all your work is saved if you go away from the
-terminal for a while; second, it may avoid some auto-saving while you
-are actually typing.
+  Auto-saving also takes place when you stop typing for a while.  By
+default, it does this after 30 seconds of idleness (at this time,
+Emacs may also perform garbage collection; @pxref{Garbage
+Collection,,, elisp, The Emacs Lisp Reference Manual}).  To change
+this interval, customize the variable @code{auto-save-timeout}.  The
+actual time period is longer if the current buffer is long; this is a
+heuristic which aims to keep out of your way when you are editing long
+buffers, in which auto-save takes an appreciable amount of time.
+Auto-saving during idle periods accomplishes two things: first, it
+makes sure all your work is saved if you go away from the terminal for
+a while; second, it may avoid some auto-saving while you are actually
+typing.
 
   Emacs also does auto-saving whenever it gets a fatal error.  This
 includes killing the Emacs job with a shell command such as @samp{kill
 %emacs}, or disconnecting a phone line or network connection.
 
 @findex do-auto-save
-  You can request an auto-save explicitly with the command @kbd{M-x
+  You can perform an auto-save explicitly with the command @kbd{M-x
 do-auto-save}.
 
 @node Recover
@@ -1138,13 +1097,11 @@ this---saving them---updates the files themselves.
 
 @vindex auto-save-list-file-prefix
   Emacs records information about interrupted sessions for later
-recovery in files named
-@file{~/.emacs.d/auto-save-list/.saves-@var{pid}-@var{hostname}}.  The
-directory used, @file{~/.emacs.d/auto-save-list/}, is determined by
-the variable @code{auto-save-list-file-prefix}.  You can record
-sessions in a different place by customizing that variable.  If you
-set @code{auto-save-list-file-prefix} to @code{nil} in your
-@file{.emacs} file, sessions are not recorded for recovery.
+recovery in files named @file{.saves-@var{pid}-@var{hostname}} in the
+directory @file{~/.emacs.d/auto-save-list/}.  This directory is
+determined by the variable @code{auto-save-list-file-prefix}.  If you
+set @code{auto-save-list-file-prefix} to @code{nil}, sessions are not
+recorded for recovery.
 
 @node File Aliases
 @section File Name Aliases
@@ -1292,8 +1249,8 @@ buffer named @samp{*diff*}.  This works by running the @command{diff}
 program, using options taken from the variable @code{diff-switches}.
 The value of @code{diff-switches} should be a string; the default is
 @code{"-c"} to specify a context diff.  @xref{Top,, Diff, diff,
-Comparing and Merging Files}, for more information about
-@command{diff} output formats.
+Comparing and Merging Files}, for more information about the
+@command{diff} program.
 
   The output of the @code{diff} command is shown using a major mode
 called Diff mode.  @xref{Diff Mode}.
@@ -1361,11 +1318,10 @@ merging files.
 @cindex patches, editing
 
   Diff mode is a major mode used for the output of @kbd{M-x diff} and
-other similar commands, as well as the output of the @command{diff}
-program.  This kind of output is called a @dfn{patch}, because it can
-be passed to the @command{patch} command to automatically apply the
-specified changes.  To select Diff mode manually, type @kbd{M-x
-diff-mode}.
+other similar commands.  This kind of output is called a @dfn{patch},
+because it can be passed to the @command{patch} command to
+automatically apply the specified changes.  To select Diff mode
+manually, type @kbd{M-x diff-mode}.
 
 @cindex hunk, diff
   The changes specified in a patch are grouped into @dfn{hunks}, which
@@ -1659,21 +1615,18 @@ Tar mode is used also for compressed archives---files with extensions
   The keys @kbd{e}, @kbd{f} and @key{RET} all extract a component file
 into its own buffer.  You can edit it there, and if you save the
 buffer, the edited version will replace the version in the Tar buffer.
-@kbd{v} extracts a file into a buffer in View mode (@pxref{View
-Mode}).  @kbd{o} extracts the file and displays it in another window,
-so you could edit the file and operate on the archive simultaneously.
-@kbd{d} marks a file for deletion when you later use @kbd{x}, and
+Clicking with the mouse on the file name in the Tar buffer does
+likewise.  @kbd{v} extracts a file into a buffer in View mode
+(@pxref{View Mode}).  @kbd{o} extracts the file and displays it in
+another window, so you could edit the file and operate on the archive
+simultaneously.
+
+  @kbd{d} marks a file for deletion when you later use @kbd{x}, and
 @kbd{u} unmarks a file, as in Dired.  @kbd{C} copies a file from the
 archive to disk and @kbd{R} renames a file within the archive.
-@kbd{g} reverts the buffer from the archive on disk.
-
-  The keys @kbd{M}, @kbd{G}, and @kbd{O} change the file's permission
-bits, group, and owner, respectively.
-
-  If your display supports colors and the mouse, moving the mouse
-pointer across a file name highlights that file name, indicating that
-you can click on it.  Clicking @kbd{Mouse-2} on the highlighted file
-name extracts the file into a buffer and displays that buffer.
+@kbd{g} reverts the buffer from the archive on disk.  The keys
+@kbd{M}, @kbd{G}, and @kbd{O} change the file's permission bits,
+group, and owner, respectively.
 
   Saving the Tar buffer writes a new version of the archive to disk with
 the changes you made to the components.
@@ -1690,19 +1643,20 @@ requires the appropriate uncompression program.
 @cindex @code{zip}
 @cindex @code{lzh}
 @cindex @code{zoo}
+@cindex @code{7z}
 @pindex arc
 @pindex jar
 @pindex zip
 @pindex rar
 @pindex lzh
 @pindex zoo
+@pindex 7z
 @cindex Java class archives
 @cindex unzip archives
-  A separate but similar Archive mode is used for archives produced by
-the programs @code{arc}, @code{jar}, @code{lzh}, @code{zip},
-@code{rar}, and @code{zoo}, which have extensions corresponding to the
-program names.  Archive mode also works for those @code{exe} files
-that are self-extracting executables.
+  A separate but similar Archive mode is used for @code{arc},
+@code{jar}, @code{lzh}, @code{zip}, @code{rar}, @code{7z}, and
+@code{zoo} archives, as well as @code{exe} files that are
+self-extracting executables.
 
   The key bindings of Archive mode are similar to those in Tar mode,
 with the addition of the @kbd{m} key which marks a file for subsequent
@@ -1712,11 +1666,11 @@ information, for those archive types where it won't fit in a single
 line.  Operations such as renaming a subfile, or changing its mode or
 owner, are supported only for some of the archive formats.
 
-  Unlike Tar mode, Archive mode runs the archiving program to unpack
-and repack archives.  Details of the program names and their options
-can be set in the @samp{Archive} Customize group.  However, you don't
-need these programs to look at the archive table of contents, only to
-extract or manipulate the subfiles in the archive.
+  Unlike Tar mode, Archive mode runs the archiving programs to unpack
+and repack archives.  However, you don't need these programs to look
+at the archive table of contents, only to extract or manipulate the
+subfiles in the archive.  Details of the program names and their
+options can be set in the @samp{Archive} Customize group.
 
 @node Remote Files
 @section Remote Files
@@ -1748,16 +1702,14 @@ Emacs chooses the method as follows:
 
 @enumerate
 @item
-If the host name starts with @samp{ftp.} (with dot), then Emacs uses
-FTP.
+If the host name starts with @samp{ftp.} (with dot), Emacs uses FTP.
 @item
-If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses
-FTP.
+If the user name is @samp{ftp} or @samp{anonymous}, Emacs uses FTP.
 @item
 If the variable @code{tramp-default-method} is set to @samp{ftp},
-then Emacs uses FTP.
+Emacs uses FTP.
 @item
-If @command{ssh-agent} is running, then Emacs uses @command{scp}.
+If @command{ssh-agent} is running, Emacs uses @command{scp}.
 @item
 Otherwise, Emacs uses @command{ssh}.
 @end enumerate
@@ -1769,32 +1721,31 @@ variable @code{tramp-mode} to @code{nil}.  You can turn off the
 feature in individual cases by quoting the file name with @samp{/:}
 (@pxref{Quoted File Names}).
 
+@cindex ange-ftp
   Remote file access through FTP is handled by the Ange-FTP package, which
 is documented in the following.  Remote file access through the other
 methods is handled by the Tramp package, which has its own manual.
 @xref{Top, The Tramp Manual,, tramp, The Tramp Manual}.
 
-When the Ange-FTP package is used, Emacs logs in through FTP using
-your user name or the name @var{user}.  It may ask you for a password
-from time to time (@pxref{Passwords}); this is used for logging in on
-@var{host}.  The form using @var{port} allows you to access servers
-running on a non-default TCP port.
+@vindex ange-ftp-default-user
+@cindex user name for remote file access
+  When the Ange-FTP package is used, Emacs logs in through FTP using
+the name @var{user}, if that is specified in the remote file name.  If
+@var{user} is unspecified, Emacs logs in using your user name on the
+local system; but if you set the variable @code{ange-ftp-default-user}
+to a string, that string is used instead.  When logging in, Emacs may
+also ask for a password.
 
 @cindex backups for remote files
 @vindex ange-ftp-make-backup-files
-  If you want to disable backups for remote files, set the variable
-@code{ange-ftp-make-backup-files} to @code{nil}.
+  For performance reasons, Emacs does not make backup files for files
+accessed via FTP by default.  To make it do so, change the variable
+@code{ange-ftp-make-backup-files} to a non-@code{nil} value.
 
-  By default, the auto-save files (@pxref{Auto Save Files}) for remote
-files are made in the temporary file directory on the local machine.
-This is achieved using the variable @code{auto-save-file-name-transforms}.
-
-@cindex ange-ftp
-@vindex ange-ftp-default-user
-@cindex user name for remote file access
-  Normally, if you do not specify a user name in a remote file name,
-that means to use your own user name.  But if you set the variable
-@code{ange-ftp-default-user} to a string, that string is used instead.
+  By default, auto-save files for remote files are made in the
+temporary file directory on the local machine, as specified by the
+variable @code{auto-save-file-name-transforms}.  @xref{Auto Save
+Files}.
 
 @cindex anonymous FTP
 @vindex ange-ftp-generate-anonymous-password
@@ -1950,10 +1901,10 @@ images as thumbnails.
 @findex filesets-init
   If you regularly edit a certain group of files, you can define them
 as a @dfn{fileset}.  This lets you perform certain operations, such as
-visiting, @code{query-replace}, and shell commands on all the files
-at once.  To make use of filesets, you must first add the expression
-@code{(filesets-init)} to your @file{.emacs} file (@pxref{Init File}).
-This adds a @samp{Filesets} menu to the menu bar.
+visiting, @code{query-replace}, and shell commands on all the files at
+once.  To make use of filesets, you must first add the expression
+@code{(filesets-init)} to your init file (@pxref{Init File}).  This
+adds a @samp{Filesets} menu to the menu bar.
 
 @findex filesets-add-buffer
 @findex filesets-remove-buffer
@@ -1980,7 +1931,7 @@ files in a fileset, and @kbd{M-x filesets-close} to close them.  Use
 a fileset.  These commands are also available from the @samp{Filesets}
 menu, where each existing fileset is represented by a submenu.
 
-   Emacs uses the concept of a fileset elsewhere @pxref{Version
-Control} to describe sets of files to be treated as a group for
-purposes of version control operations.  Those filesets are unnamed
-and do not persist across Emacs sessions.
+   @xref{Version Control}, for a different concept of ``filesets'':
+groups of files bundled together for version control operations.
+Filesets of that type are unnamed, and do not persist across Emacs
+sessions.
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 7a605100796..bae78d94744 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -7,17 +7,14 @@
 @cindex typos, fixing
 @cindex mistakes, correcting
 
-  In this chapter we describe the commands that are especially useful
-when you catch a mistake in your text after you have made it, or
-change your mind while composing text on the fly.
-
-  The most fundamental command for correcting erroneous editing is the
-undo command @kbd{C-/} (which is also bound to @kbd{C-x u} and
-@kbd{C-_}).  This undoes a single command, or a part of a command (as
-in the case of @code{query-replace}), or several consecutive
-self-inserting characters.  Consecutive repetitions of @kbd{C-/} undo
-earlier and earlier changes, back to the limit of the undo information
-available.
+  In this chapter we describe commands that are useful when you catch
+a mistake while editing.  The most fundamental command for correcting
+erroneous editing is the undo command @kbd{C-/} (which is also bound
+to @kbd{C-x u} and @kbd{C-_}).  This undoes a single command, or a
+part of a command (as in the case of @code{query-replace}), or several
+consecutive character insertions.  Consecutive repetitions of
+@kbd{C-/} undo earlier and earlier changes, back to the limit of the
+undo information available.
 
   Aside from the commands described here, you can erase text using
 deletion commands such as @key{DEL} (@code{delete-backward-char}).
@@ -231,18 +228,19 @@ case-convert it and go on typing.  @xref{Case}.@refill
   This section describes the commands to check the spelling of a
 single word or of a portion of a buffer.  These commands only work if
 the spelling checker program Aspell, Ispell or Hunspell is installed.
-Aspell, Ispell or Hunspell are not part of Emacs, but one or the other
-is usually installed in GNU/Linux and other free operating systems.
+These programs are not part of Emacs, but one of them is usually
+installed in GNU/Linux and other free operating systems.
 @ifnottex
 @xref{Top, Aspell,, aspell, The Aspell Manual}.
 @end ifnottex
 
 @table @kbd
 @item M-$
-Check and correct spelling of the active region or the word at point
-(@code{ispell-word}).
+Check and correct spelling of the word at point (@code{ispell-word}).
+If the region is active, do it for all words in the region instead.
 @item M-x ispell
-Check and correct spelling in the active region or the entire buffer.
+Check and correct spelling of all words in the buffer.  If the region
+is active, do it for all words in the region instead.
 @item M-x ispell-buffer
 Check and correct spelling in the buffer.
 @item M-x ispell-region
@@ -355,14 +353,13 @@ Show the list of options.
 @end table
 
 @findex ispell-complete-word
-  In Text mode and related modes, the command @kbd{M-@key{TAB}}
-(@code{ispell-complete-word}) shows a list of completions based on
+  In Text mode and related modes, @kbd{M-@key{TAB}}
+(@code{ispell-complete-word}) performs in-buffer completion based on
 spelling correction.  Insert the beginning of a 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}} or @kbd{C-M-i}.)  To choose one of the completions listed,
-click @kbd{Mouse-2} or @kbd{Mouse-1} fast on it, or move the cursor
-there in the completions window and type @key{RET}.  @xref{Text Mode}.
+@kbd{M-@key{TAB}}; this shows shows a list of completions.  (If your
+window manager intercepts @kbd{M-@key{TAB}}, type @kbd{@key{ESC}
+@key{TAB}} or @kbd{C-M-i}.)  Each completion is listed with a digit or
+character; type that digit or character to choose it.
 
 @cindex @code{ispell} program
 @findex ispell-kill-ispell
@@ -370,29 +367,27 @@ there in the completions window and type @key{RET}.  @xref{Text Mode}.
 to run, waiting for something to do, so that subsequent spell checking
 commands complete more quickly.  If you want to get rid of the
 process, use @kbd{M-x ispell-kill-ispell}.  This is not usually
-necessary, since the process uses no time except when you do spelling
-correction.
+necessary, since the process uses no processor time except when you do
+spelling correction.
 
 @vindex ispell-dictionary
 @vindex ispell-local-dictionary
 @vindex ispell-personal-dictionary
-@vindex ispell-complete-word-dict
-  Ispell, Aspell and Hunspell use two dictionaries together for spell checking:
-the standard dictionary and your private dictionary.  The standard
-dictionary is specified by @code{ispell-local-dictionary} or,
-if @code{nil}, by @code{ispell-dictionary}.  If both are @code{nil}
-the default dictionary is selected.  The command
-@kbd{M-x ispell-change-dictionary} sets the standard dictionary for
-the buffer and then restarts the subprocess, so that it will use a
-different standard dictionary.  Personal dictionary is specified by
-@code{ispell-personal-dictionary}.  If @code{nil}, default value is
-used.
-
-  Set variable @code{ispell-dictionary} to select a specific default
-dictionary for all your documents. Set variable
-@code{ispell-local-dictionary} in the local variables section to
-select a specific dictionary for a given document.
+@findex ispell-change-dictionary
+  Ispell, Aspell and Hunspell look up spelling in two dictionaries:
+the standard dictionary and your personal dictionary.  The standard
+dictionary is specified by the variable @code{ispell-local-dictionary}
+or, if that is @code{nil}, by the variable @code{ispell-dictionary}.
+If both are @code{nil}, the spelling program's default dictionary is
+used.  The command @kbd{M-x ispell-change-dictionary} sets the
+standard dictionary for the buffer and then restarts the subprocess,
+so that it will use a different standard dictionary.  Your personal
+dictionary is specified by the variable
+@code{ispell-personal-dictionary}.  If that is @code{nil}, the
+spelling program looks for a personal dictionary in a default
+location.
 
+@vindex ispell-complete-word-dict
   A separate dictionary is used for word completion.  The variable
 @code{ispell-complete-word-dict} specifies the file name of this
 dictionary.  The completion dictionary must be different because it
@@ -400,16 +395,14 @@ cannot use root and affix information.  For some languages, there
 is a spell checking dictionary but no word completion dictionary.
 
 @cindex Flyspell mode
+@cindex mode, Flyspell
 @findex flyspell-mode
-@findex turn-on-flyspell
-  Flyspell mode is a fully-automatic way to check spelling as you edit
-in Emacs.  It operates by checking words as you change or insert them.
-When it finds a word that it does not recognize, it highlights that
-word.  This does not interfere with your editing, but when you see the
-highlighted word, you can move to it and fix it.  Type @kbd{M-x
-flyspell-mode} to enable or disable this mode in the current buffer.
-To enable Flyspell mode in all text mode buffers, add
-@code{turn-on-flyspell} to @code{text-mode-hook}.
+  Flyspell mode is a minor mode that performs automatic spell checking
+as you type.  When it finds a word that it does not recognize, it
+highlights that word.  Type @kbd{M-x flyspell-mode} to toggle Flyspell
+mode in the current buffer.  To enable Flyspell mode in all text mode
+buffers, add @code{flyspell-mode} to @code{text-mode-hook}.
+@xref{Hooks}.
 
   When Flyspell mode highlights a word as misspelled, you can click on
 it with @kbd{Mouse-2} to display a menu of possible corrections and
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index ee417624120..e5853a17dd0 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -479,7 +479,7 @@ variable @code{fortran-break-before-delimiters} is @code{nil}.
 Otherwise (and by default), the break comes before the delimiter.
 
   To enable Auto Fill in all Fortran buffers, add
-@code{turn-on-auto-fill} to @code{fortran-mode-hook}.
+@code{auto-fill-mode} to @code{fortran-mode-hook}.
 @iftex
 @xref{Hooks,,, emacs, the Emacs Manual}.
 @end iftex
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 4c239d364f0..49222451cce 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -956,55 +956,43 @@ Parameters,,, elisp, The Emacs Lisp Reference Manual}.
 @cindex Scroll Bar mode
 @cindex mode, Scroll Bar
 
-  On graphical displays, Emacs normally makes a @dfn{scroll bar} at
-the left of each Emacs window, running the height of the
-window.@footnote{Placing it at the left is usually more useful with
-overlapping frames with text starting at the left margin.}
-
-  When Emacs is compiled with GTK+ support on the X Window System, or
-in operating systems such as Microsoft Windows or Mac OS, you can use
-the scroll bar as you do in other graphical applications.  If you
-click @kbd{Mouse-1} on the scroll bar's up and down buttons, that
-scrolls the window by one line at a time.  Clicking @kbd{Mouse-1}
-above or below the scroll bar's inner box scrolls the window by nearly
-the entire height of the window, like @kbd{M-v} and @kbd{C-v}
-respectively (@pxref{Moving Point}).  Dragging the inner box with
-@kbd{Mouse-1} scrolls the window continuously.
-
-  If Emacs is compiled without GTK+ support on the X Window System,
-the scroll bar behaves differently.  The scroll bar's inner box is
-drawn to represent the portion of the buffer currently displayed, with
-the entire height of the scroll bar representing the entire length of
-the buffer.  @kbd{Mouse-1} anywhere on the scroll bar scrolls forward
-like @kbd{C-v}, and @kbd{Mouse-3} scrolls backward like @kbd{M-v}.
-Clicking @kbd{Mouse-2} in the scroll bar lets you move or drag the
-inner box up and down.
-
-  You can also click @kbd{C-Mouse-2} in the scroll bar to split a
-window vertically.  The split occurs on the line where you click.
+  On graphical displays, there is a @dfn{scroll bar} on the side of
+each Emacs window.  Clicking @kbd{Mouse-1} on the scroll bar's up and
+down buttons scrolls the window by one line at a time.  Clicking
+@kbd{Mouse-1} above or below the scroll bar's inner box scrolls the
+window by nearly the entire height of the window, like @kbd{M-v} and
+@kbd{C-v} respectively (@pxref{Moving Point}).  Dragging the inner box
+scrolls continuously.
+
+  If Emacs is compiled on the X Window System without X toolkit
+support, the scroll bar behaves differently.  Clicking @kbd{Mouse-1}
+anywhere on the scroll bar scrolls forward like @kbd{C-v}, while
+@kbd{Mouse-3} scrolls backward like @kbd{M-v}.  Clicking @kbd{Mouse-2}
+in the scroll bar lets you drag the inner box up and down.
 
 @findex scroll-bar-mode
-@vindex scroll-bar-mode
-  You can toggle the use of the scroll bar with the command @kbd{M-x
-scroll-bar-mode}.  With a prefix argument, this command turns use of
-scroll bars on if and only if the argument is positive.  This command
-applies to all frames, including frames yet to be created.  Customize
-the variable @code{scroll-bar-mode} to control the use of scroll bars
-at startup.  You can use it to specify that they are placed at the
-right of windows if you prefer that.  You have to set this variable
-through the @samp{Customize} interface (@pxref{Easy Customization}),
-or it will not work properly.  You can also use the X resource
-@samp{verticalScrollBars} to control the initial setting of Scroll Bar
-mode.  @xref{Resources}.
-
 @findex toggle-scroll-bar
-  To enable or disable scroll bars for just the selected frame, use the
+  To toggle the use of scroll bars, type @kbd{M-x scroll-bar-mode}.
+This command applies to all frames, including frames yet to be
+created.  To toggle scroll bars for just the selected frame, use the
 command @kbd{M-x toggle-scroll-bar}.
 
+@vindex scroll-bar-mode
+  To control the use of scroll bars at startup, customize the variable
+@code{scroll-bar-mode}.  Its value should be either @code{right} (put
+scroll bars on the right side of windows), @code{left} (put them on
+the left), or @code{nil} (disable scroll bars).  By default, Emacs
+puts scroll bars on the right if it was compiled with GTK+ support on
+the X Window System, and on MS-Windows or Mac OS; Emacs puts scroll
+bars on the left if compiled on the X Window system without GTK+
+support (following the old convention for X applications).
+
 @vindex scroll-bar-width
 @cindex width of the scroll bar
-  You can control the scroll bar width by changing the value of the
-@code{scroll-bar-width} frame parameter.
+  You can also use the X resource @samp{verticalScrollBars} to enable
+or disable the scroll bars (@pxref{Resources}).  To control the scroll
+bar width, change the @code{scroll-bar-width} frame parameter
+(@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}).
 
 @node Wheeled Mice
 @section Scrolling With ``Wheeled'' Mice
@@ -1082,36 +1070,33 @@ menus' visual appearance.
 @cindex mode, Tool Bar
 @cindex icons, toolbar
 
-  The @dfn{tool bar} is a line (or lines) of icons at the top of the
-Emacs window, just below the menu bar.  You can click on these icons
-with the mouse to do various jobs.
-
-  The global tool bar contains general commands.  Some major modes
-define their own tool bars to replace it.  A few ``special'' modes
-that are not designed for ordinary editing remove some items from the
-global tool bar.
+  On graphical displays, Emacs puts a @dfn{tool bar} at the top of
+each frame, just below the menu bar.  This is a row of icons which you
+can click on with the mouse to invoke various commands.
 
-  Tool bars work only on a graphical display.  The tool bar uses colored
-XPM icons if Emacs was built with XPM support.  Otherwise, the tool
-bar uses monochrome icons (PBM or XBM format).
+  The global (default) tool bar contains general commands.  Some major
+modes define their own tool bars; whenever a buffer with such a major
+mode is current, the mode's tool bar replaces the global tool bar.
 
 @findex tool-bar-mode
 @vindex tool-bar-mode
-  You can turn display of tool bars on or off with @kbd{M-x
-tool-bar-mode} or by customizing the option @code{tool-bar-mode}.
+  To toggle the use of tool bars, type @kbd{M-x tool-bar-mode}.  This
+command applies to all frames, including frames yet to be created.  To
+control the use of tool bars at startup, customize the variable
+@code{tool-bar-mode}.
 
 @vindex tool-bar-style
 @cindex Tool Bar style
-  When Emacs is compiled with GTK+ support, tool bars can have text and images.
-Customize @code{tool-bar-style} to select style.  The default style is
-the same as for the desktop in the Gnome case.  If no default is found,
-the tool bar uses just images.
+  When Emacs is compiled with GTK+ support, each tool bar item can
+consist of an image, or a text label, or both.  By default, Emacs
+follows the Gnome desktop's tool bar style setting; if none is
+defined, it displays tool bar items as just images.  To impose a
+specific tool bar style, customize the variable @code{tool-bar-style}.
 
 @cindex Tool Bar position
-  You can also control the placement of the tool bar for the GTK+ tool bar
-with the frame parameter @code{tool-bar-position}.
-For a detailed description of frame parameters and customization,
-see @ref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}.
+  You can also control the placement of the tool bar for the GTK+ tool
+bar with the frame parameter @code{tool-bar-position}.  @xref{Frame
+Parameters,,, elisp, The Emacs Lisp Reference Manual}.
 
 @node Dialog Boxes
 @section Using Dialog Boxes
@@ -1186,11 +1171,11 @@ options for displaying tooltips, use @kbd{M-x customize-group
 customizing the windows that display tooltips.
 
 @vindex x-gtk-use-system-tooltips
-  If Emacs is built with GTK support, it displays tooltips via GTK,
-using the default appearance of GTK tooltips.  To disable this, change
-the variable @code{x-gtk-use-system-tooltips} to @code{nil}.  If you
-do this, or if Emacs is built without GTK support, the @code{tooltip}
-face specifies most attributes of the tooltip text.
+  If Emacs is built with GTK+ support, it displays tooltips via GTK+,
+using the default appearance of GTK+ tooltips.  To disable this,
+change the variable @code{x-gtk-use-system-tooltips} to @code{nil}.
+If you do this, or if Emacs is built without GTK+ support, the
+@code{tooltip} face specifies most attributes of the tooltip text.
 
 @node Mouse Avoidance
 @section Mouse Avoidance
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index a85edf101e5..c024d428511 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -70,7 +70,7 @@ meanings for it, but they all support @key{F1} for help.)
 * Package Keywords::    Finding Lisp libraries by keywords (topics).
 * Language Help::       Help relating to international language support.
 * Misc Help::           Other help commands.
-* Help Files::          Commands to display auxilliary help files.
+* Help Files::          Commands to display auxiliary help files.
 * Help Echo::           Help on active text and tooltips (`balloon help').
 @end menu
 
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 8689e9c8324..6237b00c2ee 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -736,7 +736,7 @@ insert rectangles, and commands to make blank rectangles.
 k} (@code{kill-rectangle}) to remove the text and and save it as the
 @dfn{last killed rectangle}.  In both cases, erasing the
 region-rectangle is like erasing the specified text on each line of
-the rectange; if there is any following text on the line, it moves
+the rectangle; if there is any following text on the line, it moves
 backwards to fill the gap.
 
   ``Killing'' a rectangle is not killing in the usual sense; the
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index ac81377aec9..4676983fc67 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -147,7 +147,7 @@ beginning of the line and then executing the macro.
 @findex kmacro-start-macro
 @findex kmacro-end-macro
   In addition to the @key{F3} and @key{F4} commands described above,
-Emacs also supports an older set of keybindings for defining and
+Emacs also supports an older set of key bindings for defining and
 executing keyboard macros.  To begin a macro definition, type @kbd{C-x
 (} (@code{kmacro-start-macro}); as with @key{F3}, a prefix argument
 appends this definition to the last keyboard macro.  To end a macro
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index f4a5a2858cf..5a97fa8460b 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -36,7 +36,7 @@ Support}), but we hope to improve it in the future.
 
   By default, the @key{alt} and @key{option} keys are the same as
 @key{Meta}.  The Mac @key{Cmd} key is the same as @key{Super}, and
-Emacs provides a set of keybindings using this modifier key that mimic
+Emacs provides a set of key bindings using this modifier key that mimic
 other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}).  You
 can change these bindings in the usual way (@pxref{Key Bindings}).
 
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index e84b4c9f080..bbe42551345 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -219,11 +219,11 @@ is sometimes available in ordinary buffers too.  @xref{Symbol
 Completion}.
 
 @menu
-* Example: Completion Example.    Examples of using completion.
-* Commands: Completion Commands.  A list of completion commands.
-* Strict Completion::             Different types of completion.
-* Completion Styles::             How completion matches are chosen.
-* Options: Completion Options.    Options for completion.
+* Completion Example::       Examples of using completion.
+* Completion Commands::      A list of completion commands.
+* Completion Exit::          Completion and minibuffer text submission.
+* Completion Styles::        How completion matches are chosen.
+* Completion Options::       Options for completion.
 @end menu
 
 @node Completion Example
@@ -274,7 +274,7 @@ Complete up to one word from the minibuffer text before point
 arguments that often include spaces, such as file names.
 @item @key{RET}
 Submit the text in the minibuffer as the argument, possibly completing
-first (@code{minibuffer-complete-and-exit}).  @xref{Strict Completion}.
+first (@code{minibuffer-complete-and-exit}).  @xref{Completion Exit}.
 @item ?
 Display a list of completions (@code{minibuffer-completion-help}).
 @end table
@@ -337,42 +337,68 @@ While in the completion list buffer, this moves point to the previous
 completion alternative (@code{previous-completion}).
 @end table
 
-@node Strict Completion
-@subsection Strict Completion
+@node Completion Exit
+@subsection Completion Exit
 
-  There are three ways that the @key{RET}
-(@code{minibuffer-complete-and-exit}) completion command can act,
-depending on how the argument will be used.
+@kindex RET @r{(completion in minibuffer)}
+@findex minibuffer-complete-and-exit
+  When a command reads an argument using the minibuffer with
+completion, it also controls what happens when you type @key{RET}
+(@code{minibuffer-complete-and-exit}) to submit the argument.  There
+are four types of behavior:
 
 @itemize @bullet
 @item
-@dfn{Strict} completion accepts only known completion candidates.  For
-example, when @kbd{C-x k} reads the name of a buffer to kill, only the
-name of an existing buffer makes sense.  In strict completion,
-@key{RET} refuses to exit if the text in the minibuffer does not
-complete to an exact match.
+@dfn{Strict completion} accepts only exact completion matches.  Typing
+@key{RET} exits the minibuffer only if the minibuffer text is an exact
+match, or completes to one.  Otherwise, Emacs refuses to exit the
+minibuffer; instead it tries to complete, and if no completion can be
+done it momentarily displays @samp{[No match]} after the minibuffer
+text.  (You can still leave the minibuffer by typing @kbd{C-g} to
+cancel the command.)
+
+An example of a command that uses this behavior is @kbd{M-x}, since it
+is meaningless for it to accept a non-existent command name.
 
 @item
-@dfn{Cautious} completion is similar to strict completion, except that
-@key{RET} exits only if the text is an already exact match.
-Otherwise, @key{RET} does not exit, but it does complete the text.  If
-that completes to an exact match, a second @key{RET} will exit.
+@dfn{Cautious completion} is like strict completion, except @key{RET}
+exits only if the text is already an exact match.  If the text
+completes to an exact match, @key{RET} performs that completion but
+does not exit yet; you must type a second @key{RET} to exit.
 
 Cautious completion is used for reading file names for files that must
 already exist, for example.
 
 @item
-@dfn{Permissive} completion allows any input; the completion
-candidates are just suggestions.  For example, when @kbd{C-x C-f}
-reads the name of a file to visit, any file name is allowed, including
-nonexistent file (in case you want to create a file).  In permissive
-completion, @key{RET} does not complete, it just submits the argument
-as you have entered it.
-@end itemize
+@dfn{Permissive completion} allows any input; the completion
+candidates are just suggestions.  Typing @key{RET} does not complete,
+it just submits the argument as you have entered it.
 
-  Like the other completion commands, @key{RET} displays a list of all
-possible completions whenever it is supposed to complete but is unable
-to complete any further.
+@cindex minibuffer confirmation
+@cindex confirming in the minibuffer
+@item
+@dfn{Permissive completion with confirmation} is like permissive
+completion, with an exception: if you typed @key{TAB} and this
+completed the text up to some intermediate state (i.e. one that is not
+yet an exact completion match), typing @key{RET} right afterward does
+not submit the argument.  Instead, Emacs asks for confirmation by
+momentarily displaying @samp{[Confirm]} after the text; type @key{RET}
+again to confirm and submit the text.  This catches a common mistake,
+in which one types @key{RET} before realizing that @key{TAB} did not
+complete as far as desired.
+
+@vindex confirm-nonexistent-file-or-buffer
+You can tweak the confirmation behavior by customizing the variable
+@code{confirm-nonexistent-file-or-buffer}.  The default value,
+@code{after-completion}, gives the behavior we have just described.
+If you change it to @code{nil}, Emacs does not ask for confirmation,
+falling back on permissive completion.  If you change it to any other
+non-@code{nil} value, Emacs asks for confirmation whether or not the
+preceding command was @key{TAB}.
+
+This behavior is used by most commands that read file names, like
+@kbd{C-x C-f}, and commands that read buffer names, like @kbd{C-x b}.
+@end itemize
 
 @node Completion Styles
 @subsection How Completion Alternatives Are Chosen
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 5745dd7c66c..2357902341e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1441,7 +1441,7 @@ parsed, and move point there (@code{semantic-complete-jump}).
 @kindex C-c , @key{SPC}
 Display a list of possible completions for the symbol at point
 (@code{semantic-complete-analyze-inline}).  This also activates a set
-of special keybindings for choosing a completion: @key{RET} accepts
+of special key bindings for choosing a completion: @key{RET} accepts
 the current completion, @kbd{M-n} and @kbd{M-p} cycle through possible
 completions, @key{TAB} completes as far as possible and then cycles,
 and @kbd{C-g} or any other key aborts completion.
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index b894d01b9bb..71c23655608 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1198,7 +1198,7 @@ Address mode:
 
 @c FIXME goto-addr.el commentary says to use goto-address instead.
 @smallexample
-(add-hook 'rmail-show-message-hook (lambda () (goto-address-mode 1)))
+(add-hook 'rmail-show-message-hook 'goto-address-mode)
 @end smallexample
 
 @noindent
@@ -1242,11 +1242,12 @@ coding system, the result should be readable.
 @node Rmail Editing
 @section Editing Within a Message
 
-  Most of the usual Emacs keybindings are available in Rmail mode, though a
-few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by Rmail for
-other purposes.  However, the Rmail buffer is normally read only, and
-most of the letters are redefined as Rmail commands.  If you want to
-edit the text of a message, you must use the Rmail command @kbd{e}.
+  Most of the usual Emacs key bindings are available in Rmail mode,
+though a few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by
+Rmail for other purposes.  However, the Rmail buffer is normally read
+only, and most of the letters are redefined as Rmail commands.  If you
+want to edit the text of a message, you must use the Rmail command
+@kbd{e}.
 
 @table @kbd
 @item e
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 14d4c678085..fcc31e30988 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -189,7 +189,7 @@ is sometimes useful to have this information.
 
   @var{cs} describes the character set of the text in the buffer
 (@pxref{Coding Systems}).  If it is a dash (@samp{-}), that indicates
-no special character set handling (with the possible expection of
+no special character set handling (with the possible exception of
 end-of-line conventions, described in the next paragraph).  @samp{=}
 means no conversion whatsoever, and is usually used for files
 containing non-textual data.  Other characters represent various
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index caf03291fbc..a8bd1cdf18d 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -60,7 +60,6 @@ Incremental search backward (@code{isearch-backward}).
                           or else edit the search string.
 * Isearch Scroll::      Scrolling during an incremental search.
 * Isearch Minibuffer::  Incremental search of the minibuffer history.
-* Slow Isearch::        Incremental search features for slow terminals.
 @end menu
 
 @node Basic Isearch
@@ -167,23 +166,27 @@ going past the original starting point of the search, it changes to
 you have already seen.
 
 @cindex search ring
+@kindex M-n @r{(Incremental search)}
+@kindex M-p @r{(Incremental search)}
   To reuse earlier search strings, use the @dfn{search ring}.  The
 commands @kbd{M-p} and @kbd{M-n} move through the ring to pick a
 search string to reuse.  These commands leave the selected search ring
-element in the minibuffer, where you can edit it.  To edit the current
-search string in the minibuffer without replacing it with items from
-the search ring, type @kbd{M-e}.  Type @kbd{C-s} or @kbd{C-r} to
-terminate editing the string and search for it.
+element in the minibuffer, where you can edit it.
+
+@kindex M-e @r{(Incremental search)}
+  To edit the current search string in the minibuffer without
+replacing it with items from the search ring, type @kbd{M-e}.  Type
+@kbd{C-s} or @kbd{C-r} to finish editing the string and search for it.
 
 @node Error in Isearch
 @subsection Errors in Incremental Search
 
   If your string is not found at all, the echo area says @samp{Failing
-I-Search}.  The cursor is after the place where Emacs found as much of
-your string as it could.  Thus, if you search for @samp{FOOT}, and
-there is no @samp{FOOT}, you might see the cursor after the @samp{FOO}
-in @samp{FOOL}.  In the echo area, the part of the search string that
-failed to match is highlighted using the customizable face
+I-Search}, and the cursor moves past the place where Emacs found as
+much of your string as it could.  Thus, if you search for @samp{FOOT},
+and there is no @samp{FOOT}, you might see the cursor after the
+@samp{FOO} in @samp{FOOL}.  In the echo area, the part of the search
+string that failed to match is highlighted using the face
 @code{isearch-fail}.
 
   At this point, there are several things you can do.  If your string
@@ -196,6 +199,7 @@ search string the characters that could not be found (the @samp{T} in
 entirely, returning point to where it was when the search started.
 
 @cindex quitting (in search)
+@kindex C-g @r{(Incremental search)}
   The quit command, @kbd{C-g}, does special things during searches;
 just what it does depends on the status of the search.  If the search
 has found what you specified and is waiting for input, @kbd{C-g}
@@ -264,69 +268,77 @@ use it (@pxref{Rebinding}).
 
 @vindex isearch-mode-map
   When incremental search is active, you can type @kbd{C-h C-h} to
-access interactive help options, including a list of special
-keybindings.  These keybindings are part of the keymap
+access interactive help options, including a list of special key
+bindings.  These key bindings are part of the keymap
 @code{isearch-mode-map} (@pxref{Keymaps}).
 
 @node Isearch Yank
 @subsection Isearch Yanking
 
+@kindex C-y @r{(Incremental search)}
+@kindex M-y @r{(Incremental search)}
+@findex isearch-yank-kill
+@findex isearch-yank-pop
   Within incremental search, @kbd{C-y} (@code{isearch-yank-kill})
-copies text from the kill ring into the search string.  It uses the
-same text that @kbd{C-y}, outside of incremental search, would
-normally yank into the buffer.  @kbd{Mouse-2} in the echo area does
-the same.  @xref{Yanking}.
-
-  @kbd{C-w} (@code{isearch-yank-word-or-char}) grabs the next
-character or word at point, and adds it to the search string.  This is
-convenient for searching for another occurrence of the text at point.
-(The decision, whether to copy a character or a word, is heuristic.)
-
-  Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) grabs the rest
-of the current line, and adds it to the search string.  If point is
-already at the end of a line, it grabs the entire next line.
+appends the current kill to the search string.  @kbd{M-y}
+(@code{isearch-yank-pop}), if called after @kbd{C-y}, replaces that
+appended text with an earlier kill, similar to the usual @kbd{M-y}
+(@code{yank-pop}) command (@pxref{Yanking}).  @kbd{Mouse-2} appends
+the current X selection (@pxref{Primary Selection}).
+
+@kindex C-w @r{(Incremental search)}
+@findex isearch-yank-word-or-char
+  @kbd{C-w} (@code{isearch-yank-word-or-char}) appends the next
+character or word at point to the search string.  This is an easy way
+to search for another occurrence of the text at point.  (The decision
+of whether to copy a character or a word is heuristic.)
+
+@kindex M-s C-e @r{(Incremental search)}
+@findex isearch-yank-line
+  Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) appends the rest
+of the current line to the search string.  If point is already at the
+end of a line, it appends the next line.
 
   If the search is currently case-insensitive, both @kbd{C-w} and
 @kbd{M-s C-e} convert the text they copy to lower case, so that the
 search remains case-insensitive.
 
-  @kbd{C-M-w} and @kbd{C-M-y} modify the search string by only one
-character at a time: @kbd{C-M-w} deletes the last character from the
-search string and @kbd{C-M-y} copies the character after point to the
-end of the search string.  An alternative method to add the character
-after point into the search string is to enter the minibuffer by
-@kbd{M-e} and to type @kbd{C-f} at the end of the search string in the
-minibuffer.
+@kindex C-M-w @r{(Incremental search)}
+@kindex C-M-y @r{(Incremental search)}
+@findex isearch-del-char
+@findex isearch-yank-char
+  @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character
+from the search string, and @kbd{C-M-y} (@code{isearch-yank-char})
+appends the character after point to the the search string.  An
+alternative method to add the character after point is to enter the
+minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f}
+at the end of the search string in the minibuffer.
 
 @node Isearch Scroll
 @subsection Scrolling During Incremental Search
 
 @vindex isearch-allow-scroll
-  You can enable the use of vertical scrolling during incremental
-search (without exiting the search) by setting the customizable
-variable @code{isearch-allow-scroll} to a non-@code{nil} value.  This
-applies to using the vertical scroll-bar and to certain keyboard
-commands such as @code{scroll-down-command}, @code{scroll-up-command}
-and @code{recenter} (@pxref{Scrolling}).  You must run these commands
-via their key sequences to stay in the search---typing @kbd{M-x} will
-terminate the search.  You can give prefix arguments to these commands
-in the usual way.
-
-  This feature won't let you scroll the current match out of visibility,
-however.
-
-  The feature also affects some other commands, such as @kbd{C-x 2}
-(@code{split-window-vertically}) and @kbd{C-x ^}
-(@code{enlarge-window}) which don't exactly scroll but do affect where
-the text appears on the screen.  In general, it applies to any command
-whose name has a non-@code{nil} @code{isearch-scroll} property.  So you
-can control which commands are affected by changing these properties.
+  Normally, scrolling commands exit incremental search.  If you change
+the variable @code{isearch-allow-scroll} to a non-@code{nil} value,
+that enables the use of the scroll-bar, as well as keyboard scrolling
+commands like @kbd{C-v}, @kbd{M-v}, and @kbd{C-l} (@pxref{Scrolling}).
+This applies only to calling these commands via their bound key
+sequences---typing @kbd{M-x} will still exit the search.  You can give
+prefix arguments to these commands in the usual way.  This feature
+won't let you scroll the current match out of visibility, however.
+
+  The @code{isearch-allow-scroll} feature also affects some other
+commands, such as @kbd{C-x 2} (@code{split-window-vertically}) and
+@kbd{C-x ^} (@code{enlarge-window}), which don't exactly scroll but do
+affect where the text appears on the screen.  It applies to any
+command whose name has a non-@code{nil} @code{isearch-scroll}
+property.  So you can control which commands are affected by changing
+these properties.
 
   For example, to make @kbd{C-h l} usable within an incremental search
 in all future Emacs sessions, use @kbd{C-h c} to find what command it
-runs.  (You type @kbd{C-h c C-h l}; it says @code{view-lossage}.)
-Then you can put the following line in your @file{.emacs} file
-(@pxref{Init File}):
+runs (@pxref{Key Help}), which is @code{view-lossage}.  Then you can
+put the following line in your init file (@pxref{Init File}):
 
 @example
 (put 'view-lossage 'isearch-scroll t)
@@ -359,33 +371,9 @@ wrap around, going from the last page to the first page or vice versa.
 When the current match is on a history element, that history element
 is pulled into the minibuffer.  If you exit the incremental search
 normally (e.g. by typing @key{RET}), it remains in the minibuffer
-afterwards.  Cancelling the search, with @kbd{C-g}, restores the
+afterwards.  Canceling the search, with @kbd{C-g}, restores the
 contents of the minibuffer when you began the search.
 
-@node Slow Isearch
-@subsection Slow Terminal Incremental Search
-
-  Incremental search on a slow terminal uses a modified style of display
-that is designed to take less time.  Instead of redisplaying the buffer at
-each place the search gets to, it creates a new single-line window and uses
-that to display the line that the search has found.  The single-line window
-comes into play as soon as point moves outside of the text that is already
-on the screen.
-
-  When you terminate the search, the single-line window is removed.
-Emacs then redisplays the window in which the search was done, to show
-its new position of point.
-
-@vindex search-slow-speed
-  The slow terminal style of display is used when the terminal baud rate is
-less than or equal to the value of the variable @code{search-slow-speed},
-initially 1200.  See also the discussion of the variable @code{baud-rate}
-(@pxref{baud-rate,, Customization of Display}).
-
-@vindex search-slow-window-lines
-  The number of lines to use in slow terminal search display is controlled
-by the variable @code{search-slow-window-lines}.  Its normal value is 1.
-
 @node Nonincremental Search
 @section Nonincremental Search
 @cindex nonincremental search
@@ -405,18 +393,14 @@ This enters the minibuffer to read the search string; terminate the
 string with @key{RET}, and then the search takes place.  If the string
 is not found, the search command signals an error.
 
-  When you type @kbd{C-s @key{RET}}, the @kbd{C-s} invokes incremental
-search as usual.  That command is specially programmed to invoke
-nonincremental search, @code{search-forward}, if the string you
-specify is empty.  (Such an empty argument would otherwise be
-useless.)  @kbd{C-r @key{RET}} does likewise, for a reverse
-incremental search.
-
 @findex search-forward
 @findex search-backward
-  Forward and backward nonincremental searches are implemented by the
-commands @code{search-forward} and @code{search-backward}.  These
-commands may be bound to other keys in the usual manner.
+  When you type @kbd{C-s @key{RET}}, the @kbd{C-s} invokes incremental
+search as usual.  That command is specially programmed to invoke the
+command for nonincremental search, @code{search-forward}, if the
+string you specify is empty.  (Such an empty argument would otherwise
+be useless.)  @kbd{C-r @key{RET}} does likewise, invoking the command
+@code{search-backward}.
 
 @node Word Search
 @section Word Search
@@ -476,7 +460,7 @@ apply to the lazy highlight, which always matches whole words.
 that denotes a class of alternative strings to match.  GNU Emacs
 provides both incremental and nonincremental ways to search for a
 match for a regexp.  The syntax of regular expressions is explained in
-the following section.
+the next section.
 
 @table @kbd
 @item C-M-s
@@ -531,7 +515,7 @@ starting position.  These search methods are not mirror images.
 
 @findex re-search-forward
 @findex re-search-backward
-  Nonincremental search for a regexp is done by the functions
+  Nonincremental search for a regexp is done with the commands
 @code{re-search-forward} and @code{re-search-backward}.  You can
 invoke these with @kbd{M-x}, or by way of incremental regexp search
 with @kbd{C-M-s @key{RET}} and @kbd{C-M-r @key{RET}}.
@@ -941,9 +925,9 @@ close-brackets, quotes, or parentheses, repeated zero or more times.
   Searches in Emacs normally ignore the case of the text they are
 searching through, if you specify the text in lower case.  Thus, if
 you specify searching for @samp{foo}, then @samp{Foo} and @samp{foo}
-are also considered a match.  Regexps, and in particular character
-sets, are included: @samp{[ab]} would match @samp{a} or @samp{A} or
-@samp{b} or @samp{B}.@refill
+also match.  Regexps, and in particular character sets, behave
+likewise: @samp{[ab]} matches @samp{a} or @samp{A} or @samp{b} or
+@samp{B}.@refill
 
   An upper-case letter anywhere in the incremental search string makes
 the search case-sensitive.  Thus, searching for @samp{Foo} does not find
@@ -985,8 +969,8 @@ command, there is @kbd{M-%} (@code{query-replace}), which presents
 each occurrence of the pattern and asks you whether to replace it.
 
   The replace commands normally operate on the text from point to the
-end of the buffer.  When the mark is active, they operate on the
-region instead (@pxref{Mark}).  The basic replace commands replace one
+end of the buffer.  When the region is active, they operate on it
+instead (@pxref{Mark}).  The basic replace commands replace one
 @dfn{search string} (or regexp) with one @dfn{replacement string}.  It
 is possible to perform several replacements in parallel, using the
 command @code{expand-region-abbrevs} (@pxref{Expanding Abbrevs}).
@@ -1023,7 +1007,7 @@ activating the mark; use @kbd{C-u C-@key{SPC}} to move back there.
 @xref{Mark Ring}.
 
   A prefix argument restricts replacement to matches that are
-surrounded by word boundaries.  The argument's value doesn't matter.
+surrounded by word boundaries.
 
   @xref{Replacement and Case}, for details about case-sensitivity in
 replace commands.
@@ -1153,10 +1137,8 @@ replacement is done without case conversion.
 
 @table @kbd
 @item M-% @var{string} @key{RET} @var{newstring} @key{RET}
-@itemx M-x query-replace @key{RET} @var{string} @key{RET} @var{newstring} @key{RET}
 Replace some occurrences of @var{string} with @var{newstring}.
 @item C-M-% @var{regexp} @key{RET} @var{newstring} @key{RET}
-@itemx M-x query-replace-regexp @key{RET} @var{regexp} @key{RET} @var{newstring} @key{RET}
 Replace some matches for @var{regexp} with @var{newstring}.
 @end table
 
@@ -1169,7 +1151,7 @@ occurrence and asks you whether to replace it.  Aside from querying,
 @code{query-replace} works just like @code{replace-string}
 (@pxref{Unconditional Replace}).  In particular, it preserves case
 provided @code{case-replace} is non-@code{nil}, as it normally is
-(@pxref{Replacement and Case}).  A numeric argument means consider
+(@pxref{Replacement and Case}).  A numeric argument means to consider
 only occurrences that are bounded by word-delimiter characters.
 
 @kindex C-M-%
@@ -1182,7 +1164,7 @@ like @code{query-replace}.
   These commands highlight the current match using the face
 @code{query-replace}.  They highlight other matches using
 @code{lazy-highlight} just like incremental search (@pxref{Incremental
-Search}).  By default, @code{query-replace-regexp} will show
+Search}).  By default, @code{query-replace-regexp} will show the
 substituted replacement string for the current match in the
 minibuffer.  If you want to keep special sequences @samp{\&} and
 @samp{\@var{n}} unexpanded, customize
@@ -1315,6 +1297,8 @@ matching that regexp.
 This command is just like @code{multi-isearch-buffers}, except it
 performs an incremental regexp search.
 
+@cindex Occur mode
+@cindex mode, Occur
 @item M-x occur
 Prompt for a regexp, and display a list showing each line in the
 buffer that contains a match for it.  To limit the search to part of
@@ -1325,16 +1309,22 @@ displayed before and after each matching line.
 @kindex RET @r{(Occur mode)}
 @kindex o @r{(Occur mode)}
 @kindex C-o @r{(Occur mode)}
-The buffer @samp{*Occur*} containing the output serves as a menu for
-finding the occurrences in their original context.  Click
-@kbd{Mouse-2} on an occurrence listed in @samp{*Occur*}, or position
-point there and type @key{RET}; this switches to the buffer that was
-searched and moves point to the original of the chosen occurrence.
-@kbd{o} and @kbd{C-o} display the match in another window; @kbd{C-o}
-does not select it.
-
-After using @kbd{M-x occur}, you can use @code{next-error} to visit
-the occurrences found, one by one.  @ref{Compilation Mode}.
+In the @samp{*Occur*} buffer, you can click on each entry, or move
+point there and type @key{RET}, to visit the corresponding position in
+the buffer that was searched.  @kbd{o} and @kbd{C-o} display the match
+in another window; @kbd{C-o} does not select it.  Alternatively, you
+can use the @kbd{C-x `} (@code{next-error}) command to visit the
+occurrences one by one (@pxref{Compilation Mode}).
+
+@cindex Occur Edit mode
+@cindex mode, Occur Edit
+Typing @kbd{e} in the @samp{*Occur*} buffer switches to Occur Edit
+mode, in which edits made to the entries are also applied to the text
+in the originating buffer.  Type @kbd{C-c C-c} to return to Occur
+mode.
+
+The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x
+occur}.
 
 @kindex M-s o
 @item M-s o
@@ -1342,9 +1332,6 @@ Run @code{occur} using the search string of the last incremental
 string search.  You can also run @kbd{M-s o} when an incremental
 search is active; this uses the current search string.
 
-@item M-x list-matching-lines
-Synonym for @kbd{M-x occur}.
-
 @item M-x multi-occur
 This command is just like @code{occur}, except it is able to search
 through multiple buffers.  It asks you to specify the buffer names one
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index dc92e4a519c..600d0b07818 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -343,8 +343,8 @@ details.
 additionally select the displaying window so that you can begin
 editing its buffer.  The command @kbd{C-x `} (@code{next-error}) is
 one example (@pxref{Compilation Mode}).  Such commands work by calling
-@code{pop-to-buffer} internally.  @xref{Displaying Buffers,,Displaying
-Buffers in Windows, elisp, The Emacs Lisp Reference Manual}.
+@code{pop-to-buffer} internally.  @xref{Switching Buffers,,Switching
+to a Buffer in a Window, elisp, The Emacs Lisp Reference Manual}.
 
   Commands with names ending in @code{-other-window} behave like
 @code{display-buffer}, except that they never display in the selected
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 02c2d2b8750..6b0ef9c5d8b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.3.
+
+        * trampver.texi: Update release number.
+
 2011-10-14  Glenn Morris  <rgm@gnu.org>
 
         * ert.texi (Introduction, How to Run Tests)
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 31d3ac0204f..63dc78dc4e8 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.2.3-pre
+@set trampver 2.2.3-24.1
 
 @c Other flags from configuration
 @set instprefix /usr/local