=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.1,v retrieving revision 1.7 retrieving revision 1.8 diff -c -r1.7 -r1.8 *** src/usr.bin/cvs/cvs.1 2004/11/26 16:14:12 1.7 --- src/usr.bin/cvs/cvs.1 2004/12/02 22:38:30 1.8 *************** *** 1,4 **** ! .\" $OpenBSD: cvs.1,v 1.7 2004/11/26 16:14:12 jfb Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau .\" All rights reserved. --- 1,4 ---- ! .\" $OpenBSD: cvs.1,v 1.8 2004/12/02 22:38:30 jmc Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau .\" All rights reserved. *************** *** 83,89 **** Use the program .Ar editor whenever editing log information. ! This option overrides the environment variables CVSEDITOR, VISUAL and EDITOR. .It Fl f Do not read the user's configuration file on startup. .It Fl l --- 83,89 ---- Use the program .Ar editor whenever editing log information. ! This option overrides the environment variables CVSEDITOR, VISUAL, and EDITOR. .It Fl f Do not read the user's configuration file on startup. .It Fl l *************** *** 132,139 **** .Pp .It Xo Sy commit .Op Fl flnR - .Op Fl m Ar msg .Op Fl F Ar logfile .Op Fl r Ar rev .Op Ar file ... .Xc --- 132,139 ---- .Pp .It Xo Sy commit .Op Fl flnR .Op Fl F Ar logfile + .Op Fl m Ar msg .Op Fl r Ar rev .Op Ar file ... .Xc *************** *** 167,173 **** .Pp The .Fl A ! flag resets any sticky tags, dates or kopts that have been set on the tree. The .Fl l flag is used to specify a local change only and disables the recursive --- 167,173 ---- .Pp The .Fl A ! flag resets any sticky tags, dates, or kopts that have been set on the tree. The .Fl l flag is used to specify a local change only and disables the recursive *************** *** 186,212 **** .Nm will also connect to the server and ask it to print its version information. .El - .Sh FILES - .Bl -tag -width Ds - .It Pa $HOME/.cvsrc - File containing a list of implicit options to pass to certain commands. - This file is read on startup unless the - .Fl f - option is specified. - .It Pa $CVSROOT/CVSROOT - Directory containing repository administrative files. - .It Pa $CVSROOT/CVSROOT/loginfo - File containing associations between modules and handlers for - post-commit logging. - .El .Sh ENVIRONMENT .Bl -tag -width CVS_CLIENT_LOG ! .It Ev CVSROOT ! When set, this variable should contain the string pointing to the root ! directory of the CVS repository. ! The contents of this variable are ignored when the ! .Fl d ! option is given or if `Root' files exist in the checked-out copy. .It Ev CVS_RSH Name of the program to use when connecting to the server through a remote shell. --- 186,199 ---- .Nm will also connect to the server and ask it to print its version information. .El .Sh ENVIRONMENT .Bl -tag -width CVS_CLIENT_LOG ! .It Ev CVS_CLIENT_LOG ! This variable enables logging of all communications between the client and ! server when running in non-local mode. ! If set, this environment variable must contain a base path from which two ! paths will be generated by appending ".in" to the value for the server's ! input and ".out" for the server's output. .It Ev CVS_RSH Name of the program to use when connecting to the server through a remote shell. *************** *** 220,249 **** The default is to use `cvs'. .It Ev CVSEDITOR Name of the editor to use when editing commit messages. ! Checked before EDITOR and VISUAL. .It Ev EDITOR .It Ev VISUAL - .It Ev CVS_CLIENT_LOG - This variable enables logging of all communications between the client and - server when running in non-local mode. - If set, this environment variable must contain a base path from which two - paths will be generated by appending ".in" to the value for the server's - input and ".out" for the server's output. .El .Sh SEE ALSO - .Xr rcs 1 , .Xr diff 1 , .Xr patch 1 , .Xr cvsd 8 - .Sh CAVEATS - This CVS implementation does not fully conform to the GNU CVS version. - In some cases, this was done explicitly because GNU CVS has inconsistencies - or ambiguous behaviour. - Some things have also been left out or modified to enhance the overall - security of the system. - .Pp - Among other things, support for the pserver connection mechanism has been - dropped because of security issues with the authentication mechanism. .Sh HISTORY The OpenCVS project is a BSD-licensed rewrite of the original Concurrent Versioning System written by Jean-Francois Brousseau. --- 207,243 ---- The default is to use `cvs'. .It Ev CVSEDITOR Name of the editor to use when editing commit messages. ! Checked before ! .Ev EDITOR ! and ! .Ev VISUAL . ! .It Ev CVSROOT ! When set, this variable should contain the string pointing to the root ! directory of the CVS repository. ! The contents of this variable are ignored when the ! .Fl d ! option is given or if `Root' files exist in the checked-out copy. .It Ev EDITOR .It Ev VISUAL .El + .Sh FILES + .Bl -tag -width Ds + .It Pa $HOME/.cvsrc + File containing a list of implicit options to pass to certain commands. + This file is read on startup unless the + .Fl f + option is specified. + .It Pa $CVSROOT/CVSROOT + Directory containing repository administrative files. + .It Pa $CVSROOT/CVSROOT/loginfo + File containing associations between modules and handlers for + post-commit logging. + .El .Sh SEE ALSO .Xr diff 1 , .Xr patch 1 , + .Xr rcs 1 , .Xr cvsd 8 .Sh HISTORY The OpenCVS project is a BSD-licensed rewrite of the original Concurrent Versioning System written by Jean-Francois Brousseau. *************** *** 253,255 **** --- 247,258 ---- .An Jean-Francois Brousseau .An Vincent Labrecque .An Joris Vink + .Sh CAVEATS + This CVS implementation does not fully conform to the GNU CVS version. + In some cases, this was done explicitly because GNU CVS has inconsistencies + or ambiguous behaviour. + Some things have also been left out or modified to enhance the overall + security of the system. + .Pp + Among other things, support for the pserver connection mechanism has been + dropped because of security issues with the authentication mechanism.