Man page overhaul: cvsacl.5 goes away, ACLs will now be part of the

standard configuration and are described in cvsd.conf(5) from now
on

3 files changed, 77 insertions, 22 deletions

diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1
index 53b17614497..99860255817 100644
--- a/usr.bin/cvs/cvs.1
+++ b/usr.bin/cvs/cvs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvs.1,v 1.1 2004/07/13 22:02:40 jfb Exp $
+.\"	$OpenBSD: cvs.1,v 1.2 2004/07/25 03:23:57 jfb Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\" All rights reserved.
@@ -141,8 +141,15 @@ input and ".out" for the server's output.
 .Xr diff 1 ,
 .Xr patch 1 ,
 .Xr cvsd 8
+.Sh CAVEATS
+This CVS implementation does not fully conform to the GNU CVS version.
+In many cases, this was done explicitly because GNU CVS has inconsistencies
+or ambiguous behaviour.
 .Sh HISTORY
 The OpenCVS project is a BSD-licensed rewrite of the original
 Concurrent Versioning System written by Jean-Francois Brousseau.
 The original CVS code was written in large parts by Dick Grune,
 Brian Berliner and Jeff Polk.
+.Sh AUTHORS
+.An Jean-Francois Brousseau
+.An Vincent Labrecque
diff --git a/usr.bin/cvs/cvsd.8 b/usr.bin/cvs/cvsd.8
index f65eba78929..78c849beeb1 100644
--- a/usr.bin/cvs/cvsd.8
+++ b/usr.bin/cvs/cvsd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvsd.8,v 1.1 2004/07/13 22:02:40 jfb Exp $
+.\"	$OpenBSD: cvsd.8,v 1.2 2004/07/25 03:23:57 jfb Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\"
@@ -55,6 +55,9 @@ socket on which it listens for requests.
 The parent process' only purpose is to answer requests for things outside of
 the child's jail.
 .Pp
+.Nm
+provides a way to apply Access Control Lists on the modules based on
+operation, path, tags and users.
 In order to enforce ACLs and prevent users from modifying the files in the
 repository directly, all of the files within the repository should be owned
 by the user and group
@@ -97,6 +100,8 @@ as the file to bind to for the local socket.
 Be verbose.
 .Sh FILES
 .Bl -tag -width /var/run/cvsd.sock -compact
+.It Pa /etc/cvsd.conf
+Standard configuration file for the server.
 .It Pa /var/run/cvsd.pid
 Process ID of the currently running
 .Nm .
@@ -106,8 +111,8 @@ Default listening socket for incoming cvs requests.
 .Sh SEE ALSO
 .Xr cvs 1 ,
 .Xr rcs 1 ,
-.Xr rcsfile 5 ,
-.Xr cvsacl 5
+.Xr cvsd.conf 5 ,
+.Xr rcsfile 5
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/cvs/cvsacl.5 b/usr.bin/cvs/cvsd.conf.5
index f1f12cf370a..07f9c1020d9 100644
--- a/usr.bin/cvs/cvsacl.5
+++ b/usr.bin/cvs/cvsd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvsacl.5,v 1.1 2004/07/13 22:02:40 jfb Exp $
+.\"	$OpenBSD: cvsd.conf.5,v 1.1 2004/07/25 03:23:58 jfb Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\"
@@ -24,27 +24,62 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 22, 2004
-.Dt CVSACL 5
+.Dd July 20, 2004
+.Dt CVSD.CONF 5
 .Os
 .Sh NAME
-.Nm cvsacl
-.Nd CVS Access Control Lists format
+.Nm cvsd.conf
+.Nd CVS daemon configuration file format
 .Sh DESCRIPTION
 The
 .Nm
-file format is the format understood by the
+configuration file format is used by the
 .Xr cvsd 8
-daemon for performing access control on files within the CVS repository.
-It is composed of access rules, each on a single line, which either allow
-or deny certain operations on files or entire directories.
-.Sh GRAMMAR
-The
-.Nm
-grammar is expressed in BNF (Backus-Naur Form) notation.
-Terminals are displayed as normal text.
-Nonterminals are in bold.
-Anything enclosed between angle brackets
+server.
+The server's configuration file is read upon startup and reparsed on every
+server restart.
+.Pp
+It is a human-readable text file consisting of one-line directives that
+the server handles to modify its configuration and Access Control List rules
+to control operations on the repository.
+Comments can be inserted anywhere in the file by putting a '#' character
+before them and span to the end of the line.
+.Pp
+To simplify maintenance of the configuration, the format allows for the
+definition of variables that can later be used for interpolation throughout
+the configuration file by preceding them with the '$' character.
+These variables are refered to as macros.
+.Sh DIRECTIVES
+The following directives are supported by the server:
+.Bl -tag -width xxxxx
+.It Sy cvsroot Ar path
+Set the server's CVS root directory to
+.Ar path .
+.It Sy listen Ar addr
+Add the address
+.Ar addr
+to the list of addresses on which the server will listen for incoming
+connections.
+This is currently parsed but ignored, as the CVS daemon doesn't support
+direct TCP connections yet.
+.It Sy minchild Ar num
+Set the server's minimum number of child processes to
+.Ar num .
+.It Sy maxchild Ar num
+Set the server's maximum number of child processes to
+.Ar num .
+.It Sy reqsock Ar path
+Set the server's local socket path to
+.Ar path .
+In order for this to work, the
+.Xr cvs 1
+client must be aware of the socket's path.
+.El
+.Sh ACL GRAMMAR
+The Access Control Lists grammar is expressed in BNF (Backus-Naur Form)
+notation.
+In this representation, terminals are displayed as normal text and nonterminals
+are in bold.
 .Po
 .Ql [
 and
@@ -94,14 +129,22 @@ rules:
 .Sh EXAMPLES
 The following rule denies all operations:
 .Bd -literal
-	deny quick
+	deny quick any
 .Ed
+.Sh FILES
+.Bl -tag -width /etc/cvsd.conf -compact
+.It Pa /etc/cvsd.conf
+Default configuration file for
+.Xr cvsd 8 .
+.El
 .Sh SEE ALSO
 .Xr cvs 1 ,
+.Xr rcsfile 5 ,
 .Xr cvsd 8
 .Sh HISTORY
 The
 .Nm
-file format appeared with the OpenCVS project.
+file format was introduced along with the CVS daemon as part of the
+OpenCVS project.
 .Sh AUTHORS
 .An Jean-Francois Brousseau