Clean up visible whitespaces and <para> around <screen> and <programlisting>.

svn path=/head/; revision=40466

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

@@ -284,8 +284,7 @@
       <para>(For this case, the contents are also identical for both
 	server and client.)</para>
 
-      <programlisting>
+      <programlisting>.if !defined(CC) || ${CC} == "cc"
-.if !defined(CC) || ${CC} == "cc"
 CC=clang
 .endif
 .if !defined(CXX) || ${CXX} == "c++"
@@ -296,8 +295,7 @@ CPP=clang-cpp
 .endif
 # Do not die on warnings
 NO_WERROR=
-WERROR=
+WERROR=</programlisting>
-</programlisting>
     </example>
 
     <example>
@@ -599,22 +597,19 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
     <example>
       <title>Update the i386-7 tree and do a complete build</title>
 
-      <screen>
+      <screen>&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen>
-&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen>
     </example>
 
     <example>
       <title>Restart an interrupted amd64-8 build without updating</title>
 
-      <screen>
+      <screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
-&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
     </example>
 
     <example>
       <title>Post-process a completed sparc64-7 tree</title>
 
-      <screen>
+      <screen>&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen>
-&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen>
     </example>
 
     <para>Hint: it is usually best to run the <command>dopackages</command>
@@ -812,6 +807,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>
 
     <para>If you forget to do this, then the old build
@@ -831,11 +827,12 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
       commands hanging.  If so, you are going to have to use the
       <command>allgohans</command> script to run an &man.ssh.1;
       command across all clients for that buildenv.  For example:</para>
-<screen>&prompt.user; ssh gohan24 df</screen>
+
+      <screen>&prompt.user; ssh gohan24 df</screen>
 
     <para>will get you a df, and</para>
 
-<screen>&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports"
+      <screen>&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports"
 &prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src"</screen>
 
     <para>are supposed to get rid of the hanging mounts.  You will have to
@@ -844,7 +841,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
     <note>
       <para>Ignore the following:
 
-<screen>umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: statfs: No such file or directory
+	  <screen>umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: statfs: No such file or directory
 umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: unknown file system
 umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 /x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory</screen>
@@ -1212,10 +1209,10 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       <para>The following example is obsolete</para>
     </note>
 
-    <para>
+    <screen>&prompt.user; <userinput>cvs -R update -dP > update.out</userinput>
-      <screen>&prompt.user; <userinput>cvs -R update -dP > update.out</userinput>
 &prompt.user; <userinput>date > .updated</userinput></screen>
-      This will most closely simulate what the <literal>dopackages</literal>
+
+    <para>This will most closely simulate what the <literal>dopackages</literal>
       script does.  (While <filename>.updated</filename> is merely
       informative, it can be a help.)</para>
 
@@ -1520,13 +1517,13 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 	  </para>
 	  <para>
 	    Required options:</para>
-	  <programlisting>
+
-options         NULLFS
+	  <programlisting>options         NULLFS
 options         TMPFS</programlisting>
 	  <para>
 	    Suggested options:</para>
-	  <programlisting>
+
-options         GEOM_CONCAT
+	  <programlisting>options         GEOM_CONCAT
 options         GEOM_STRIPE
 options         SHMMAXPGS=65536
 options         SEMMNI=40
@@ -1539,26 +1536,27 @@ options         ALT_BREAK_TO_DEBUGGER</programlisting>
 	  <para>For <filename>PAE</filename>, it is not currently possible
 	    to load modules.  Therefore, if you are running an architecture
 	    that supports Linux emulation, you will need to add:</para>
-	  <programlisting>
+
-options         COMPAT_LINUX
+	  <programlisting>options         COMPAT_LINUX
 options         LINPROCFS</programlisting>
 
 	  <para>Also for <filename>PAE</filename>, as of 20110912 you need
 	    the following.  This needs to be investigated:</para>
