[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/20 12:43:52

Modified files:
        doc            : ChangeLog cvs.1 cvs.texinfo stamp-vti 
                         version.texi 

Log message:
        * cvs.texinfo (CVS commands): Correct tag & rtag description.
        (rdiff): Use {} for required alternates instead of ().  Clarify.
        (rdiff options): Remove reference to -V.
        (tag & rtag): Rev/date argument to rtag isn't required.  Other minor
        updates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.960&tr2=1.961&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.1.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?tr1=1.686&tr2=1.687&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?tr1=1.186&tr2=1.187&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?tr1=1.187&tr2=1.188&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.960 ccvs/doc/ChangeLog:1.961
--- ccvs/doc/ChangeLog:1.960    Fri May 19 22:16:47 2006
+++ ccvs/doc/ChangeLog  Sat May 20 12:43:51 2006
@@ -1,3 +1,11 @@
+2006-05-20  Derek Price  <address@hidden>
+
+       * cvs.texinfo (CVS commands): Correct tag & rtag description.
+       (rdiff): Use {} for required alternates instead of ().  Clarify.
+       (rdiff options): Remove reference to -V.
+       (tag & rtag): Rev/date argument to rtag isn't required.  Other minor
+       updates.
+
 2006-05-19  Derek Price  <address@hidden>
 
        * cvs.texinfo (log): Rename to...
Index: ccvs/doc/cvs.1
diff -u ccvs/doc/cvs.1:1.46 ccvs/doc/cvs.1:1.47
--- ccvs/doc/cvs.1:1.46 Fri May 19 22:16:47 2006
+++ ccvs/doc/cvs.1      Sat May 20 12:43:51 2006
@@ -3513,7 +3513,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
@@ -3524,10 +3524,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
@@ -3536,11 +3533,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
@@ -3615,15 +3612,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 address@hidden asking for an
@@ -3856,7 +3844,7 @@
 Delete the signature(s) with key ID \fIkeyid\fR.
 .SP
 .SH "tag & rtag"
-.SS "Mark a snapshot of workspace for later retrieval."
+.SS "Mark project snapshot for later retrieval."
 .IX "tag (subcommand)"
 .IX "freeze (subcommand)"
 .IX "rtag (subcommand)"
@@ -3871,8 +3859,10 @@
 .IP "\(bu" 2
 Synonym: ta, freeze
 .SP
+and
+.SP
 .IP "\(bu" 2
-rtag [-abBdFflnR] (-r tag | -D date) new_tag module\&...
+rtag [-abBdFflnR] [-r tag | -D date] new_tag module\&...
 .IP "\(bu" 2
 Requires: repository.
 .IP "\(bu" 2
@@ -3886,9 +3876,10 @@
 to supplied implicitly by the \fBcvs\fR records of your working files.
 .SP
 \fBrtag\fR works similarly, but does not need a sandbox to operate
-in, requiring an explicitly supplied tag or date instead.  \fBcvs\fR
+in, requiring an explicitly supplied tag or date instead (or assuming
+the tip of the trunk when one is not supplied explicitly).  \fBcvs\fR
 uses this preexisting tag or date to determine which revisions of
-files in the repository to attach the new tag to.
+files in the repository to attach the new symbolic tag to.
 .SP
 The symbolic tags are meant to permanently record which
 revisions of which files were used for some purpose.  The \fBcheckout\fR
@@ -3896,7 +3887,7 @@
 copy of a tagged release at any time in the future,
 regardless of whether files have been changed, added,
 or removed on the trunk or other branches since the release was tagged.
-For more, see see node `Branching and merging\(aq in the CVS manual.
+For more, see node `Branching and merging\(aq in the CVS manual.
 .SP
 These commands may also be used to delete a symbolic tag,
 or to create a branch.  See the options section below.
@@ -3995,8 +3986,8 @@
 .IP "" 0
 \fB-n\fR
 .IP "" 2
-Do not execute the tag program specified in the \fBmodules\fR file.
-\fBrtag\fR only.  See see node `modules\(aq in the CVS manual, for more.
+Do not execute the tag program specified in the \fBmodules\fR file
+(\fBrtag\fR only).  see node `modules\(aq in the CVS manual, for more.
 .SP
 .SH "update"
 .SS "Bring work tree in sync with repository"
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.686 ccvs/doc/cvs.texinfo:1.687
--- ccvs/doc/cvs.texinfo:1.686  Fri May 19 22:16:47 2006
+++ ccvs/doc/cvs.texinfo        Sat May 20 12:43:51 2006
@@ -8229,7 +8229,7 @@
 * release::                     Indicate that a directory is no longer in use
 * server & pserver::            Act as a server for a client on stdin/stdout
 * sign::                        Attach new OpenPGP revision signature
-* tag & rtag::                  Attach new OpenPGP revision signature
+* tag & rtag::                  Mark project snapshot for later retrieval
 * update::                      Bring work tree in sync with repository
 * verify::                      Verify OpenPGP revision signatures
 * version::                     Print client and server version strings
@@ -11335,7 +11335,7 @@
 
 @itemize @bullet
 @item
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D 
date2] address@hidden
+rdiff [options] @{-r tag1[:date1] | -D address@hidden [-r tag2[:date2] | -D 
date2] address@hidden
 @item
 Requires: repository.
 @item
@@ -11347,10 +11347,7 @@
 Builds a Larry Wall format patch(1) file between two
 releases, that can be fed directly into the @code{patch}
 program to bring an old release up-to-date with the new
-release.  (This is one of the few @sc{cvs} commands that
-operates directly from the repository, and doesn't
-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.
 
 You can specify (using the standard @samp{-r} and
 @samp{-D} options) any combination of one or two
@@ -11359,11 +11356,11 @@
 that revision or date and the current head revisions in
 the @sc{rcs} file.
 
-Note that if the software release affected is contained
-in more than one directory, then it may be necessary to
-specify the @samp{-p} option to the @code{patch} command when
-patching the old sources, so that @code{patch} 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 @samp{-p} option when feeding
+the patch back to the @code{patch} command, so that @code{patch} is able
+to update files that are located in directories other than the one
+patch is run in.
 
 @menu
 * rdiff options::               rdiff options
@@ -11427,13 +11424,6 @@
 of the @code{patch} program can't handle the unidiff
 format, so if you plan to post this patch to the net
 you should probably not use @samp{-u}.
-
address@hidden -V @var{vn}
-Expand keywords according to the rules current in
address@hidden version @var{vn} (the expansion format changed with
address@hidden version 5).  Note that this option is no
-longer accepted.  @sc{cvs} will always expand keywords the
-way that @sc{rcs} version 5 does.
 @end table
 
 @c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -11657,7 +11647,7 @@
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 @node tag & rtag
address@hidden tag & rtag---Mark a snapshot of workspace for later retrieval.
address@hidden tag & rtag---Mark project snapshot for later retrieval.
 @cindex tag (subcommand)
 @cindex freeze (subcommand)
 @cindex rtag (subcommand)
@@ -11674,9 +11664,12 @@
 Synonym: ta, freeze
 @end itemize
 
address@hidden
+and
+
 @itemize @bullet
 @item
-rtag [-abBdFflnR] (-r tag | -D date) new_tag address@hidden
+rtag [-abBdFflnR] [-r tag | -D date] new_tag address@hidden
 @item
 Requires: repository.
 @item
@@ -11691,9 +11684,10 @@
 to supplied implicitly by the @sc{cvs} records of your working files.
 
 @code{rtag} works similarly, but does not need a sandbox to operate
-in, requiring an explicitly supplied tag or date instead.  @sc{cvs}
+in, requiring an explicitly supplied tag or date instead (or assuming
+the tip of the trunk when one is not supplied explicitly).  @sc{cvs}
 uses this preexisting tag or date to determine which revisions of
-files in the repository to attach the new tag to.
+files in the repository to attach the new symbolic tag to.
 
 The symbolic tags are meant to permanently record which
 revisions of which files were used for some purpose.  The @code{checkout}
@@ -11701,7 +11695,7 @@
 copy of a tagged release at any time in the future,
 regardless of whether files have been changed, added,
 or removed on the trunk or other branches since the release was tagged.
-For more, see @xref{Branching and merging}.
+For more, @xref{Branching and merging}.
 
 These commands may also be used to delete a symbolic tag,
 or to create a branch.  See the options section below.
@@ -11779,8 +11773,8 @@
 resolve to an existing revision).
 
 @item -n
-Do not execute the tag program specified in the @file{modules} file.
address@hidden only.  See @xref{modules}, for more.
+Do not execute the tag program specified in the @file{modules} file
+(@code{rtag} only).  @xref{modules}, for more.
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.186 ccvs/doc/stamp-vti:1.187
--- ccvs/doc/stamp-vti:1.186    Fri May 19 22:16:47 2006
+++ ccvs/doc/stamp-vti  Sat May 20 12:43:52 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 19 May 2006
address@hidden UPDATED 20 May 2006
 @set UPDATED-MONTH May 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.187 ccvs/doc/version.texi:1.188
--- ccvs/doc/version.texi:1.187 Fri May 19 22:16:47 2006
+++ ccvs/doc/version.texi       Sat May 20 12:43:52 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 19 May 2006
address@hidden UPDATED 20 May 2006
 @set UPDATED-MONTH May 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1