Minor clarifications.

(Numbered Backups): New node, split out from Backup Names.

1 files changed, 159 insertions, 148 deletions

diff --git a/man/files.texi b/man/files.texi
index 7b08fc5c791..b3cd615638c 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -68,21 +68,22 @@ a slash, it is interpreted with respect to the default directory.  The
 default directory is kept in the variable @code{default-directory},
 which has a separate value in every buffer.
 
-  For example, if the default file name is @file{/u/rms/gnu/gnu.tasks} then
-the default directory is @file{/u/rms/gnu/}.  If you type just @samp{foo},
-which does not specify a directory, it is short for @file{/u/rms/gnu/foo}.
-@samp{../.login} would stand for @file{/u/rms/.login}.  @samp{new/foo}
-would stand for the file name @file{/u/rms/gnu/new/foo}.
-
 @findex cd
 @findex pwd
   The command @kbd{M-x pwd} displays the current buffer's 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 that is visited in that buffer.  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.
+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.
+
+  For example, if the default file name is @file{/u/rms/gnu/gnu.tasks}
+then the default directory is normally @file{/u/rms/gnu/}.  If you
+type just @samp{foo}, which does not specify a directory, it is short
+for @file{/u/rms/gnu/foo}.  @samp{../.login} would stand for
+@file{/u/rms/.login}.  @samp{new/foo} would stand for the file name
+@file{/u/rms/gnu/new/foo}.
 
 @vindex insert-default-directory
   The default directory actually appears in the minibuffer when the
@@ -102,6 +103,14 @@ with @samp{/usr/tmp/} and you add @samp{/x1/rms/foo}, you get
 first slash in the double slash; the result is @samp{/x1/rms/foo}.
 @xref{Minibuffer File}.
 
+@cindex home directory shorthand
+  You can use @file{~/} in a file name to mean your home directory,
+or @file{~@var{user-id}/} to mean the home directory of a user whose
+login name is @code{user-id}.  (On DOS and Windows systems, where a user
+doesn't have a home directory, Emacs substitutes @file{~/} with the
+value of the environment variable @code{HOME}; see @ref{General
+Variables}.)
+
 @cindex environment variables in file names
 @cindex expansion of environment variables
 @cindex @code{$} in file names
@@ -120,14 +129,6 @@ is not defined).
   Note that shell commands to set environment variables affect Emacs
 only when done before Emacs is started.
 
-@cindex home directory shorthand
-  You can use @file{~/} in a file name to mean your home directory,
-or @file{~@var{user-id}/} to mean the home directory of a user whose
-login name is @code{user-id}.  (On DOS and Windows systems, where a user
-doesn't have a home directory, Emacs substitutes @file{~/} with the
-value of the environment variable @code{HOME}; see @ref{General
-Variables}.)
-
   To access a file with @samp{$} in its name, if the @samp{$} causes
 expansion, type @samp{$$}.  This pair is converted to a single
 @samp{$} at the same time as variable substitution is performed for a
@@ -136,7 +137,7 @@ single @samp{$}.  Alternatively, quote the whole file name with
 literal @samp{~} should also be quoted with @samp{/:}.
 
 @findex substitute-in-file-name
-  The Lisp function that performs the substitution is called
+  The Lisp function that performs the @samp{$}-substitution is called
 @code{substitute-in-file-name}.  The substitution is performed only on
 file names read as such using the minibuffer.
 
@@ -185,7 +186,7 @@ in that window, so you can always tell what buffer you are editing.
 
   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
-place permanent, until you @dfn{save} the buffer.  Saving the buffer
+permanent place, until you @dfn{save} the buffer.  Saving the buffer
 means that Emacs writes the current contents of the buffer into its
 visited file.  @xref{Saving}.
 
@@ -208,17 +209,17 @@ While in the minibuffer, you can abort @kbd{C-x C-f} by typing
 @kbd{C-g}.  File-name completion ignores certain filenames; for more
 about this, see @ref{Completion Options}.
 
-  Your confirmation that @kbd{C-x C-f} has completed successfully is 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 could not be created, or
-cannot be read, then you get an error, with an error message displayed
-in the echo area.
+  Your confirmation that @kbd{C-x C-f} has completed successfully is
+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, then you get an error,
+with an error message 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 that the file itself has not changed
-since you visited or saved it last.  If the file has changed, a warning
-message is shown.  @xref{Interlocking,,Simultaneous Editing}.
+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.
 
 @vindex large-file-warning-threshold
 @cindex maximum buffer size exceeded, error message
