diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index d9fb65247..7ac51582d 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -57,16 +57,17 @@
           <row>
             <entry><ulink url="6to4.htm">6to4 and 6in4 Tunnels</ulink></entry>
 
-            <entry><ulink url="Vserver.html">Linux-vserver</ulink></entry>
+            <entry><ulink url="LXC.html">Linux Containers
+            (LXC)</ulink></entry>
 
-            <entry></entry>
+            <entry><ulink url="Laptop.html">Shorewall on a
+            Laptop</ulink></entry>
           </row>
 
           <row>
             <entry><ulink url="Accounting.html">Accounting</ulink></entry>
 
-            <entry><ulink url="ConnectionRate.html">Limiting Connection
-            Rates</ulink></entry>
+            <entry><ulink url="Vserver.html">Linux-vserver</ulink></entry>
 
             <entry><ulink url="Shorewall-perl.html">Shorewall
             Perl</ulink></entry>
@@ -75,7 +76,8 @@
           <row>
             <entry><ulink url="Actions.html">Actions</ulink></entry>
 
-            <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
+            <entry><ulink url="ConnectionRate.html">Limiting Connection
+            Rates</ulink></entry>
 
             <entry><ulink url="shorewall_setup_guide.htm">Shorewall Setup
             Guide</ulink></entry>
