aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/maintaining.texi8
-rw-r--r--doc/emacs/vc1-xtra.texi19
2 files changed, 10 insertions, 17 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 0846440d1de..cb53529cea7 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1206,11 +1206,9 @@ file. RCS and SCCS show the name of the user locking a file as its
1206status. 1206status.
1207 1207
1208@ifnottex 1208@ifnottex
1209@vindex vc-stay-local 1209 On CVS, the @code{vc-dir} command normally contacts the repository,
1210 On CVS and Subversion, the @code{vc-dir} command normally contacts 1210which may be on a remote machine, to check for updates. If you change
1211the repository, which may be on a remote machine, to check for 1211the variable @code{vc-cvs-stay-local} to @code{nil} (@pxref{CVS
1212updates. If you change the variable @code{vc-stay-local} or
1213@code{vc-cvs-stay-local} (for CVS) to @code{nil} (@pxref{CVS
1214Options}), then Emacs avoids contacting a remote repository when 1212Options}), then Emacs avoids contacting a remote repository when
1215generating the VC Directory buffer (it will still contact it when 1213generating the VC Directory buffer (it will still contact it when
1216necessary, e.g., when doing a commit). This may be desirable if you 1214necessary, e.g., when doing a commit). This may be desirable if you
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 6c4e0770dea..7a4b8e47019 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -364,18 +364,13 @@ the name of the operation to invoke.
364@cindex remote repositories (CVS) 364@cindex remote repositories (CVS)
365 When using a CVS repository on a remote machine, VC can try keeping 365 When using a CVS repository on a remote machine, VC can try keeping
366network interactions to a minimum. This is controlled by the variable 366network interactions to a minimum. This is controlled by the variable
367@code{vc-cvs-stay-local}. There is another variable, 367@code{vc-cvs-stay-local}. If @code{vc-cvs-stay-local} is
368@code{vc-stay-local}, which enables the feature also for other back 368@code{only-file} (the default), VC determines the version control
369ends that support it, including CVS@. In the following, we will talk 369status of each file using only the entry in the local CVS subdirectory
370only about @code{vc-cvs-stay-local}, but everything applies to 370and the information returned by previous CVS commands. As a
371@code{vc-stay-local} as well. 371consequence, if you have modified a file and somebody else has checked
372 372in other changes, you will not be notified of the conflict until you
373 If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC 373try to commit.
374determines the version control status of each file using only the
375entry in the local CVS subdirectory and the information returned by
376previous CVS commands. As a consequence, if you have modified a file
377and somebody else has checked in other changes, you will not be
378notified of the conflict until you try to commit.
379 374
380 If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the 375 If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
381remote repository @emph{before} it decides what to do in 376remote repository @emph{before} it decides what to do in