- Fix the ln instruction in portbuild.sh to DTRT.

- Deprecate /tmp/blah.core for kern.corefile.  This is almost always
  the Wrong Thing, since /tmp is usually an md.
- Drop the modifications to usr/local/etc/rc.d/squid, and move them
  into /etc/rc.conf instead.
- Fix markup for the usr2 citations.

en_US.ISO8859-1/articles/portbuild/article.sgml

@@ -1436,6 +1436,8 @@ sshd_program="/usr/local/sbin/sshd"
 
 gmond_enable="YES"
 squid_enable="YES"
+squid_chdir="<filename>/<replaceable>usr2</replaceable>/local/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"
 </screen>
 	      </para>
 	    </listitem>
@@ -1448,7 +1450,7 @@ squid_enable="YES"
 	    <listitem>
 	      <para>Modify <filename>etc/sysctl.conf</filename>:<screen>
 9a10,30
-> kern.corefile=/tmp/%N.core
+> kern.corefile=<filename>/<replaceable>usr2</replaceable>/%N.core</filename>
 > kern.sugid_coredump=1
 > #debug.witness_ddb=0
 > #debug.witness_watch=0
@@ -1550,9 +1552,9 @@ www/squid (with SQUID_AUFS on)</screen>
 #
 # Configure a package build system post-boot
 
-scratchdir=/usr2
+scratchdir=<filename>/<replaceable>usr2</replaceable></filename>
 
-ln -sf ${scratchdir}/portbuild /var/portbuild
+ln -sf ${scratchdir}/portbuild /var/
 
 # Identify builds ready for use
 cd /var/portbuild/${arch}
@@ -1567,20 +1569,6 @@ touch /tmp/.boot_finished</screen>
 	      </para>
 	    </listitem>
 
-	    <listitem>
-	      <para>Modify
-		 <filename>usr/local/etc/rc.d/squid</filename>:<screen>
-40c40
-< squid_chdir=${squid_chdir:-"/usr/local/squid/logs"}
----
-> squid_chdir=${squid_chdir:-"/usr2/squid/logs"}
-43c43
-< squid_pidfile=${squid_pidfile:-"/usr/local/squid/logs/squid.pid"}
----
-> squid_pidfile=${squid_pidfile:-"/usr2/squid/logs/squid.pid"}</screen>
-	      </para>
-	    </listitem>
-
 	    <listitem>
 	      <para>Modify
 		 <filename>usr/local/etc/squid/squid.conf</filename>:<screen>
@@ -1603,7 +1591,7 @@ touch /tmp/.boot_finished</screen>
 	      </para>
 
 	      <para>Also, change <filename>usr/local</filename>
-		to <filename>usr2</filename> in the definitions of
+		to <filename><replaceable>usr2</replaceable></filename> in
 		<literal>cache_dir</literal>,
 		<literal>access_log</literal>,
 		<literal>cache_log</literal>,
@@ -1649,7 +1637,9 @@ touch /tmp/.boot_finished</screen>
       <procedure>
 	<step>
 	  <para>Change into the port/package directory you picked
-	    above, e.g., <command>cd /usr2</command>.</para>
+	    above, e.g.,
+	    <command>cd <filename>/<replaceable>usr2</replaceable></filename></command>.
+	  </para>
 	</step>
 
 	<step>
@@ -1752,8 +1742,8 @@ touch /tmp/.boot_finished</screen>
 	  <para>Suggested values:<screen>
 disconnected=1
 http_proxy="http://localhost:3128/"
-squid_dir=/usr2/squid
-scratchdir=/usr2/pkgbuild
+squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
+scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
 client_user=ports-<replaceable>${arch}</replaceable>
 sudo_cmd="sudo -H"
 rsync_gzip=-z