aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.
1028@vindex vc-cvs-stay-local 1028@vindex vc-cvs-stay-local
1029 In the above, if the repository were on a remote machine, VC only 1029 In the above, if the repository were on a remote machine, VC only
1030contacts it when the variable @code{vc-stay-local} (or 1030contacts it when the variable @code{vc-stay-local} (or
1031@code{vc-cvs-stay-local}) is @code{nil} (@pxref{CVS Options}). This is 1031@code{vc-cvs-stay-local}) is @code{nil}
1032because access to the repository may be slow, or you may be working 1032@iftex
1033offline and not have access to the repository at all. As a 1033(@pxref{CVS Options,,,emacs-xtra, Specialized Emacs Features}).
1034@end iftex
1035@ifnottex
1036(@pxref{CVS Options}).
1037@end ifnottex
1038This is because access to the repository may be slow, or you may be
1039working offline and not have access to the repository at all. As a
1034consequence, VC would not be able to tell you that @samp{file3.c} is 1040consequence, VC would not be able to tell you that @samp{file3.c} is
1035in the ``merge'' state; you would learn that only when you try to 1041in the ``merge'' state; you would learn that only when you try to
1036check-in your modified copy of the file, or use a command such as 1042check-in your modified copy of the file, or use a command such as