diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2004-12-14 00:12:32 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2004-12-14 00:12:32 +0000 |
commit | 94d82ca6f112d0d4b09c192485ce21135c07c7a8 (patch) | |
tree | 843c3ba36ebe05fa0c565adbf1f4e8a42e1c52bc | |
parent | 61c5778e4a97cf2f0bdf975057ad0162365b2bca (diff) |
move the cvsrc example stuff to cvsrc.5;
make it clearer that $HOME/.cvsrc is the user config file;
add a reference to cvsrc(5) in cvs(1) SEE ALSO;
ok xsa@ (actually this started life as a diff from him...)
-rw-r--r-- | usr.bin/cvs/cvs.1 | 21 | ||||
-rw-r--r-- | usr.bin/cvs/cvsrc.5 | 24 |
2 files changed, 24 insertions, 21 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index df83efa6dda..fdddeaf629c 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.15 2004/12/13 13:55:10 jmc Exp $ +.\" $OpenBSD: cvs.1,v 1.16 2004/12/14 00:12:31 jmc Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" All rights reserved. @@ -57,21 +57,9 @@ from the home directory of the user who invoked it. This file is used to specify implicit options passed to .Nm or one of its commands whenever it is invoked. -Each command should be specified on a separate line along with the arguments. -For example, the following two lines: -.Pp -.Bl -item -compact -offset indent -.It -cvs -q -.It -diff -u -.El -.Pp -specify that -.Nm -should always run in quiet mode and the -.Ic diff -command should always produce unified output. +See +.Xr cvsrc 5 +for further information. .Pp The following options are supported: .Bl -tag -width "-e editorXX" @@ -365,6 +353,7 @@ post-commit logging. .Xr gzip 1 , .Xr patch 1 , .Xr rcs 1 , +.Xr cvsrc 5 , .Xr cvsd 8 .Sh HISTORY The OpenCVS project is a BSD-licensed rewrite of the original diff --git a/usr.bin/cvs/cvsrc.5 b/usr.bin/cvs/cvsrc.5 index 857b3cae24e..96019acb794 100644 --- a/usr.bin/cvs/cvsrc.5 +++ b/usr.bin/cvs/cvsrc.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvsrc.5,v 1.2 2004/07/26 17:29:49 jfb Exp $ +.\" $OpenBSD: cvsrc.5,v 1.3 2004/12/14 00:12:31 jmc Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" All rights reserved. @@ -30,12 +30,18 @@ .Nm cvsrc .Nd startup resource file for CVS .Sh DESCRIPTION -The cvsrc file provides a way to give the +The +.Nm +file provides a way to give the .Xr cvs 1 program implicit global options and command-specific options. -The file is read on startup unless the +Unless the .Fl f -option is specified. +option is specified, +.Xr cvs 1 +reads its startup configuration file +.Pa .cvsrc +from the home directory of the user who invoked it. .Pp The format of each line is as follows: .Pp @@ -60,6 +66,14 @@ or .Fl Q flags. .Sh EXAMPLES -Need to put in some examples! +Specify that +.Xr cvs 1 +should always run in quiet mode and the +.Ic diff +internal command should always produce unified output: +.Bd -literal -offset indent +cvs -q +diff -u +.Ed .Sh SEE ALSO .Xr cvs 1 |