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 b4602a4321..4819a58cdb 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -4507,8 +4507,8 @@ Received 264951 bytes in 0.1 seconds</screen>
 	      <entry><systemitem>fe80::/10</systemitem></entry>
 	      <entry>10 bits</entry>
 	      <entry>link-local</entry>
-	      <entry>Equivalent to the loopback address or automatic
-		private addresses (169.254.1.0-169.254.254.255) in
+	      <entry>Equivalent to automatic private addresses
+		(169.254.1.0-169.254.254.255) in
 		<acronym>IPv4</acronym>.</entry>
 	    </row>
 
@@ -4583,8 +4583,9 @@ rtsold_enable="YES"</programlisting>
       <sect2>
 	<title>Connecting to a Provider</title>
 
-      <para>Currently, there are four ways to connect to other
-	<acronym>IPv6</acronym> hosts and networks:</para>
+      <para>In order to connect to other
+	<acronym>IPv6</acronym> networks, one must have a
+	provider or a tunnel that supports <acronym>IPv6</acronym>:</para>
 
       <itemizedlist>
 	<listitem>
@@ -4604,60 +4605,56 @@ rtsold_enable="YES"</programlisting>
 	      Electric</link> offers tunnels with end-points all
 	    around the globe.</para>
 	</listitem>
-
-	<listitem>
-	  <para>Tunnel via 6-to-4 as described in <link
-	      xlink:href="http://www.ietf.org/rfc/rfc3068.txt">RFC3068</link>.</para>
-	</listitem>
-
-	<listitem>
-	  <para>Use the <package>net/freenet6</package> port for a
-	    dial-up connection.</para>
-	</listitem>
       </itemizedlist>
 
+      <note>
+	  <para>Install the <package>net/freenet6</package> package or port for a
+	    dial-up connection.</para>
+	  </note>
+
 	<para>This section demonstrates how to take the directions
-	  from a tunnel provider and convert it into settings that
+	  from a tunnel provider and convert them into
+	  <filename>/etc/rc.conf</filename> settings that
 	  will persist through reboots.</para>
 
-	<para>To restore the tunnel on
-	  startup, add the following lines to
-	  <filename>/etc/rc.conf</filename>.</para>
-
-	<para>The first entry lists the generic tunneling interfaces
-	  to be configured.  This example configures one interface,
+	<para>The first <filename>/etc/rc.conf</filename> entry
+	  creates the generic tunneling interface
 	  <filename>gif0</filename>:</para>
 
 	<programlisting>gif_interfaces="gif<replaceable>0</replaceable>"</programlisting>
 
-	<para>To configure that interface with a local endpoint of
-	  <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint
-	  of <replaceable>REMOTE_IPv4_ADDR</replaceable>:</para>
+	<para>Next, configure that interface with the
+	  <acronym>IPv4</acronym> addresses of the local and remote endpoints.  Replace
+	  <replaceable>MY_IPv4_ADDR</replaceable> and
+	  <replaceable>REMOTE_IPv4_ADDR</replaceable> with the actual
+	  <acronym>IPv4</acronym> addresses:</para>
 
 	<programlisting>gifconfig_gif0="<replaceable>MY_IPv4_ADDR REMOTE_IPv4_ADDR</replaceable>"</programlisting>
 
 	<para>To apply the <acronym>IPv6</acronym> address that has
 	  been assigned for use as the <acronym>IPv6</acronym> tunnel
-	  endpoint, add the following line for
-	  &os;&nbsp;9.<replaceable>x</replaceable> and later:</para>
+	  endpoint, add this line, replacing
+	  <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>
+	  with the assigned address:</para>
 
 	<programlisting>ifconfig_gif0_ipv6="inet6 <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
 
 	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
-	  add:</para>
+	  that line should instead use this format:</para>
 
 	<programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
 
 	<para>Then, set the default route for
-	  <acronym>IPv6</acronym>.  This is the other side of the
-	  <acronym>IPv6</acronym> tunnel:</para>
+	  the other side of the
+	  <acronym>IPv6</acronym> tunnel.  Replace
+	  <replaceable>MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable>
+	  with the default gateway address assigned by the provider:</para>
 
 	<programlisting>ipv6_defaultrouter="<replaceable>MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
 
-	<para>If the server is to route <acronym>IPv6</acronym>
-	  between the rest of the network and the world, the following
-	  <filename>/etc/rc.conf</filename> setting will also be
-	  needed:</para>
+	<para>If the &os; system will route <acronym>IPv6</acronym>
+	  packets between the rest of the network and the world, enable
+	  the gateway using this line:</para>
 
 	<programlisting>ipv6_gateway_enable="YES"</programlisting>
     </sect2>