Index: cvs.1
===================================================================
RCS file: /sources/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.50
diff -U10 -r1.50 cvs.1
--- cvs.1	11 Jul 2006 21:49:04 -0000	1.50
+++ cvs.1	14 Aug 2006 05:29:05 -0000
@@ -229,22 +229,22 @@
 .IX "Left-hand options"
 .SP
 The available \fBcvs_options\fR (that are given to the
 left of \fBcvs_command\fR) are:
 .SP
 .IP "" 0
 \fB--allow-root=\fIrootdir\fB\fR
 .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
-see node `Password authentication server\(aq in the CVS manual & see node `Write proxies\(aq in the CVS manual.
+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"
 .IX "Stream authentication"
 .IP "" 0
 \fB-a\fR
 .IP "" 2
 Authenticate all communication between the client and
 the server.  Only has an effect on the \fBcvs\fR client.
 As of this writing, this is only implemented when using
 a GSSAPI connection (see node `GSSAPI authenticated\(aq in the CVS manual).
@@ -297,31 +297,31 @@
 specifying \fB-T\fR for the client has no effect on the server and
 vice versa.
 .SP
 .IX "CVSROOT, overriding"
 .IX "Overriding CVSROOT"
 .IP "" 0
 \fB-d \fIcvs_root_directory\fB\fR
 .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"
 .IP "" 0
 \fB-e \fIeditor\fB\fR
 .IP "" 2
 Use \fIeditor\fR to enter revision log information.  Overrides the
 setting of the \fB$CVSEDITOR\fR and \fB$EDITOR\fR
 environment variables.  For more information, see
-see node `Committing your changes\(aq in the CVS manual.
+`Committing your changes\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-f\fR
 .IP "" 2
 Do not read the \fB~/.cvsrc\fR file.  This
 option is most often used because of the
 non-orthogonality of the \fBcvs\fR option set.  For
 example, the \fBcvs log\fR option \fB-N\fR (turn off
 display of tag names) does not have a corresponding
 option to turn the display on.  So if you have
@@ -492,21 +492,21 @@
 .IP "" 0
 \fB--no-sign\fR
 .IP "" 2
 Force OpenPGP signatures on or off.  \fB-g\fR & \fB--sign\fR will cause the
 commit to abort if the server does not support OpenPGP signatures.  Without one
 of these options, CVS will autonegotiate signing, attempting to sign commits
 when the server supports it.  Overrides the \fB$CVS_SIGN_COMMITS\fR
 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: see node `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
 \fB--sign-template \fItemplate\fB\fR
 .IP "" 2
 Use \fItemplate\fR as the command line template to generate OpenPGP signatures.
 Format strings in this template are substituted before the commit is run:
 .SP
 .IP "" 2
 \fB%M\fR
@@ -522,50 +522,50 @@
 .IP "" 4
 Substitute in any \fIarg\fRs set via the \fB--sign-arg\fR option or the
 CVSROOT sign-arg method option.
 .IP "" 2
 \fB%s\fR
 .IP "" 4
 Substitute the name of the file to generate a signature for.
 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: see node `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
 \fB--textmode\fR
 .IP "" 2
 The value passed to both in place of \fB%M\fR in both the OpenPGP signature
 and the OpenPGP verification command line templates.  Defaults to
 \fB--textmode\fR.
 .SP
-\fBWARNING: see node `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
 \fB--verify\fR
 .IP "" 2
 .IP "" 0
 \fB--no-verify\fR
 .IP "" 2
 Force OpenPGP signature verification on checkout off, or set the failure mode.
 With a failure mode of \fBwarn\fR, the user will be warned of invalid
 signatures but the checkout will be allowed.  With a failure mode of
 \fBfatal\fR, the checkout will be aborted when the first corrupt file is
 received.  If the server does not support OpenPGP signatures, a failure mode
 of \fBfatal\fR will disallow the entire checkout.  Overrides the
 \fB$CVS_VERIFY_CHECKOUTS\fR environment variable (see node `Environment
 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: see node `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
 \fB--verify-template=\fItemplate\fB\fR
 .IP "" 2
 Use \fItemplate\fR as the command line template to verify OpenPGP signatures.
 Format strings in this template are substituted before the command is run:
 .SP
 .IP "" 2
 \fB%M\fR
@@ -587,23 +587,23 @@
 .IP "" 4
 Substitute the name of the file containing the signature.
 .IP "" 2
 \fB%s\fR
 .IP "" 4
 Substitute the name of the signed file.
 This template should exit with an exit code of zero if the signature is valid
 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: see node `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"
 .SS "Common command options"
 .IX "Common options"
 .IX "Right-hand options"
 .SP
 This section describes the \fBcommand_options\fR that
 are available across several \fBcvs\fR commands.  These
 options are always given to the right of
@@ -673,43 +673,43 @@
 every file).  This is so that \fBcvs\fR will continue to
 give an error if you mistype a tag name.
 .SP
 \fB-f\fR is available with these commands:
 \fBannotate\fR, \fBcheckout\fR, \fBexport\fR,
 \fBrdiff\fR, \fBrtag\fR, and \fBupdate\fR.
 .SP
 \fBWARNING:  The \fBcommit\fB and \fBremove\fB
 commands also have a
 \fB-f\fB option, but it has a different behavior for
-those commands.  See see node `commit options\(aq in the CVS manual, and
-see node `Removing files\(aq in the CVS manual.\fR
+those commands.  See `commit options\(aq in the CVS manual, and
+`Removing files\(aq in the CVS manual.\fR
 .SP
 .IP "" 0
 \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
 with a \fBcheckout\fR or \fBupdate\fR command,
 \fBcvs\fR associates your selected \fIkflag\fR with any files
 it operates on, and continues to use that \fIkflag\fR with future
 commands on the same files until you specify otherwise.
 .SP
 The \fB-k\fR option is available with the \fBadd\fR,
 \fBcheckout\fR, \fBdiff\fR, \fBexport\fR, \fBimport\fR,
 \fBrdiff\fR, and \fBupdate\fR commands.
 .SP
-\fBWARNING: Prior to CVS version 1.12.2, the \fB-k\fB flag
+\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
 \fB-l\fR
 .IP "" 2
 Local; run only in current working directory, rather than
 recursing through subdirectories.
 .SP
 Available with the following commands: \fBannotate\fR, \fBcheckout\fR,
 \fBcommit\fR, \fBdiff\fR, \fBedit\fR, \fBeditors\fR, \fBexport\fR,
@@ -737,21 +737,21 @@
 .SP
 \fBThis is not the same as the \fBcvs -n\fB
 program option, which you can specify to the left of a cvs command!\fR
 .SP
 Available with the \fBcheckout\fR, \fBexport\fR,
 and \fBrtag\fR commands.
 .SP
 .IP "" 0
 \fB-P\fR
 .IP "" 2
-Prune empty directories.  See see node `Removing directories\(aq in the CVS manual.
+Prune empty directories.  See `Removing directories\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe the files retrieved from the repository to standard output,
 rather than writing them in the current directory.  Available
 with the \fBcheckout\fR and \fBupdate\fR commands.
 .SP
 .IP "" 0
 \fB-R\fR
@@ -781,22 +781,22 @@
 available in the repository, and \fBBASE\fR refers to the
 revision you last checked out into the current working directory.
 .SP
 The tag specification is sticky when you use this
 with \fBcheckout\fR or \fBupdate\fR to make your own
 copy of a file: \fBcvs\fR remembers the tag and continues to use it on
 future update commands, until you specify otherwise (for more information
 on sticky tags/dates, see node `Sticky tags\(aq in the CVS manual).
 .SP
 The tag can be either a symbolic or numeric tag, as
-described in see node `Tags\(aq in the CVS manual, or the name of a branch, as
-described in see node `Branching and merging\(aq in the CVS manual.
+described in `Tags\(aq in the CVS manual, or the name of a branch, as
+described in `Branching and merging\(aq in the CVS manual.
 When \fItag\fR is the name of a
 branch, some commands accept the optional \fIdate\fR argument to specify
 the revision as of the given date on the branch.
 When a command expects a specific revision,
 the name of a branch is interpreted as the most recent
 revision on that branch.
 .SP
 Specifying the \fB-q\fR global option along with the
 \fB-r\fR command option is often useful, to suppress
 the warning messages when the \fBrcs\fR file
@@ -816,20 +816,125 @@
 \fB-W\fR
 .IP "" 2
 Specify file names that should be filtered.  You can
 use this option repeatedly.  The spec can be a file
 name pattern of the same type that you can specify in
 the \fB.cvswrappers\fR file.
 Available with the following commands: \fBimport\fR,
 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)"
 .SP
 .IP "\(bu" 2
 Requires: repository, working directory.
 .IP "\(bu" 2
 Changes: repository.
 .IP "\(bu" 2
 Synonym: rcs
@@ -843,21 +948,21 @@
 used.
 .SP
 .IX "cvsadmin"
 .IX "UserAdminOptions, in CVSROOT/config"
 On unix, if there is a group named \fBcvsadmin\fR,
 only members of that group can run \fBcvs admin\fR
 commands, except for those specified using the
 \fBUserAdminOptions\fR configuration option in the
 \fBCVSROOT/config\fR file.  Options specified using
 \fBUserAdminOptions\fR can be run by any user.  See
-see node `config\(aq in the CVS manual for more on \fBUserAdminOptions\fR.
+`config\(aq in the CVS manual for more on \fBUserAdminOptions\fR.
 .SP
 The \fBcvsadmin\fR group should exist on the server,
 or any system running the non-client/server \fBcvs\fR.
 To disallow \fBcvs admin\fR for all users, create a
 group with no users in it.  On NT, the \fBcvsadmin\fR
 feature does not exist and all users
 can run \fBcvs admin\fR.
 .SP
 .SH "admin options"
 .SP
@@ -892,21 +997,21 @@
 local changes\(aq in the CVS manual).
 There can be no space between \fB-b\fR and its argument.
 .SP
 .IX "Comment leader"
 .IP "" 0
 \fB-c\fIstring\fB\fR
 .IP "" 2
 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
 .IP "" 2
 Might not work together with \fBcvs\fR.  Erase the login
 names appearing in the comma-separated list
 \fIlogins\fR from the access list of the RCS file.  If
 \fIlogins\fR is omitted, erase the entire access list.
 There can be no space between \fB-e\fR and its argument.
 .SP
@@ -923,21 +1028,21 @@
 .IP "" 2
 Useless with \fBcvs\fR.  This creates and initializes a
 new \fBrcs\fR file, without depositing a revision.  With
 \fBcvs\fR, add files with the \fBcvs add\fR command
 (see node `Adding files\(aq in the CVS manual).
 .SP
 .IP "" 0
 \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.
 .SP
 .IP "" 0
 \fB-l[\fIrev\fB]\fR
 .IP "" 2
 Lock the revision with number \fIrev\fR.  If a branch
 is given, lock the latest revision on that branch.  If
 \fIrev\fR is omitted, lock the latest revision on the
@@ -971,21 +1076,21 @@
 \fB-m\fIrev\fB:\fImsg\fB\fR
 .IP "" 2
 Replace the log message of revision \fIrev\fR with
 \fImsg\fR.
 .SP
 .IP "" 0
 \fB-N\fIname\fB[:[\fIrev\fB]]\fR
 .IP "" 2
 Act like \fB-n\fR, except override any previous
 assignment of \fIname\fR.  For use with magic branches,
-see see node `Magic branch numbers\(aq in the CVS manual.
+see `Magic branch numbers\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-n\fIname\fB[:[\fIrev\fB]]\fR
 .IP "" 2
 Associate the symbolic name \fIname\fR with the branch
 or revision \fIrev\fR.  It is normally better to use
 \fBcvs tag\fR or \fBcvs rtag\fR instead.  Delete the
 symbolic name if both \fB:\fR and \fIrev\fR are
 omitted; otherwise, print an error message if
 \fIname\fR is already associated with another number.
@@ -1108,21 +1213,21 @@
 \fBcvs admin -o\fR.  If one specifies the
 non-\fB::\fR syntaxes, then \fBcvs\fR will delete the
 revisions but leave the symbolic names pointing to
 nonexistent revisions.  This behavior is preserved for
 compatibility with previous versions of \fBcvs\fR, but
 because it isn\(aqt very useful, in the future it may
 change to be like the \fB::\fR case.
 .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
 starts to edit it and tries to check it back in.  For
 this reason, this option is not a good way to take back
 a bogus commit; commit a new revision undoing the bogus
 change instead (see node `Merging two revisions\(aq in the CVS manual).
 .SP
 .IP "" 0
 \fB-q\fR
@@ -1247,21 +1352,21 @@
 .IP "\(bu" 2
 Changes: nothing.
 .SP
 For each file in \fIfiles\fR, print the head revision
 of the trunk, together with information on the last
 modification for each line.  
 .SP
 .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
 \fB-l\fR
 .IP "" 2
 Local directory only, no recursion.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
@@ -1275,21 +1380,21 @@
 .IP "" 0
 \fB-F\fR
 .IP "" 2
 Annotate binary files.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Annotate file as of specified revision/tag 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 see node `Common options\(aq in the CVS manual.
+existed on \fIdate\fR.  See `Common options\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-D \fIdate\fB\fR
 .IP "" 2
 Annotate file as of specified date.
 .SP
 .IP "" 0
 \fB-w \fIwidth\fB\fR
 .IP "" 2
 Modify the width of the username field (default 8).
@@ -1320,23 +1425,23 @@
 The file \fBssfile\fR currently contains two lines.
 The \fBssfile line 1\fR line was checked in by
 \fBmary\fR on March 27.  Then, on March 28, \fBjoe\fR
 added a line \fBssfile line 2\fR, without modifying
 the \fBssfile line 1\fR line.  This report doesn\(aqt
 tell you anything about lines which have been deleted
 or replaced; you need to use \fBcvs diff\fR for that
 (see node `diff\(aq in the CVS manual).
 .SP
 The options to \fBcvs annotate\fR are listed in
-see node `Invoking CVS\(aq in the CVS manual, and can be used to select the files
+`Invoking CVS\(aq in the CVS manual, and can be used to select the files
 and revisions to annotate.  The options are described
-in more detail there and in see node `Common options\(aq in the CVS manual.
+in more detail there and in `Common options\(aq in the CVS manual.
 .SP
 .SH "checkout"
 .SS "Check out sources for editing"
 .IX "checkout (subcommand)"
 .IX "co (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: checkout [options] modules\&...
 .IP "\(bu" 2
 Requires: repository.
@@ -1349,21 +1454,21 @@
 source files specified by \fImodules\fR.  You must execute
 \fBcheckout\fR before using most of the other \fBcvs\fR
 commands, since most of them operate on your working
 directory.
 .SP
 The \fImodules\fR are either
 symbolic names for some
 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
 the appropriate source files.  You can then edit these
 source files at any time (regardless of whether other
 software developers are editing their own copies of the
 sources); update them to include new changes applied by
 others to the source repository; or commit your work as
 a permanent change to the source repository.
 .SP
@@ -1393,98 +1498,98 @@
 will appear in your work area.
 However, \fBcheckout\fR takes a module name whereas
 \fBupdate\fR takes a directory name.  Also
 to use \fBcheckout\fR this way it must be run from the
 top level directory (where you originally ran
 \fBcheckout\fR from), so before you run
 \fBcheckout\fR to update an existing directory, don\(aqt
 forget to change your directory to the top level
 directory.
 .SP
-For the output produced by the \fBcheckout\fR command
-see see node `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
 \fB-D \fIdate\fB\fR
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 This option is sticky, and implies \fB-P\fR.  See
-see node `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
 .IP "" 2
 Only useful with the \fB-D\fR or \fB-r\fR flags.  If no matching revision is
 found, retrieve the most recent revision (instead of ignoring the file).
 .SP
 .IP "" 0
 \fB-k \fIkflag\fB\fR
 .IP "" 2
 Process keywords according to \fIkflag\fR.  See
-see node `Keyword substitution\(aq in the CVS manual.
+`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.  See see node `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.
 .SP
 .IP "" 0
 \fB-n\fR
 .IP "" 2
 Do not run any checkout program (as specified
 with the \fB-o\fR option in the modules file;
 see node `modules\(aq in the CVS manual).
 .SP
 .IP "" 0
 \fB-P\fR
 .IP "" 2
-Prune empty directories.  See see node `Moving directories\(aq in the CVS manual.
+Prune empty directories.  See `Moving directories\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe files to the standard output.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
 Checkout directories recursively.  This option is on by default.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Checkout the revision 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 see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.  Also,
-see see node `Common options\(aq in the CVS manual.
+See `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.  Also,
+see `Common options\(aq in the CVS manual.
 .SP
 In addition to those, you can use these special command
 options with \fBcheckout\fR:
 .SP
 .IP "" 0
 \fB-A\fR
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
 Does not reset sticky \fB-k\fR options on modified files.
-See see node `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
 .IP "" 2
 Copy the module file, sorted, to the standard output,
 instead of creating or modifying any files or
 directories in your working directory.
 .SP
 .IP "" 0
 \fB-d \fIdir\fB\fR
@@ -1533,36 +1638,36 @@
 revision which the working directory is based on, and
 the revision specified in the \fB-j\fR option.
 .SP
 In addition, each -j option can contain an optional
 date specification which, when used with branches, can
 limit the chosen revision to one within a specific
 date.  An optional date is specified by adding a colon
 (:) 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
 .IP "" 2
 Only useful together with \fB-d \fIdir\fB\fR.  With
 this option, \fBcvs\fR will not \`\`shorten\(aq\(aq module paths
 in your working directory when you check out a single
 module.  See the \fB-d\fR flag for examples and a
 discussion.
 .SP
 .IP "" 0
 \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
 .SH "checkout examples"
 .SP
 Get a copy of the module \fBtc\fR:
 .SP
 .PD 0
 .SP
 .IP "" 2
@@ -1618,36 +1723,36 @@
 current first with \fBupdate\fR (see node `update\(aq in the CVS manual).
 \fBcommit\fR does not call the \fBupdate\fR command
 for you, but rather leaves that for you to do when the
 time is right.
 .SP
 When all is well, an editor is invoked to allow you to
 enter a log message that will be written to one or more
 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 & 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
 that the argument file contains the log message.
 .SP
 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 & rlog\(aq in the CVS manual,
-see node `File status\(aq in the CVS manual.
+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,
+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
 \fB-l\fR
 .IP "" 2
 Local; run only in current working directory.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
@@ -1663,36 +1768,36 @@
 cannot commit to a specific revision on a branch.
 .SP
 \fBcommit\fR also supports these options:
 .SP
 .IP "" 0
 \fB-c\fR
 .IP "" 2
 Refuse to commit files unless the user has registered a valid edit on the
 file via \fBcvs edit\fR.  This is most useful when \fBcommit -c\fR
 and \fBedit -c\fR have been placed in all \fB.cvsrc\fR files.
-A commit can be forced anyways by either regestering an edit retroactively
+A commit can be forced anyways by either registering an edit retroactively
 via \fBcvs edit\fR (no changes to the file will be lost) or using the
 \fB-f\fR option to commit.  Support for \fBcommit -c\fR requires both
 client and a server versions 1.12.10 or greater.
 .SP
 .IP "" 0
 \fB-F \fIfile\fB\fR
 .IP "" 2
 Read the log message from \fIfile\fR, instead
 of invoking an editor.
 .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 see node `Common options\(aq in the CVS manual.
+the \fB-f\fR option as defined in `Common options\(aq in the CVS manual.
 .SP
 Force \fBcvs\fR to commit a new revision even if you haven\(aqt
 made any changes to the file.  As of \fBcvs\fR version 1.12.10,
 it also causes the \fB-c\fR option to be ignored.  If the current revision
 of \fIfile\fR is 1.7, then the following two commands
 are equivalent:
 .SP
 .PD 0
 .SP
 .IP "" 4
@@ -1832,34 +1937,34 @@
 If any file names are given, only those files are
 compared.  If any directories are given, all files
 under them will be compared.
 .SP
 The exit status for diff is different than for other
 \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
 \fB-D \fIdate\fB\fR
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 See \fB-r\fR for how this affects the comparison.
 .SP
 .IP "" 0
 \fB-k \fIkflag\fB\fR
 .IP "" 2
 Process keywords according to \fIkflag\fR.  See
-see node `Keyword substitution\(aq in the CVS manual.
+`Keyword substitution\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
 Local; run only in current working directory.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
 Examine directories recursively.  This option is on by
@@ -1937,21 +2042,21 @@
 .IP "" 2
 Use the context output format, showing \fIlines\fR (an integer) lines of
 context, or three if \fIlines\fR is not given.
 For proper operation, \fBpatch\fR typically needs at least two lines of
 context.
 .SP
 .IP "" 0
 \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
 .IP "" 2
 Change the algorithm to perhaps find a smaller set of changes.  This makes
 \fBdiff\fR slower (sometimes much slower).
 .SP
 .IP "" 0
 \fB-e\fR
 .IP "" 2
@@ -2059,21 +2164,21 @@
 .SP
 .IP "" 0
 \fB--left-column\fR
 .IP "" 2
 Print only the left column of two common lines in side by side format.
 .SP
 .IP "" 0
 \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
 .IP "" 2
 Change the algorithm to perhaps find a smaller set of changes.  This
 makes \fBdiff\fR slower (sometimes much slower).
 .SP
 .IP "" 0
 \fB-n\fR
 .IP "" 2
@@ -2086,39 +2191,39 @@
 .IP "" 0
 \fB--new-file\fR
 .IP "" 2
 In directory comparison, if a file is found in only one directory,
 treat it as present but empty in the other directory.
 .SP
 .IP "" 0
 \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
 .IP "" 2
 Show which C function each change is in.
 .SP
 .IP "" 0
 \fB--rcs\fR
 .IP "" 2
 Output RCS-format diffs; like \fB-f\fR except that each command
@@ -2727,43 +2832,43 @@
 .IP "" 0
 \fB-R\fR
 .IP "" 2
 Export directories recursively.  This is on by default.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Export the revision 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 see node `Common options\(aq in the CVS manual.
+existed on \fIdate\fR.  See `Common options\(aq in the CVS manual.
 .SP
 In addition, these options (that are common to
 \fBcheckout\fR and \fBexport\fR) are also supported:
 .SP
 .IP "" 0
 \fB-d \fIdir\fB\fR
 .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
 \fB-k \fIsubst\fB\fR
 .IP "" 2
 Set keyword expansion mode (see node `Substitution modes\(aq in the CVS manual).
 .SP
 .IP "" 0
 \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"
 .SS "Show status of files and users"
 .IX "history (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis:     history [-report] [-flags] [-options args] [files\&...]
 .IP "\(bu" 2
 Requires: the file \fB$CVSROOT/CVSROOT/history\fR
@@ -2996,45 +3101,45 @@
 .IP "\(bu" 2
 Requires: Repository, source distribution directory.
 .IP "\(bu" 2
 Changes: repository.
 .SP
 Use \fBimport\fR to incorporate an entire source
 distribution from an outside source (e.g., a source
 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
 (or a path to a directory) under the \fBcvs\fR root directory
 for repositories; if the directory did not exist,
 import creates it.
 .SP
 When you use import for updates to source that has been
 modified in your source repository (since a prior
 import), it will notify you of any files that conflict
 in the two branches of development; use \fBcheckout
 -j\fR to reconcile the differences, as import instructs
 you to do.
 .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
 branch; for example, files from the first imported
 collection of source will be revision 1.1.1.1, then
 files from the first imported update will be revision
 1.1.1.2, and so on.
 .SP
 At least three arguments are required.
 \fIrepository\fR is needed to identify the collection
@@ -3048,78 +3153,78 @@
 Note that \fBimport\fR does \fInot\fR change the
 directory in which you invoke it.  In particular, it
 does not set up that directory as a \fBcvs\fR working
 directory; if you want to work with the sources import
 them first and then check them out into a different
 directory (see node `Getting the source\(aq in the CVS manual).
 .SP
 .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
 .IP "" 2
 Use \fImessage\fR as log information, instead of
 invoking an editor.
 .SP
 There are the following additional special options.
 .SP
 .IP "" 0
 \fB-b \fIbranch\fB\fR
 .IP "" 2
-See see node `Multiple vendor branches\(aq in the CVS manual.
+See `Multiple vendor branches\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-k \fIsubst\fB\fR
 .IP "" 2
 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 see node `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
 \fB-I \fIname\fB\fR
 .IP "" 2
 Specify file names that should be ignored during
 import.  You can use this option repeatedly.  To avoid
 ignoring any files at all (even those ignored by
 default), specify \`-I !\(aq.
 .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
 .IP "" 2
 Specify file names that should be filtered during
 import.  You can use this option repeatedly.
 .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
 .IP "" 2
 Modify the algorithm used by \fBcvs\fR when importing new files
 so that new files do not immediately appear on the main trunk.
 .SP
 Specifically, this flag causes \fBcvs\fR to mark new files as
 if they were deleted on the main trunk, by taking the following
 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
 CVSROOT/config (see node `config\(aq in the CVS manual).
 .SP
 .SH "import output"
 .SP
 \fBimport\fR keeps you informed of its progress by printing a line
 for each file, preceded by one character indicating the status of the file:
 .SP
@@ -3153,21 +3258,21 @@
 The file is a symbolic link; \fBcvs import\fR ignores symbolic links.
 People periodically suggest that this behavior should
 be changed, but if there is a consensus on what it
 should be changed to, it is not apparent.
 (Various options in the \fBmodules\fR file can be used
 to recreate symbolic links on checkout, update, etc.;
 see node `modules\(aq in the CVS manual.)
 .SP
 .SH "import examples"
 .SP
-See see node `Tracking sources\(aq in the CVS manual, and see node `From files\(aq in the CVS manual.
+See `Tracking sources\(aq in the CVS manual, and `From files\(aq in the CVS manual.
 .SP
 .SH "log & rlog"
 .SS "Print out log information for files"
 .IX "log (subcommand)"
 .IX "rlog (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: log [options] [files\&...]
 .IP "\(bu" 2
 Requires: repository, working directory.
@@ -3358,21 +3463,21 @@
 .IP "" 2
 Suppress the header if no revisions are selected.
 .SP
 .IP "" 0
 \fB-s \fIstates\fB\fR
 .IP "" 2
 Print information about revisions whose state
 attributes match one of the states given in the
 comma-separated list \fIstates\fR.  Individual states may
 be any text string, though \fBcvs\fR commonly only uses two
-states, \fBExp\fR and \fBdead\fR.  See see node `admin options\(aq in the CVS manual
+states, \fBExp\fR and \fBdead\fR.  See `admin options\(aq in the CVS manual
 for more information.
 .SP
 .IP "" 0
 \fB-t\fR
 .IP "" 2
 Print the same as \fB-h\fR, plus the descriptive text.
 .SP
 .IP "" 0
 \fB-w\fIlogins\fB\fR
 .IP "" 2
@@ -3446,21 +3551,21 @@
 These standard options are supported by \fBls\fR & \fBrls\fR:
 .SP
 .IP "" 0
 \fB-d\fR
 .IP "" 2
 Show dead revisions (with tag when specified).
 .SP
 .IP "" 0
 \fB-e\fR
 .IP "" 2
-Display in CVS/Entries format.  This format is meant to remain easily parsable
+Display in CVS/Entries format.  This format is meant to remain easily parseable
 by automation.
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
 Display all details.
 .SP
 .IP "" 0
 \fB-P\fR
 .IP "" 2
@@ -3469,21 +3574,21 @@
 .IP "" 0
 \fB-R\fR
 .IP "" 2
 List recursively.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Show files 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 see node `Common options\(aq in the CVS manual.
+existed on \fIdate\fR.  See `Common options\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-D \fIdate\fB\fR
 .IP "" 2
 Show files from date.
 .SP
 .SH "rls examples"
 .SP
 .PD 0
 .SP
@@ -3557,56 +3662,56 @@
 .SP
 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
 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
 \fB-D \fIdate\fB\fR
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 .SP
 .IP "" 0
 \fB-f\fR
 .IP "" 2
 If no matching revision is found, retrieve the most
 recent revision (instead of ignoring the file).
 .SP
 .IP "" 0
 \fB-k \fIkflag\fB\fR
 .IP "" 2
 Process keywords according to \fIkflag\fR.  See
-see node `Keyword substitution\(aq in the CVS manual.
+`Keyword substitution\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-l\fR
 .IP "" 2
 Local; don\(aqt descend subdirectories.
 .SP
 .IP "" 0
 \fB-R\fR
 .IP "" 2
 Examine directories recursively.  This option is on by default.
 .SP
 .IP "" 0
 \fB-r \fItag\fB\fR
 .IP "" 2
 Use the revision 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 see node `Common options\(aq in the CVS manual.
+existed on \fIdate\fR.  See `Common options\(aq in the CVS manual.
 .SP
 In addition to the above, these options are available:
 .SP
 .IP "" 0
 \fB-c\fR
 .IP "" 2
 Use the context diff format.  This is the default format.
 .SP
 .IP "" 0
 \fB-s\fR
@@ -3639,21 +3744,21 @@
 Suppose you receive mail from \fRfoo@example.net\fR asking for an
 update from release 1.2 to 1.4 of the tc compiler.  You
 have no such patches on hand, but with \fBcvs\fR that can
 easily be fixed with a command such as this:
 .SP
 .PD 0
 .SP
 .IP "" 2
 $ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \\
 .IP "" 2
-$$ Mail -s \(aqThe patches you asked for\(aq foo@example.net
+> Mail -s \(aqThe patches you asked for\(aq foo@example.net
 
 .PD
 .IP "" 0
 .SP
 Suppose you have made release 1.3, and forked a branch
 called \fBR_1_3fix\fR for bug fixes.  \fBR_1_3_1\fR
 corresponds to release 1.3.1, which was made some time
 ago.  Now, you want to see how much development has been
 done on the branch.  This command can be used:
 .SP
@@ -3712,23 +3817,23 @@
 .IP "" 0
 \fB-d\fR
 .IP "" 2
 Delete your working copy of the file if the release
 succeeds.  If this flag is not given your files will
 remain in your working directory.
 .SP
 \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"
 .SP
 Before \fBrelease\fR releases your sources it will
 print a one-line message for any file that is not
 up-to-date.
 .SP
 .IP "" 0
 \fBU \fIfile\fB\fR
@@ -3744,21 +3849,21 @@
 sources, but has not yet been committed to the
 repository.  If you delete your copy of the sources
 this file will be lost.
 .SP
 .IP "" 0
 \fBR \fIfile\fB\fR
 .IP "" 2
 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
 .IP "" 2
 The file is modified in your working directory.  There
 might also be a newer revision inside the repository.
 .SP
 .IP "" 0
 \fB? \fIfile\fB\fR
 .IP "" 2
@@ -3785,20 +3890,145 @@
 .IP "" 2
 You have [0] altered files in this repository.
 .IP "" 2
 Are you sure you want to release (and delete) directory \`tc\(aq: y
 .IP "" 2
 $
 
 .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)"
 .IX "server (subcommand)"
 .SP
 .IP "\(bu" 2
 pserver [-c path]
 .SP
 server [-c path]
 .IP "\(bu" 2
@@ -3830,40 +4060,40 @@
 .SH "sign"
 .SS "--Attach new OpenPGP revision signature"
 .IX "sign (subcommand)"
 .SP
 The \fBsign\fR command may be used to attach new OpenPGP signatures to
 any revision of a file.  Existing signatures are not removed when new
 ones are added.  \fBsign\fR may also be used to delete signatures from a
 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
 .IP "" 2
 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, see node `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
 .IP "" 0
 \fB-d \fIkeyid\fB\fR
 .IP "" 2
 Delete the signature(s) with key ID \fIkeyid\fR.
 .SP
 .SH "tag & rtag"
 .SS "Mark project snapshot for later retrieval."
@@ -3913,37 +4143,37 @@
 .SP
 These commands may also be used to delete a symbolic tag,
 or to create a branch.  See the options section below.
 .SP
 If you attempt to create a tag that already exists,
 CVS will complain and not overwrite that tag.  Use
 the \fB-F\fR option to move the tag to a new set of
 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
 .IP "" 2
 Tag the most recent revision no later than \fIdate\fR.  This option is
 not valid when deleting tags (see \fB-d\fR option, below).
 .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
-Update directories recursively (default).  see node `Recursive
+Update directories recursively (default).  See `Recursive
 behavior\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 Tag 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 not valid when deleting tags
 (see \fB-d\fR option, below).
 .SP
@@ -3954,69 +4184,69 @@
 \fB-a\fR
 .IP "" 2
 Clear \fInew_tag\fR from removed files that would not otherwise be tagged
 (\fBrtag\fR only).
 .SP
 .IP "" 0
 \fB-B\fR
 .IP "" 2
 Allows \fB-d\fR or \fB-F\fR to delete or move branch tags.
 .SP
-\fBWARNING: Recovering the information stored by branch tags is
+\fBWARNING:  Recovering the information stored by branch tags is
 a very hard problem, more so than regular tags.  Be absolutely sure you
 understand what you are doing before using this option.\fR
 .SP
 .IP "" 0
 \fB-b\fR
 .IP "" 2
 The \fB-b\fR option makes the new tag a branch tag (see node `Branching and
 merging\(aq in the CVS manual), allowing concurrent, isolated development.  This is commonly used
 to create patches to a previously released software distribution.
 .SP
 .IP "" 0
 \fB-c\fR
 .IP "" 2
 Abort if any tagged files are locally modified (\fBtag\fR only).
 .SP
 .IP "" 0
 \fB-d\fR
 .IP "" 2
 Delete \fInew_tag\fR, instead of creating it.
 .SP
-\fBWARNING: Be very certain of your ground before you delete a tag; doing
+\fBWARNING:  Be very certain of your ground before you delete a tag; doing
 this permanently discards some historical information, which could later turn
 out to be valuable.\fR
 .SP
 .IP "" 0
 \fB-F\fR
 .IP "" 2
 When a tag already exists, move it to the new revision.  When the tag
 does not exist, create it as normal.  This option is new in \fBcvs\fR 1.4.
 The pre-1.4 behavior is identical to \fBcvs tag -F\fR.
 .SP
-\fBWARNING: Be very certain of your ground before you delete a tag; doing
+\fBWARNING:  Be very certain of your ground before you delete a tag; doing
 this permanently discards some historical information, which could later turn
 out to be valuable.\fR
 .SP
 .IP "" 0
 \fB-f\fR
 .IP "" 2
 With \fB-r \fItag\fB\fR or \fB-d \fIdate\fB\fR, force a head revision match
 if \fItag\fR and \fIdate\fR are not found (in other words, attach \fInew_tag\fR
 to the most recent trunk revision when \fItag\fR and \fIdate\fR do not
 resolve to an existing revision).
 .SP
 .IP "" 0
 \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"
 .IX "update (subcommand)"
 .SP
 .IP "\(bu" 2
 update [-ACdflPpR] [-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
@@ -4031,86 +4261,86 @@
 with any revisions applied to the source repository
 since your last checkout or update.  Without the \fB-C\fR
 option, \fBupdate\fR will also merge any differences
 between the local copy of files and their base revisions
 into any destination revisions specified with \fB-r\fR,
 \fB-D\fR, or \fB-A\fR.
 .SP
 .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
 \fB-D date\fR
 .IP "" 2
 Use the most recent revision no later than \fIdate\fR.
 This option is sticky, and implies \fB-P\fR.
-See see node `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
 .IP "" 2
 Only useful with the \fB-D\fR or \fB-r\fR flags.  If no matching revision
 is found, retrieve the most recent revision (instead of ignoring the file).
 .SP
 .IP "" 0
 \fB-k \fIkflag\fB\fR
 .IP "" 2
 Process keywords according to \fIkflag\fR.  See
-see node `Keyword substitution\(aq in the CVS manual.
+`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.  See see node `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
 .IP "" 2
-Prune empty directories.  See see node `Moving directories\(aq in the CVS manual.
+Prune empty directories.  See `Moving directories\(aq in the CVS manual.
 .SP
 .IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe files to the standard output.
 .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
 \fB-r \fItag\fB[:\fIdate\fB]\fR
 .IP "" 2
 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 see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates. Also
-see see node `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.
 .SP
 .IP "" 0
 \fB-A\fR
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
 Does not reset sticky \fB-k\fR options on modified files.
-See see node `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
 .IP "" 2
 Overwrite locally modified files with clean copies from
 the repository (the modified file is saved in
 \fB.#\fIfile\fB.\fIrevision\fB\fR, however).
 .SP
 .IP "" 0
 \fB-d\fR
@@ -4130,61 +4360,61 @@
 command line), then updating with \fB-d\fR will create
 those directories, which may not be what you want.
 .SP
 .IP "" 0
 \fB-I \fIname\fB\fR
 .IP "" 2
 Ignore files whose names match \fIname\fR (in your
 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
 \fB-W\fIspec\fB\fR
 .IP "" 2
 Specify file names that should be filtered during
 update.  You can use this option repeatedly.
 .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
 .IP "" 2
 With two \fB-j\fR options, merge changes from the
 revision specified with the first \fB-j\fR option to
 the revision specified with the second \fBj\fR option,
 into the working directory.
 .SP
 With one \fB-j\fR option, merge changes from the
 ancestor revision to the revision specified with the
 \fB-j\fR option, into the working directory.  The
 ancestor revision is the common ancestor of the
 revision which the working directory is based on, and
 the revision specified in the \fB-j\fR option.
 .SP
 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
 limit the chosen revision to one within a specific
 date.  An optional date is specified by adding a colon
 (:) 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"
 .SP
 \fBupdate\fR and \fBcheckout\fR keep you informed of
 their progress by printing a line for each file, preceded
 by one character indicating the status of the file:
 .SP
 .IP "" 0
 \fBU \fIfile\fB\fR
@@ -4236,21 +4466,21 @@
 .IX "__ files (VMS)"
 A conflict was detected while trying to merge your
 changes to \fIfile\fR with changes from the source
 repository.  \fIfile\fR (the copy in your working
 directory) is now the result of attempting to merge
 the two revisions; an unmodified copy of your file
 is also in your working directory, with the name
 \fB.#\fIfile\fB.\fIrevision\fB\fR where \fIrevision\fR
 is the revision that your modified file started
 from.  Resolve the conflict as described in
-see node `Conflicts example\(aq in the CVS manual.
+`Conflicts example\(aq in the CVS manual.
 (Note that some systems automatically purge
 files that begin with \fB.#\fR if they have not been
 accessed for a few days.  If you intend to keep a copy
 of your original file, it is a very good idea to rename
 it.)  Under \fBvms\fR, the file name starts with
 \fB__\fR rather than \fB.#\fR.
 .SP
 .IP "" 0
 \fB? \fIfile\fB\fR
 .IP "" 2
@@ -4265,44 +4495,44 @@
 .IX "verify (subcommand)"
 .SP
 The \fBverify\fR command may be used to verify the OpenPGP signatures for
 specific revisions of a file.  Note that when the verify mode is
 set to \fBwarn\fR or \fBfatal\fR, via the environment
 (see node `Environment variables\(aq in the CVS manual), the command line (see node `Global options\(aq in the CVS manual),
 or as a CVSROOT method option (see node `The connection method\(aq in the CVS manual), \fBcvs\fR
 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
 .IP "" 2
 Pipe signatures to the standard output, instead of verifying.
 .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
 .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, see node `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, see node `Global options\(aq in the CVS manual.
 .SH "AUTHORS"
 .TP
 Dick Grune