@@ -232,7 +233,7 @@ buffer size, which is around 256 megabytes on 32-bit machines
 saying that the maximum buffer size has been exceeded.
 
 @cindex file selection dialog
-  On graphical terminals, there are two additional methods for
+  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
@@ -313,9 +314,6 @@ buffer (after first offering to save it if it is modified).  When
 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 find a file which exists but cannot be read, @kbd{C-x C-f}
-signals an error.
-
 @kindex C-x 4 f
 @findex find-file-other-window
   @kbd{C-x 4 f} (@code{find-file-other-window}) is like @kbd{C-x C-f}
@@ -392,7 +390,7 @@ Save any or all buffers in their visited files (@code{save-some-buffers}).
 Forget that the current buffer has been changed (@code{not-modified}).
 With prefix argument (@kbd{C-u}), mark the current buffer as changed.
 @item C-x C-w
-Save the current buffer as a specified file name (@code{write-file}).
+Save the current buffer with a specified file name (@code{write-file}).
 @item M-x set-visited-file-name
 Change the file name under which the current buffer will be saved.
 @end table
@@ -464,9 +462,9 @@ saved.  (@samp{~} is often used as a mathematical symbol for `not'; thus
 a different file name, one which is not in use for anything important.
 Alternatively, you can cancel all the changes made since the file was
 visited or saved, by reading the text from the file again.  This is
-called @dfn{reverting}.  @xref{Reverting}.  You could also undo all the
+called @dfn{reverting}.  @xref{Reverting}.  (You could also undo all the
 changes by repeating the undo command @kbd{C-x u} until you have undone
-all the changes; but reverting is easier.
+all the changes; but reverting is easier.)  You can also kill the buffer.
 
 @findex set-visited-file-name
   @kbd{M-x set-visited-file-name} alters the name of the file that the
@@ -522,6 +520,9 @@ to make backup files.  By default it is @code{nil}, since backup files
 are redundant when you store all the previous versions in a version
 control system.  @xref{General VC Options}.
 
+  At your option, Emacs can keep either a single backup for each file,
+or make a series of numbered backup files for each file that you edit.
+
 @vindex backup-enable-predicate
 @vindex temporary-file-directory
 @vindex small-temporary-file-directory
@@ -530,9 +531,6 @@ prevents backup files being written for files in the directories used
 for temporary files, specified by @code{temporary-file-directory} or
 @code{small-temporary-file-directory}.
 
-  At your option, Emacs can keep either a single backup file or a series of
-numbered backup files for each file that you edit.
-
   Emacs makes a backup for a file only the first time the file is saved
 from one buffer.  No matter how many times you save a file, its backup file
 continues to contain the contents from before the file was visited.
@@ -550,19 +548,54 @@ backup from the previous contents, and arranges to make another from the
 newly saved contents if you save again.
 
 @menu
-* Names: Backup Names.          How backup files are named;
-                                  choosing single or numbered backup files.
+* One or More: Numbered Backups. Whether to make one backup file or many.
+* Names: Backup Names.          How backup files are named.
 * Deletion: Backup Deletion.    Emacs deletes excess numbered backups.
 * Copying: Backup Copying.      Backups can be made by copying or renaming.
 @end menu
 
+@node Numbered Backups
+@subsubsection Numbered Backups
+
+@vindex version-control
+  The choice of single backup file or multiple numbered backup files
+is controlled by the variable @code{version-control}.  Its possible
+values are:
+
+@table @code
+@item t
+Make numbered backups.
+@item nil
+Make numbered backups for files that have numbered backups already.
+Otherwise, make single backups.
+@item never
+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
+@code{version-control} locally in an individual buffer to control the
+making of backups for that buffer's file.  For example, Rmail mode
+locally sets @code{version-control} to @code{never} to make sure that
+there is only one backup for an Rmail file.  @xref{Locals}.
+
+@cindex @env{VERSION_CONTROL} environment variable
+  If you set the environment variable @env{VERSION_CONTROL}, to tell
+various GNU utilities what to do with backup files, Emacs also obeys the
+environment variable by setting the Lisp variable @code{version-control}
+accordingly at startup.  If the environment variable's value is @samp{t}
+or @samp{numbered}, then @code{version-control} becomes @code{t}; if the
+value is @samp{nil} or @samp{existing}, then @code{version-control}
+becomes @code{nil}; if it is @samp{never} or @samp{simple}, then
+@code{version-control} becomes @code{never}.
+
 @node Backup Names
 @subsubsection Single or Numbered Backups
 
-  If you choose to have a single backup file (this is the default),
-the backup file's name is normally constructed by appending @samp{~} to the
-file name being edited; thus, the backup file for @file{eval.c} would
-be @file{eval.c~}.
+  When Emacs makes a single backup file, its name is normally
+constructed by appending @samp{~} to the file name being edited; thus,
+the backup file for @file{eval.c} would be @file{eval.c~}.
 
 @vindex make-backup-file-name-function
 @vindex backup-directory-alist
@@ -593,36 +626,6 @@ through names like @file{eval.c.~259~} and beyond.  The variable
 @code{backup-directory-alist} applies to numbered backups just as
 usual.
 
-@vindex version-control
-  The choice of single backup or numbered backups is controlled by the
-variable @code{version-control}.  Its possible values are
-
-@table @code
-@item t
-Make numbered backups.
-@item nil
-Make numbered backups for files that have numbered backups already.
-Otherwise, make single backups.
-@item never
-Never make numbered backups; always make single backups.
-@end table
-
-@noindent
-You can set @code{version-control} locally in an individual buffer to
-control the making of backups for that buffer's file.  For example,
-Rmail mode locally sets @code{version-control} to @code{never} to make sure
-that there is only one backup for an Rmail file.  @xref{Locals}.
-
-@cindex @env{VERSION_CONTROL} environment variable
-  If you set the environment variable @env{VERSION_CONTROL}, to tell
-various GNU utilities what to do with backup files, Emacs also obeys the
-environment variable by setting the Lisp variable @code{version-control}
-accordingly at startup.  If the environment variable's value is @samp{t}
-or @samp{numbered}, then @code{version-control} becomes @code{t}; if the
-value is @samp{nil} or @samp{existing}, then @code{version-control}
-becomes @code{nil}; if it is @samp{never} or @samp{simple}, then
-@code{version-control} becomes @code{never}.
-
 @node Backup Deletion
 @subsubsection Automatic Deletion of Backups
 
@@ -822,6 +825,7 @@ different name, and use @code{diff} to compare the two files.@refill
 @subsection Shadowing Files
 @cindex shadow files
 @cindex file shadows
+@findex shadow-initialize
 
 @table @kbd
 @item M-x shadow-initialize
@@ -867,7 +871,6 @@ shadow-define-cluster}.
 
 @node Time Stamps
 @subsection Updating Time Stamps Automatically
-@findex time-stamp
 @cindex time stamps
 @cindex modification dates
 @cindex locale, date format
@@ -888,6 +891,7 @@ or like this:
 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
@@ -946,24 +950,26 @@ discard your changes.)
   You may find it useful to have Emacs revert files automatically when
 they change.  Three minor modes are available to do this.
 
-  @kbd{M-x global-auto-revert-mode} runs Global Auto-Revert mode,
+  @kbd{M-x global-auto-revert-mode} enables Global Auto-Revert mode,
 which periodically checks all file buffers and reverts when the
-corresponding file has changed.  @kbd{M-x auto-revert-mode} runs a
-local version, Auto-Revert mode, which applies only to the buffer in
-which it was activated.  Auto-Revert mode can be used to ``tail'' a
-file, such as a system log, so that changes made to that file by other
-programs are continuously displayed.  To do this, just move the point
-to the end of the buffer, and it will stay there as the file contents
-change.  However, if you are sure that the file will only change by
-growing at the end, you can tail the file more efficiently using
-Auto-Revert Tail mode, @kbd{M-x auto-revert-tail-mode}.
+corresponding file has changed.  @kbd{M-x auto-revert-mode} enables a
+local version, Auto-Revert mode, which applies only to the current
+buffer.
+
+  You can use Auto-Revert mode to ``tail'' a file such as a system
+log, so that changes made to that file by other programs are
+continuously displayed.  To do this, just move the point to the end of
+the buffer, and it will stay there as the file contents change.
+However, if you are sure that the file will only change by growing at
+the end, use Auto-Revert Tail mode instead
+(@vcode{auto-revert-tail-mode}).  It is more efficient for this.
 
 @vindex auto-revert-interval
   The variable @code{auto-revert-interval} controls how often to check
 for a changed file.  Since checking a remote file is too slow, these
 modes do not check or revert remote files.
 
-@xref{VC Mode Line}, for Auto Revert peculiarities in buffers that
+  @xref{VC Mode Line}, for Auto Revert peculiarities in buffers that
 visit files under version control.
 
 @node Auto Save
@@ -977,13 +983,13 @@ your keystrokes) without being asked.  This is called @dfn{auto-saving}.
 It prevents you from losing more than a limited amount of work if the
 system crashes.
 
-  When Emacs determines that it is time for auto-saving, each buffer is
-considered, and is auto-saved if auto-saving is turned on for it and it
-has been changed since the last time it was auto-saved.  The message
-@samp{Auto-saving...} is displayed in the echo area during auto-saving,
-if any files are actually auto-saved.  Errors occurring during
-auto-saving are caught so that they do not interfere with the execution
-of commands you have been typing.
+  When Emacs determines that it is time for auto-saving, it considers
+each buffer, and each is auto-saved if auto-saving is enabled for it
+and it has been changed since the last time it was auto-saved.  The
+message @samp{Auto-saving...} is displayed in the echo area during
+auto-saving, if any files are actually auto-saved.  Errors occurring
+during auto-saving are caught so that they do not interfere with the
+execution of commands you have been typing.
 
 @menu
 * Files: Auto Save Files.       The file where auto-saved changes are
@@ -1041,10 +1047,10 @@ saving.
 
 @vindex delete-auto-save-files
   A buffer's auto-save file is deleted when you save the buffer in its
-visited file.  To inhibit this, set the variable @code{delete-auto-save-files}
-to @code{nil}.  Changing the visited file name with @kbd{C-x C-w} or
-@code{set-visited-file-name} renames any auto-save file to go with
-the new visited name.
+visited file.  (You can inhibit this by setting the variable
+@code{delete-auto-save-files} to @code{nil}.)  Changing the visited
+file name with @kbd{C-x C-w} or @code{set-visited-file-name} renames
+any auto-save file to go with the new visited name.
 
 @node Auto Save Control
 @subsection Controlling Auto-Saving
@@ -1284,9 +1290,11 @@ merging, and use of symbolic links and meta-data in repositories.
 terms of capabilities, it is the weakest of the six that VC supports.
 VC compensates for certain features missing in SCCS (snapshots, for
 example) by implementing them itself, but some other VC features, such
-as multiple branches, are not available with SCCS.  You should use
-SCCS only if for some reason you cannot use RCS, or one of the
-higher-level systems such as CVS or GNU Arch.
+as multiple branches, are not available with SCCS.  Since SCCS is
+non-free, not respecting its users freedom,d, you should not use it;
+use its free replacement CSSC instead.  But you should use CSSC only
+if for some reason you cannot use RCS, or one of the higher-level
+systems such as CVS or GNU Arch.
 
 In the following, we discuss mainly RCS, SCCS and CVS.  Nearly
 everything said about CVS applies to GNU Arch, Subversion and Meta-CVS
@@ -1549,13 +1557,13 @@ Version Control}).
   When you check in changes, @kbd{C-x v v} first reads a log entry.  It
 pops up a buffer called @samp{*VC-Log*} for you to enter the log entry.
 
-Sometimes the @samp{*VC-Log*} buffer contains default text when you enter it,
+  Sometimes the @samp{*VC-Log*} buffer contains default text when you enter it,
 typically the last log message entered.  If it does, mark and point
 are set around the entire contents of the buffer so that it is easy to
 kill the contents of the buffer with @kbd{C-w}.
 
 @findex log-edit-insert-changelog
-If you work by writing entries in the @file{ChangeLog}
+  If you work by writing entries in the @file{ChangeLog}
 (@pxref{Change Log}) and then commit the change under revision
 control, you can generate the Log Edit text from the ChangeLog using
 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}).  This looks for
@@ -1565,13 +1573,13 @@ if the top entry was made under your user name on the current date.
 @xref{Change Logs and VC}, for the opposite way of
 working---generating ChangeLog entries from the revision control log.
 
-In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files})
+  In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files})
 shows the list of files to be committed in case you need to check
 that.  (This can be a list of more than one file if you use VC Dired
 mode or PCL-CVS.  @xref{VC Dired Mode}, and @ref{Top, , About PCL-CVS,
 pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.)
 
-When you have finished editing the log message, type @kbd{C-c C-c} to
+  When you have finished editing the log message, type @kbd{C-c C-c} to
 exit the buffer and commit the change.
 
   To abort check-in, just @strong{don't} type @kbd{C-c C-c} in that
@@ -1665,8 +1673,8 @@ them; they exist only in the records of the master file.
   For some backends, you can display the file @dfn{annotated} with
 per-line version information and using colors to enhance the visual
 appearance, with the command @kbd{M-x vc-annotate}.
-It creates a new buffer
-to display file's text, colored to show how old each part is.  Text
+It creates a new buffer (the ``annotate buffer'') displaying the
+file's text, with each part colored to show how old it is.  Text
 colored red is new, blue means old, and intermediate colors indicate
 intermediate ages.  By default, the time scale is 360 days, so that
 everything more than one year old is shown in blue.
@@ -1790,8 +1798,8 @@ changes to the current file, including the text of the log entries.  The
 output appears in a separate window.  The point is centered at the
 revision of the file that is currently being visited.
 
-From the change log buffer, the following keys are used to move
-between the logs of revisions and files, to view past revisions, and
+  In the change log buffer, you can use the following keys to move
+between the logs of revisions and of files, to view past revisions, and
 to view diffs:
 
 @table @kbd
@@ -2410,14 +2418,16 @@ or a snapshot against a named version.
 
 @cindex named configurations (RCS)
   VC's snapshot facilities are modeled on RCS's named-configuration
-support.  They use RCS's native facilities for this, so under VC
-snapshots made using RCS are visible even when you bypass VC.
+support.  They use RCS's native facilities for this, so
+snapshots made using RCS through VC are visible even when you bypass VC.
 
 @c worded verbosely to avoid overfull hbox.
   For SCCS, VC implements snapshots itself.  The files it uses contain
 name/file/version-number triples.  These snapshots are visible only
 through VC.
 
+@c ??? What about CVS?
+
   A snapshot is a set of checked-in versions.  So make sure that all the
 files are checked in and not locked when you make a snapshot.
 
@@ -2472,6 +2482,8 @@ most recent entry in the change log file.
 
 This command works with RCS or CVS only, not with SCCS.
 
+@c ??? What about other back ends?
+
 @item C-u C-x v a
 As above, but only find entries for the current buffer's file.
 
@@ -2625,6 +2637,8 @@ directly into working files.  Certain special strings called
 @dfn{version headers} are replaced in each successive version by the
 number of that version.
 
+@c ??? How does this relate to CVS?
+
   If you are using RCS, and version headers are present in your working
 files, Emacs can use them to determine the current version and the
 locking state of the files.  This is more reliable than referring to the
@@ -2657,7 +2671,7 @@ setting the variables @code{vc-@var{backend}-header} where
 each string in the list is inserted as a separate header on a line of
 its own.
 
-  It is often necessary to use ``superfluous'' backslashes when
+  It may be necessary to use apparently-superfluous backslashes when
 writing the strings that you put in this variable.  For instance, you
 might write @code{"$Id\$"} rather than @code{"$Id@w{$}"}.  The extra
 backslash prevents the string constant from being interpreted as a
@@ -2899,8 +2913,8 @@ only for repositories from hosts that match the pattern.
 listing} is a list of all the files in a directory.  Emacs provides
 commands to create and delete directories, and to make directory
 listings in brief format (file names only) and verbose format (sizes,
-dates, and authors included).  There is also a directory browser called
-Dired; see @ref{Dired}.
+dates, and authors included).  Emacs also includes a directory browser
+feature called Dired; see @ref{Dired}.
 
 @table @kbd
 @item C-x C-d @var{dir-or-pattern} @key{RET}
@@ -2950,9 +2964,10 @@ default).
 
 @vindex directory-free-space-program
 @vindex directory-free-space-args
-  Emacs adds information about the amount of free space on the disk
-that contains the directory.  To do this, it runs the program
-specified by @code{directory-free-space-program} with arguments
+  In verbose directory listings, Emacs adds information about the
+amount of free space on the disk that contains the directory.  To do
+this, it runs the program specified by
+@code{directory-free-space-program} with arguments
 @code{directory-free-space-args}.
 
 @node Comparing Files
@@ -2967,19 +2982,26 @@ running the @code{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.
 
-@findex diff-goto-source
-  After running @kbd{M-x diff}, you can use @kbd{C-x `} to visit
-successive changed locations in the two source files, as in
-Compilation mode (@pxref{Compilation Mode}.)  In the @samp{*diff*} buffer,
-you can move to a particular hunk of changes and type @kbd{C-c C-c}
-(@code{diff-goto-source}) to visit the corresponding source location.
-
 @findex diff-backup
   The command @kbd{M-x diff-backup} compares a specified file with its most
 recent backup.  If you specify the name of a backup file,
 @code{diff-backup} compares it with the source file that it is a backup
 of.
 
