diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 884270d58a..632265a1ea 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -831,7 +831,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
       <para>To free up resources, you will need to clean up client machines by
 	running <command>build cleanup</command> command.  For example:</para>
 
-      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen>
+      <screen>&prompt.user; <userinput>/a/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen>
 
       <para>If you forget to do this, then the old build
 	<literal>jail</literal>s will not be cleaned up for 24 hours, and no
@@ -846,6 +846,11 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
 	and it is less than the number of jobs that <literal>loads</literal>
 	thinks are in use, you are in trouble.</para>
 
+      <note>
+	<para>The following notes about mounting only apply to
+	  <literal>connected</literal> nodes.</para>
+      </note>
+
       <para>You may have problem with the <command>umount</command>
 	commands hanging.  If so, you are going to have to use the
 	<command>allgohans</command> script to run an &man.ssh.1;
@@ -875,6 +880,11 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 	<para>You may also see messages about <literal>procfs</literal>.</para>
       </note>
 
+      <note>
+	<para>The above is the end of the notes that apply only to
+	  <literal>connected</literal> nodes.</para>
+      </note>
+
       <para>After you have done all the above, remove the
 	<filename><replaceable>${arch}</replaceable>/lock</filename>
 	file before trying to restart the build.  If you do not,
@@ -921,7 +931,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       <userinput>scripts/stats <replaceable>${branch}</replaceable></userinput>
       command shows the number of packages already built.</para>
 
-    <para>Running <userinput>cat /var/portbuild/*/loads/*</userinput>
+    <para>Running <userinput>cat /a/portbuild/*/loads/*</userinput>
       shows the client loads and number of concurrent builds in
       progress.  The files that have been recently updated are the clients
       that are online; the others are the offline clients.</para>
@@ -958,7 +968,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       it if not.</para>
 
     <para>Keep an eye on &man.df.1; output.  If the
-      <filename>/var/portbuild</filename> file system becomes full
+      <filename>/a/portbuild</filename> file system becomes full
       then <trademark>Bad Things</trademark> happen.</para>
 
     <para>The status of all current builds is generated periodically
@@ -1212,7 +1222,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 
     <note>
       <para>Most of the information in this section is obsolete
-	as of 2013.</para>
+	as of 2013 and needs to be rewritten.</para>
     </note>
 
     <para>Experimental patches builds are run from time to time to
@@ -1271,9 +1281,9 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       branch is the control branch, and the <literal>8-exp</literal>
       branch is the experimental patches branch):</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8-exp/errors</userinput>
+    <screen>&prompt.user; <userinput>cd /a/portbuild/i386/8-exp/errors</userinput>
 &prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/8-exp-errs</userinput>
-&prompt.user; <userinput>cd /var/portbuild/i386/8/errors</userinput>
+&prompt.user; <userinput>cd /a/portbuild/i386/8/errors</userinput>
 &prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/8-errs</userinput></screen>
 
     <note>
@@ -1336,7 +1346,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       rebuild of the affected packages under the control
       branch:</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8/ports</userinput></screen>
+    <screen>&prompt.user; <userinput>cd /a/portbuild/i386/8/ports</userinput></screen>
 
     <note>
       <para>The following example is obsolete</para>
@@ -1351,7 +1361,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
     <para>The following command will set up the control branch for
       the partial build:</para>
 
-    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper 8 -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
+    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
 
     <!-- XXX MCL obsolete -->
     <para>The builds must be performed from the
@@ -1359,7 +1369,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       initially be empty except for the Makefile symlink.  If this
       symlink does not exist, it must be created:</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8/packages/All</userinput>
+    <screen>&prompt.user; <userinput>cd /a/portbuild/i386/8/packages/All</userinput>
 &prompt.user; <userinput>ln -sf ../../Makefile .</userinput>
 &prompt.user; <userinput>make -k -j&lt;#&gt; &lt;list of packages to build&gt;</userinput></screen>
 
@@ -3072,7 +3082,7 @@ qmanager</programlisting>
       <listitem>
 	<para>Note the time and failure mode (e.g., paste in the
 	  relevant console output) in
-	  <filename>/var/portbuild/<replaceable>${arch}</replaceable>/reboots</filename></para>
+	  <filename>/a/portbuild/<replaceable>${arch}</replaceable>/reboots</filename></para>
       </listitem>
 
       <listitem>