From 4de09b6aab7afd91b019e95011f37c7f4b868a89 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 18 Nov 2012 16:30:04 +0000
Subject: [PATCH] Continue deorbiting cvs-specific stuff.  Change the portlist
 a bit. Add a note about src.

---
 .../articles/portbuild/article.xml            | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 4638bef849..6e2ab42875 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2243,17 +2243,30 @@ ssh_cmd="/usr/local/bin/ssh"
 	  </listitem>
 
 	  <listitem>
-	    <para>For what was previously head, change
+	    <para>(Old codebase) For what was previously head, change
 	      <makevar>SRC_BRANCH_<replaceable>branch</replaceable>_TAG</makevar> to
 	      <literal>RELENG_<replaceable>branch</replaceable>_0</literal>
 	      (literal zero).</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Add
+	    <para>(Old codebase) Add
 	      <makevar>SRC_BRANCH_<replaceable>new-branch</replaceable>_TAG</makevar>
 	      <literal>=.</literal> (literal period).</para>
 	  </listitem>
+
+	  <listitem>
+	    <para>(New codebase) For what was previously head, change
+	      <makevar>SRC_BRANCH_<replaceable>branch</replaceable>_SUBDIR</makevar> to
+	      <literal>releng/<replaceable>branch</replaceable>.0</literal>
+	      (literal zero).</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>(New codebase) Add
+	      <makevar>SRC_BRANCH_<replaceable>new-branch</replaceable>_SUBDIR</makevar>
+	      <literal>=head</literal>.</para>
+	  </listitem>
 	</itemizedlist>
       </listitem>
 
@@ -2903,13 +2916,8 @@ ttyu0   "/usr/libexec/getty std.9600"   vt100   on secure</screen>
     <sect2 id="pointyhat-src">
       <title>Configuring <literal>src</literal></title>
 
-      <procedure>
-
-	<step>
-	  <para>TBA</para>
-	</step>
-
-      </procedure>
+      <para>You should be able to install from the most recent release.
+      </para>
 
     </sect2>
 
@@ -2939,18 +2947,22 @@ lang/python27 (or sucessor)</screen>
 	  </para>
 
 	  <para>The following ports (or their latest successors) are strongly suggested:<screen>
-benchmarks/bonnie++
 devel/ccache
 mail/postfix
 net/isc-dhcp41-server
 ports-mgmt/pkg
-ports-mgmt/pkg_tree
 ports-mgmt/portaudit
 ports-mgmt/portmaster
 security/sudo
 shells/bash
 shells/zsh
-sysutils/screen
+sysutils/screen</screen>
+	  </para>
+
+	  <para>The following ports (or their latest successors) are handy:<screen>
+benchmarks/bonnie++
+ports-mgmt/pkg_tree
+sysutils/dmidecode
 sysutils/smartmontools</screen>
 	  </para>
 	</step>
@@ -2975,7 +2987,7 @@ ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</screen>
     </sect2>
 
     <sect2 id="pointyhat-repo">
-      <title>Setting up and configuring the portbuild repository</title>
+      <title>Setting up and configuring the <application>portbuild</application> repository</title>
 
       <procedure>