@@ -85,7 +87,7 @@
             <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
             (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
 
-            <entry><ulink url="Macros.html">Macros</ulink></entry>
+            <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
 
             <entry><ulink url="samba.htm">SMB</ulink></entry>
           </row>
@@ -94,8 +96,7 @@
             <entry><ulink url="Anatomy.html">Anatomy of
             Shorewall</ulink></entry>
 
-            <entry><ulink url="MAC_Validation.html">MAC
-            Verification</ulink></entry>
+            <entry><ulink url="Macros.html">Macros</ulink></entry>
 
             <entry><ulink url="two-interface.htm#SNAT">SNAT</ulink>
             (<firstterm>Source Network Address
@@ -106,7 +107,8 @@
             <entry><ulink url="Audit.html">AUDIT Target
             support</ulink></entry>
 
-            <entry><ulink url="Manpages.html">Man Pages</ulink></entry>
+            <entry><ulink url="MAC_Validation.html">MAC
+            Verification</ulink></entry>
 
             <entry><ulink url="SplitDNS.html">Split DNS the Easy
             Way</ulink></entry>
@@ -116,8 +118,7 @@
             <entry><ulink url="traffic_shaping.htm">Bandwidth
             Control</ulink></entry>
 
-            <entry><ulink url="ManualChains.html">Manual
-            Chains</ulink></entry>
+            <entry><ulink url="Manpages.html">Man Pages</ulink></entry>
 
             <entry><ulink url="Shorewall_Squid_Usage.html">Squid with
             Shorewall</ulink></entry>
@@ -127,8 +128,8 @@
             <entry><ulink
             url="blacklisting_support.htm">Blacklisting/Whitelisting</ulink></entry>
 
-            <entry><ulink
-            url="two-interface.htm#SNAT">Masquerading</ulink></entry>
+            <entry><ulink url="ManualChains.html">Manual
+            Chains</ulink></entry>
 
             <entry><ulink
             url="starting_and_stopping_shorewall.htm">Starting/stopping the
@@ -139,9 +140,8 @@
             <entry>Bridge: <ulink
             url="bridge-Shorewall-perl.html">Bridge/Firewall</ulink></entry>
 
-            <entry><ulink url="MultiISP.html">Multiple Internet Connections
-            from a Single Firewall</ulink> (<ulink
-            url="MultiISP_ru.html">Russian</ulink>)</entry>
+            <entry><ulink
+            url="two-interface.htm#SNAT">Masquerading</ulink></entry>
 
             <entry><ulink url="NAT.htm">Static (one-to-one)
             NAT</ulink></entry>
@@ -151,8 +151,8 @@
             <entry>Bridge: <ulink url="SimpleBridge.html">No firewalling of
             traffic between bridge port</ulink></entry>
 
-            <entry><ulink url="Multiple_Zones.html">Multiple Zones Through One
-            Interface</ulink></entry>
+            <entry><ulink url="MultiISP.html">Multiple Internet Connections
+            from a Single Firewall</ulink></entry>
 
             <entry><ulink url="support.htm">Support</ulink></entry>
           </row>
@@ -161,8 +161,8 @@
             <entry><ulink url="Build.html">Building Shorewall from
             GIT</ulink></entry>
 
-            <entry><ulink url="MyNetwork.html">My Shorewall
-            Configuration</ulink></entry>
+            <entry><ulink url="Multiple_Zones.html">Multiple Zones Through One
+            Interface</ulink></entry>
 
             <entry><ulink url="configuration_file_basics.htm">Tips and
             Hints</ulink></entry>
@@ -172,8 +172,8 @@
             <entry><ulink
             url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
 
-            <entry><ulink url="NetfilterOverview.html">Netfilter
-            Overview</ulink></entry>
+            <entry><ulink url="MyNetwork.html">My Shorewall
+            Configuration</ulink></entry>
 
             <entry><ulink url="Accounting.html">Traffic
             Accounting</ulink></entry>
@@ -183,7 +183,8 @@
             <entry><ulink url="CompiledPrograms.html">Compiled Firewall
             Programs</ulink></entry>
 
-            <entry><ulink url="netmap.html">Network Mapping</ulink></entry>
+            <entry><ulink url="NetfilterOverview.html">Netfilter
+            Overview</ulink></entry>
 
             <entry><ulink url="simple_traffic_shaping.html">Traffic
             Shaping/QOS - Simple</ulink></entry>
@@ -193,8 +194,7 @@
             <entry><ulink url="configuration_file_basics.htm">Configuration
             File Basics</ulink></entry>
 
-            <entry><ulink url="NAT.htm">One-to-one NAT</ulink> (Static
-            NAT)</entry>
+            <entry><ulink url="netmap.html">Network Mapping</ulink></entry>
 
             <entry><ulink url="traffic_shaping.htm">Traffic Shaping/QOS -
             Complex</ulink></entry>
@@ -204,7 +204,7 @@
             <entry><ulink url="dhcp.htm">DHCP</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html"><ulink
-            url="OPENVPN.html">OpenVPN</ulink></ulink></entry>
+            url="NAT.htm">One-to-one NAT</ulink> (Static NAT)</ulink></entry>
 
             <entry><ulink url="Shorewall_Squid_Usage.html">Transparent
             Proxy</ulink></entry>
@@ -215,7 +215,7 @@
             url="two-interface.htm#DNAT">DNAT</ulink> (<firstterm>Destination
             Network Address Translation</firstterm>)</ulink></entry>
 
-            <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
+            <entry><ulink url="OPENVPN.html">OpenVPN</ulink></entry>
 
             <entry><ulink url="UPnP.html">UPnP</ulink></entry>
           </row>
@@ -223,8 +223,7 @@
           <row>
             <entry><ulink url="Dynamic.html">Dynamic Zones</ulink></entry>
 
-            <entry><ulink url="starting_and_stopping_shorewall.htm">Operating
-            Shorewall</ulink></entry>
+            <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
 
             <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
           </row>
@@ -233,8 +232,8 @@
             <entry><ulink url="ECN.html">ECN Disabling by host or
             subnet</ulink></entry>
 
-            <entry><ulink url="PacketMarking.html">Packet
-            Marking</ulink></entry>
+            <entry><ulink url="starting_and_stopping_shorewall.htm">Operating
+            Shorewall</ulink></entry>
 
             <entry><ulink url="LennyToSqueeze.html">Upgrading to Shorewall 4.4
             (Upgrading Debian Lenny to Squeeze)</ulink></entry>
@@ -245,8 +244,8 @@
             url="shorewall_extension_scripts.htm">Extension Scripts</ulink>
             (User Exits)</ulink></entry>
 
-            <entry><ulink url="PacketHandling.html">Packet Processing in a
-            Shorewall-based Firewall</ulink></entry>
+            <entry><ulink url="PacketMarking.html">Packet
+            Marking</ulink></entry>
 
             <entry><ulink url="VPNBasics.html">VPN</ulink></entry>
           </row>
@@ -255,7 +254,8 @@
             <entry><ulink
             url="fallback.htm">Fallback/Uninstall</ulink></entry>
 
-            <entry><ulink url="ping.html">'Ping' Management</ulink></entry>
+            <entry><ulink url="PacketHandling.html">Packet Processing in a
+            Shorewall-based Firewall</ulink></entry>
 
             <entry><ulink url="VPN.htm">VPN Passthrough</ulink></entry>
           </row>
@@ -263,8 +263,7 @@
           <row>
             <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
 
-            <entry><ulink url="two-interface.htm#DNAT">Port
-            Forwarding</ulink></entry>
+            <entry><ulink url="ping.html">'Ping' Management</ulink></entry>
 
             <entry><ulink url="blacklisting_support.htm#whitelisting">White
             List Creation</ulink></entry>
@@ -274,7 +273,8 @@
             <entry><ulink
             url="shorewall_features.htm">Features</ulink></entry>
 
-            <entry><ulink url="ports.htm">Port Information</ulink></entry>
+            <entry><ulink url="two-interface.htm#DNAT">Port
+            Forwarding</ulink></entry>
 
             <entry><ulink url="XenMyWay.html">Xen - Shorewall in a Bridged Xen
             DomU</ulink></entry>
@@ -284,8 +284,7 @@
             <entry><ulink url="Multiple_Zones.html">Forwarding Traffic on the
             Same Interface</ulink></entry>
 
-            <entry><ulink url="PortKnocking.html">Port Knocking and Other Uses
-            of the 'Recent Match'</ulink></entry>
+            <entry><ulink url="ports.htm">Port Information</ulink></entry>
 
             <entry><ulink url="XenMyWay-Routed.html">Xen - Shorewall in Routed
             Xen Dom0</ulink></entry>
@@ -294,7 +293,8 @@
           <row>
             <entry><ulink url="FTP.html">FTP and Shorewall</ulink></entry>
 
-            <entry><ulink url="PPTP.htm">PPTP</ulink></entry>
+            <entry><ulink url="PortKnocking.html">Port Knocking and Other Uses
+            of the 'Recent Match'</ulink></entry>
 
             <entry></entry>
           </row>
@@ -303,7 +303,7 @@
             <entry><ulink url="FoolsFirewall.html">Fool's
             Firewall</ulink></entry>
 
-            <entry><ulink url="ProxyARP.htm">Proxy ARP</ulink></entry>
+            <entry><ulink url="PPTP.htm">PPTP</ulink></entry>
 
             <entry></entry>
           </row>
@@ -312,8 +312,7 @@
             <entry><ulink url="support.htm">Getting help or answers to
             questions</ulink></entry>
 
-            <entry><ulink url="shorewall_quickstart_guide.htm">QuickStart
-            Guides</ulink></entry>
+            <entry><ulink url="ProxyARP.htm">Proxy ARP</ulink></entry>
 
             <entry></entry>
           </row>
@@ -322,7 +321,8 @@
             <entry><ulink
             url="Install.htm">Installation/Upgrade</ulink></entry>
 
-            <entry><ulink url="NewRelease.html">Release Model</ulink></entry>
+            <entry><ulink url="shorewall_quickstart_guide.htm">QuickStart
+            Guides</ulink></entry>
 
             <entry></entry>
           </row>
@@ -330,6 +330,14 @@
           <row>
             <entry><ulink url="IPP2P.html">IPP2P</ulink></entry>
 
+            <entry><ulink url="NewRelease.html">Release Model</ulink></entry>
+
+            <entry></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="IPSEC-2.6.html">IPSEC</ulink></entry>
+
             <entry><ulink
             url="shorewall_prerequisites.htm">Requirements</ulink></entry>
 
@@ -337,7 +345,7 @@
           </row>
 
           <row>
-            <entry><ulink url="IPSEC-2.6.html">IPSEC</ulink></entry>
+            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
 
             <entry><ulink url="Shorewall_and_Routing.html">Routing and
             Shorewall</ulink></entry>
@@ -346,7 +354,7 @@
           </row>
 
           <row>
-            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
+            <entry><ulink url="IPv6Support.html">IPv6 Support</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html">Routing on One
             Interface</ulink></entry>
@@ -354,20 +362,11 @@
             <entry></entry>
           </row>
 
-          <row>
-            <entry><ulink url="IPv6Support.html">IPv6 Support</ulink></entry>
-
-            <entry><ulink url="samba.htm">Samba</ulink></entry>
-
-            <entry></entry>
-          </row>
-
           <row>
             <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
             Filtering</ulink></entry>
 
-            <entry><ulink url="Shorewall-init.html">Shorewall
-            Init</ulink></entry>
+            <entry><ulink url="samba.htm">Samba</ulink></entry>
 
             <entry></entry>
           </row>
@@ -376,8 +375,8 @@
             <entry><ulink url="kernel.htm">Kernel
             Configuration</ulink></entry>
 
-            <entry><ulink url="CompiledPrograms.html#Lite">Shorewall
-            Lite</ulink></entry>
+            <entry><ulink url="Shorewall-init.html">Shorewall
+            Init</ulink></entry>
 
             <entry></entry>
           </row>
@@ -386,8 +385,8 @@
             <entry><ulink url="KVM.html">KVM (Kernel-mode Virtual
             Machine)</ulink></entry>
 
-            <entry><ulink url="Laptop.html">Shorewall on a
-            Laptop</ulink></entry>
+            <entry><ulink url="CompiledPrograms.html#Lite">Shorewall
+            Lite</ulink></entry>
 
             <entry></entry>
           </row>
diff --git a/docs/images/Network2011a.dia b/docs/images/Network2011a.dia
index 47cf54ee0..c60b3c555 100644
Binary files a/docs/images/Network2011a.dia and b/docs/images/Network2011a.dia differ
diff --git a/docs/images/Network2011a.png b/docs/images/Network2011a.png
new file mode 100644
index 000000000..e79543797
Binary files /dev/null and b/docs/images/Network2011a.png differ