-	  <programlisting>
+
-nooption        NFSD                    # New Network Filesystem Server
+	  <programlisting>nooption        NFSD                    # New Network Filesystem Server
 options         NFSCLIENT               # Network Filesystem Client
 options         NFSSERVER               # Network Filesystem Server</programlisting>
 	</step>
 
 	<step>
-	  <para>As root, do the usual build steps, e.g.:<screen>
+	  <para>As root, do the usual build steps, e.g.:</para>
-&prompt.root; <userinput>make -j4 buildworld</userinput>
+
+	  <screen>&prompt.root; <userinput>make -j4 buildworld</userinput>
 &prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>${kernconf}</replaceable></userinput>
 &prompt.root; <userinput>make installkernel KERNCONF=<replaceable>${kernconf}</replaceable></userinput>
 &prompt.root; <userinput>make installworld</userinput></screen>
-	    The install steps use <makevar>DESTDIR</makevar>.
+
-	  </para>
+	  <para>The install steps use <makevar>DESTDIR</makevar>.</para>
 	</step>
 
 	<step>
@@ -1598,9 +1596,10 @@ options         NFSSERVER               # Network Filesystem Server</programlist
 
 	    <listitem>
 	      <para>Also add the following users:</para>
-	      <programlisting>
+
-squid:*:100:100::0:0:User &amp;:/usr/local/squid:/bin/sh
+	      <programlisting>squid:*:100:100::0:0:User &amp;:/usr/local/squid:/bin/sh
 ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
+
 	      <para>Add them to <filename>etc/group</filename> as well.</para>
 	    </listitem>
 
@@ -1611,7 +1610,8 @@ ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 
 	    <listitem>
 	      <para>In <filename>etc/crontab</filename>: add</para>
-		<programlisting>*       *       *       *       *       root    /var/portbuild/scripts/client-metrics</programlisting>
+
+	      <programlisting>*       *       *       *       *       root    /var/portbuild/scripts/client-metrics</programlisting>
 	    </listitem>
 
 	    <listitem>
@@ -1623,14 +1623,15 @@ ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 
 	    <listitem>
 	      <para>In <filename>etc/inetd.conf</filename>: add</para>
-		<programlisting>infoseek        stream  tcp     nowait  nobody  /var/portbuild/scripts/reportload</programlisting>
+
+	      <programlisting>infoseek        stream  tcp     nowait  nobody  /var/portbuild/scripts/reportload</programlisting>
 	    </listitem>
 
 	    <listitem>
 	      <para>You should run the cluster on UTC.  If you have not set the clock
-		to UTC:
+		to UTC:</para>
-		<programlisting>&prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC etc/localtime</programlisting>
+
-	      </para>
+	      <programlisting>&prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC etc/localtime</programlisting>
 	    </listitem>
 
 	    <listitem>
@@ -1640,8 +1641,9 @@ ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 		  different, machines, you will need to put those in
 		  the override directories.)</para>
 
-	      <para>Recommended entries for physical nodes:<programlisting>
+	      <para>Recommended entries for physical nodes:</para>
-hostname="<replaceable>${hostname}</replaceable>"
+
+	      <programlisting>hostname="<replaceable>${hostname}</replaceable>"
 inetd_enable="YES"
 linux_enable="YES"
 nfs_client_enable="YES"
@@ -1653,18 +1655,16 @@ sshd_program="/usr/local/sbin/sshd"
 gmond_enable="YES"
 squid_enable="YES"
 squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"
+squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
-</programlisting>
-	      </para>
 
-	      <para>Required entries for VMWare-based nodes:<programlisting>
+	      <para>Required entries for VMWare-based nodes:</para>
-vmware_guest_vmmemctl_enable="YES"
-vmware_guest_guestd_enable="YES"
-</programlisting>
-	      </para>
 
