diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 4fa6806c74..ac161fb4f3 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -4355,14 +4355,21 @@ Received 264951 bytes in 0.1 seconds</screen>
     </itemizedlist>
 
 
-    <para>For more information see:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><link
+    <para>For more information, refer to <link
 	    xlink:href="http://www.kame.net">KAME.net</link></para>
-      </listitem>
-    </itemizedlist>
+
+      <para>Currently <acronym>IPv6</acronym> support for many
+	applications and services is very good, though for some
+	software it still needs work.  For authoritative information
+	about the support of <acronym>IPv6</acronym>, please consult
+	the Official Documentation for the software in
+	question.</para>
+
+      <para>Web, <acronym>DNS</acronym> and Mail applications and
+	servers have the best support for <acronym>IPv6</acronym>
+	because they are the most common use case.  Other applications
+	may have varying degrees of <acronym>IPv6</acronym>
+	support.</para>
 
     <sect2>
       <title>Background on <acronym>IPv6</acronym> Addresses</title>
@@ -4476,12 +4483,8 @@ Received 264951 bytes in 0.1 seconds</screen>
 	  </tbody>
 	</tgroup>
       </table>
-    </sect2>
 
-    <sect2>
-      <title>Reading <acronym>IPv6</acronym> Addresses</title>
-
-      <para>The canonical form is represented as:
+      <para>When reading an <acronym>IPv6</acronym> address, the canonical form is represented as:
 	<systemitem>x:x:x:x:x:x:x:x</systemitem>, with each
 	<quote>x</quote> being a 16 bit hex value.  For example:
 	<systemitem>FEBC:A574:382B:23C1:AA49:4592:4EFE:9982</systemitem>.</para>
@@ -4525,7 +4528,7 @@ Received 264951 bytes in 0.1 seconds</screen>
     </sect2>
 
     <sect2>
-      <title>Getting Connected</title>
+      <title>Configuring <acronym>IPv6</acronym></title>
 
       <para>Currently, there are four ways to connect to other
 	<acronym>IPv6</acronym> hosts and networks:</para>
@@ -4559,15 +4562,6 @@ Received 264951 bytes in 0.1 seconds</screen>
 	    dial-up connection.</para>
 	</listitem>
       </itemizedlist>
-    </sect2>
-
-    <sect2>
-      <title>Applying the Needed Changes to
-	<filename>/etc/rc.conf</filename></title>
-
-      <sect3>
-	<title><acronym>IPv6</acronym> Client
-	  Auto-Configuration</title>
 
 	<para>To automatically configure a machine on a
 	  <acronym>LAN</acronym> which acts as a client, not a
@@ -4588,11 +4582,6 @@ Received 264951 bytes in 0.1 seconds</screen>
 	  add:</para>
 
 	<programlisting>ipv6_enable="YES"</programlisting>
-      </sect3>
-
-      <sect3>
-	<title><acronym>IPv6</acronym> Client Static
-	  Configuration</title>
 
 	<para>To statically assign the <acronym>IPv6</acronym>
 	  address,
@@ -4618,14 +4607,16 @@ Received 264951 bytes in 0.1 seconds</screen>
 	  following to <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>ipv6_defaultrouter="2001:db8:4672:6565::1"</programlisting>
-      </sect3>
+      </sect2>
 
-      <sect3>
-	<title><acronym>IPv6</acronym> Router/Gateway Settings</title>
+      <sect2>
+	<title>Connecting to a Provider</title>
 
 	<para>This section demonstrates how to take the directions
 	  from a tunnel provider and convert it into settings that
-	  will persist through reboots.  To restore the tunnel on
+	  will persist through reboots.</para>
+	    
+	<para>To restore the tunnel on
 	  startup, add the following lines to
 	  <filename>/etc/rc.conf</filename>.</para>
 
@@ -4658,10 +4649,6 @@ Received 264951 bytes in 0.1 seconds</screen>
 	  <acronym>IPv6</acronym> tunnel:</para>
 
 	<programlisting>ipv6_defaultrouter="<replaceable>MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
-      </sect3>
-
-      <sect3>
-	<title><acronym>IPv6</acronym> Tunnel Settings</title>
 
 	<para>If the server is to route <acronym>IPv6</acronym>
 	  between the rest of the network and the world, the following
@@ -4669,7 +4656,6 @@ Received 264951 bytes in 0.1 seconds</screen>
 	  needed:</para>
 
 	<programlisting>ipv6_gateway_enable="YES"</programlisting>
-      </sect3>
     </sect2>
 
     <sect2>
@@ -4735,23 +4721,6 @@ Received 264951 bytes in 0.1 seconds</screen>
 	section 3.6 and 3.7 as well as <acronym>RFC</acronym> 4038
 	section 4.2 may be useful to some adminstrators.</para>
     </sect2>
-
-    <sect2>
-      <title>Application Use of <acronym>IPv6</acronym></title>
-
-      <para>Currently <acronym>IPv6</acronym> support for many
-	applications and services is very good, though for some
-	software it still needs work.  For authoritative information
-	about the support of <acronym>IPv6</acronym>, please consult
-	the Official Documentation for the software in
-	question.</para>
-
-      <para>Web, <acronym>DNS</acronym> and Mail applications and
-	servers have the best support for <acronym>IPv6</acronym>
-	because they are the most common use case.  Other applications
-	may have varying degrees of <acronym>IPv6</acronym>
-	support.</para>
-    </sect2>
   </sect1>
 <!--
   <sect1 xml:id="network-atm">