diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 1ea7b145d6..e4f95b404b 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -63,7 +63,7 @@
Main CVSROOT
- ncvs.FreeBSD.org:/home/ncvs
+ ncvs.FreeBSD.org:/home/ncvs (although also see ).
@@ -179,7 +179,7 @@
It is assumed that you are already familiar with the basic operation
of CVS.
- The CVS repository is hosted on the repository machines. The &a.cvs;
+ The &a.cvs;
are the owners
of the CVS repository and are
responsible for direct modification of it for the purposes of
cleanup or fixing some grievous abuse of CVS by a committer.
@@ -188,15 +188,74 @@
operation, mail the &a.cvs; (or call one of them) and report the problem to
one of them. The only ones able to directly fiddle
the repository bits on the repository hosts are the repomeisters.
- There are no login shells available on
- ncvs.FreeBSD.org, except
+ To enforce this, there are no login shells available on
+ the repository machines, except
to the repomeisters.
+ The CVS tree is currently split into four distinct repositories,
+ namely doc, ports,
+ projects and src. These are
+ combined under a single CVSROOT when distributed
+ via CVSup for the convenience of our users.
+
+ Note that the www module containing sources
+ for the FreeBSD website is
+ contained within the doc repository.
+
+ The CVS repositories are hosted on the repository machines.
+ Currently, each of the repositories above reside on the same physical
+ machine, ncvs.FreeBSD.org, but to allow for
+ the possibility of placing each on a separate machine in the future,
+ there is a separate hostname for each that committers should use.
+ Additionally, each repository is stored in a separate directory. The
+ following table summarises the situation.
+
+
+ &os; CVS Repositories, Hosts and Directories
+
+
+
+
+ Repository
+ Host
+ Directory
+
+
+
+
+
+ doc
+ dcvs.FreeBSD.org
+ /home/dcvs
+
+
+
+ ports
+ pcvs.FreeBSD.org
+ /home/pcvs
+
+
+
+ projects
+ projcvs.FreeBSD.org
+ /home/projcvs
+
+
+
+ src
+ ncvs.FreeBSD.org
+ /home/ncvs
+
+
+
+
+
CVS operations are done remotely by setting the
- CVSROOT environment variable to
- ncvs.FreeBSD.org:/home/ncvs
- and the CVS_RSH variable to
- ssh
+ CVSROOT environment variable to the appropriate host
+ and top-level directory (for example,
+ ncvs.FreeBSD.org:/home/ncvs),
+ the CVS_RSH variable to
+ ssh,
and then doing the appropriate
check-out/check-in operations. If you wish to add
something which is wholly new (like contrib-ified
@@ -221,12 +280,19 @@
charge of cvsup-master.
- Many committers define an alias fcvs
- which aliases to
- cvs -d
- xxx@ncvs.FreeBSD.org:/home/ncvs
- for this purpose. That way they do all CVS operations
- locally and use fcvs commit for committing
+ Many committers define aliases
+ which expand to the correct cvs invocation
+ for the appropriate repository. For example, a &man.tcsh.1; user may
+ add the following to their .cshrc for this
+ purpose:
+
+ alias dcvs env CVS_RSH=ssh cvs -d user@dcvs.freebsd.org:/home/dcvs
+alias pcvs env CVS_RSH=ssh cvs -d user@pcvs.freebsd.org:/home/pcvs
+alias projcvs env CVS_RSH=ssh cvs -d user@projcvs.freebsd.org:/home/projcvs
+alias scvs env CVS_RSH=ssh cvs -d user@ncvs.freebsd.org:/home/ncvs
+
+ This way they can do all CVS operations
+ locally and use Xcvs commit for committing
to the official CVS tree.
@@ -607,11 +673,11 @@
You will almost certainly get a conflict because
- of the $Id: article.sgml,v 1.168 2003-07-12 01:04:23 peter Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.169 2003-07-13 16:04:35 ceri Exp $ (or in FreeBSD's case,
$FreeBSD$)
lines, so you will have to edit the file to resolve the conflict
- (remove the marker lines and the second $Id: article.sgml,v 1.168 2003-07-12 01:04:23 peter Exp $ line,
- leaving the original $Id: article.sgml,v 1.168 2003-07-12 01:04:23 peter Exp $ line intact).
+ (remove the marker lines and the second $Id: article.sgml,v 1.169 2003-07-13 16:04:35 ceri Exp $ line,
+ leaving the original $Id: article.sgml,v 1.169 2003-07-13 16:04:35 ceri Exp $ line intact).