summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-07-09 02:52:14 +0000
committerGlenn Morris <rgm@gnu.org>2009-07-09 02:52:14 +0000
commit672fe986bf8d04fa405f9bdce99991b0c712079d (patch)
tree1500b7e9954d2087edd23b395b3a2c50277deb82 /doc
parent6b5a97b21861090c1463070e5f09fa5d0b610c06 (diff)
downloademacs-672fe986bf8d04fa405f9bdce99991b0c712079d.tar.gz
(VC Directory Buffer): Fix cross-reference.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/maintaining.texi12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index cd0a733c850..42522a3cbff 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1028,9 +1028,15 @@ need to merge them with the work file before you can check it in.
@vindex vc-cvs-stay-local
In the above, if the repository were on a remote machine, VC only
contacts it when the variable @code{vc-stay-local} (or
-@code{vc-cvs-stay-local}) is @code{nil} (@pxref{CVS Options}). This is
-because access to the repository may be slow, or you may be working
-offline and not have access to the repository at all. As a
+@code{vc-cvs-stay-local}) is @code{nil}
+@iftex
+(@pxref{CVS Options,,,emacs-xtra, Specialized Emacs Features}).
+@end iftex
+@ifnottex
+(@pxref{CVS Options}).
+@end ifnottex
+This is because access to the repository may be slow, or you may be
+working offline and not have access to the repository at all. As a
consequence, VC would not be able to tell you that @samp{file3.c} is
in the ``merge'' state; you would learn that only when you try to
check-in your modified copy of the file, or use a command such as