Disambiguate two slightly different uses of the term 'filesets'.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 68c150a67c9542abb824d616f41f5c8d957f7f6b..b5ff36e287930de74fcf1892983bda6764f0569f 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+       * files.texi: Disambiguate two slightly different uses of the term 
+       'filesets'.
+
 2007-10-18  Martin Rudalics  <rudalics@gmx.at>
 
        * trouble.texi (Quitting): Fix typo.

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 80feaea234022a8de5d697b59f6166279154591a..dc819bef178f87cbc97503e6b214c8cb38a44413 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1347,7 +1347,7 @@ distributed work.  It differs in many ways from old well-known
 systems, such as CVS and RCS.  It supports different transports for
 interoperating between users, offline operations, and it has good
 branching and merging features.  It also supports atomic commits of
-fileset changes, and keeps a history of file renaming and moving.  VC
+filesets, and keeps a history of file renaming and moving.  VC
 does not support all operations provided by GNU Arch, so you must
 sometimes invoke it from the command line, or use a specialized
 module.
@@ -1355,7 +1355,7 @@ module.
 @cindex git
   git is a version-control system invented by Linus Torvalds to
 support Linux kernel development.  Like GNU Arch, it supports atomic
-commits of fileset changes, and keeps a history of file renaming and
+commits of filesets, and keeps a history of file renaming and
 moving.  One significant feature of git is that it largely abolishes
 the notion of a single centralized repository; instead, each working
 copy of a git project is its own repository and coordination is done
@@ -1638,6 +1638,11 @@ marked files, but did not pass them to the version-control backends as
 a group.  Now it does, which enables VC to drive changeset-based
 version-control systems.
 
+   Emacs uses the concept of named filesets elsewhere
+(@pxref{Filesets}) to allow you to view and visit files in functional
+groups. Unlike those, VC filesets are not named and don't persist
+across sessions.
+
 @node Doing The Right Thing
 @subsubsection Performing the next operation in the development cycle
 
@@ -3061,6 +3066,11 @@ 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 essions.
+
 @ignore
    arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
 @end ignore