summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Rogers <rogers-emacs@rgrjr.dyndns.org>2010-11-23 00:18:26 -0800
committerGlenn Morris <rgm@gnu.org>2010-11-23 00:18:26 -0800
commit17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1 (patch)
treedaf4b7dba697057298e169a39b62589fba173305
parentb8e5cf1da0ef8f5e3cc37dd4276fe813f0305182 (diff)
downloademacs-17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1.tar.gz
emacs-17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1.tar.bz2
emacs-17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1.zip
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.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/maintaining.texi5
-rw-r--r--doc/emacs/vc1-xtra.texi6
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index db27d5c46f0..91cabc40c9d 100644
--- 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 68e521be4ca..a2240330a9d 100644
--- 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 5095c3f4764..04d37719013 100644
--- 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.