# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1290500306 28800
# Node ID 6e3b84ac704d59af57b6bf654604deed53282f98
# Parent  b9089a7c21abdbf8eb494e6fb770e9e523799234
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 -r b9089a7c21ab -r 6e3b84ac704d doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Mon Nov 22 20:09:29 2010 +0200
+++ b/doc/emacs/ChangeLog	Tue Nov 23 00:18:26 2010 -0800
@@ -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 -r b9089a7c21ab -r 6e3b84ac704d doc/emacs/maintaining.texi
--- a/doc/emacs/maintaining.texi	Mon Nov 22 20:09:29 2010 +0200
+++ b/doc/emacs/maintaining.texi	Tue Nov 23 00:18:26 2010 -0800
@@ -524,7 +524,7 @@
 @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 @@
 
   @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 -r b9089a7c21ab -r 6e3b84ac704d doc/emacs/vc1-xtra.texi
--- a/doc/emacs/vc1-xtra.texi	Mon Nov 22 20:09:29 2010 +0200
+++ b/doc/emacs/vc1-xtra.texi	Tue Nov 23 00:18:26 2010 -0800
@@ -594,7 +594,7 @@
 @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 @@
 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.