cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ...
Date: Mon, 21 Aug 2006 21:34:05 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/08/21 21:34:05

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

Log message:
        * cvs.texinfo (man page nodes): Tweak grammar, especially refs.
        (Patch from Kevin R. Bulgrien <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.974&r2=1.975
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.1?cvsroot=cvs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.696&r2=1.697
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.196&r2=1.197
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.198&r2=1.199

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -b -r1.974 -r1.975
--- ChangeLog   21 Aug 2006 20:59:13 -0000      1.974
+++ ChangeLog   21 Aug 2006 21:34:05 -0000      1.975
@@ -1,5 +1,8 @@
 2006-08-21  Derek Price  <address@hidden>
 
+       * cvs.texinfo (man page nodes): Tweak grammar, especially refs.
+       (Patch from Kevin R. Bulgrien <address@hidden>.)
+
        * mkman.pl (do_keyword): Process ref and p?xref differently.
        (Original patch from Kevin R. Bulgrien <address@hidden>.)
 

Index: cvs.1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- cvs.1       21 Aug 2006 20:59:13 -0000      1.52
+++ cvs.1       21 Aug 2006 21:34:05 -0000      1.53
@@ -236,7 +236,7 @@
 .IP "" 2
 May be invoked multiple times to specify one legal \fBcvsroot\fR directory with
 each invocation.  Also causes CVS to preparse the configuration file for each
-specified root, which can be useful when configuring write proxies,  See
+specified root, which can be useful when configuring write proxies.  See
 `Password authentication server\(aq in the CVS manual & `Write proxies\(aq in 
the CVS manual.
 .SP
 .IX "Authentication, stream"
@@ -304,7 +304,7 @@
 .IP "" 2
 Use \fIcvs_root_directory\fR as the root directory
 pathname of the repository.  Overrides the setting of
-the \fB$CVSROOT\fR environment variable.  see node `Repository\(aq in the CVS 
manual.
+the \fB$CVSROOT\fR environment variable.  See `Repository\(aq in the CVS 
manual.
 .SP
 .IX "EDITOR, overriding"
 .IX "Overriding EDITOR"
@@ -499,7 +499,7 @@
 environment variable (see node `Environment variables\(aq in the CVS manual) 
and the \fBsign\fR and
 \fBno-sign\fR method options (see node `The connection method\(aq in the CVS 
manual).
 .SP
-\fBWARNING: `OpenPGP Signed Commits\(aq in the CVS manual for more on using 
OpenPGP
+\fBWARNING:  See `OpenPGP Signed Commits\(aq in the CVS manual for more on 
using OpenPGP
 signatures securely.\fR
 .SP
 .IP "" 0
@@ -529,7 +529,7 @@
 This template should send the generated signature to its standard output.
 Overrides the \fBsign-template\fR method option and defaults to something like
 \fB/usr/bin/gpg --detach-sign --output - %M %@ %s\fR.
-\fBWARNING: `OpenPGP Signed Commits\(aq in the CVS manual for more on using 
OpenPGP
+\fBWARNING:  See `OpenPGP Signed Commits\(aq in the CVS manual for more on 
using OpenPGP
 signatures securely.\fR
 .SP
 .IP "" 0
@@ -539,7 +539,7 @@
 and the OpenPGP verification command line templates.  Defaults to
 \fB--textmode\fR.
 .SP
-\fBWARNING: `OpenPGP Signed Commits\(aq in the CVS manual for more on using 
OpenPGP
+\fBWARNING:  See `OpenPGP Signed Commits\(aq in the CVS manual for more on 
using OpenPGP
 signatures securely.\fR
 .SP
 .IP "" 0
@@ -558,7 +558,7 @@
 variables\(aq in the CVS manual) and the \fBverify\fR and \fBno-verify\fR 
method options
 (see node `The connection method\(aq in the CVS manual).
 .SP
-\fBWARNING: `OpenPGP Signed Commits\(aq in the CVS manual for more on using 
OpenPGP
+\fBWARNING:  See `OpenPGP Signed Commits\(aq in the CVS manual for more on 
using OpenPGP
 signatures securely.\fR
 .SP
 .IP "" 0
@@ -594,9 +594,9 @@
 for the signed file and a non-zero exit code otherwise.  Overrides the
 \fB$CVS_VERIFY_TEMPLATE\fR environment variable (see node `Environment
 variables\(aq in the CVS manual) and the \fBverify-template\fR method option 
(see node `The connection
-method\(aq in the CVS manual and defaults to something like
+method\(aq in the CVS manual) and defaults to something like
 \fB/usr/bin/gpg --detach-sign --output - %M %@ %S %s\fR.
-\fBWARNING: `OpenPGP Signed Commits\(aq in the CVS manual for more on using 
OpenPGP
+\fBWARNING:  See `OpenPGP Signed Commits\(aq in the CVS manual for more on 
using OpenPGP
 signatures securely.\fR
 .SP
 .SH "Common options"
@@ -642,7 +642,7 @@
 slightly different way; see node `history options\(aq in the CVS manual).
 .SP
 For a complete description of the date formats accepted by \fBcvs\fR,
-`Date input formats\(aq in the CVS manual.
+see node `Date input formats\(aq in the CVS manual.
 .SP
 Remember to quote the argument to the \fB-D\fR
 flag so that your shell doesn\(aqt interpret spaces as
@@ -687,7 +687,7 @@
 \fB-k \fIkflag\fB\fR
 .IP "" 2
 Override the default processing of RCS keywords other than
-\fB-kb\fR.  see node `Keyword substitution\(aq in the CVS manual, for the 
meaning of
+\fB-kb\fR.  See `Keyword substitution\(aq in the CVS manual, for the meaning of
 \fIkflag\fR.  Used with the \fBcheckout\fR and \fBupdate\fR
 commands, your \fIkflag\fR specification is
 \fIsticky\fR; that is, when you use this option
@@ -702,7 +702,7 @@
 .SP
 \fBWARNING: Prior to CVS version 1.12.2, the \fB-k\fB flag
 overrode the \fB-kb\fB indication for a binary file.  This could
-sometimes corrupt binary files.  see node `Merging and keywords\(aq in the CVS 
manual, for
+sometimes corrupt binary files.  See `Merging and keywords\(aq in the CVS 
manual, for
 more.\fR
 .SP
 .IP "" 0
@@ -823,6 +823,111 @@
 and \fBupdate\fR.
 .SP
 .SP
+.SH "add"
+.SS "Add files and directories to the repository"
+.IX "add (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: add [-k rcs-kflag] [-m message] files...
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBadd\fR command is used to present new files
+and directories for addition into the \fBcvs\fR
+repository.  When \fBadd\fR is used on a directory,
+a new directory is created in the repository
+immediately.  When used on a file, only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is used on
+the newly added file. 
+.SP
+The \fBadd\fR command also resurrects files that
+have been previously removed.  This can be done
+before or after the \fBcommit\fR command is used
+to finalize the removal of files.  Resurrected files
+are restored into the working directory at the time
+the \fBadd\fR command is executed.
+.SP
+.SH "add options"
+.SP
+These standard options are supported by \fBadd\fR
+(see node `Common options\(aq in the CVS manual, for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-k \fIkflag\fB\fR
+.IP "" 2
+Process keywords according to \fIkflag\fR.  See
+`Keyword substitution\(aq in the CVS manual.
+This option is sticky; future updates of
+this file in this working directory will use the same
+\fIkflag\fR.  The \fBstatus\fR command can be viewed
+to see the sticky options.  For more information on
+the \fBstatus\fR command, see node `Invoking CVS\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-m \fImessage\fB\fR
+.IP "" 2
+Use \fImessage\fR as the log message, instead of
+invoking an editor.
+.SP
+.SH "add examples"
+.SP
+.SS "Adding a directory"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ mkdir doc
+.IP "" 2
+$ cvs add doc
+.IP "" 2
+Directory /path/to/repository/doc added to the repository
+
+.PD
+.IP "" 0
+.SP
+.SS "Adding a file"
+.SP
+.PD 0
+.SP
+.SP
+.IP "" 2
+$ >TODO
+.IP "" 2
+$ cvs add TODO
+.IP "" 2
+cvs add: scheduling file \`TODO\(aq for addition
+.IP "" 2
+cvs add: use \(aqcvs commit\(aq to add this file permanently
+
+.PD
+.IP "" 0
+.SP
+.SS "Undoing a \fBremove\fR command"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ rm -f makefile
+.IP "" 2
+$ cvs remove makefile
+.IP "" 2
+cvs remove: scheduling \`makefile\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+.IP "" 2
+$ cvs add makefile
+.IP "" 2
+U makefile
+.IP "" 2
+cvs add: makefile, version 1.2, resurrected
+
+.PD
+.IP "" 0
+.SP
 .SH "admin"
 .SS "Administration"
 .IX "Admin (subcommand)"
@@ -899,7 +1004,7 @@
 Sets the comment leader to \fIstring\fR.  The comment
 leader is not used by current versions of \fBcvs\fR or
 \fBrcs\fR 5.7.  Therefore, you can almost surely not
-worry about it.  see node `Keyword substitution\(aq in the CVS manual.
+worry about it.  See `Keyword substitution\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-e[\fIlogins\fB]\fR
@@ -930,7 +1035,7 @@
 \fB-k\fIsubst\fB\fR
 .IP "" 2
 Set the default keyword
-substitution to \fIsubst\fR.  see node `Keyword
+substitution to \fIsubst\fR.  See `Keyword
 substitution\(aq in the CVS manual.  Giving an explicit \fB-k\fR option to
 \fBcvs update\fR, \fBcvs export\fR, or \fBcvs
 checkout\fR overrides this default.
@@ -1115,7 +1220,7 @@
 .SP
 Due to the way \fBcvs\fR handles branches \fIrev\fR
 cannot be specified symbolically if it is a branch.
-see node `Magic branch numbers\(aq in the CVS manual, for an explanation.
+See `Magic branch numbers\(aq in the CVS manual for an explanation.
 .SP
 Make sure that no-one has checked out a copy of the
 revision you outdate.  Strange things will happen if he
@@ -1254,7 +1359,7 @@
 .SH "annotate options"
 .SP
 These standard options are supported by \fBannotate\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -1356,7 +1461,7 @@
 collection of source directories and files, or paths to
 directories or files in the repository.  The symbolic
 names are defined in the \fBmodules\fR file.
-see node `modules\(aq in the CVS manual.
+See `modules\(aq in the CVS manual.
 .SP
 Depending on the modules you specify, \fBcheckout\fR may
 recursively create directories and populate them with
@@ -1400,13 +1505,13 @@
 forget to change your directory to the top level
 directory.
 .SP
-For the output produced by the \fBcheckout\fR command
-see `update output\(aq in the CVS manual.
+For the output produced by the \fBcheckout\fR command,
+see node `update output\(aq in the CVS manual.
 .SP
 .SH "checkout options"
 .SP
 These standard options are supported by \fBcheckout\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -1414,7 +1519,7 @@
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 This option is sticky, and implies \fB-P\fR.  See
-`Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
+`Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
 .SP
 .IP "" 0
 \fB-f\fR
@@ -1430,7 +1535,7 @@
 This option is sticky; future updates of
 this file in this working directory will use the same
 \fIkflag\fR.  The \fBstatus\fR command can be viewed
-to see the sticky options.  See `Invoking CVS\(aq in the CVS manual, for
+to see the sticky options.  See `Invoking CVS\(aq in the CVS manual for
 more information on the \fBstatus\fR command.
 .SP
 .IP "" 0
@@ -1477,7 +1582,7 @@
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
 Does not reset sticky \fB-k\fR options on modified files.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky 
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky 
tags/dates.
 .SP
 .IP "" 0
 \fB-c\fR
@@ -1540,7 +1645,7 @@
 (:) to the tag:
 \fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
 .SP
-see node `Branching and merging\(aq in the CVS manual.
+See `Branching and merging\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-N\fR
@@ -1555,7 +1660,7 @@
 \fB-s\fR
 .IP "" 2
 Like \fB-c\fR, but include the status of all modules,
-and sort it by the status string.  see node `modules\(aq in the CVS manual, for
+and sort it by the status string.  See `modules\(aq in the CVS manual, for
 info about the \fB-s\fR option that is used inside the
 modules file to set the module status.
 .SP
@@ -1625,7 +1730,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 `log & rlog\(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
@@ -1635,12 +1740,12 @@
 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 `log & rlog\(aq in the CVS manual,
-`File status\(aq in the CVS manual.
+and `File status\(aq in the CVS manual.
 .SP
 .SH "commit options"
 .SP
 These standard options are supported by \fBcommit\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -1834,12 +1939,12 @@
 under them will be compared.
 .SP
 The exit status for diff is different than for other
-\fBcvs\fR commands; for details `Exit status\(aq in the CVS manual.
+\fBcvs\fR commands; for details see node `Exit status\(aq in the CVS manual.
 .SP
 .SH "diff options"
 .SP
 These standard options are supported by \fBdiff\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -1944,7 +2049,7 @@
 \fB--changed-group-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output a line group containing differing lines from
-both files in if-then-else format.  see node `Line group formats\(aq in the 
CVS manual.
+both files in if-then-else format.  See `Line group formats\(aq in the CVS 
manual.
 .SP
 .IP "" 0
 \fB-d\fR
@@ -2066,7 +2171,7 @@
 \fB--line-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output all input lines in if-then-else format.
-see node `Line formats\(aq in the CVS manual.
+See `Line formats\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB--minimal\fR
@@ -2093,25 +2198,25 @@
 \fB--new-group-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output a group of lines taken from just the second
-file in if-then-else format.  see node `Line group formats\(aq in the CVS 
manual.
+file in if-then-else format.  See `Line group formats\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB--new-line-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output a line taken from just the second file in
-if-then-else format.  see node `Line formats\(aq in the CVS manual.
+if-then-else format.  See `Line formats\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB--old-group-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output a group of lines taken from just the first
-file in if-then-else format.  see node `Line group formats\(aq in the CVS 
manual.
+file in if-then-else format.  See `Line group formats\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB--old-line-format=\fIformat\fB\fR
 .IP "" 2
 Use \fIformat\fR to output a line taken from just the first file in
-if-then-else format.  see node `Line formats\(aq in the CVS manual.
+if-then-else format.  See `Line formats\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-p\fR
@@ -2744,7 +2849,7 @@
 .IP "" 2
 Create a directory called \fIdir\fR for the working
 files, instead of using the module name.
-see node `checkout options\(aq in the CVS manual, for complete details on how
+See `checkout options\(aq in the CVS manual for complete details on how
 \fBcvs\fR handles this flag.
 .SP
 .IP "" 0
@@ -2756,7 +2861,7 @@
 \fB-N\fR
 .IP "" 2
 Only useful together with \fB-d \fIdir\fB\fR.
-see node `checkout options\(aq in the CVS manual, for complete details on how
+See `checkout options\(aq in the CVS manual for complete details on how
 \fBcvs\fR handles this flag.
 .SP
 .SH "history"
@@ -3003,7 +3108,7 @@
 vendor) into your source repository directory.  You can
 use this command both for initial creation of a
 repository, and for wholesale updates to the module
-from the outside source.  see node `Tracking sources\(aq in the CVS manual, for
+from the outside source.  See `Tracking sources\(aq in the CVS manual for
 a discussion on this subject.
 .SP
 The \fIrepository\fR argument gives a directory name
@@ -3020,14 +3125,14 @@
 .SP
 If \fBcvs\fR decides a file should be ignored
 (see node `cvsignore\(aq in the CVS manual), it does not import it and prints
-\fBI \fR followed by the filename (see node `import output\(aq in the CVS 
manual, for a
+\fBI \fR followed by the filename (see node `import output\(aq in the CVS 
manual for a
 complete description of the output).
 .SP
 If the file \fB$CVSROOT/CVSROOT/cvswrappers\fR exists,
 any file whose names match the specifications in that
 file will be treated as packages and the appropriate
 filtering will be performed on the file/directory
-before being imported.  see node `Wrappers\(aq in the CVS manual.
+before being imported.  See `Wrappers\(aq in the CVS manual.
 .SP
 The outside source is saved in a first-level
 branch, by default 1.1.1.  Updates are leaves of this
@@ -3055,7 +3160,7 @@
 .SH "import options"
 .SP
 This standard option is supported by \fBimport\fR
-(see node `Common options\(aq in the CVS manual, for a complete description):
+(see node `Common options\(aq in the CVS manual for a complete description):
 .SP
 .IP "" 0
 \fB-m \fImessage\fB\fR
@@ -3076,7 +3181,7 @@
 Indicate the keyword expansion mode desired.  This
 setting will apply to all files created during the
 import, but not to any files that previously existed in
-the repository.  See `Substitution modes\(aq in the CVS manual, for a
+the repository.  See `Substitution modes\(aq in the CVS manual for a
 list of valid \fB-k\fR settings.
 .SP
 .IP "" 0
@@ -3089,7 +3194,7 @@
 .SP
 \fIname\fR can be a file name pattern of the same type
 that you can specify in the \fB.cvsignore\fR file.
-see node `cvsignore\(aq in the CVS manual.
+See `cvsignore\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-W \fIspec\fB\fR
@@ -3099,7 +3204,7 @@
 .SP
 \fIspec\fR can be a file name pattern of the same type
 that you can specify in the \fB.cvswrappers\fR
-file. see node `Wrappers\(aq in the CVS manual.
+file.  See `Wrappers\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-X\fR
@@ -3112,7 +3217,7 @@
 steps for each file in addition to those normally taken on import:
 creating a new revision on the main trunk indicating that
 the new file is \fBdead\fR, resetting the new file\(aqs default branch,
-and placing the file in the Attic (see node `Attic\(aq in the CVS manual) 
directory.
+and placing the file in the Attic directory (see node `Attic\(aq in the CVS 
manual).
 .SP
 Use of this option can be forced on a repository-wide basis
 by setting the \fBImportNewFilesToVendorBranchOnly\fR option in
@@ -3564,7 +3669,7 @@
 .SH "rdiff options"
 .SP
 These standard options are supported by \fBrdiff\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -3646,7 +3751,7 @@
 .IP "" 2
 $ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \\
 .IP "" 2
-$$ Mail -s \(aqThe patches you asked for\(aq address@hidden
+> Mail -s \(aqThe patches you asked for\(aq address@hidden
 
 .PD
 .IP "" 0
@@ -3719,9 +3824,9 @@
 \fBWARNING:  The \fBrelease\fB command deletes
 all directories and files recursively.  This
 has the very serious side-effect that any directory
-that you have created inside your checked-out sources,
-and not added to the repository (using the \fBadd\fB
-command; see node `Adding files\(aq in the CVS manual) will be silently 
deleted\(emeven
+created inside checked-out sources, and not added to
+the repository (using the \fBadd\fB command;
+see node `Adding files\(aq in the CVS manual) will be silently deleted\(emeven
 if it is non-empty!\fR
 .SP
 .SH "release output"
@@ -3751,7 +3856,7 @@
 The file has been removed from your private copy of the
 sources, but has not yet been removed from the
 repository, since you have not yet committed the
-removal.  see node `commit\(aq in the CVS manual.
+removal.  See `commit\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fBM \fIfile\fB\fR
@@ -3792,6 +3897,131 @@
 .PD
 .IP "" 0
 .SP
+.SH "remove"
+.SS "Remove files from active use"
+.IX "remove (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: remove [-flR] [files...]
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: working directory.
+.SP
+The \fBremove\fR command is used to remove unwanted
+files from active use.  The user normally deletes the
+files from the working directory prior to invocation
+of the \fBremove\fR command.  Only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is run.
+.SP
+The \fBremove\fR command does not delete files from
+from the repository.  \fBcvs\fR keeps all historical
+data in the repository so that it is possible to
+reconstruct previous states of the projects under
+revision control.
+.SP
+To undo \fBcvs\fR \fBremove\fR or to resurrect files
+that were previously removed, see node `add\(aq in the CVS manual.
+.SP
+.SH "remove options"
+.SP
+These standard options are supported by \fBremove\fR
+(see node `Common options\(aq in the CVS manual for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-l\fR
+.IP "" 2
+Local; run only in current working directory.  See `Recursive behavior\(aq in 
the CVS manual.
+.SP
+.IP "" 0
+\fB-R\fR
+.IP "" 2
+Process directories recursively.  See `Recursive behavior\(aq in the CVS 
manual.
+.SP
+.SP
+In addition, these options are also supported:
+.SP
+.IP "" 0
+\fB-f\fR
+.IP "" 2
+Note that this is not the standard behavior of
+the \fB-f\fR option as defined in `Common options\(aq in the CVS manual.
+.SP
+Delete files before removing them.
+.SP
+Entire directory hierarchies are easily removed
+using \fB-f\fR, but take note that it is not as
+easy to resurrect directory hierarchies as it is
+to remove them.
+.SP
+.SP
+.SH "remove examples"
+.SP
+.SS "Removing a file"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ cvs remove remove.me
+.IP "" 2
+cvs remove: file \`remove.me\(aq still in working directory
+.IP "" 2
+cvs remove: 1 file exists; remove it first
+.IP "" 2
+$ rm -f remove.me
+.IP "" 2
+$ cvs remove remove.me
+.IP "" 2
+cvs remove: scheduling \`remove.me\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+.SP
+.IP "" 2
+$ ls remove.it
+.IP "" 2
+remove.it
+.IP "" 2
+$ cvs remove -f remove.it
+.IP "" 2
+cvs remove: scheduling \`remove.it\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+
+.PD
+.IP "" 0
+.SP
+.SS "Removing entire directories"
+.SP
+.PD 0
+.IP "" 2
+$ tree -d a
+.IP "" 2
+a
+.IP "" 2
+|-- CVS
+.IP "" 2
+\`-- b
+.IP "" 2
+    \`-- CVS
+.SP
+.IP "" 2
+3 directories
+.IP "" 2
+$ cvs remove -f a
+.IP "" 2
+cvs remove: Removing a
+.IP "" 2
+cvs remove: Removing a/b
+.IP "" 2
+cvs remove: scheduling \`a/b/c\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+
+.PD
+.IP "" 0
+.SP
 .SH "server & pserver"
 .SS "Act as a server for a client on stdin/stdout"
 .IX "pserver (subcommand)"
@@ -3837,18 +4067,18 @@
 revision.
 .SP
 These standard options are available with \fBsign\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
-Local; run only in current working directory.  see node `Recursive 
behavior\(aq in the CVS manual.
+Local; run only in current working directory.  See `Recursive behavior\(aq in 
the CVS manual.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
-Sign all files recursively (default).  see node `Recursive behavior\(aq in the 
CVS manual.
+Sign all files recursively (default).  See `Recursive behavior\(aq in the CVS 
manual.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
@@ -3856,7 +4086,7 @@
 Sign the revisions specified by \fItag\fR or, when \fIdate\fR is specified
 and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it
 existed on \fIdate\fR.  With \fB-d\fR, delete keys from the specified
-revision.  See also, `Common options\(aq in the CVS manual.
+revision.  See also:  `Common options\(aq in the CVS manual.
 .SP
 This special option is also available with \fBsign\fR.
 .SP
@@ -3920,7 +4150,7 @@
 revisions.
 .SP
 These standard options are supported by \fBtag\fR or \fBrtag\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of 
them):
+(see node `Common options\(aq in the CVS manual for a complete description of 
them):
 .SP
 .IP "" 0
 \fB-D \fIdate\fB\fR
@@ -3931,12 +4161,12 @@
 .IP "" 0
 \fB-l\fR
 .IP "" 2
-Local; run only in current working directory.  see node `Recursive 
behavior\(aq in the CVS manual.
+Local; run only in current working directory.  See `Recursive behavior\(aq in 
the CVS manual.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
-Update directories recursively (default).  see node `Recursive
+Update directories recursively (default).  See `Recursive
 behavior\(aq in the CVS manual.
 .SP
 .IP "" 0
@@ -4009,7 +4239,7 @@
 \fB-n\fR
 .IP "" 2
 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.
+(\fBrtag\fR only).  See `modules\(aq in the CVS manual for more information.
 .SP
 .SH "update"
 .SS "Bring work tree in sync with repository"
@@ -4038,7 +4268,7 @@
 .SH "update options"
 .SP
 These standard options are available with \fBupdate\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
@@ -4046,7 +4276,7 @@
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 This option is sticky, and implies \fB-P\fR.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky 
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky 
tags/dates.
 .SP
 .IP "" 0
 \fB-f\fR
@@ -4062,13 +4292,13 @@
 This option is sticky; future updates of
 this file in this working directory will use the same
 \fIkflag\fR.  The \fBstatus\fR command can be viewed
-to see the sticky options.  See `Invoking CVS\(aq in the CVS manual, for
+to see the sticky options.  See `Invoking CVS\(aq in the CVS manual for
 more information on the \fBstatus\fR command.
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
-Local; run only in current working directory.  see node `Recursive 
behavior\(aq in the CVS manual.
+Local; run only in current working directory.  See `Recursive behavior\(aq in 
the CVS manual.
 .SP
 .IP "" 0
 \fB-P\fR
@@ -4083,7 +4313,7 @@
 .IP "" 0
 \fB-R\fR
 .IP "" 2
-Update directories recursively (default).  see node `Recursive
+Update directories recursively (default).  See `Recursive
 behavior\(aq in the CVS manual.
 .SP
 .IP "" 0
@@ -4092,8 +4322,8 @@
 Retrieve the revisions specified by \fItag\fR or, when \fIdate\fR is specified
 and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it
 existed on \fIdate\fR.  This option is sticky, and implies \fB-P\fR.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky 
tags/dates. Also
-see `Common options\(aq in the CVS manual.
+See `Sticky tags\(aq in the CVS manual for more information on sticky 
tags/dates.  Also
+see node `Common options\(aq in the CVS manual.
 .SP
 These special options are also available with
 \fBupdate\fR.
@@ -4103,7 +4333,7 @@
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
 Does not reset sticky \fB-k\fR options on modified files.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky 
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky 
tags/dates.
 .SP
 .IP "" 0
 \fB-C\fR
@@ -4137,7 +4367,7 @@
 working directory) during the update.  You can specify
 \fB-I\fR more than once on the command line to specify
 several files to ignore.  Use \fB-I !\fR to avoid
-ignoring any files at all.  see node `cvsignore\(aq in the CVS manual, for 
other
+ignoring any files at all.  See `cvsignore\(aq in the CVS manual for other
 ways to make \fBcvs\fR ignore some files.
 .SP
 .IP "" 0
@@ -4148,7 +4378,7 @@
 .SP
 \fIspec\fR can be a file name pattern of the same type
 that you can specify in the \fB.cvswrappers\fR
-file. see node `Wrappers\(aq in the CVS manual.
+file.  See `Wrappers\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-j\fIrevision\fB\fR
@@ -4168,7 +4398,7 @@
 Note that using a single \fB-j \fItagname\fB\fR option rather than
 \fB-j \fIbranchname\fB\fR to merge changes from a branch will
 often not remove files which were removed on the branch.
-see node `Merging adds and removals\(aq in the CVS manual, for more.
+See `Merging adds and removals\(aq in the CVS manual for more information.
 .SP
 In addition, each \fB-j\fR option can contain an optional
 date specification which, when used with branches, can
@@ -4177,7 +4407,7 @@
 (:) to the tag:
 \fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
 .SP
-see node `Branching and merging\(aq in the CVS manual.
+See `Branching and merging\(aq in the CVS manual.
 .SP
 .SP
 .SH "update output"
@@ -4272,13 +4502,13 @@
 verifies all revisions before operating on them.
 .SP
 These standard options are available with \fBverify\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
 them):
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
-Local; run only in current working directory.  see node `Recursive 
behavior\(aq in the CVS manual.
+Local; run only in current working directory.  See `Recursive behavior\(aq in 
the CVS manual.
 .SP
 .IP "" 0
 \fB-p\fR
@@ -4288,21 +4518,21 @@
 .IP "" 0
 \fB-R\fR
 .IP "" 2
-Sign all files recursively (default).  see node `Recursive behavior\(aq in the 
CVS manual.
+Sign all files recursively (default).  See `Recursive behavior\(aq in the CVS 
manual.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Verify the revisions specified by \fItag\fR or, when \fIdate\fR is specified
 and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it
-existed on \fIdate\fR.  See also, `Common options\(aq in the CVS manual.
+existed on \fIdate\fR.  See also:  `Common options\(aq in the CVS manual.
 .SP
 .SH "version"
 .SS "--Print client and server version strings"
 .IX "version (subcommand)"
 .SP
 \fBversion\fR outputs a version string for both the \fBcvs\fR client and
-a \fBcvs\fR server, when a server can be contacted.  Also, `Global options\(aq 
in the CVS manual.
+a \fBcvs\fR server, when a server can be contacted.  Also, see node `Global 
options\(aq in the CVS manual.
 .SH "AUTHORS"
 .TP
 Dick Grune

Index: cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -b -r1.696 -r1.697
--- cvs.texinfo 14 Aug 2006 13:04:38 -0000      1.696
+++ cvs.texinfo 21 Aug 2006 21:34:05 -0000      1.697
@@ -2337,7 +2337,7 @@
 variable (@pxref{Environment variables}) and may be overridden by the
 @samp{--sign} and @samp{--no-sign} global options (@pxref{Global options}).
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item address@hidden
@@ -2362,7 +2362,7 @@
 @pxref{Global options} and defaults to
 @samp{/usr/bin/gpg --detach-sign --output - Mt %@@ %s}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item textmode
@@ -2370,7 +2370,7 @@
 and the OpenPGP verification command line templates.  Defaults to
 @samp{--textmode}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item verify
@@ -2385,7 +2385,7 @@
 variables}) and may be overridden by the @samp{--verify} and @samp{--no-verify}
 global options (@pxref{Global options}).
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item address@hidden
@@ -2416,7 +2416,7 @@
 defaults to something like
 @samp{/usr/bin/gpg --detach-sign --output - %M %@@ %S %s}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 @end table
 
@@ -4097,7 +4097,7 @@
 tag.
 
 @noindent
address@hidden: the commands in this section are
address@hidden:  The commands in this section are
 dangerous; they permanently discard historical
 information and it can be difficult or impossible to
 recover from errors.  If you are a @sc{cvs}
@@ -8248,6 +8248,7 @@
 * Global options::              Options you give to the left of cvs_command
 * Common options::              Options you give to the right of cvs_command
 * Date input formats::         Acceptable formats for date specifications
+* add::                         Add files and directories to the repository
 * admin::                       Administration
 * annotate & rannotate::        What revision modified each line of a file?
 * checkout::                    Checkout sources for editing
@@ -8260,6 +8261,7 @@
 * ls & rls::                    List files in the repository
 * rdiff::                       'patch' format diffs between releases
 * release::                     Indicate that a directory is no longer in use
+* remove::                      Remove files from active development
 * server & pserver::            Act as a server for a client on stdin/stdout
 * sign::                        Attach new OpenPGP revision signature
 * tag & rtag::                  Mark project snapshot for later retrieval
@@ -8428,7 +8430,7 @@
 @item address@hidden
 May be invoked multiple times to specify one legal @sc{cvsroot} directory with
 each invocation.  Also causes CVS to preparse the configuration file for each
-specified root, which can be useful when configuring write proxies,  See
+specified root, which can be useful when configuring write proxies.  See
 @ref{Password authentication server} & @ref{Write proxies}.
 
 @cindex Authentication, stream
@@ -8490,7 +8492,7 @@
 @item -d @var{cvs_root_directory}
 Use @var{cvs_root_directory} as the root directory
 pathname of the repository.  Overrides the setting of
-the @code{$CVSROOT} environment variable.  @xref{Repository}.
+the @code{$CVSROOT} environment variable.  See @ref{Repository}.
 
 @cindex EDITOR, overriding
 @cindex Overriding EDITOR
@@ -8655,7 +8657,7 @@
 environment variable (@pxref{Environment variables}) and the @samp{sign} and
 @samp{no-sign} method options (@pxref{The connection method}).
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item --sign-template @var{template}
@@ -8679,7 +8681,7 @@
 Overrides the @samp{sign-template} method option and defaults to something like
 @samp{/usr/bin/gpg --detach-sign --output - %M %@@ %s}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item --textmode
@@ -8687,7 +8689,7 @@
 and the OpenPGP verification command line templates.  Defaults to
 @samp{--textmode}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item --verify
@@ -8702,7 +8704,7 @@
 variables}) and the @samp{verify} and @samp{no-verify} method options
 (@pxref{The connection method}).
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 
 @item address@hidden
@@ -8729,10 +8731,11 @@
 for the signed file and a non-zero exit code otherwise.  Overrides the
 @code{$CVS_VERIFY_TEMPLATE} environment variable (@pxref{Environment
 variables}) and the @samp{verify-template} method option (@pxref{The connection
-method} and defaults to something like
+method}) and defaults to something like
 @samp{/usr/bin/gpg --detach-sign --output - %M %@@ %S %s}.
 
address@hidden: @ref{OpenPGP Signed Commits} for more on using OpenPGP
+
address@hidden:  See @ref{OpenPGP Signed Commits} for more on using OpenPGP
 signatures securely.}
 @end table
 
@@ -8779,7 +8782,7 @@
 slightly different way; @pxref{history options}).
 
 For a complete description of the date formats accepted by @sc{cvs},
address@hidden input formats}.
address@hidden input formats}.
 @c What other formats should we accept?  I don't want
 @c to start accepting a whole mess of non-standard
 @c new formats (there are a lot which are in wide use in
@@ -8874,7 +8877,7 @@
 
 @item -k @var{kflag}
 Override the default processing of RCS keywords other than
address@hidden  @xref{Keyword substitution}, for the meaning of
address@hidden  See @ref{Keyword substitution}, for the meaning of
 @var{kflag}.  Used with the @code{checkout} and @code{update}
 commands, your @var{kflag} specification is
 @dfn{sticky}; that is, when you use this option
@@ -8889,7 +8892,7 @@
 
 @strong{WARNING: Prior to CVS version 1.12.2, the @samp{-k} flag
 overrode the @samp{-kb} indication for a binary file.  This could
-sometimes corrupt binary files.  @xref{Merging and keywords}, for
+sometimes corrupt binary files.  See @ref{Merging and keywords}, for
 more.}
 
 @item -l
@@ -9020,6 +9023,98 @@
 @include getdate-cvs.texi
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden add
address@hidden add---Add files and directories to the repository
address@hidden add (subcommand)
+
address@hidden @bullet
address@hidden
+Synopsis: add [-k rcs-kflag] [-m message] files...
address@hidden
+Requires: repository, working directory.
address@hidden
+Changes: repository, working directory.
address@hidden itemize
+
+The @code{add} command is used to present new files
+and directories for addition into the @sc{cvs}
+repository.  When @code{add} is used on a directory,
+a new directory is created in the repository
+immediately.  When used on a file, only the working
+directory is updated.  Changes to the repository are
+not made until the @code{commit} command is used on
+the newly added file. 
+
+The @code{add} command also resurrects files that
+have been previously removed.  This can be done
+before or after the @code{commit} command is used
+to finalize the removal of files.  Resurrected files
+are restored into the working directory at the time
+the @code{add} command is executed.
+
address@hidden
+* add options::             add options
+* add examples::            add examples
address@hidden menu
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
. .
address@hidden add options
address@hidden add options
+
+These standard options are supported by @code{add}
+(@pxref{Common options}, for a complete description of
+them):
+
address@hidden @code
address@hidden -k @var{kflag}
+Process keywords according to @var{kflag}.  See
address@hidden substitution}.
+This option is sticky; future updates of
+this file in this working directory will use the same
address@hidden  The @code{status} command can be viewed
+to see the sticky options.  For more information on
+the @code{status} command, @xref{Invoking CVS}.
+
address@hidden -m @var{message}
+Use @var{message} as the log message, instead of
+invoking an editor.
address@hidden table
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
. .
address@hidden add examples
address@hidden add examples
+
address@hidden Adding a directory
+
address@hidden
+$ mkdir doc
+$ cvs add doc
+Directory /path/to/repository/doc added to the repository
address@hidden example
+
address@hidden Adding a file
+
address@hidden
+
+$ >TODO
+$ cvs add TODO
+cvs add: scheduling file `TODO' for addition
+cvs add: use 'cvs commit' to add this file permanently
address@hidden example
+
address@hidden Undoing a @code{remove} command
+
address@hidden
+$ rm -f makefile
+$ cvs remove makefile
+cvs remove: scheduling `makefile' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
+$ cvs add makefile
+U makefile
+cvs add: makefile, version 1.2, resurrected
address@hidden example
+
address@hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
- -
 @node admin
 @appendixsec admin---Administration
 @cindex Admin (subcommand)
@@ -9103,7 +9198,7 @@
 Sets the comment leader to @var{string}.  The comment
 leader is not used by current versions of @sc{cvs} or
 @sc{rcs} 5.7.  Therefore, you can almost surely not
-worry about it.  @xref{Keyword substitution}.
+worry about it.  See @ref{Keyword substitution}.
 
 @item address@hidden
 Might not work together with @sc{cvs}.  Erase the login
@@ -9126,7 +9221,7 @@
 
 @item address@hidden
 Set the default keyword
-substitution to @var{subst}.  @xref{Keyword
+substitution to @var{subst}.  See @ref{Keyword
 substitution}.  Giving an explicit @samp{-k} option to
 @code{cvs update}, @code{cvs export}, or @code{cvs
 checkout} overrides this default.
@@ -9290,7 +9385,7 @@
 
 Due to the way @sc{cvs} handles branches @var{rev}
 cannot be specified symbolically if it is a branch.
address@hidden branch numbers}, for an explanation.
+See @ref{Magic branch numbers} for an explanation.
 @c FIXME: is this still true?  I suspect not.
 
 Make sure that no-one has checked out a copy of the
@@ -9430,7 +9525,7 @@
 @appendixsubsec annotate options
 
 These standard options are supported by @code{annotate}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
@@ -9522,7 +9617,7 @@
 collection of source directories and files, or paths to
 directories or files in the repository.  The symbolic
 names are defined in the @samp{modules} file.
address@hidden
+See @ref{modules}.
 @c Needs an example, particularly of the non-"modules"
 @c case but probably of both.
 
@@ -9572,8 +9667,8 @@
 forget to change your directory to the top level
 directory.
 
-For the output produced by the @code{checkout} command
-see @ref{update output}.
+For the output produced by the @code{checkout} command,
address@hidden output}.
 
 @menu
 * checkout options::            checkout options
@@ -9585,14 +9680,14 @@
 @appendixsubsec checkout options
 
 These standard options are supported by @code{checkout}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
 @item -D @var{date}
 Use the most recent revision no later than @var{date}.
 This option is sticky, and implies @samp{-P}.  See
address@hidden tags}, for more information on sticky tags/dates.
address@hidden tags} for more information on sticky tags/dates.
 
 @item -f
 Only useful with the @samp{-D} or @samp{-r} flags.  If no matching revision is
@@ -9604,7 +9699,7 @@
 This option is sticky; future updates of
 this file in this working directory will use the same
 @var{kflag}.  The @code{status} command can be viewed
-to see the sticky options.  See @ref{Invoking CVS}, for
+to see the sticky options.  See @ref{Invoking CVS} for
 more information on the @code{status} command.
 
 @item -l
@@ -9639,7 +9734,7 @@
 @item -A
 Reset any sticky tags, dates, or @samp{-k} options.
 Does not reset sticky @samp{-k} options on modified files.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
 
 @item -c
 Copy the module file, sorted, to the standard output,
@@ -9696,7 +9791,7 @@
 (:) to the tag:
 @address@hidden:@var{Date_Specifier}}.
 
address@hidden and merging}.
+See @ref{Branching and merging}.
 
 @item -N
 Only useful together with @samp{-d @var{dir}}.  With
@@ -9707,7 +9802,7 @@
 
 @item -s
 Like @samp{-c}, but include the status of all modules,
-and sort it by the status string.  @xref{modules}, for
+and sort it by the status string.  See @ref{modules}, for
 info about the @samp{-s} option that is used inside the
 modules file to set the module status.
 @end table
@@ -9775,7 +9870,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
address@hidden command; see @ref{log & rlog}.  You can specify the
address@hidden 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
@@ -9785,7 +9880,7 @@
 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 & rlog},
address@hidden status}.
+and @ref{File status}.
 
 @menu
 * commit options::              commit options
@@ -9797,7 +9892,7 @@
 @appendixsubsec commit options
 
 These standard options are supported by @code{commit}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
@@ -9967,7 +10062,7 @@
 under them will be compared.
 
 The exit status for diff is different than for other
address@hidden commands; for details @ref{Exit status}.
address@hidden commands; for details @xref{Exit status}.
 
 @menu
 * diff options::                diff options
@@ -9979,7 +10074,7 @@
 @appendixsubsec diff options
 
 These standard options are supported by @code{diff}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
@@ -10076,7 +10171,7 @@
 
 @item address@hidden
 Use @var{format} to output a line group containing differing lines from
-both files in if-then-else format.  @xref{Line group formats}.
+both files in if-then-else format.  See @ref{Line group formats}.
 
 @item -d
 Change the algorithm to perhaps find a smaller set of changes.  This makes
@@ -10154,7 +10249,7 @@
 
 @item address@hidden
 Use @var{format} to output all input lines in if-then-else format.
address@hidden formats}.
+See @ref{Line formats}.
 
 @item --minimal
 Change the algorithm to perhaps find a smaller set of changes.  This
@@ -10171,19 +10266,19 @@
 
 @item address@hidden
 Use @var{format} to output a group of lines taken from just the second
-file in if-then-else format.  @xref{Line group formats}.
+file in if-then-else format.  See @ref{Line group formats}.
 
 @item address@hidden
 Use @var{format} to output a line taken from just the second file in
-if-then-else format.  @xref{Line formats}.
+if-then-else format.  See @ref{Line formats}.
 
 @item address@hidden
 Use @var{format} to output a group of lines taken from just the first
-file in if-then-else format.  @xref{Line group formats}.
+file in if-then-else format.  See @ref{Line group formats}.
 
 @item address@hidden
 Use @var{format} to output a line taken from just the first file in
-if-then-else format.  @xref{Line formats}.
+if-then-else format.  See @ref{Line formats}.
 
 @item -p
 Show which C function each change is in.
@@ -10653,7 +10748,7 @@
 @item -d @var{dir}
 Create a directory called @var{dir} for the working
 files, instead of using the module name.
address@hidden options}, for complete details on how
+See @ref{checkout options} for complete details on how
 @sc{cvs} handles this flag.
 
 @item -k @var{subst}
@@ -10661,7 +10756,7 @@
 
 @item -N
 Only useful together with @samp{-d @var{dir}}.
address@hidden options}, for complete details on how
+See @ref{checkout options} for complete details on how
 @sc{cvs} handles this flag.
 @end table
 
@@ -10896,7 +10991,7 @@
 vendor) into your source repository directory.  You can
 use this command both for initial creation of a
 repository, and for wholesale updates to the module
-from the outside source.  @xref{Tracking sources}, for
+from the outside source.  See @ref{Tracking sources} for
 a discussion on this subject.
 
 The @var{repository} argument gives a directory name
@@ -10913,14 +11008,14 @@
 
 If @sc{cvs} decides a file should be ignored
 (@pxref{cvsignore}), it does not import it and prints
address@hidden } followed by the filename (@pxref{import output}, for a
address@hidden } followed by the filename (@pxref{import output} for a
 complete description of the output).
 
 If the file @file{$CVSROOT/CVSROOT/cvswrappers} exists,
 any file whose names match the specifications in that
 file will be treated as packages and the appropriate
 filtering will be performed on the file/directory
-before being imported.  @xref{Wrappers}.
+before being imported.  See @ref{Wrappers}.
 
 The outside source is saved in a first-level
 branch, by default 1.1.1.  Updates are leaves of this
@@ -10959,7 +11054,7 @@
 @appendixsubsec import options
 
 This standard option is supported by @code{import}
-(@pxref{Common options}, for a complete description):
+(@pxref{Common options} for a complete description):
 
 @table @code
 @item -m @var{message}
@@ -10977,7 +11072,7 @@
 Indicate the keyword expansion mode desired.  This
 setting will apply to all files created during the
 import, but not to any files that previously existed in
-the repository.  See @ref{Substitution modes}, for a
+the repository.  See @ref{Substitution modes} for a
 list of valid @samp{-k} settings.
 
 @item -I @var{name}
@@ -10988,7 +11083,7 @@
 
 @var{name} can be a file name pattern of the same type
 that you can specify in the @file{.cvsignore} file.
address@hidden
+See @ref{cvsignore}.
 @c -- Is this really true?
 
 @item -W @var{spec}
@@ -10997,7 +11092,7 @@
 
 @var{spec} can be a file name pattern of the same type
 that you can specify in the @file{.cvswrappers}
-file. @xref{Wrappers}.
+file.  See @ref{Wrappers}.
 
 @item -X
 Modify the algorithm used by @sc{cvs} when importing new files
@@ -11008,7 +11103,7 @@
 steps for each file in addition to those normally taken on import:
 creating a new revision on the main trunk indicating that
 the new file is @code{dead}, resetting the new file's default branch,
-and placing the file in the Attic (@pxref{Attic}) directory.
+and placing the file in the Attic directory (@pxref{Attic}).
 
 Use of this option can be forced on a repository-wide basis
 by setting the @samp{ImportNewFilesToVendorBranchOnly} option in
@@ -11428,7 +11523,7 @@
 @appendixsubsec rdiff options
 
 These standard options are supported by @code{rdiff}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
@@ -11493,7 +11588,7 @@
 
 @example
 $ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \
-$$ Mail -s 'The patches you asked for' foo@@example.net
+> Mail -s 'The patches you asked for' foo@@example.net
 @end example
 
 Suppose you have made release 1.3, and forked a branch
@@ -11566,9 +11661,9 @@
 @strong{WARNING:  The @code{release} command deletes
 all directories and files recursively.  This
 has the very serious side-effect that any directory
-that you have created inside your checked-out sources,
-and not added to the repository (using the @code{add}
-command; @pxref{Adding files}) will be silently deleted---even
+created inside checked-out sources, and not added to
+the repository (using the @code{add} command;
address@hidden files}) will be silently deleted---even
 if it is non-empty!}
 @end table
 
@@ -11596,7 +11691,7 @@
 The file has been removed from your private copy of the
 sources, but has not yet been removed from the
 repository, since you have not yet committed the
-removal.  @xref{commit}.
+removal.  See @ref{commit}.
 
 @item M @var{file}
 The file is modified in your working directory.  There
@@ -11628,6 +11723,112 @@
 @end example
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden remove
address@hidden remove---Remove files from active use
address@hidden remove (subcommand)
+
address@hidden @bullet
address@hidden
+Synopsis: remove [-flR] [files...]
address@hidden
+Requires: repository, working directory.
address@hidden
+Changes: working directory.
address@hidden itemize
+
+The @code{remove} command is used to remove unwanted
+files from active use.  The user normally deletes the
+files from the working directory prior to invocation
+of the @code{remove} command.  Only the working
+directory is updated.  Changes to the repository are
+not made until the @code{commit} command is run.
+
+The @code{remove} command does not delete files from
+from the repository.  @sc{cvs} keeps all historical
+data in the repository so that it is possible to
+reconstruct previous states of the projects under
+revision control.
+
+To undo @sc{cvs} @code{remove} or to resurrect files
+that were previously removed, @xref{add}.
+
address@hidden
+* remove options::             remove options
+* remove examples::            remove examples
address@hidden menu
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
. .
address@hidden remove options
address@hidden remove options
+
+These standard options are supported by @code{remove}
+(@pxref{Common options} for a complete description of
+them):
+
address@hidden @code
address@hidden -l
+Local; run only in current working directory.  See @ref{Recursive behavior}.
+
address@hidden -R
+Process directories recursively.  See @ref{Recursive behavior}.
+
address@hidden table
+
+In addition, these options are also supported:
+
address@hidden @code
address@hidden -f
+Note that this is not the standard behavior of
+the @samp{-f} option as defined in @ref{Common options}.
+
+Delete files before removing them.
+
+Entire directory hierarchies are easily removed
+using @samp{-f}, but take note that it is not as
+easy to resurrect directory hierarchies as it is
+to remove them.
+
address@hidden table
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
. .
address@hidden remove examples
address@hidden remove examples
+
address@hidden Removing a file
+
address@hidden
+$ cvs remove remove.me
+cvs remove: file `remove.me' still in working directory
+cvs remove: 1 file exists; remove it first
+$ rm -f remove.me
+$ cvs remove remove.me
+cvs remove: scheduling `remove.me' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
+
+$ ls remove.it
+remove.it
+$ cvs remove -f remove.it
+cvs remove: scheduling `remove.it' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
address@hidden example
+
address@hidden Removing entire directories
address@hidden
+$ tree -d a
+a
+|-- CVS
+`-- b
+    `-- CVS
+
+3 directories
+$ cvs remove -f a
+cvs remove: Removing a
+cvs remove: Removing a/b
+cvs remove: scheduling `a/b/c' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
address@hidden example
+
address@hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
- -
 @node server & pserver
 @appendixsec server & pserver---Act as a server for a client on stdin/stdout
 @cindex pserver (subcommand)
@@ -11676,21 +11877,21 @@
 revision.
 
 These standard options are available with @code{sign}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
 @item -l
-Local; run only in current working directory.  @xref{Recursive behavior}.
+Local; run only in current working directory.  See @ref{Recursive behavior}.
 
 @item -R
-Sign all files recursively (default).  @xref{Recursive behavior}.
+Sign all files recursively (default).  See @ref{Recursive behavior}.
 
 @item -r @var{tag}[:@var{date}]
 Sign the revisions specified by @var{tag} or, when @var{date} is specified
 and @var{tag} is a branch tag, the version from the branch @var{tag} as it
 existed on @var{date}.  With @code{-d}, delete keys from the specified
-revision.  See also, @ref{Common options}.
+revision.  See also:  @ref{Common options}.
 @end table
 
 @need 800
@@ -11762,7 +11963,7 @@
 revisions.
 
 These standard options are supported by @code{tag} or @code{rtag}
-(@pxref{Common options}, for a complete description of them):
+(@pxref{Common options} for a complete description of them):
 
 @table @code
 @item -D @var{date}
@@ -11770,10 +11971,10 @@
 not valid when deleting tags (see @samp{-d} option, below).
 
 @item -l
-Local; run only in current working directory.  @xref{Recursive behavior}.
+Local; run only in current working directory.  See @ref{Recursive behavior}.
 
 @item -R
-Update directories recursively (default).  @xref{Recursive
+Update directories recursively (default).  See @ref{Recursive
 behavior}.
 
 @item -r @var{tag}[:@var{date}]
@@ -11830,7 +12031,7 @@
 
 @item -n
 Do not execute the tag program specified in the @file{modules} file
-(@code{rtag} only).  @xref{modules}, for more.
+(@code{rtag} only).  See @ref{modules} for more information.
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -11870,14 +12071,14 @@
 @appendixsubsec update options
 
 These standard options are available with @code{update}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
 @item -D date
 Use the most recent revision no later than @var{date}.
 This option is sticky, and implies @samp{-P}.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
 
 @item -f
 Only useful with the @samp{-D} or @samp{-r} flags.  If no matching revision
@@ -11889,11 +12090,11 @@
 This option is sticky; future updates of
 this file in this working directory will use the same
 @var{kflag}.  The @code{status} command can be viewed
-to see the sticky options.  See @ref{Invoking CVS}, for
+to see the sticky options.  See @ref{Invoking CVS} for
 more information on the @code{status} command.
 
 @item -l
-Local; run only in current working directory.  @xref{Recursive behavior}.
+Local; run only in current working directory.  See @ref{Recursive behavior}.
 
 @item -P
 Prune empty directories.  See @ref{Moving directories}.
@@ -11902,15 +12103,15 @@
 Pipe files to the standard output.
 
 @item -R
-Update directories recursively (default).  @xref{Recursive
+Update directories recursively (default).  See @ref{Recursive
 behavior}.
 
 @item -r @var{tag}[:@var{date}]
 Retrieve the revisions specified by @var{tag} or, when @var{date} is specified
 and @var{tag} is a branch tag, the version from the branch @var{tag} as it
 existed on @var{date}.  This option is sticky, and implies @samp{-P}.
-See @ref{Sticky tags}, for more information on sticky tags/dates. Also
-see @ref{Common options}.
+See @ref{Sticky tags} for more information on sticky tags/dates.  Also
address@hidden options}.
 @end table
 
 @need 800
@@ -11921,7 +12122,7 @@
 @item -A
 Reset any sticky tags, dates, or @samp{-k} options.
 Does not reset sticky @samp{-k} options on modified files.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
 
 @item -C
 Overwrite locally modified files with clean copies from
@@ -11949,7 +12150,7 @@
 working directory) during the update.  You can specify
 @samp{-I} more than once on the command line to specify
 several files to ignore.  Use @samp{-I !} to avoid
-ignoring any files at all.  @xref{cvsignore}, for other
+ignoring any files at all.  See @ref{cvsignore} for other
 ways to make @sc{cvs} ignore some files.
 
 @item address@hidden
@@ -11958,7 +12159,7 @@
 
 @var{spec} can be a file name pattern of the same type
 that you can specify in the @file{.cvswrappers}
-file. @xref{Wrappers}.
+file.  See @ref{Wrappers}.
 
 @item address@hidden
 With two @samp{-j} options, merge changes from the
@@ -11976,7 +12177,7 @@
 Note that using a single @samp{-j @var{tagname}} option rather than
 @samp{-j @var{branchname}} to merge changes from a branch will
 often not remove files which were removed on the branch.
address@hidden adds and removals}, for more.
+See @ref{Merging adds and removals} for more information.
 
 In addition, each @samp{-j} option can contain an optional
 date specification which, when used with branches, can
@@ -11985,7 +12186,7 @@
 (:) to the tag:
 @address@hidden:@var{Date_Specifier}}.
 
address@hidden and merging}.
+See @ref{Branching and merging}.
 
 @end table
 
@@ -12081,23 +12282,23 @@
 verifies all revisions before operating on them.
 
 These standard options are available with @code{verify}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
 them):
 
 @table @code
 @item -l
-Local; run only in current working directory.  @xref{Recursive behavior}.
+Local; run only in current working directory.  See @ref{Recursive behavior}.
 
 @item -p
 Pipe signatures to the standard output, instead of verifying.
 
 @item -R
-Sign all files recursively (default).  @xref{Recursive behavior}.
+Sign all files recursively (default).  See @ref{Recursive behavior}.
 
 @item -r @var{tag}[:@var{date}]
 Verify the revisions specified by @var{tag} or, when @var{date} is specified
 and @var{tag} is a branch tag, the version from the branch @var{tag} as it
-existed on @var{date}.  See also, @ref{Common options}.
+existed on @var{date}.  See also:  @ref{Common options}.
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -12106,7 +12307,7 @@
 @cindex version (subcommand)
 
 @code{version} outputs a version string for both the @sc{cvs} client and
-a @sc{cvs} server, when a server can be contacted.  Also, @ref{Global options}.
+a @sc{cvs} server, when a server can be contacted.  Also, @xref{Global 
options}.
 
 @c ----- END MAN 1 -----
 @c ---------------------------------------------------------------------
@@ -13477,7 +13678,7 @@
 mechanisms outside @sc{cvs}, to insert any necessary
 changes.
 
address@hidden: do not use @code{COPY} with
address@hidden:  Do not use @code{COPY} with
 @sc{cvs} 1.9 or earlier - such versions of @sc{cvs} will
 copy one version of your file over the other, wiping
 out the previous contents.}

Index: stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- stamp-vti   21 Aug 2006 20:59:13 -0000      1.196
+++ stamp-vti   21 Aug 2006 21:34:05 -0000      1.197
@@ -1,4 +1,4 @@
address@hidden UPDATED 14 August 2006
address@hidden UPDATED 21 August 2006
 @set UPDATED-MONTH August 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- version.texi        21 Aug 2006 20:59:13 -0000      1.198
+++ version.texi        21 Aug 2006 21:34:05 -0000      1.199
@@ -1,4 +1,4 @@
address@hidden UPDATED 14 August 2006
address@hidden UPDATED 21 August 2006
 @set UPDATED-MONTH August 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]