-	      <para>Recommended entries for VMWare-based nodes:<programlisting>
+	      <programlisting>vmware_guest_vmmemctl_enable="YES"
-hostname=""
+vmware_guest_guestd_enable="YES"</programlisting>
+
+	      <para>Recommended entries for VMWare-based nodes:</para>
+
+	      <programlisting>hostname=""
 ifconfig_em0="DHCP"
 fsck_y_enable="YES"
 
@@ -1678,9 +1678,7 @@ sshd_program="/usr/local/sbin/sshd"
 gmond_enable="YES"
 squid_enable="YES"
 squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"
+squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
-</programlisting>
-	      </para>
 
 	      <para>&man.ntpd.8; should <emphasis>not</emphasis>
 		be enabled for VMWare instances.</para>
@@ -1701,8 +1699,9 @@ squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</
 	    </listitem>
 
 	    <listitem>
-	      <para>Modify <filename>etc/sysctl.conf</filename>:<screen>
+	      <para>Modify <filename>etc/sysctl.conf</filename>:</para>
-9a10,30
+
+	      <screen>9a10,30
 > kern.corefile=<filename>/<replaceable>usr2</replaceable>/%N.core</filename>
 > kern.sugid_coredump=1
 > #debug.witness_ddb=0
@@ -1724,7 +1723,6 @@ squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</
 > security.jail.enforce_statfs=1
 >
 > vfs.lookup_shared=1</screen>
-	      </para>
 	    </listitem>
 
 	    <listitem>
@@ -1745,13 +1743,13 @@ squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</
 
       <procedure>
 	<step>
-	  <para>Install the following ports:<screen>
+	  <para>Install the following ports:</para>
-net/rsync
+
+	  <programlisting>net/rsync
 security/openssh-portable (with HPN on)
 security/sudo
 sysutils/ganglia-monitor-core (with GMETAD off)
-www/squid (with SQUID_AUFS on)</screen>
+www/squid (with SQUID_AUFS on)</programlisting>
-	  </para>
 
 	  <para>There is a WIP to create a meta-port, but it is not yet
 	    complete.
@@ -1777,8 +1775,9 @@ www/squid (with SQUID_AUFS on)</screen>
 	  <itemizedlist>
 	    <listitem>
 	      <para>Modify
-		 <filename>usr/local/etc/gmond.conf</filename>:<screen>
+		 <filename>usr/local/etc/gmond.conf</filename>:</para>
-21,22c21,22
+
+	      <screen>21,22c21,22
 &lt;   name = "unspecified"
 &lt;   owner = "unspecified"
 ---
@@ -1788,7 +1787,6 @@ www/squid (with SQUID_AUFS on)</screen>
 &lt;   url = "unspecified"
 ---
 &gt;   url = "http://pointyhat.freebsd.org"</screen>
-	      </para>
 
 	      <!-- XXX MCL adapted literally from krismail; I do not understand it -->
 	      <para>If there are machines from more than one cluster in the
@@ -1801,8 +1799,9 @@ www/squid (with SQUID_AUFS on)</screen>
 	      <para>Create
 		 <filename>usr/local/etc/rc.d/portbuild.sh</filename>,
 		 using the appropriate value for
-		 <literal>scratchdir</literal>:<programlisting>
+		 <literal>scratchdir</literal>:</para>
-#!/bin/sh
+
+	      <programlisting>#!/bin/sh
 #
 # Configure a package build system post-boot
 
@@ -1820,13 +1819,13 @@ done
 
 # Flag that we are ready to accept jobs
 touch /tmp/.boot_finished</programlisting>
-	      </para>
 	    </listitem>
 
 	    <listitem>
 	      <para>Modify
-		 <filename>usr/local/etc/squid/squid.conf</filename>:<screen>
+		 <filename>usr/local/etc/squid/squid.conf</filename>:</para>
-288,290c288,290
+
+	      <screen>288,290c288,290
 &lt; #auth_param basic children 5
 &lt; #auth_param basic realm Squid proxy-caching web server
 &lt; #auth_param basic credentialsttl 2 hours
