[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100236: Small VC fixes for doc/emacs.

[Glenn Morris]

------------------------------------------------------------
revno: 100236
author: Bob Rogers <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-11-23 00:18:26 -0800
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/maintaining.texi
  doc/emacs/vc1-xtra.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-11-21 16:05:27 +0000
+++ b/doc/emacs/ChangeLog       2010-11-23 08:18:26 +0000
@@ -1,3 +1,8 @@
+2010-11-23  Bob Rogers  <address@hidden>
+
+       * 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  <address@hidden>
 
        * maintaining.texi (Version Control Systems): Fix repeated sentence.

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2010-11-21 16:05:27 +0000
+++ b/doc/emacs/maintaining.texi        2010-11-23 08:18:26 +0000
@@ -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

=== modified file 'doc/emacs/vc1-xtra.texi'
--- a/doc/emacs/vc1-xtra.texi   2010-06-23 02:46:43 +0000
+++ b/doc/emacs/vc1-xtra.texi   2010-11-23 08:18:26 +0000
@@ -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 address@hidden, VC
+  VC mode does much of its work by running the shell commands for the
+appropriate backend.  If @code{vc-command-messages} is address@hidden, VC
 displays messages to indicate which shell commands it runs, and
 additional messages when the commands finish.