1 files changed, 4 insertions, 18 deletions

diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index 659ee2a9c4..2511b2165a 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -19,6 +19,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder role="mailto:portmgr@FreeBSD.org">The &os; Ports
 	Management Team</holder>
     </copyright>
@@ -47,7 +48,7 @@
       be used to specify one of the package architectures
       (amd64, &i386;, ia64, and &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (5, 5-exp, 6, 6-exp, 7, 7-exp, 8).
+      to specify the build branch (5, 6, 6-exp, 7, 7-exp, 8).
     </para>
 
     <note>
@@ -180,13 +181,6 @@
       </listitem>
 
       <listitem>
-	<para><command>dopackages.5-exp</command> - Perform
-	  a 5.X build with experimental patches
-	  (5-exp branch)
-	</para>
-      </listitem>
-
-      <listitem>
 	<para><command>dopackages.6</command> - Perform
 	  a 6.X build
 	</para>
@@ -219,12 +213,6 @@
       </listitem>
     </itemizedlist>
 
-    <note>
-      <para>As of early 2007, the 5-exp branch is just another 6-exp
-	branch in disguise.  For instance, it will have
-	<filename>INDEX-6</filename>.</para>
-    </note>
-
     <para>These are wrappers around <command>dopackages</command>,
       and are all symlinked to <command>dopackages.wrapper</command>.
       New branch wrapper scripts can be created by symlinking
@@ -554,7 +542,7 @@
     <para>To free up resources, you will need to clean up by running
       <command>dosetupnode</command> on each client machine.  For example,
       in &man.csh.1;:
-      <screen>&prompt.user; <userinput>cd ~/loads; foreach i (*); /var/portbuild/scripts/dosetupnode i386 5-exp $i -norsync &; done</userinput></screen>
+      <screen>&prompt.user; <userinput>cd ~/loads; foreach i (*); /var/portbuild/scripts/dosetupnode i386 6-exp $i -norsync &; done</userinput></screen>
 
       The <literal>-norsync</literal> says not to bother resyncing the
       entire build data (ports tree, etc) on any remote machines, and it
@@ -920,9 +908,7 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
       <literal>bsd.port.mk</literal>), or to test large sweeping
       upgrades.  The current experimental patches branch is
       <literal>6-exp</literal> on the &i386;
-      architecture.  (For the moment, we are also using
-      <literal>5-exp</literal> as a secondary branch, but
-      actually using the bits from <literal>RELENG_6</literal>.)</para>
+      architecture.</para>
 
     <para>In general, an experimental patches build is run the same
       way as any other build, except that you should first update the