diff options
| author | Bob Rogers | 2010-11-23 00:18:26 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-11-23 00:18:26 -0800 |
| commit | 17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1 (patch) | |
| tree | daf4b7dba697057298e169a39b62589fba173305 | |
| parent | b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182 (diff) | |
| download | emacs-17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1.tar.gz 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/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 5 | ||||
| -rw-r--r-- | doc/emacs/vc1-xtra.texi | 6 |
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 @@ | |||
| 1 | 2010-11-23 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> | ||
| 2 | |||
| 3 | * maintaining.texi (VC With A Locking VCS, VC Directory Commands): | ||
| 4 | * vc1-xtra.texi (Customizing VC, General VC Options): Small fixes. | ||
| 5 | |||
| 1 | 2010-11-21 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-11-21 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * maintaining.texi (Version Control Systems): Fix repeated sentence. | 8 | * 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. | |||
| 524 | @end itemize | 524 | @end itemize |
| 525 | 525 | ||
| 526 | These rules also apply when you use CVS in locking mode, except | 526 | These rules also apply when you use CVS in locking mode, except |
| 527 | that there is no such thing as stealing a lock. | 527 | that CVS does not support stealing a lock. |
| 528 | 528 | ||
| 529 | @node Advanced C-x v v | 529 | @node Advanced C-x v v |
| 530 | @subsubsection Advanced Control in @kbd{C-x v v} | 530 | @subsubsection Advanced Control in @kbd{C-x v v} |
| @@ -1161,7 +1161,8 @@ directory buffer will be used. | |||
| 1161 | 1161 | ||
| 1162 | @kbd{M-s a C-s} does an incremental search on the marked files. | 1162 | @kbd{M-s a C-s} does an incremental search on the marked files. |
| 1163 | 1163 | ||
| 1164 | @kbd{M-s a C-M-s} does an incremental search on the marked files. | 1164 | @kbd{M-s a C-M-s} does an incremental regular expression search |
| 1165 | on the marked files. | ||
| 1165 | 1166 | ||
| 1166 | @cindex stashes in version control | 1167 | @cindex stashes in version control |
| 1167 | @cindex shelves in version control | 1168 | @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. | |||
| 594 | @vindex vc-handled-backends | 594 | @vindex vc-handled-backends |
| 595 | The variable @code{vc-handled-backends} determines which version | 595 | The variable @code{vc-handled-backends} determines which version |
| 596 | control systems VC should handle. The default value is @code{(RCS CVS | 596 | control systems VC should handle. The default value is @code{(RCS CVS |
| 597 | SVN SCCS BZR GIT HG Arch)}, so it contains all the version systems | 597 | SVN SCCS Bzr Git Hg Mtn Arch)}, so it contains all the version systems |
| 598 | that are currently supported. If you want VC to ignore one or more of | 598 | that are currently supported. If you want VC to ignore one or more of |
| 599 | these systems, exclude its name from the list. To disable VC entirely, | 599 | these systems, exclude its name from the list. To disable VC entirely, |
| 600 | set this variable to @code{nil}. | 600 | set this variable to @code{nil}. |
| @@ -657,8 +657,8 @@ variable does not affect @kbd{C-x v c}; that operation is so drastic | |||
| 657 | that it should always ask for confirmation.) | 657 | that it should always ask for confirmation.) |
| 658 | 658 | ||
| 659 | @vindex vc-command-messages | 659 | @vindex vc-command-messages |
| 660 | VC mode does much of its work by running the shell commands for RCS, | 660 | VC mode does much of its work by running the shell commands for the |
| 661 | CVS and SCCS. If @code{vc-command-messages} is non-@code{nil}, VC | 661 | appropriate backend. If @code{vc-command-messages} is non-@code{nil}, VC |
| 662 | displays messages to indicate which shell commands it runs, and | 662 | displays messages to indicate which shell commands it runs, and |
| 663 | additional messages when the commands finish. | 663 | additional messages when the commands finish. |
| 664 | 664 | ||