aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi20
2 files changed, 14 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 279a9a47ec3..544cdd8f676 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12007-10-13 Eric S. Raymond <esr@snark.thyrsus.com>
2
3 * files.texi: Capitalize node names according to convention.
4
12007-10-13 Glenn Morris <rgm@gnu.org> 52007-10-13 Glenn Morris <rgm@gnu.org>
2 6
3 * misc.texi (Interactive Shell): Correct INSIDE_EMACS reference. 7 * misc.texi (Interactive Shell): Correct INSIDE_EMACS reference.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 78c72dac330..80feaea2340 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1595,15 +1595,15 @@ system, but is usually not excessive.
1595@subsection Basic Editing under Version Control 1595@subsection Basic Editing under Version Control
1596 1596
1597@menu 1597@menu
1598* Selecting a fileset:: Choosing a set of files to operate on 1598* Selecting A Fileset:: Choosing a set of files to operate on
1599* Doing the next logical thing:: Stepping forward in the development cycle 1599* Doing The Right Thing:: Stepping forward in the development cycle
1600* VC with a locking VCS:: RCS in its default mode, SCCS, and optionally CVS. 1600* VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS.
1601* VC with a merging VCS:: Without locking: default mode for CVS. 1601* VC With A Merging VCS:: Without locking: default mode for CVS.
1602* Advanced C-x v v:: Advanced features available with a prefix argument. 1602* Advanced C-x v v:: Advanced features available with a prefix argument.
1603* Log Buffer:: Features available in log entry buffers. 1603* Log Buffer:: Features available in log entry buffers.
1604@end menu 1604@end menu
1605 1605
1606@node Selecting a fileset 1606@node Selecting A Fileset
1607@subsubsection Choosing the scope of your command 1607@subsubsection Choosing the scope of your command
1608 1608
1609@cindex filesets 1609@cindex filesets
@@ -1638,7 +1638,7 @@ marked files, but did not pass them to the version-control backends as
1638a group. Now it does, which enables VC to drive changeset-based 1638a group. Now it does, which enables VC to drive changeset-based
1639version-control systems. 1639version-control systems.
1640 1640
1641@node Doing the next logical thing 1641@node Doing The Right Thing
1642@subsubsection Performing the next operation in the development cycle 1642@subsubsection Performing the next operation in the development cycle
1643 1643
1644 The principal VC command is an all-purpose command that performs 1644 The principal VC command is an all-purpose command that performs
@@ -1667,7 +1667,7 @@ accidentally edit a file without properly checking it out first. To
1667achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only} 1667achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only}
1668in your @file{~/.emacs} file. (@xref{Init Rebinding}.) 1668in your @file{~/.emacs} file. (@xref{Init Rebinding}.)
1669 1669
1670@node VC with a locking VCS 1670@node VC With A Locking VCS
1671@subsubsection Basic Version Control with Locking 1671@subsubsection Basic Version Control with Locking
1672 1672
1673 If locking is used for the file (as with SCCS, and RCS in its default 1673 If locking is used for the file (as with SCCS, and RCS in its default
@@ -1698,7 +1698,7 @@ formerly locked the file, to inform him of what has happened.
1698 These rules also apply when you use CVS in locking mode, except 1698 These rules also apply when you use CVS in locking mode, except
1699that there is no such thing as stealing a lock. 1699that there is no such thing as stealing a lock.
1700 1700
1701@node VC with a merging VCS 1701@node VC With A Merging VCS
1702@subsubsection Basic Version Control with Merging 1702@subsubsection Basic Version Control with Merging
1703 1703
1704 When your version-control system is merging-based rather than 1704 When your version-control system is merging-based rather than