diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index a13fedd412..3a28e81de1 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -255,8 +255,10 @@
It is assumed that you are already familiar with the basic operation
of the version control systems in use. Traditionally this was
- CVS, but as of June 2008, Subversion is used for the src tree.
- Subversion is covered in .
+ CVS. Subversion is used for the src tree as
+ of May 2008 and the doc/www tree as of May
+ 2012. Subversion is covered in .
The &a.cvsadm; are the owners
of the repository and
are responsible for direct modification of it for the purposes of
@@ -285,19 +287,15 @@
/home/pcvs, the ports
repository
- dcvs@ - regarding
- /home/dcvs, the doc
- repository
-
projcvs@ - regarding
/home/projcvs, the
third party projects repository
- The &os; repositories are currently split into four distinct parts,
- namely doc, ports,
- projects and src. These are
+ The &os; repositories are currently split into two distinct parts,
+ namely ports and projects.
+ These are
combined under a single CVSROOT when distributed
via CVSup for the convenience of our users.
The src tree is automatically exported to
@@ -307,11 +305,6 @@
CVS but in Subversion. The official
and exported trees are not necessarily equal.
- Note that the sources for the
- FreeBSD website are
- contained within the www module of 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
@@ -333,12 +326,6 @@
-
- doc
- dcvs.FreeBSD.org
- /home/dcvs
-
-
ports
pcvs.FreeBSD.org
@@ -365,8 +352,7 @@
user may add the following to their .cshrc for this
purpose:
- alias dcvs cvs -d user@dcvs.FreeBSD.org:/home/dcvs
-alias pcvs cvs -d user@pcvs.FreeBSD.org:/home/pcvs
+ alias pcvs cvs -d user@pcvs.FreeBSD.org:/home/pcvs
alias projcvs cvs -d user@projcvs.FreeBSD.org:/home/projcvs
This way they can do all CVS operations
@@ -1029,11 +1015,9 @@ checkout -P
ssh connection to the repository machine. First, put this
configuration into your ~/.ssh/config:
- Host dcvs.FreeBSD.org
+ Host pcvs.FreeBSD.org
ControlPath /home/user/.ssh/cvs.cpath
Host projcvs.FreeBSD.org
- ControlPath /home/user/.ssh/cvs.cpath
-Host pcvs.FreeBSD.org
ControlPath /home/user/.ssh/cvs.cpath
Now open the persistent connection to the repoman:
@@ -1061,6 +1045,22 @@ Host pcvs.FreeBSD.org
first real SVN commit is
r179447.
+ The &os; doc/www repository switched
+ from CVS to Subversion on May 19th, 2012.
+ The first real SVN commit is
+ r38821.
+
+
+ Part of the doc/www
+ CVS to SVN conversion
+ included an infrastructural change to the build process.
+ The most notable change is the location of the
+ &os; website www tree, which has
+ been moved from
+ www/lang/ to
+ head/lang/htdocs/.
+
+
There are mechanisms in place to automatically merge
changes back from the Subversion repository to the
CVS one, so regular users should not notice
@@ -1124,10 +1124,23 @@ Host pcvs.FreeBSD.org
Direct Checkout
The first is to check out directly from the main
- repository:
+ repository. For the src tree,
+ use:
&prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src
+ For the doc tree, use:
+
+ &prompt.user; svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc
+
+
+ Though the remaining examples in this document are
+ written with the workflow of working with the
+ src tree in mind, the underlying
+ concepts are the same for working with the
+ doc tree.
+
+
The above command will check out a
CURRENT source tree as /usr/src/,