[Emacs-diffs] Changes to emacs/doc/emacs/vc2-xtra.texi,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/10/10 15:29:31

Index: vc2-xtra.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/vc2-xtra.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- vc2-xtra.texi       6 Sep 2007 04:49:08 -0000       1.1
+++ vc2-xtra.texi       10 Oct 2007 15:29:31 -0000      1.2
@@ -6,17 +6,20 @@
 @c printed version) or in the main Emacs manual (for the on-line version).
 @node Remote Repositories
 @subsection Remote Repositories
address@hidden remote repositories (CVS)
address@hidden remote repositories
 
-  A common way of using CVS is to set up a central CVS repository on
-some Internet host, then have each developer check out a personal
-working copy of the files on his local machine.  Committing changes to
-the repository, and picking up changes from other users into one's own
-working area, then works by direct interactions with the CVS server.
-
-  One difficulty is that access to the CVS server is often slow, and
-that developers might need to work off-line as well.  VC is designed
-to reduce the amount of network interaction necessary.
+  A common way of using CVS and other more advanced VCSes is to set up
+a central repository on some Internet host, then have each
+developer check out a personal working copy of the files on his local
+machine.  Committing changes to the repository, and picking up changes
+from other users into one's own working area, then works by direct
+interactions with the repository server.
+
+  One difficulty is that access to a repository server is often slow,
+and that developers might need to work off-line as well.  While only
+third-generation decentralized VCses such as GNU Arch or Mercurial
+really solve this problem, VC is designed to reduce the amount of
+network interaction necessary.
 
 @menu
 * Version Backups::        Keeping local copies of repository versions.
@@ -28,7 +31,7 @@
 @cindex version backups
 
 @cindex automatic version backups
-  When VC sees that the CVS repository for a file is on a remote
+  When VC sees that the repository for a file is on a remote
 machine, it automatically makes local backups of unmodified versions
 of the address@hidden version backups}.  This means that you
 can compare the file to the repository version (@kbd{C-x v =}), or
@@ -47,7 +50,7 @@
 @end ifnottex
 But they follow a similar naming convention.
 
-  For a file that comes from a remote CVS repository, VC makes a
+  For a file that comes from a remote repository, VC makes a
 version backup whenever you save the first changes to the file, and
 removes it after you have committed your modified version to the
 repository. You can disable the making of automatic version backups by