Import cvs-1.9.23 as at 19980123. There are a number of really nice

things fixed in here, including the '-ko' vs. -A problem with
remote cvs which caused all files with -ko to be resent each time
(which is damn painful over a modem, I can tell you).  It also found a
heap of stray empty directories that should have been pruned with the -P
flag to cvs update but were not for some reason.

It also has the fully integrated rcs and diff, so no more fork/exec
overheads for rcs,ci,patch,diff,etc.  This means that it parses the control
data in the rcs files only once rather than twice or more.

If the 'cvs diff' vs. Index thing is going to be fixed for future patch
compatability, this is the place to do it.

2 files changed, 34 insertions, 12 deletions

diff --git a/contrib/cvs/man/ChangeLog b/contrib/cvs/man/ChangeLog
index 6023631..c873cb2 100644
--- a/contrib/cvs/man/ChangeLog
+++ b/contrib/cvs/man/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jan 12 11:10:21 1998  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.1: Refer to Cederqvist as Cederqvist not as cvs.texinfo.
+	Describe it in a way which hopefully makes more sense for people
+	who aren't getting the CVS source distribution itself.  In "SEE
+	ALSO" section, also mention web pages.  Use a period not a comma
+	at the end of the references to other manpages.
+
+	* cvs.1: Remove $Id; we decided to get rid of these some time ago.
+
+Sun Jan 11 13:46:54 1998  Peter Wemm  <peter@netplex.com.au>
+
+	* cvs.1: Fix "the the" typo.  From Wolfram Schneider
+ 	<wosch@freebsd.org> via FreeBSD sources.
+
 Wed Feb 12 14:20:43 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* Makefile.in (install): Depend on installdirs.
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index 30f0ff9..a0efd4b 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -2,7 +2,6 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id: cvs.1,v 1.15 1996/11/30 19:49:56 kingdon Exp $
 .TH CVS 1 "\*(Dt"
 .\" Full space in nroff; half space in troff
 .de SP
@@ -27,7 +26,7 @@ cvs \- Concurrent Versions System
 .SH "NOTE"
 This manpage is a summary of some of the features of
 .B cvs
-but for more in-depth documentation, consult cvs.texinfo (as
+but for more in-depth documentation, consult the Cederqvist manual (as
 described in the SEE ALSO section of this manpage).
 .SH "DESCRIPTION"
 .IX "revision control system" "\fLcvs\fR"
@@ -1284,7 +1283,7 @@ Each
 file is searched for the revision or tag.
 .TP 1i
 \fB\ \ \ \ \ \ \-t\fP \fItag\fP
-Show records since tag \fItag\fP was last added to the the history file.
+Show records since tag \fItag\fP was last added to the history file.
 This differs from the \fB-r\fP flag above in that it reads
 only the history file, not the
 .SM RCS
@@ -1327,7 +1326,7 @@ names associated with
 administration, or with other common source control systems; common
 names for patch files, object files, archive files, and editor backup
 files; and other names that are usually artifacts of assorted utilities.
-For an up to date list of ignored file names, see cvs.texinfo (as
+For an up to date list of ignored file names, see the Cederqvist manual (as
 described in the SEE ALSO section of this manpage).
 .SP
 The outside source is saved in a first-level
@@ -1888,7 +1887,7 @@ Use \fB\-I\fP \fIname\fP to ignore files whose names match \fIname\fP
 \fB\-I\fP more than once on the command line to specify several files
 to ignore.  By default,
 \fBupdate\fP ignores files whose names match certain patterns; for
-an up to date list of ignored file names, see cvs.texinfo (as
+an up to date list of ignored file names, see the Cederqvist manual (as
 described in the SEE ALSO section of this manpage).
 .SP
 Use
@@ -2152,12 +2151,20 @@ module and vendor branch support and author of the
 shell script (the ancestor of
 .` "cvs import").
 .SH "SEE ALSO"
-The most comprehensive manual for CVS is cvs.texinfo, also known as
-Version Management with CVS by Per Cederqvist et al.  For more
-information about the formats which this manual is in or can be
-converted to (info, postscript, etc.), see the README file in the CVS
-distribution.
-
+The most comprehensive manual for CVS is
+Version Management with CVS by Per Cederqvist et al.  Depending on
+your system, you may be able to get it with the
+.B info cvs
+command or it may be available as cvs.ps (postscript), cvs.texinfo
+(texinfo source), or cvs.html.
+.SP
+For CVS updates, more information on documentation, software related
+to CVS, development of CVS, and more, see:
+.in +1i
+.B http://www.cyclic.com
+.B http://www.loria.fr/~molli/cvs-index.html
+.in -1i
+.SP
 .BR ci ( 1 ),
 .BR co ( 1 ),
 .BR cvs ( 5 ),
@@ -2168,4 +2175,4 @@ distribution.
 .BR rcs ( 1 ),
 .BR rcsdiff ( 1 ),
 .BR rcsmerge ( 1 ),
-.BR rlog ( 1 ),
+.BR rlog ( 1 ).