diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
index 5d23211315..ca76e57522 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -3218,6 +3218,7 @@ dhcpd_ifaces="dc0"</programlisting>
 
     <sect2>
       <title>Starting BIND</title>
+
       <indexterm>
 	<primary>BIND</primary>
 	<secondary>starting</secondary>
@@ -3254,6 +3255,7 @@ dhcpd_ifaces="dc0"</programlisting>
 
     <sect2>
       <title>Configuration Files</title>
+
       <indexterm>
 	<primary>BIND</primary>
 	<secondary>configuration files</secondary>
@@ -3322,8 +3324,7 @@ options {
 // the entries in /etc/resolv.conf, uncomment the following line and
 // set named_auto_forward=yes in /etc/rc.conf.  You can also enable
 // named_auto_forward_only (the effect of which is described above).
-//	include "/etc/namedb/auto_forward.conf";
-</programlisting>
+//	include "/etc/namedb/auto_forward.conf";</programlisting>
 
 	<para>Just as the comment says, to benefit from an uplink's
 	  cache, <literal>forwarders</literal> can be enabled here.
@@ -3607,7 +3608,7 @@ zone "1.168.192.in-addr.arpa" {
 	  <primary>BIND</primary>
 	  <secondary>zone files</secondary>
 	</indexterm>
-	
+
 	<para>An example master zone file for <hostid
 	  role="domainname">example.org</hostid> (existing within
 	  <filename>/etc/namedb/master/example.org</filename>) is as
@@ -3640,28 +3641,24 @@ mx              IN      A       192.168.1.4
 mail            IN      A       192.168.1.5
 
 ; Aliases
-www             IN      CNAME   example.org.<programlisting>
+www             IN      CNAME   example.org.</programlisting>
 
-        <para>
-          Note that every hostname ending in a <quote>.</quote> is an
+        <para>Note that every hostname ending in a <quote>.</quote> is an
           exact hostname, whereas everything without a trailing
           <quote>.</quote> is relative to the origin.  For example,
           <literal>ns1</literal> is translated into
-          <literal>ns1.<replaceable>example.org.</replaceable></literal>
-        </para>
+          <literal>ns1.<replaceable>example.org.</replaceable></literal></para>
+
+        <para>The format of a zone file follows:</para>
 
-        <para>
-          The format of a zone file follows:
-        </para>
         <programlisting>recordname      IN recordtype   value</programlisting>
 
 	<indexterm>
 	  <primary>DNS</primary>
 	  <secondary>records</secondary>
 	</indexterm>
-        <para>
-          The most commonly used DNS records:
-        </para>
+
+        <para>The most commonly used DNS records:</para>
 
 	<variablelist>
 	  <varlistentry>
@@ -3702,8 +3699,7 @@ www             IN      CNAME   example.org.<programlisting>
 	  </varlistentry>
 	</variablelist>
 
-        <programlisting>
-example.org. IN SOA ns1.example.org. admin.example.org. (
+        <programlisting>example.org. IN SOA ns1.example.org. admin.example.org. (
                         2006051501      ; Serial
                         10800           ; Refresh after 3 hours
                         3600            ; Retry after 1 hour
@@ -3714,23 +3710,28 @@ example.org. IN SOA ns1.example.org. admin.example.org. (
 	  <varlistentry>
 	    <term><hostid role="domainname">example.org.</hostid></term>
 
-	    <listitem><para>the domain name, also the origin for this
-		zone file.</para></listitem>
+	    <listitem>
+	      <para>the domain name, also the origin for this
+		zone file.</para>
+	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><hostid role="fqdn">ns1.example.org.</hostid></term>
 
-	    <listitem><para>the primary/authoritative name server for this
-		zone.</para></listitem>
+	    <listitem>
+	      <para>the primary/authoritative name server for this
+		zone.</para>
+	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><literal>admin.example.org.</literal></term>
 
-	    <listitem><para>the responsible person for this zone,
+	    <listitem>
+	      <para>the responsible person for this zone,
 		email address with <quote>@</quote>
-          replaced.  (<email>admin@example.org</email> becomes
+		replaced.  (<email>admin@example.org</email> becomes
 		<literal>admin.example.org</literal>)</para>
 	    </listitem>
 	  </varlistentry>
@@ -3738,91 +3739,75 @@ example.org. IN SOA ns1.example.org. admin.example.org. (
 	  <varlistentry>
 	    <term><literal>2006051501</literal></term>
 
-	      <listitem><para>the serial number of the file.  This
-		  must be incremented each time the zone file is
-		  modified.  Nowadays, many admins prefer a
-		  <literal>yyyymmddrr</literal> format for the serial
-		  number.  <literal>2006051501</literal> would mean
-		  last modified 05/15/2006, the latter
-		  <literal>01</literal> being the first time the zone
-		  file has been modified this day.  The serial number
-		  is important as it alerts slave name servers for a
-		  zone when it is updated.</para>
-	      </listitem>
+	    <listitem>
+	      <para>the serial number of the file.  This
+		must be incremented each time the zone file is
+		modified.  Nowadays, many admins prefer a
+		<literal>yyyymmddrr</literal> format for the serial
+		number.  <literal>2006051501</literal> would mean
+		last modified 05/15/2006, the latter
+		<literal>01</literal> being the first time the zone
+		file has been modified this day.  The serial number
+		is important as it alerts slave name servers for a
+		zone when it is updated.</para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
 
-        <programlisting>
-       IN NS           ns1.example.org.</programlisting>
+        <programlisting>       IN NS           ns1.example.org.</programlisting>
 
-        <para>
-          This is an NS entry.  Every name server that is going to reply
-          authoritatively for the zone must have one of these entries.
-        </para>
+        <para>This is an NS entry.  Every name server that is going to reply
+          authoritatively for the zone must have one of these entries.</para>
 
-        <programlisting>
-localhost       IN      A       127.0.0.1
+        <programlisting>localhost       IN      A       127.0.0.1
 ns1             IN      A       192.168.1.2
 ns2             IN      A       192.168.1.3
 mx              IN      A       192.168.1.4
 mail            IN      A       192.168.1.5</programlisting>
 
-        <para>
-          The A record indicates machine names.  As seen above,
+        <para>The A record indicates machine names.  As seen above,
           <hostid role="fqdn">ns1.example.org</hostid> would resolve
-          to <hostid role="ipaddr">192.168.1.2</hostid>.
-        </para>
+          to <hostid role="ipaddr">192.168.1.2</hostid>.</para>
 
-        <programlisting>
-                IN      A       192.168.1.1</programlisting>
+        <programlisting>                IN      A       192.168.1.1</programlisting>
 
 	<para>This line assigns IP address
 	  <hostid role="ipaddr">192.168.1.1</hostid> to the current origin,
 	  in this case <hostid role="domainname">example.org</hostid>.</para>
 
-        <programlisting>
-www             IN CNAME        @</programlisting>
+        <programlisting>www             IN CNAME        @</programlisting>
 
-        <para>
-          The canonical name record is usually used for giving aliases
+        <para>The canonical name record is usually used for giving aliases
           to a machine.  In the example, <hostid>www</hostid> is
           aliased to the <quote>master</quote> machine whose name happens
           to be the same as the domain name
           <hostid role="domainname">example.org</hostid>
           (<hostid role="ipaddr">192.168.1.1</hostid>).
           CNAMEs can never be used together with another kind of record
-	  for the same hostname.
-        </para>
+	  for the same hostname.</para>
 
 	<indexterm>
 	  <primary>MX record</primary>
 	</indexterm>
 
-        <programlisting>
-               IN MX   10      mail.example.org.</programlisting>
+        <programlisting>               IN MX   10      mail.example.org.</programlisting>
 
-        <para>
-          The MX record indicates which mail
+        <para>The MX record indicates which mail
           servers are responsible for handling incoming mail for the
           zone.  <hostid role="fqdn">mail.example.org</hostid> is the
           hostname of the mail server, and 10 being the priority of
-          that mail server.
-        </para>
+          that mail server.</para>
 
-        <para>
-          One can have several mail servers, with priorities of 10,
+        <para>One can have several mail servers, with priorities of 10,
           20 and so on.  A mail server attempting to deliver to <hostid
-          role="domainname">example.org</hostid> would first try the
+	    role="domainname">example.org</hostid> would first try the
           highest priority MX (the record with the lowest priority
 	  number), then the second highest, etc, until the mail can be
-	  properly delivered.
-        </para>
+	  properly delivered.</para>
 
-        <para>
-          For in-addr.arpa zone files (reverse DNS), the same format is
+        <para>For in-addr.arpa zone files (reverse DNS), the same format is
           used, except with PTR entries instead of
-	  A or CNAME.
-        </para>
+	  A or CNAME.</para>
 
         <programlisting>$TTL 3600
 
@@ -3844,6 +3829,7 @@ www             IN CNAME        @</programlisting>
 
         <para>This file gives the proper IP address to hostname
           mappings of our above fictitious domain.</para>
+
 	<para>It is worth noting that all names on the right side
 	  of a PTR record need to be fully qualified (i.e., end in
 	  a <quote>.</quote>).</para>
@@ -3991,7 +3977,7 @@ www             IN CNAME        @</programlisting>
 	  <listitem>
 	    <para>This specifies the default directory hierarchy for
 	    the <application>Apache</application> installation.  Binaries are stored in the
-	    <filename class="directory">bin</filename> and 
+	    <filename class="directory">bin</filename> and
 	    <filename class="directory">sbin</filename> subdirectories
 	    of the server root, and configuration files are stored in
 	    <filename class="directory">etc/apache</filename>.</para>
@@ -4281,7 +4267,7 @@ DocumentRoot /www/someotherdomain.tld
 	  from the ports system.</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/ports/www/rubygem-rails; make all install clean</userinput></screen>
-      </sect3>          
+      </sect3>
 
       <sect3>
         <title>mod_perl</title>
@@ -5215,7 +5201,7 @@ syslogd_flags="-a logclient.example.com -vv"</programlisting>
 
       <para>Similar to log servers, clients must also meet a few minimum
 	requirements:</para>
- 
+
       <itemizedlist>
 	<listitem>
 	  <para>&man.syslogd.8; must be configured to send messages of