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

[Eric S. Raymond]

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

Index: files.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/files.texi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- files.texi  10 Oct 2007 13:24:29 -0000      1.5
+++ files.texi  10 Oct 2007 15:03:07 -0000      1.6
@@ -1262,9 +1262,9 @@
 
 @menu
 * Why Version Control?:: Understanding the problems it addresses
-* Version Systems::  Supported version control back-end systems.
-* VC Concepts::      Words and concepts related to version control.
-* Types of Log File::    The per-file VC log in contrast to the ChangeLog.
+* Version Control Systems:: Supported version control back-end systems.
+* VCS Concepts::            Words and concepts related to version control.
+* Types of Log File::       The VCS log in contrast to the ChangeLog.
 @end menu
 
 @node Why Version Control?
@@ -1287,7 +1287,7 @@
 are an important aid to memory; for a multi-person project they 
 become a vitally important form of communication among developers.
 
address@hidden Version Systems
address@hidden Version Control Systems
 @subsubsection Supported Version Control Systems
 
 @cindex back end (version control)
@@ -1368,11 +1368,11 @@
 @cindex Mercurial
   Mercurial is a distributed version-control systems broadly
 resembling GNU Arch and git, with atomic fileset commits and
-rename/move histories.  Like git it is fully decventralized.
+rename/move histories.  Like git it is fully decentralized.
 VC fully supports Mercurial, except for repository sync operations
 which still need to be done from the command line.
 
address@hidden VC Concepts
address@hidden VCS Concepts
 @subsubsection Concepts of Version Control
 
 @cindex repository
@@ -1448,7 +1448,7 @@
 between them as much as possible.
 
 @cindex files versus changesets.
-  On SCCS. RCS, CVS, and other early version-control systems, checkins
+  On SCCS, RCS, CVS, and other early version-control systems, checkins
 and other operations are @dfn{file-based}; each file has its own
 @dfn{master file} with its own comment- and revision history separate
 from that of all other files in the system.  Later systems, beginning
@@ -1475,7 +1475,6 @@
 ``commit'' and ``update''.
 
 @cindex centralized vs. decentralized
-
   Early version-control systems were designed around a @dfn{centralized}
 model in which each project has only one repository used by all
 developers.  SCCS, RCS, CVS, and Subversion share this kind of model.
@@ -1584,6 +1583,15 @@
 @node Basic VC Editing
 @subsection Basic Editing under Version Control
 
address@hidden
+* Selecting a fileset::          Choosing a set of files to operate on 
+* Doing the next logical thing:: Stepping forward in the development cycle
+* VC with a locking VCS::     RCS in its default mode, SCCS, and optionally 
CVS.
+* VC with a merging VCS::     Without locking: default mode for CVS.
+* Advanced C-x v v::    Advanced features available with a prefix argument.
+* Log Buffer::          Features available in log entry buffers.
address@hidden menu
+
 @node Selecting a fileset
 @subsubsection Choosing the scope of your command
 
@@ -1647,14 +1655,7 @@
 achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only}
 in your @file{~/.emacs} file.  (@xref{Init Rebinding}.)
 
address@hidden
-* VC with Locking::     RCS in its default mode, SCCS, and optionally CVS.
-* Without Locking::     Without locking: default mode for CVS.
-* Advanced C-x v v::    Advanced features available with a prefix argument.
-* Log Buffer::          Features available in log entry buffers.
address@hidden menu
-
address@hidden VC with Locking
address@hidden VC with a locking VCS
 @subsubsection Basic Version Control with Locking
 
   If locking is used for the file (as with SCCS, and RCS in its default
@@ -1685,8 +1686,8 @@
   These rules also apply when you use CVS in locking mode, except
 that there is no such thing as stealing a lock.
 
address@hidden Without Locking
address@hidden Basic Version Control without Locking
address@hidden VC with a merging VCS
address@hidden Basic Version Control with Merging
 
   When your version-control system is merging-based rather than
 locking-based---the default for CVS and Subversion, and the way GNU