@@ -1842,7 +1841,6 @@ touch /tmp/.boot_finished</programlisting>
 &gt; maximum_object_size 400 MB
 2828a2838
 &gt; negative_ttl 0 minutes</screen>
-	      </para>
 
 	      <para>Also, change <filename>usr/local</filename>
 		to <filename><replaceable>usr2</replaceable></filename> in
@@ -1875,11 +1873,11 @@ touch /tmp/.boot_finished</programlisting>
 	      </note>
 
 	      <para>Create
-		 <filename>usr/local/etc/sudoers/sudoers.d/portbuild</filename>:<programlisting>
+		 <filename>usr/local/etc/sudoers/sudoers.d/portbuild</filename>:</para>
-# local changes for package building
+
+	      <programlisting># local changes for package building
 %wheel        ALL=(ALL) ALL
 ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlisting>
-	      </para>
 	    </listitem>
 	  </itemizedlist>
 	</step>
@@ -1899,8 +1897,9 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 	</step>
 
 	<step>
-	  <para>As root:<screen>
+	  <para>As root:</para>
-&prompt.root; <userinput>mkdir portbuild</userinput>
+
+	  <screen>&prompt.root; <userinput>mkdir portbuild</userinput>
 &prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> portbuild</userinput>
 &prompt.root; <userinput>mkdir pkgbuild</userinput>
 &prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> pkgbuild</userinput>
@@ -1908,7 +1907,6 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 &prompt.root; <userinput>mkdir squid/cache</userinput>
 &prompt.root; <userinput>mkdir squid/logs</userinput>
 &prompt.root; <userinput>chown -R squid:squid squid</userinput></screen>
-	  </para>
 	</step>
 
 	<!-- XXX MCL adapted literally from krismail; I do not understand it -->
@@ -1928,8 +1926,9 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 
 	<step>
 	  <para>As root, initialize the <command>squid</command>
-	    directories:
+	    directories:</para>
-	    <screen><userinput>squid -z</userinput></screen></para>
+
+	  <screen><userinput>squid -z</userinput></screen>
 	</step>
       </procedure>
 
@@ -1980,15 +1979,15 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 	      of <makevar>MASTER_SITE_BACKUP</makevar> must be common
 	      to all nodes, but the first entry in
 	      <makevar>MASTER_SITE_OVERRIDE</makevar> should be the
-	      nearest local FTP mirror.  Example:<programlisting>
+	      nearest local FTP mirror.  Example:</para>
-.if defined(FETCH_ORIGINAL)
+
+	      <programlisting>.if defined(FETCH_ORIGINAL)
 MASTER_SITE_BACKUP=
 .else
 MASTER_SITE_OVERRIDE= \
 	ftp://<replaceable>friendly-local-ftp-mirror</replaceable>/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ \
 	ftp://${BACKUP_FTP_SITE}/pub/FreeBSD/distfiles/${DIST_SUBDIR}/
 .endif</programlisting>
-	      </para>
 	    </listitem>
 	    <listitem>
 	      <para><command>tar</command> it up and move it to the right
@@ -2010,8 +2009,9 @@ MASTER_SITE_OVERRIDE= \
 	    file contains overrides to
 <filename>/var/portbuild/<replaceable>${arch}</replaceable>/portbuild.conf</filename>.</para>
 
-	  <para>Suggested values:<programlisting>
+	  <para>Suggested values:</para>
-disconnected=1
+
+	  <programlisting>disconnected=1
 http_proxy="http://localhost:3128/"
 squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
 scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
@@ -2021,16 +2021,14 @@ rsync_gzip=-z
 
 infoseek_host=localhost
 infoseek_port=<replaceable>${tunelled-tcp-port}</replaceable></programlisting>
-	  </para>
 