+@findex diff-goto-source
+@findex diff-mode
+@cindex Diff mode
+  The @samp{*diff*} buffer uses Diff mode, which enables you to use
+@kbd{C-x `} to visit successive changed locations in the two source
+files, as in Compilation mode (@pxref{Compilation Mode}.)  You can
+also move to a particular hunk of changes and type @kbd{C-c C-c}
+(@code{diff-goto-source}) to visit the corresponding source location.
+
+@cindex patches
+  Differences between versions of files are often distributed as
+patches, which are the output from the @command{diff} program.  You
+can use Diff mode to operate on a patch by typing @kbd{M-x diff-mode}.
+
 @findex compare-windows
   The command @kbd{M-x compare-windows} compares the text in the
 current window with that in the next window.  (For more information
@@ -2990,10 +3012,10 @@ one character at a time, until it reaches characters that don't match.
 Then the command exits.
 
   If point in the two windows is followed by non-matching text when
-the command starts, it tries heuristically to advance up to matching
-text in the two windows, and then exits.  So if you use @kbd{M-x
-compare-windows} repeatedly, each time it either skips one matching
-range or finds the start of another.
+the command starts, @kbd{M-x compare-windows} tries heuristically to
+advance up to matching text in the two windows, and then exits.  So if
+you use @kbd{M-x compare-windows} repeatedly, each time it either
+skips one matching range or finds the start of another.
 
 @vindex compare-ignore-case
 @vindex compare-ignore-whitespace
@@ -3004,16 +3026,6 @@ If the variable @code{compare-ignore-whitespace} is non-@code{nil},
 @code{compare-windows} normally ignores changes in whitespace, and a
 prefix argument turns that off.
 
-@findex diff-mode
-@cindex diffs
-@cindex patches
-@cindex Diff mode
-  Differences between versions of files are often distributed as
-@dfn{patches}, which are the output from @command{diff} or a version
-control system that uses @command{diff}.  @kbd{M-x diff-mode} turns on
-Diff mode, a major mode for viewing and editing patches, either as
-``unified diffs'' or ``context diffs.''
-
 @cindex Smerge mode
 @findex smerge-mode
 @cindex failed merges
@@ -3154,19 +3166,20 @@ mode called Tar mode which provides a Dired-like list of the contents
 would in Dired, and visit the subfiles contained in the archive.
 However, not all Dired commands are available in Tar mode.
 
-  If you enable Auto Compression mode (@pxref{Compressed Files}), then
+  If Auto Compression mode is enabled (@pxref{Compressed Files}), then
 Tar mode is used also for compressed archives---files with extensions
 @samp{.tgz}, @code{.tar.Z} and @code{.tar.gz}.
 
   The keys @kbd{e}, @kbd{f} and @key{RET} all extract a component file
-into its own buffer.  You can edit it there and when 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.  @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
+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.  @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.  @kbd{g} reverts the buffer from the archive on disk.
+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.
@@ -3282,8 +3295,6 @@ This is achieved using the variable @code{auto-save-file-name-transforms}.
   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.
-(The Emacs package that implements FTP file access is called
-@code{ange-ftp}.)
 
 @cindex anonymous FTP
 @vindex ange-ftp-generate-anonymous-password
@@ -3293,8 +3304,8 @@ are handled specially.  The variable
 @code{ange-ftp-generate-anonymous-password} controls what happens: if
 the value of this variable is a string, then that string is used as
 the password; if non-@code{nil} (the default), then the value of
-@code{user-mail-address} is used; if @code{nil}, the user is prompted
-for a password as normal.
+@code{user-mail-address} is used; if @code{nil}, then Emacs prompts
+you for a password as usual.
 
 @cindex firewall, and accessing remote files
 @cindex gateway, and remote file access with @code{ange-ftp}
@@ -3453,7 +3464,7 @@ This adds a @samp{Filesets} menu to the menu bar.
 
 @findex filesets-add-buffer
 @findex filesets-remove-buffer
-  The simplest way to define filesets is by adding files to them one
+  The simplest way to define a fileset is by adding files to it one
 at a time.  To add a file to fileset @var{name}, visit the file and
 type @kbd{M-x filesets-add-buffer @kbd{RET} @var{name} @kbd{RET}}.  If
 there is no fileset @var{name}, this creates a new one, which