[src/trunk]: src/external/gpl2/xcvs/dist/doc cvs.1 & cvs.texinfo: add various...

[gutteridge <gutteridge%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a77ef14415a
branches:  trunk
changeset: 841151:9a77ef14415a
user:      gutteridge <gutteridge%NetBSD.org@localhost>
date:      Wed May 01 02:15:07 2019 +0000

description:
cvs.1 & cvs.texinfo: add various small corrections

Add various corrections mostly sourced from upstream's cvs.texinfo,
e.g., note NetBSD's local change to log admin commands in history
(subsequently added on upstream's HEAD, since it was noted in
r. 1.689), add some references to rannotate and rlog (from r. 1.686),
some amendments concerning rdiff (from r. 1.687), and miscellaneous
typo fixes.

diffstat:

 external/gpl2/xcvs/dist/doc/cvs.1       |  53 +++++++++++-----------
 external/gpl2/xcvs/dist/doc/cvs.texinfo |  76 ++++++++++++++++----------------
 2 files changed, 65 insertions(+), 64 deletions(-)

diffs (truncated from 407 to 300 lines):

diff -r b212f2184d86 -r 9a77ef14415a external/gpl2/xcvs/dist/doc/cvs.1
--- a/external/gpl2/xcvs/dist/doc/cvs.1 Tue Apr 30 23:42:53 2019 +0000
+++ b/external/gpl2/xcvs/dist/doc/cvs.1 Wed May 01 02:15:07 2019 +0000
@@ -1098,7 +1098,7 @@
 stable), and \fBRel\fR (for released).  By default,
 the state of a new revision is set to \fBExp\fR when
 it is created.  The state is visible in the output from
