Import of cvs-1.9.9-970515 onto vendor branch.

Obtained from: cyclic.com

4 files changed, 73 insertions, 66 deletions

diff --git a/contrib/cvs/man/ChangeLog b/contrib/cvs/man/ChangeLog
index 69017c9..6023631 100644
--- a/contrib/cvs/man/ChangeLog
+++ b/contrib/cvs/man/ChangeLog
@@ -1,3 +1,51 @@
+Wed Feb 12 14:20:43 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* Makefile.in (install): Depend on installdirs.
+
+Thu Jan  2 13:30:56 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* Makefile.in, cvsbug.8: Remove "675" paragraph;
+	see ../ChangeLog for rationale.
+
+Sat Nov 30 14:49:32 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.1: Add note at beginning about how cvs.texinfo is more
+	complete than this document.  Without some such indication, users
+	have no way of knowing which document to consult.
+
+Tue Oct  1 14:01:28 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.1: Revert all changes by Greg Woods since CVS 1.8.86.  They
+	are for new features which are not appropriate at this stage of
+	the release process.
+
+Mon Sep 30 18:21:05 1996  Greg A. Woods  <woods@most.weird.com>
+
+	* cvs.1: document -D, -g, DIFFBIN, and GREPBIN.
+
+Mon Sep 16 23:22:16 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvsbug.8: Remove references to cvsbug.el (or other aspects of
+	emacs interface) and cvsbug.info (or other aspects of texinfo
+	documentation).  Neither one has ever existed.
+
+Wed Jul 24 19:01:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cvs.1: Document -x.
+
+Fri Sep 13 11:01:59 1996  Greg A. Woods  <woods@clapton.seachange.com>
+
+	* cvs.1: add description of -k and -K for rdiff.  Mention that
+	import allows '-b 1' to import to the trunk.
+
+Tue May 14 10:23:59 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.1: Add cvs.texinfo to the SEE ALSO section.  Replace an out
+	of date list of default ignore patterns with a reference to
+	cvs.texinfo (if someone wants to undo this change that is OK with
+	me but I did it this way because it isn't clear people would
+	actually keep cvs.1 up to date).
+
 Wed Mar 13 17:06:39 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* cvsinit.8: Removed.
diff --git a/contrib/cvs/man/Makefile.in b/contrib/cvs/man/Makefile.in
index 894e4d78..ffc3613 100644
--- a/contrib/cvs/man/Makefile.in
+++ b/contrib/cvs/man/Makefile.in
@@ -12,10 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 SHELL = /bin/sh
 
 srcdir     = @srcdir@
@@ -39,10 +35,9 @@ man8dir = $(mandir)/man8
 all:
 .PHONY: all
 
-# This used to depend on installdirs, but someone took it out (I think
-# maybe it is/was some kind of Cygnus convention to not depend on installdirs;
-# I'm not sure).  I don't know what the pro(s) and con(s) are.
-install: all
+# This needs to depend on installdirs so that (for example) the
+# install will not fail if $(prefix)/man/man5 does not yet exist.
+install: all installdirs
 	for f in $(MAN1FILES); do \
 		$(INSTALL_DATA) $(srcdir)/$$f $(man1dir)/$$f; \
 	done
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index 7cef6e5..30f0ff9 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id: cvs.1,v 1.9 1996/03/13 22:59:06 kingdon Exp $
+.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
@@ -24,6 +24,11 @@ cvs \- Concurrent Versions System
 ] [
 .I command_args
 ]
+.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
+described in the SEE ALSO section of this manpage).
 .SH "DESCRIPTION"
 .IX "revision control system" "\fLcvs\fR"
 .IX  cvs  ""  "\fLcvs\fP \- concurrent versions system"
@@ -240,6 +245,11 @@ Overrides the setting of the
 .SM CVSREAD
 environment variable.
 .TP
+.B \-x
+Encrypt all communication between the client and the server.  As of
+this writing, this is only implemented when using a Kerberos
+connection.
+.TP
 \fB\-z\fP \fIcompression\-level\fP
 When transferring files across the network use
 .B gzip
@@ -1317,22 +1327,8 @@ 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.
-Currently, the default list of ignored files includes files matching
-these names:
-.SP
-.in +1i
-.ft B
-.nf
-RCSLOG  RCS  SCCS
-CVS*  cvslog.*
-tags  TAGS
-\&.make.state  .nse_depinfo
-*~  #*  .#*  ,*
-*.old  *.bak  *.BAK  *.orig  *.rej  .del\-*
-*.a  *.o  *.so  *.Z  *.elc  *.ln  core
-.fi
-.ft P
-.in -1i
+For an up to date list of ignored file names, see cvs.texinfo (as
+described in the SEE ALSO section of this manpage).
 .SP
 The outside source is saved in a first-level
 .SM RCS
@@ -1891,21 +1887,9 @@ Use \fB\-I\fP \fIname\fP to ignore files whose names match \fIname\fP
 (in your working directory) during the update.  You can specify
 \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 any of the following:
-.SP
-.in +1i
-.ft B
-.nf
-RCSLOG  RCS  SCCS
-CVS*  cvslog.*
-tags  TAGS
-\&.make.state  .nse_depinfo
-*~  #*  .#*  ,*
-*.old  *.bak  *.BAK  *.orig  *.rej  .del\-*
-*.a  *.o  *.so  *.Z  *.elc  *.ln  core
-.fi
-.ft P
-.in -1i
+\fBupdate\fP ignores files whose names match certain patterns; for
+an up to date list of ignored file names, see cvs.texinfo (as
+described in the SEE ALSO section of this manpage).
 .SP
 Use
 .` "\-I !"
@@ -2168,6 +2152,12 @@ 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.
+
 .BR ci ( 1 ),
 .BR co ( 1 ),
 .BR cvs ( 5 ),
diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8
index 496ef14..63574d4 100644
--- a/contrib/cvs/man/cvsbug.8
+++ b/contrib/cvs/man/cvsbug.8
@@ -16,10 +16,6 @@
 .\"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 .\"    General Public License for more details.
 .\"
-.\"    You should have received a copy of the GNU Library General Public
-.\"    License along with this program; if not, write to the Free
-.\"    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
-.\"
 .\" ---------------------------------------------------------------------------
 .nh
 .TH CVSBUG 1 xVERSIONx "February 1993"
@@ -211,33 +207,11 @@ code.
 /tmp/pf$$	copy of empty PR form, for testing purposes
 .br
 /tmp/pbad$$	file for rejected PRs
-.SH EMACS USER INTERFACE
-An Emacs user interface for 
-.B cvsbug
-with completion of field values is part of the 
-.B cvsbug
-distribution (invoked with
-.BR "M-x cvsbug" ).
-See the file
-.B cvsbug.info
-or the ASCII file
-.B INSTALL
-in the top level directory of the distribution for configuration and
-installation information.  The Emacs LISP template file is 
-.B cvsbug-el.in
-and is installed as
-.BR cvsbug.el .
 .SH INSTALLATION AND CONFIGURATION
 See 
-.B cvsbug.info
-or
 .B INSTALL
 for installation instructions.
 .SH SEE ALSO
-.I Reporting Problems Using cvsbug
-(also installed as the GNU Info file
-.BR cvsbug.info ).
-.LP
 .BR gnats (l),
 .BR query-pr (1),
 .BR edit-pr (1),