procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't mention 'vc-stay-local' in the user manual

Browse source 
* doc/emacs/vc1-xtra.texi (CVS Options):
* doc/emacs/maintaining.texi (VC Directory Buffer): Remove
references to 'vc-stay-local', which no longer exists.
(Bug#30138)
This commit is contained in:
Eli Zaretskii 2018-01-20 14:44:01 +02:00
parent 8ce430bb50
commit cfc94fd245
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/maintaining.texi
View file

@ -1206,11 +1206,9 @@ file. RCS and SCCS show the name of the user locking a file as its
status. status.
@ifnottex @ifnottex
@vindex vc-stay-local On CVS, the @code{vc-dir} command normally contacts the repository,
On CVS and Subversion, the @code{vc-dir} command normally contacts which may be on a remote machine, to check for updates. If you change
the repository, which may be on a remote machine, to check for the variable @code{vc-cvs-stay-local} to @code{nil} (@pxref{CVS
updates. If you change the variable @code{vc-stay-local} or
@code{vc-cvs-stay-local} (for CVS) to @code{nil} (@pxref{CVS
Options}), then Emacs avoids contacting a remote repository when Options}), then Emacs avoids contacting a remote repository when
generating the VC Directory buffer (it will still contact it when generating the VC Directory buffer (it will still contact it when
necessary, e.g., when doing a commit). This may be desirable if you necessary, e.g., when doing a commit). This may be desirable if you

19
doc/emacs/vc1-xtra.texi
View file

@ -364,18 +364,13 @@ the name of the operation to invoke.
@cindex remote repositories (CVS) @cindex remote repositories (CVS)
When using a CVS repository on a remote machine, VC can try keeping When using a CVS repository on a remote machine, VC can try keeping
network interactions to a minimum. This is controlled by the variable network interactions to a minimum. This is controlled by the variable
@code{vc-cvs-stay-local}. There is another variable, @code{vc-cvs-stay-local}. If @code{vc-cvs-stay-local} is
@code{vc-stay-local}, which enables the feature also for other back @code{only-file} (the default), VC determines the version control
ends that support it, including CVS@. In the following, we will talk status of each file using only the entry in the local CVS subdirectory
only about @code{vc-cvs-stay-local}, but everything applies to and the information returned by previous CVS commands. As a
@code{vc-stay-local} as well. 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
If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC try to commit.
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 If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
remote repository @emph{before} it decides what to do in remote repository @emph{before} it decides what to do in