-\fIcvs log\fR (see node `log\(aq in the CVS manual), and in the
+\fIcvs log\fR (see node `log & rlog\(aq in the CVS manual), and in the
 \fB$\fP\fPLog$\fR and \fB$\fP\fPState$\fR keywords
 (see node `Keyword substitution\(aq in the CVS manual).  Note that \fBcvs\fR
 uses the \fBdead\fR state for its own purposes (see node `Attic\(aq in the CVS manual); to
@@ -1113,7 +1113,7 @@
 contents of the named \fIfile\fR into the RCS file,
 deleting the existing text.  The \fIfile\fR pathname
 may not begin with \fB-\fR.  The descriptive text can be seen in the
-output from \fBcvs log\fR (see node `log\(aq in the CVS manual).
+output from \fBcvs log\fR (see node `log & rlog\(aq in the CVS manual).
 There can be no space between \fB-t\fR and its argument.
 .SP
 If \fIfile\fR is omitted,
@@ -1171,9 +1171,10 @@
 this option has never done anything useful.
 .SP
 .SP
-.SH "annotate"
+.SH "annotate & rannotate"
 .SS "What revision modified each line of a file?"
 .IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: annotate [options] files\&...
@@ -1225,6 +1226,8 @@
 Annotate file as of specified date.
 .SP
 .SH "annotate example"
+.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 For example:
 .SP
@@ -1511,6 +1514,7 @@
 .SH "commit"
 .SS "Check files into the repository"
 .IX "commit (subcommand)"
+.IX "ci (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: commit [-lnRf] [-m \(aqlog_message\(aq |
@@ -1550,7 +1554,7 @@
 logging programs (see node `modules\(aq in the CVS manual, and see node `loginfo\(aq in the CVS manual)
 and placed in the \fBrcs\fR file inside the
 repository.  This log message can be retrieved with the
-\fBlog\fR command; see see node `log\(aq in the CVS manual.  You can specify the
+\fBlog\fR command (see node `log & rlog\(aq in the CVS manual).  You can specify the
 log message on the command line with the \fB-m
 \fImessage\fB\fR option, and thus avoid the editor invocation,
 or use the \fB-F \fIfile\fB\fR option to specify
@@ -1559,8 +1563,8 @@
 At \fBcommit\fR, a unique commitid is placed in the \fBrcs\fR
 file inside the repository. All files committed at once
 get the same commitid. The commitid can be retrieved with
-the \fBlog\fR and \fBstatus\fR command; see see node `log\(aq in the CVS manual,
-see node `File status\(aq in the CVS manual.
+the \fBlog\fR and \fBstatus\fR command (see node `log & rlog\(aq in the CVS manual,
+see node `File status\(aq in the CVS manual).
 .SP
 .SH "commit options"
 .SP
@@ -2821,6 +2825,12 @@
 .IP "" 4
 A file was removed.
 .SP
+One record type results from the admin command:
+.IP "" 2
+\fBX\fR
+.IP "" 4
+The admin command.
+.SP
 The options shown as \fB-flags\fR constrain or expand
 the report without requiring option arguments:
 .SP
@@ -3117,9 +3127,10 @@
 .PD
 .IP "" 0
 .SP
-.SH "log"
+.SH "log & rlog"
 .SS "Print out log information for files"
 .IX "log (subcommand)"
+.IX "rlog (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: log [options] [files\&...]
@@ -3488,7 +3499,7 @@
 .IX "rdiff (subcommand)"
 .SP
 .IP "\(bu" 2
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules\&...
+rdiff [options] {-r tag1[:date1] | -D date1} [-r tag2[:date2] | -D date2] modules\&...
 .IP "\(bu" 2
 Requires: repository.
 .IP "\(bu" 2
@@ -3499,10 +3510,7 @@
 Builds a Larry Wall format patch(1) file between two
 releases, that can be fed directly into the \fBpatch\fR
 program to bring an old release up-to-date with the new
-release.  (This is one of the few \fBcvs\fR commands that
-operates directly from the repository, and doesn\(aqt
-require a prior checkout.) The diff output is sent to
-the standard output device.
+release.  The diff output is sent to the standard output device.
 .SP
 You can specify (using the standard \fB-r\fR and
 \fB-D\fR options) any combination of one or two
@@ -3511,11 +3519,11 @@
 that revision or date and the current head revisions in
 the \fBrcs\fR file.
 .SP
-Note that if the software release affected is contained
-in more than one directory, then it may be necessary to
-specify the \fB-p\fR option to the \fBpatch\fR command when
-patching the old sources, so that \fBpatch\fR is able to find
-the files that are located in other directories.
+Note that if the patch created by rdiff spans multiple directories,
+then it may be necessary to specify the \fB-p\fR option when feeding
+the patch back to the \fBpatch\fR command, so that \fBpatch\fR is able
+to update files that are located in directories other than the one
+patch is run in.
 .SP
 .SH "rdiff options"
 .SP
@@ -3595,15 +3603,6 @@
 format, so if you plan to post this patch to the net
 you should probably not use \fB-u\fR.
 .SP
-.IP "" 0
-\fB-V \fIvn\fB\fR
-.IP "" 2
-Expand keywords according to the rules current in
-\fBrcs\fR version \fIvn\fR (the expansion format changed with
-\fBrcs\fR version 5).  Note that this option is no
-longer accepted.  \fBcvs\fR will always expand keywords the
-way that \fBrcs\fR version 5 does.
-.SP
 .SH "rdiff examples"
 .SP
 Suppose you receive mail from \fRfoo%example.net@localhost\fR asking for an
@@ -4078,7 +4077,7 @@
 .IX "update (subcommand)"
 .SP
 .IP "\(bu" 2
-update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files\&...
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] [files\&...]
 .IP "\(bu" 2
 Requires: repository, working directory.
 .IP "\(bu" 2
diff -r b212f2184d86 -r 9a77ef14415a external/gpl2/xcvs/dist/doc/cvs.texinfo
--- a/external/gpl2/xcvs/dist/doc/cvs.texinfo   Tue Apr 30 23:42:53 2019 +0000
+++ b/external/gpl2/xcvs/dist/doc/cvs.texinfo   Wed May 01 02:15:07 2019 +0000
@@ -3300,7 +3300,7 @@
 @c -- The contributed scripts
 @menu
 * From files::                  This method is useful with old projects
-                                where files already exists.
+                                where files already exist.
 * From other version control systems::  Old projects where you want to
                                         preserve history from another system.
 * From scratch::                Creating a directory tree from scratch.
@@ -5036,7 +5036,7 @@
 @c changing right away.
 
 Unlike most other commands, the @code{add} command is
-not recursive.  You have to expcicitly name files and
+not recursive.  You have to explicitly name files and
 directories that you wish to add to the repository.
 However, each directory will need to be added
 separately before you will be able to add new files
@@ -5615,7 +5615,7 @@
 @c greatly shrink the "log" node.
 To look through the log messages which have been
 specified for every revision which has been committed,
-use the @code{cvs log} command (@pxref{log}).
+use the @code{cvs log} command (@pxref{log & rlog}).
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 @node history database
@@ -8103,7 +8103,7 @@
 * Date input formats::         Acceptable formats for date specifications
 * add::                         Add files and directories to the repository
 * admin::                       Administration
-* annotate::                    What revision modified each line of a file?
+* annotate & rannotate::        What revision modified each line of a file?
 * checkout::                    Checkout sources for editing
 * commit::                      Check files into the repository
 * diff::                        Show differences between revisions
@@ -8111,7 +8111,7 @@
 * history::                     Show status of files and users
 * import::                      Import sources into CVS, using vendor branches
 * init::                        Initialize a repository
-* log::                         Show log messages for files
+* log & rlog::                  Show log messages for files
 * ls & rls::                    List files in the repository
 * rdiff::                       'patch' format diffs between releases
 * release::                     Indicate that a directory is no longer in use
@@ -9138,7 +9138,7 @@
 stable), and @samp{Rel} (for released).  By default,
 the state of a new revision is set to @samp{Exp} when
 it is created.  The state is visible in the output from
-@var{cvs log} (@pxref{log}), and in the
+@var{cvs log} (@pxref{log & rlog}), and in the
 @samp{$@splitrcskeyword{Log}$} and @samp{$@splitrcskeyword{State}$} keywords
 (@pxref{Keyword substitution}).  Note that @sc{cvs}
 uses the @code{dead} state for its own purposes (@pxref{Attic}); to
@@ -9151,7 +9151,7 @@
 contents of the named @var{file} into the RCS file,
 deleting the existing text.  The @var{file} pathname
 may not begin with @samp{-}.  The descriptive text can be seen in the
-output from @samp{cvs log} (@pxref{log}).
+output from @samp{cvs log} (@pxref{log & rlog}).
 There can be no space between @samp{-t} and its argument.
 
 If @var{file} is omitted,
@@ -9209,9 +9209,10 @@
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-@node annotate
-@appendixsec annotate---What revision modified each line of a file?
+@node annotate & rannotate
+@appendixsec annotate & rannotate---What revision modified each line of a file?
 @cindex annotate (subcommand)
+@cindex rannotate (subcommand)
 
 @itemize @bullet
 @item
@@ -9264,6 +9265,8 @@
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 @node annotate example
 @appendixsubsec annotate example
+@cindex annotate (subcommand)
+@cindex rannotate (subcommand)
 
 For example:
 
@@ -9532,6 +9535,7 @@
 @node commit
 @appendixsec commit---Check files into the repository
 @cindex commit (subcommand)
+@cindex ci (subcommand)
 
 @itemize @bullet
 @item
@@ -9573,7 +9577,7 @@
 logging programs (@pxref{modules}, and @pxref{loginfo})
 and placed in the @sc{rcs} file inside the
 repository.  This log message can be retrieved with the
-@code{log} command; see @ref{log}.  You can specify the
+@code{log} command (@pxref{log & rlog}).  You can specify the
 log message on the command line with the @samp{-m
 @var{message}} option, and thus avoid the editor invocation,
 or use the @samp{-F @var{file}} option to specify
@@ -9582,8 +9586,8 @@
 At @code{commit}, a unique commitid is placed in the @sc{rcs}
 file inside the repository. All files committed at once
 get the same commitid. The commitid can be retrieved with
-the @code{log} and @code{status} command; see @ref{log},
-@ref{File status}.
+the @code{log} and @code{status} command (@pxref{log & rlog},
+@pxref{File status}).
 
 @menu
 * commit options::              commit options
@@ -10590,6 +10594,13 @@
 @item R
 A file was removed.
 @end table
+
+@noindent
+One record type results from the admin command:
+@table @code
+@item X
+The admin command.
+@end table
 @end table
 
 The options shown as @samp{-flags} constrain or expand
@@ -10894,9 +10905,10 @@
 @end example
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-@node log
-@appendixsec log---Print out log information for files
+@node log & rlog
+@appendixsec log & rlog---Print out log information for files
 @cindex log (subcommand)
+@cindex rlog (subcommand)
 
 @itemize @bullet