svn commit: r38835 - head/en_US.ISO8859-1/articles/committers-guide
Glen Barber
gjb at FreeBSD.org
Sat May 19 16:55:28 UTC 2012
Author: gjb
Date: Sat May 19 16:55:27 2012
New Revision: 38835
URL: http://svn.freebsd.org/changeset/doc/38835
Log:
Update the committers-guide article to reflect the Documentation
CVS->SVN conversion:
- Remove references of 'dcvs' from the VCS Operations Guide
- Fix the date the src tree was moved from CVS->SVN while here
- Add the date the doc CVS->SVN conversion was officially complete
- Add doc-specific notes to the Subversion primer
- Document that, though the Subversion Primer is written with the src
tree in mind, the underlying concepts are the same
Modified:
head/en_US.ISO8859-1/articles/committers-guide/article.sgml
Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.sgml Sat May 19 14:27:48 2012 (r38834)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml Sat May 19 16:55:27 2012 (r38835)
@@ -255,8 +255,10 @@
<para>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 <xref linkend="subversion-primer">.</para>
+ CVS. Subversion is used for the <literal>src</literal> tree as
+ of May 2008 and the <literal>doc/www</literal> tree as of May
+ 2012. Subversion is covered in <xref
+ linkend="subversion-primer">.</para>
<para>The &a.cvsadm; are the <quote>owners</quote> of the repository and
are responsible for direct modification of it for the purposes of
@@ -285,19 +287,15 @@
/home/pcvs</filename>, the ports
repository</para></listitem>
- <listitem><para>dcvs@ - regarding <filename class="directory">
- /home/dcvs</filename>, the doc
- repository</para></listitem>
-
<listitem><para>projcvs@ - regarding <filename class="directory">
/home/projcvs</filename>, the
third party projects repository</para></listitem>
</itemizedlist>
</note>
- <para>The &os; repositories are currently split into four distinct parts,
- namely <literal>doc</literal>, <literal>ports</literal>,
- <literal>projects</literal> and <literal>src</literal>. These are
+ <para>The &os; repositories are currently split into two distinct parts,
+ namely <literal>ports</literal> and <literal>projects</literal>.
+ These are
combined under a single <literal>CVSROOT</literal> when distributed
via <application>CVSup</application> for the convenience of our users.
The <literal>src</literal> tree is automatically exported to
@@ -307,11 +305,6 @@
<application>CVS</application> but in Subversion. The official
and exported trees are not necessarily equal.</para>
- <note><para>Note that the sources for the
- <ulink url="http://www.FreeBSD.org">FreeBSD website</ulink> are
- contained within the <literal>www</literal> module of the
- <literal>doc</literal> repository.</para></note>
-
<para>The CVS repositories are hosted on the repository machines.
Currently, each of the repositories above reside on the same physical
machine, <hostid role="hostname">ncvs.FreeBSD.org</hostid>, but to allow for
@@ -334,12 +327,6 @@
<tbody>
<row>
- <entry>doc</entry>
- <entry>dcvs.FreeBSD.org</entry>
- <entry>/home/dcvs</entry>
- </row>
-
- <row>
<entry>ports</entry>
<entry>pcvs.FreeBSD.org</entry>
<entry>/home/pcvs</entry>
@@ -365,8 +352,7 @@
user may add the following to their <filename>.cshrc</filename> for this
purpose:</para>
- <programlisting>alias dcvs cvs -d <replaceable>user</replaceable>@dcvs.FreeBSD.org:/home/dcvs
-alias pcvs cvs -d <replaceable>user</replaceable>@pcvs.FreeBSD.org:/home/pcvs
+ <programlisting>alias pcvs cvs -d <replaceable>user</replaceable>@pcvs.FreeBSD.org:/home/pcvs
alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/projcvs</programlisting>
<para>This way they can do all CVS operations
@@ -1029,11 +1015,9 @@ checkout -P</programlisting>
ssh connection to the repository machine. First, put this
configuration into your <filename>~/.ssh/config</filename>:</para>
- <programlisting>Host dcvs.FreeBSD.org
+ <programlisting>Host pcvs.FreeBSD.org
ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
Host projcvs.FreeBSD.org
- ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
-Host pcvs.FreeBSD.org
ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath</programlisting>
<para>Now open the persistent connection to the repoman:</para>
@@ -1061,6 +1045,22 @@ Host pcvs.FreeBSD.org
first real <acronym>SVN</acronym> commit is
<emphasis>r179447</emphasis>.</para>
+ <para>The &os; <literal>doc/www</literal> repository switched
+ from <acronym>CVS</acronym> to Subversion on May 19th, 2012.
+ The first real <acronym>SVN</acronym> commit is
+ <emphasis>r38821</emphasis>.</para>
+
+ <note>
+ <para>Part of the <literal>doc/www</literal>
+ <acronym>CVS</acronym> to <acronym>SVN</acronym> conversion
+ included an infrastructural change to the build process.
+ The most notable change is the location of the
+ &os; website <literal>www</literal> tree, which has
+ been moved from
+ <literal>www/<replaceable>lang/</replaceable></literal> to
+ <literal>head/<replaceable>lang</replaceable>/htdocs/</literal>.</para>
+ </note>
+
<para>There are mechanisms in place to automatically merge
changes back from the Subversion repository to the
<acronym>CVS</acronym> one, so regular users should not notice
@@ -1124,10 +1124,23 @@ Host pcvs.FreeBSD.org
<title>Direct Checkout</title>
<para>The first is to check out directly from the main
- repository:</para>
+ repository. For the <literal>src</literal> tree,
+ use:</para>
<screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src</userinput></screen>
+ <para>For the <literal>doc</literal> tree, use:</para>
+
+ <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc</userinput></screen>
+
+ <note>
+ <para>Though the remaining examples in this document are
+ written with the workflow of working with the
+ <literal>src</literal> tree in mind, the underlying
+ concepts are the same for working with the
+ <literal>doc</literal> tree.</para>
+ </note>
+
<para>The above command will check out a
<literal>CURRENT</literal> source tree as <filename
class="directory"><replaceable>/usr/src/</replaceable></filename>,
More information about the svn-doc-all
mailing list