diff --git a/docs/6to4.xml b/docs/6to4.xml
index 1f5890d13..4d2d5b21c 100644
--- a/docs/6to4.xml
+++ b/docs/6to4.xml
@@ -249,22 +249,12 @@ webadmin@lists:~/ftpsite/contrib/IPv6&gt; </programlisting>
 
       <para>On my laptop, ursa:</para>
 
-      <programlisting>ursa:~ # ip -6 addr ls dev wlan0
-3: wlan0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qlen 1000
- <emphasis role="bold">   inet6 2002:ce7c:92b4:1:21a:73ff:fedb:8c35/64 scope global dynamic 
-       valid_lft 2591996sec preferred_lft 604796sec</emphasis>
-    inet6 fe80::21a:73ff:fedb:8c35/64 scope link 
-       valid_lft forever preferred_lft forever
-ursa:~ # ip -6 addr ls dev eth0
+      <programlisting>ursa:~ # ip -6 addr ls dev eth0
 3: eth0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qlen 1000
  <emphasis role="bold">   inet6 2002:ce7c:92b4:1:21a:24ff:fecb:2bcc/64 scope global dynamic 
        valid_lft 2591996sec preferred_lft 604796sec</emphasis>
     inet6 fe80::21a:73ff:fedb:8c35/64 scope link 
        valid_lft forever preferred_lft forever
-ursa:~ # ip -6 route ls dev wlan0
-<emphasis role="bold">2002:ce7c:92b4:1::/64  proto kernel  metric 256  expires 2592160sec mtu 1500 advmss 1440 hoplimit 4294967295</emphasis>
-fe80::/64  metric 256  expires 21314573sec mtu 1500 advmss 1440 hoplimit 4294967295
-<emphasis role="bold">default via fe80::202:e3ff:fe08:55fa  proto kernel  metric 1024  expires 28sec mtu 1500 advmss 1440 hoplimit 64</emphasis>
 ursa:~ # ip -6 route ls dev eth0
 <emphasis role="bold">2002:ce7c:92b4:1::/64  proto kernel  metric 256  expires 2592160sec mtu 1500 advmss 1440 hoplimit 4294967295</emphasis>
 fe80::/64  metric 256  expires 21314573sec mtu 1500 advmss 1440 hoplimit 4294967295
diff --git a/docs/IPP2P.xml b/docs/IPP2P.xml
index a13d7e7f7..dd4c243ae 100644
--- a/docs/IPP2P.xml
+++ b/docs/IPP2P.xml
@@ -97,12 +97,12 @@
       <listitem>
         <para>Shorewall-perl 4.2.5 and later will assume "ipp2p" if that
         option is supported by the installed iptables/Netfilter. Otherwise,
-        Shorewall-perl will assume "edk,kazza,gnu,dc"</para>
+        Shorewall-perl will assume "edk,kazaa,gnu,dc"</para>
       </listitem>
     </itemizedlist>
 
     <para>If 'ipp2p' is specified, Shorewall-perl 4.2.5 and later will
-    substitute "edk,kazza,gnu,dc".</para>
+    substitute "edk,kazaa,gnu,dc".</para>
   </section>
 
   <section id="Example">
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 6db74365c..2d54d2e7d 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -1303,8 +1303,7 @@ wlan0                   192.168.0.0/24</programlisting><note>
       <listitem>
         <para>A local network consisting of wired and wireless client systems.
         A Linksys WRT300N wireless router is used as an access point for the
-        wireless hosts; the WAN port on the router is unused as is the builtin
-        DHCP server. The firewall runs a DHCP server.</para>
+        wireless hosts.</para>
       </listitem>
 
       <listitem>
diff --git a/docs/images/Network2008c.dia b/docs/images/Network2008c.dia
index 6a7b5f456..1afdee091 100644
Binary files a/docs/images/Network2008c.dia and b/docs/images/Network2008c.dia differ
diff --git a/docs/images/Network2008c.png b/docs/images/Network2008c.png
index 61a54e961..419bebf95 100644
Binary files a/docs/images/Network2008c.png and b/docs/images/Network2008c.png differ
diff --git a/docs/images/Network2009.dia b/docs/images/Network2009.dia
index 67112922b..038989efc 100644
Binary files a/docs/images/Network2009.dia and b/docs/images/Network2009.dia differ
diff --git a/docs/images/Network2009.png b/docs/images/Network2009.png
index 2c14e5110..60c27de0e 100644
Binary files a/docs/images/Network2009.png and b/docs/images/Network2009.png differ