-	  <para>Possible other values:<programlisting>
+	  <para>Possible other values:</para>
-use_md_swap=1
+
+	  <programlisting>use_md_swap=1
 md_size=9g
 use_zfs=1
 scp_cmd="/usr/local/bin/scp"
-ssh_cmd="/usr/local/bin/ssh"
+ssh_cmd="/usr/local/bin/ssh"</programlisting>
-</programlisting>
-	  </para>
 	</step>
       </procedure>
 
@@ -2049,7 +2047,7 @@ ssh_cmd="/usr/local/bin/ssh"
 	  <para>Add an appropriate <literal>data_source</literal> entry to
 	    <filename>/usr/local/etc/gmetad.conf</filename>:</para>
 
-	    <programlisting>data_source "<replaceable>arch</replaceable>/<replaceable>location</replaceable> Package Build Cluster" 30 <replaceable>hostname</replaceable></programlisting>
+	  <programlisting>data_source "<replaceable>arch</replaceable>/<replaceable>location</replaceable> Package Build Cluster" 30 <replaceable>hostname</replaceable></programlisting>
 
 	  <para>You will need to restart <filename>gmetad</filename>.
 	  </para>
@@ -2206,6 +2204,7 @@ ssh_cmd="/usr/local/bin/ssh"
 	<itemizedlist>
 	  <listitem>
 	    <para>Kick-start the build for the branch with:</para>
+
 	      <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen>
 	  </listitem>
 
@@ -2372,14 +2371,13 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
       </listitem>
 
       <listitem>
-	<para>Create a new <application>zfs</application> filesystem:
+	<para>Create a new <application>zfs</application> filesystem:</para>
+
 	  <screen>&prompt.root; zfs create -o mountpoint=/a/portbuild/<replaceable>arch</replaceable> a/portbuild/<replaceable>arch</replaceable></screen>
-	</para>
       </listitem>
 
       <listitem>
-	<screen>
+	<screen>&prompt.root; chown ports-<replaceable>arch</replaceable>:portbuild /var/portbuild/<replaceable>arch</replaceable>;
-&prompt.root; chown ports-<replaceable>arch</replaceable>:portbuild /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; chmod 775 /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
@@ -2406,8 +2404,9 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para>Kick-start the build for the branch with
+	    <para>Kick-start the build for the branch with</para>
-	      <screen>&prompt.root; build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen></para>
+
+	      <screen>&prompt.root; build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen>
 	  </listitem>
 	</itemizedlist>
 
@@ -2472,7 +2471,7 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
 	  <step>
 	    <para>Make a private configuration directory:</para>
 
-	  <screen>&prompt.root; mkdir /var/portbuild/conf/<replaceable>arch</replaceable></screen>
+	      <screen>&prompt.root; mkdir /var/portbuild/conf/<replaceable>arch</replaceable></screen>
 	  </step>
 
 	  <step>
@@ -2529,8 +2528,9 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
 
     <itemizedlist>
       <listitem>
-	<para>Tell <application>qmanager</application> about the arch:
+	<para>Tell <application>qmanager</application> about the arch:</para>
-	  <screen>python <replaceable>path</replaceable>/qmanager/qclient add_acl name=ports-<replaceable>arch</replaceable> uidlist=ports-<replaceable>arch</replaceable> gidlist=portbuild sense=1</screen></para>
+
+	  <screen>python <replaceable>path</replaceable>/qmanager/qclient add_acl name=ports-<replaceable>arch</replaceable> uidlist=ports-<replaceable>arch</replaceable> gidlist=portbuild sense=1</screen>
       </listitem>
 
       <listitem>
@@ -2575,35 +2575,36 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
 	</step>
 
 	<step>
-	  <para>Export that value for a later initialization step:
+	  <para>Export that value for a later initialization step:</para>
-	    <screen>&prompt.root; export PORTBUILD_USER=<replaceable>portbuild</replaceable></screen>
+
-	  </para>
+	  <screen>&prompt.root; export PORTBUILD_USER=<replaceable>portbuild</replaceable></screen>
 	</step>
 
 	<step>
