Small VC fixes for doc/emacs.

* doc/emacs/maintaining.texi (VC With A Locking VCS, VC Directory Commands):
* doc/emacs/vc1-xtra.texi (Customizing VC, General VC Options): Small fixes.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index db27d5c46f0e9bec004b0c61c70e14fd273ad80a..91cabc40c9d37f610340e92fd2df4e347e33c980 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-23  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
+
+       * maintaining.texi (VC With A Locking VCS, VC Directory Commands):
+       * vc1-xtra.texi (Customizing VC, General VC Options): Small fixes.
+
 2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * maintaining.texi (Version Control Systems): Fix repeated sentence.

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 68e521be4ca2b5137143d074d89530c81e720369..a2240330a9d26c2d478c0af0bee57a36e3083453 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -524,7 +524,7 @@ locked the file, to inform him of what has happened.
 @end itemize
 
   These rules also apply when you use CVS in locking mode, except
-that there is no such thing as stealing a lock.
+that CVS does not support stealing a lock.
 
 @node Advanced C-x v v
 @subsubsection Advanced Control in @kbd{C-x v v}
@@ -1161,7 +1161,8 @@ directory buffer will be used.
 
   @kbd{M-s a C-s} does an incremental search on the marked files.
 
-  @kbd{M-s a C-M-s} does an incremental search on the marked files.
+  @kbd{M-s a C-M-s} does an incremental regular expression search
+on the marked files.
 
 @cindex stashes in version control
 @cindex shelves in version control

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 5095c3f4764a12d6c605527d98a5f50c5906e112..04d37719013c5e47f7c068d7bd6de46133b7ddf8 100644 (file)
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -594,7 +594,7 @@ headers.
 @vindex vc-handled-backends
 The variable @code{vc-handled-backends} determines which version
 control systems VC should handle.  The default value is @code{(RCS CVS
-SVN SCCS BZR GIT HG Arch)}, so it contains all the version systems
+SVN SCCS Bzr Git Hg Mtn Arch)}, so it contains all the version systems
 that are currently supported.  If you want VC to ignore one or more of
 these systems, exclude its name from the list.  To disable VC entirely,
 set this variable to @code{nil}.
@@ -657,8 +657,8 @@ variable does not affect @kbd{C-x v c}; that operation is so drastic
 that it should always ask for confirmation.)
 
 @vindex vc-command-messages
-  VC mode does much of its work by running the shell commands for RCS,
-CVS and SCCS.  If @code{vc-command-messages} is non-@code{nil}, VC
+  VC mode does much of its work by running the shell commands for the
+appropriate backend.  If @code{vc-command-messages} is non-@code{nil}, VC
 displays messages to indicate which shell commands it runs, and
 additional messages when the commands finish.