Minor doc fix.

* lisp/vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
* lisp/vc/vc-hooks.el (vc-stay-local): Doc fix.
* doc/emacs/vc1-xtra.texi (CVS Options): Fix the default value of
  `vc-cvs-stay-local'.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 31fd58f..9f9f7da 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,7 @@
 2013-06-09  Xue Fuqiao  <xfq.free@gmail.com>
 
        * vc1-xtra.texi (Revision Tags): Add a cross reference.
+       (CVS Options): Fix the default value of `vc-cvs-stay-local'.
 
 2013-06-07  Xue Fuqiao  <xfq.free@gmail.com>
 

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 0b10960..96e1718 100644 (file)
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -384,12 +384,12 @@ ends that support it, including CVS@.  In the following, we will talk
 only about @code{vc-cvs-stay-local}, but everything applies to
 @code{vc-stay-local} as well.
 
-  If @code{vc-cvs-stay-local} is @code{t} (the default), VC determines
-the version control status of each file using only the entry in the
-local CVS subdirectory and the information returned by previous CVS
-commands.  As a consequence, if you have modified a file and somebody
-else has checked in other changes, you will not be notified of the
-conflict until you try to commit.
+  If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC
+determines the version control status of each file using only the
+entry in the local CVS subdirectory and the information returned by
+previous CVS commands.  As a consequence, if you have modified a file
+and somebody else has checked in other changes, you will not be
+notified of the conflict until you try to commit.
 
   If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
 remote repository @emph{before} it decides what to do in

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7173c5..a6f45a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-09  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
+
+       * vc/vc-hooks.el (vc-stay-local): Doc fix.
+
 2013-06-09  Aidan Gauland  <aidalgol@amuri.net>
 
        * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused

diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index eee8960..17b278d 100644 (file)
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -115,7 +115,7 @@ This is only meaningful if you don't use the implicit checkout model
 This avoids slow queries over the network and instead uses heuristics
 and past information to determine the current status of a file.
 
-If value is the symbol `only-file' `vc-dir' will connect to the
+If value is the symbol `only-file', `vc-dir' will connect to the
 server, but heuristics will be used to determine the status for
 all other VC operations.
 

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 5c8a451..284481e 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -128,7 +128,7 @@ See also variable `vc-consult-headers'."
 This avoids slow queries over the network and instead uses heuristics
 and past information to determine the current status of a file.
 
-If value is the symbol `only-file' `vc-dir' will connect to the
+If value is the symbol `only-file', `vc-dir' will connect to the
 server, but heuristics will be used to determine the status for
 all other VC operations.