-	  <para>Add the following to <filename>/boot/loader.conf</filename>:<programlisting>
+	  <para>Add the following to <filename>/boot/loader.conf</filename>:</para>
-console="vidconsole,comconsole"</programlisting>
+
-	  </para>
+	  <programlisting>console="vidconsole,comconsole"</programlisting>
 	</step>
 
 	<step>
 	  <para>You should run the cluster on UTC.  If you have not set the clock
-	    to UTC:
+	    to UTC:</para>
-	    <programlisting>&prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC /etc/localtime</programlisting>
+
-	  </para>
+	  <programlisting>&prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC /etc/localtime</programlisting>
 	</step>
 
 	<step>
 	  <para>Create the appropriate
 	    <filename>/etc/rc.conf</filename>.</para>
 
-	  <para>Required entries:</para><programlisting>
+	  <para>Required entries:</para>
-hostname="<replaceable>${hostname}</replaceable>"
-sshd_enable="YES"
-</programlisting>
 
-<para>Recommended entries:</para><programlisting>
+	  <programlisting>hostname="<replaceable>${hostname}</replaceable>"
-background_fsck="NO"
+sshd_enable="YES"</programlisting>
+
+	  <para>Recommended entries:</para>
+
+	  <programlisting>background_fsck="NO"
 clear_tmp_enable="YES"
 dumpdev="AUTO"
 fsck_y_enable="YES"
@@ -2626,8 +2627,7 @@ rpc_lockd_enable="NO"
 rpc_statd_enable="YES"
 sendmail_enable="NONE"
 smartd_enable="YES"
-zfs_enable="YES"
+zfs_enable="YES"</programlisting>
-</programlisting>
 	</step>
 
 	<step>
@@ -2641,12 +2641,12 @@ zfs_enable="YES"
 	</step>
 
 	<step>
-	  <para>Add the following to <filename>/etc/sysctl.conf</filename>:<programlisting>
+	  <para>Add the following to <filename>/etc/sysctl.conf</filename>:</para>
-kern.maxfiles=40000
+
+	  <programlisting>kern.maxfiles=40000
 kern.maxfilesperproc=38000
 sysctl vfs.usermount=1
 sysctl vfs.zfs.super_owner=1</programlisting>
-	  </para>
 	</step>
 
 	<step>
@@ -2674,8 +2674,9 @@ ttyu0   "/usr/libexec/getty std.9600"   vt100   on secure</programlisting>
 
       <procedure>
 	<step>
-	  <para>The following ports (or their latest successors) are required:<programlisting>
+	  <para>The following ports (or their latest successors) are required:</para>
-databases/py-sqlite3
+
+	  <programlisting>databases/py-sqlite3
 databases/py-sqlalchemy (only SQLITE is needed)
 devel/git (WITH_SVN)
 devel/py-configobj
@@ -2686,16 +2687,16 @@ net/rsync
 sysutils/ganglia-monitor-core (with GMETAD off)
 sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11)
 www/apache22 (with EXT_FILTER)</programlisting>
-	  </para>
 
-	  <para>Expect those to bring in, among others:<programlisting>
+	  <para>Expect those to bring in, among others:</para>
-databases/sqlite3
+
+	  <programlisting>databases/sqlite3
 lang/perl-5.14 (or successor)
 lang/python27 (or sucessor)</programlisting>
-	  </para>
 
-	  <para>The following ports (or their latest successors) are strongly suggested:<programlisting>
+	  <para>The following ports (or their latest successors) are strongly suggested:</para>
-devel/ccache
+
+	  <programlisting>devel/ccache
 mail/postfix
 net/isc-dhcp41-server
 ports-mgmt/pkg
