diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index b034094fe2..e20c460559 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -7890,20 +7890,20 @@ gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
       <sect3>
 	<title>IPv6 Router/Gateway Settings</title>
 
-	<para>This will help you take the directions that your Tunnel provider,
+	<para>This will help you take the directions that your tunnel provider,
 	  such as the <ulink url="http://www.6bone.net/">6bone</ulink>, has
 	  given you and convert it into settings that will persist through reboots.
 	  To restore your tunnel on startup use something like the following in
 	  <filename>/etc/rc.conf</filename>:</para>
 
 	<para>List the Generic Tunneling interfaces that will be configured, for
-	  example: gif0</para>
+	  example: <devicename>gif0</devicename></para>
 
 	<programlisting>gif_interfaces="gif0"</programlisting>
 
-	<para>To configure the interface with a local endpoint of:
-	  <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint of:
-	  <replaceable>REMOTE_IPv4_ADDR</replaceable>.</para>
+	<para>To configure the interface with a local endpoint of
+	  <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint of
+	  <replaceable>REMOTE_IPv4_ADDR</replaceable>:</para>
 
 	<programlisting>gif_config_gif0="<replaceable>MY_IPv4_ADDR REMOTE_IPv4_ADDR</replaceable>"</programlisting>