Module Name:    src
Committed By:   gutteridge
Date:           Fri Jul  5 22:42:09 UTC 2019

Modified Files:
        src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: a couple of minor corrections

Add a caveat about file locking (a.k.a. reserved checkouts) to the
"release" command, and add a missing word elsewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.11 -r1.12 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.10 src/external/gpl2/xcvs/dist/doc/cvs.1:1.11
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.10	Wed May  1 02:15:07 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Fri Jul  5 22:42:09 2019
@@ -908,7 +908,7 @@ editing a given file at a time).  See th
 that file for details (and see the \fBREADME\fR file
 in that directory for disclaimers about the unsupported
 nature of contrib).  According to comments in that
-file, locking must set to strict (which is the default).
+file, locking must be set to strict (which is the default).
 .SP
 .IP "" 0
 \fB-L\fR
@@ -3654,8 +3654,9 @@ Requires: Working directory.
 Changes: Working directory, history log.
 .SP
 This command is meant to safely cancel the effect of
-\fBcvs checkout\fR.  Since \fBcvs\fR doesn\(aqt lock files, it
-isn\(aqt strictly necessary to use this command.  You can
+\fBcvs checkout\fR.  Since \fBcvs\fR doesn\(aqt lock files
+(except for the \fBcvs admin -l\fR command, see node `admin options\(aq in the CVS manual),
+it isn\(aqt strictly necessary to use this command.  You can
 always simply delete your working directory, if you
 like; but you risk losing changes you may have
 forgotten, and you leave no trace in the \fBcvs\fR history

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.11 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.12
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.11	Wed May  1 02:15:07 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Fri Jul  5 22:42:09 2019
@@ -8970,7 +8970,7 @@ editing a given file at a time).  See th
 that file for details (and see the @file{README} file
 in that directory for disclaimers about the unsupported
 nature of contrib).  According to comments in that
-file, locking must set to strict (which is the default).
+file, locking must be set to strict (which is the default).
 
 @item -L
 Set locking to strict.  Strict locking means that the
@@ -11370,8 +11370,9 @@ Changes: Working directory, history log.
 @end itemize
 
 This command is meant to safely cancel the effect of
-@samp{cvs checkout}.  Since @sc{cvs} doesn't lock files, it
-isn't strictly necessary to use this command.  You can
+@samp{cvs checkout}.  Since @sc{cvs} doesn't lock files
+(except for the @code{cvs admin -l} command, @pxref{admin options}),
+it isn't strictly necessary to use this command.  You can
 always simply delete your working directory, if you
 like; but you risk losing changes you may have
 forgotten, and you leave no trace in the @sc{cvs} history

Reply via email to