@@ -2705,15 +2706,14 @@ security/sudo
 shells/bash
 shells/zsh
 sysutils/screen</programlisting>
-	  </para>
 
-	  <para>The following ports (or their latest successors) are handy:<programlisting>
+	  <para>The following ports (or their latest successors) are handy:</para>
-benchmarks/bonnie++
+
+	  <programlisting>benchmarks/bonnie++
 ports-mgmt/pkg_tree
 sysutils/dmidecode
 sysutils/smartmontools
 sysutils/zfs-stats</programlisting>
-	  </para>
 	</step>
 
       </procedure>
@@ -2729,21 +2729,22 @@ sysutils/zfs-stats</programlisting>
 
 	<step>
 	  <para>Pick a <application>zfs</application> volume name and export
-	    it.  We have used <replaceable>a</replaceable> so far to date.
+	    it.  We have used <replaceable>a</replaceable> so far to date.</para>
-	    <programlisting>&prompt.root; export ZFS_VOLUME=<replaceable>a</replaceable></programlisting>
+
-	  </para>
+	  <programlisting>&prompt.root; export ZFS_VOLUME=<replaceable>a</replaceable></programlisting>
 	</step>
 
 	<step>
 	  <para>Pick a mountpoint and export it.  We have used
-	    <filename>/<replaceable>a</replaceable></filename> so far to date.
+	    <filename>/<replaceable>a</replaceable></filename> so far to date.</para>
-	    <screen>&prompt.root; export ZFS_MOUNTPOINT=/<replaceable>a</replaceable></screen>
+
-	  </para>
+	  <screen>&prompt.root; export ZFS_MOUNTPOINT=/<replaceable>a</replaceable></screen>
 	</step>
 
 	<step>
 	  <para>Create the mountpoint.</para>
-	    <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}</screen>
+
+	  <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}</screen>
 	</step>
 
 	<step>
@@ -2753,7 +2754,7 @@ sysutils/zfs-stats</programlisting>
 	  <example>
 	    <title>Creating a <application>zfs</application> volume for portbuild</title>
 
-<screen>&prompt.root; zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
+	    <screen>&prompt.root; zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
 	  </example>
 	</step>
 
@@ -2779,32 +2780,30 @@ sysutils/zfs-stats</programlisting>
 	  <para>Select an <application>svn</application> repository
 	    and export it.  See the
 	    <ulink url="&url.books.handbook;/mirrors-svn.html">&os; Handbook</ulink>
-	    for the currently supported list.
+	    for the currently supported list.</para>
-	    <screen>&prompt.root; export VCS_REPOSITORY=<replaceable>svn://svn0.us-east.FreeBSD.org</replaceable></screen>
+
-	  </para>
+	  <screen>&prompt.root; export VCS_REPOSITORY=<replaceable>svn://svn0.us-east.FreeBSD.org</replaceable></screen>
 	</step>
 
 	<step>
-	  <para>Create the <filename>portbuild</filename> directory:<screen>
+	  <para>Create the <filename>portbuild</filename> directory:</para>
-&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild
+
-</screen>
+	  <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild</screen>
-	  </para>
 	</step>
 
 	<step>
 	  <para>Create and mount a new <application>zfs</application>
-	    filesystem on it:
+	    filesystem on it:</para>
-	    <screen>zfs create -o mountpoint=${ZFS_MOUNTPOINT}/portbuild ${ZFS_VOLUME}/portbuild</screen>
+
-	  </para>
+	  <screen>zfs create -o mountpoint=${ZFS_MOUNTPOINT}/portbuild ${ZFS_VOLUME}/portbuild</screen>
 	</step>
 
 	<step>
-	  <para>Set up the directory:<screen>
+	  <para>Set up the directory:</para>
-&prompt.root; chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild
+
+	  <screen>&prompt.root; chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild
 &prompt.root; chmod 775 ${ZFS_MOUNTPOINT}/portbuild
-&prompt.root; ln -sf ${ZFS_MOUNTPOINT}/portbuild /var/portbuild
+&prompt.root; ln -sf ${ZFS_MOUNTPOINT}/portbuild /var/portbuild</screen>
-</screen>
-	  </para>
 
 	  <note>
 	    <para>The <command>ln</command> is necessary due to a number
@@ -2820,10 +2819,9 @@ sysutils/zfs-stats</programlisting>
       <procedure>
 
 	<step>
-	  <para>set up the repository:<screen>
+	  <para>set up the repository:</para>
-&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild
+
-</screen>
+	  <screen>&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild</screen>
-	  </para>
 	</step>
 
       </procedure>
@@ -2931,9 +2929,9 @@ sysutils/zfs-stats</programlisting>
 
 	<step>
 	  <para>As euid root, set up the <application>zfs</application>
-	    <literal>permission set</literal>:
+	    <literal>permission set</literal>:</para>
-	    <screen>&prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin</screen>
+
-	  </para>
+	  <screen>&prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin</screen>
 	</step>
 
 	<step>
@@ -2953,11 +2951,11 @@ sysutils/zfs-stats</programlisting>
 	<step>
 	  <para>Copy the following files from
 	    <filename>/var/portbuild/etc/rc.d/</filename> to
-	    <filename>/usr/local/etc/rc.d/</filename>:<programlisting>
+	    <filename>/usr/local/etc/rc.d/</filename>:</para>
-buildproxy.sh
+
+	  <programlisting>buildproxy.sh
 pollmachine.sh
 qmanager.sh</programlisting>
-	  </para>
 
 	  <para>As root, start each one of them.  You may find it handy
 	    to start each under <application>screen</application> for
@@ -2973,9 +2971,7 @@ qmanager.sh</programlisting>
 	      the first <command>build</command> command.</para>
 	  </note>
 
-	  <para><screen>
+	  <screen>&prompt.root; python /<replaceable>a</replaceable>/portbuild/qmanager/qclient add_acl name=deny_all uidlist= gidlist= sense=0</screen>
-&prompt.root; python /<replaceable>a</replaceable>/portbuild/qmanager/qclient add_acl name=deny_all uidlist= gidlist= sense=0
-</screen></para>
 	</step>
 
       </procedure>
@@ -2991,10 +2987,10 @@ qmanager.sh</programlisting>
 	  <para>As the <replaceable>portbuild</replaceable> user,
 	    run the following commands manually to create the
 	    <literal>src</literal> and <literal>ports</literal>
-	    repositories, respectively:<screen>
+	    repositories, respectively:</para>
-&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap.ports
+
-&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap
+	  <screen>&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap.ports
-</screen></para>
+&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap</screen>
 
 	  <para>These will be periodically run from the
 	    <replaceable>portbuild</replaceable>
@@ -3047,9 +3043,9 @@ qmanager.sh</programlisting>
 	</step>
 
 	<step>
-	  <para>If not already created, add the following user:<programlisting>
+	  <para>If not already created, add the following user:</para>
-ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
+
-	  </para>
+	  <programlisting>ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 
 	  <para>Add it to <filename>/etc/group</filename> as well.</para>
 	</step>
@@ -3077,9 +3073,9 @@ ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 	<step>
 	  <para>At some point, you will probably find it handy to append
 	    the following to the <makevar>PATH</makevar> definition for
-	    the <replaceable>portbuild</replaceable> user:
+	    the <replaceable>portbuild</replaceable> user:</para>
-	    <programlisting>/<replaceable>a</replaceable>/portbuild/scripts:/<replaceable>a</replaceable>/portbuild/tools</programlisting>
+
-	    </para>
+	  <programlisting>/<replaceable>a</replaceable>/portbuild/scripts:/<replaceable>a</replaceable>/portbuild/tools</programlisting>
 	</step>
 
       </procedure>