diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index 5707dc42b..5b275d978 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -87,8 +87,8 @@
           <row>
             <entry><ulink url="6to4.htm">6to4 and 6in4 Tunnels</ulink></entry>
 
-            <entry><ulink url="LXC.html">Linux Containers
-            (LXC)</ulink></entry>
+            <entry><ulink url="KVM.html">KVM (Kernel-mode Virtual
+            Machine)</ulink></entry>
 
             <entry><ulink url="Laptop.html">Shorewall on a
             Laptop</ulink></entry>
@@ -97,7 +97,8 @@
           <row>
             <entry><ulink url="Accounting.html">Accounting</ulink></entry>
 
-            <entry><ulink url="Vserver.html">Linux-vserver</ulink></entry>
+            <entry><ulink url="LXC.html">Linux Containers
+            (LXC)</ulink></entry>
 
             <entry><ulink url="Shorewall-perl.html">Shorewall
             Perl</ulink></entry>
@@ -106,8 +107,7 @@
           <row>
             <entry><ulink url="Actions.html">Actions</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_setup_guide.htm">Shorewall Setup
             Guide</ulink></entry>
@@ -117,7 +117,8 @@
             <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
             (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
 
-            <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
+            <entry><ulink url="ConnectionRate.html">Limiting Connection
+            Rates</ulink></entry>
 
             <entry><ulink url="samba.htm">SMB</ulink></entry>
           </row>
@@ -126,7 +127,7 @@
             <entry><ulink url="Anatomy.html">Anatomy of
             Shorewall</ulink></entry>
 
-            <entry><ulink url="Macros.html">Macros</ulink></entry>
+            <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
 
             <entry><ulink url="two-interface.htm#SNAT">SNAT</ulink>
             (<firstterm>Source Network Address
@@ -137,8 +138,7 @@
             <entry><ulink url="Anti-Spoofing.html">Anti-Spoofing
             Measures</ulink></entry>
 
-            <entry><ulink url="MAC_Validation.html">MAC
-            Verification</ulink></entry>
+            <entry><ulink url="Macros.html">Macros</ulink></entry>
 
             <entry><ulink url="SplitDNS.html">Split DNS the Easy
             Way</ulink></entry>
@@ -148,8 +148,8 @@
             <entry><ulink url="Audit.html">AUDIT Target
             support</ulink></entry>
 
-            <entry>Manpages (<ulink url="Manpages.html">IPv4</ulink>) (<ulink
-            url="Manpages6.html">IPv6</ulink>)</entry>
+            <entry><ulink url="MAC_Validation.html">MAC
+            Verification</ulink></entry>
 
             <entry><ulink url="Shorewall_Squid_Usage.html">Squid with
             Shorewall</ulink></entry>
@@ -159,8 +159,8 @@
             <entry><ulink url="traffic_shaping.htm">Bandwidth
             Control</ulink></entry>
 
-            <entry><ulink url="ManualChains.html">Manual
-            Chains</ulink></entry>
+            <entry>Manpages (<ulink url="Manpages.html">IPv4</ulink>) (<ulink
+            url="Manpages6.html">IPv6</ulink>)</entry>
 
             <entry><ulink
             url="starting_and_stopping_shorewall.htm">Starting/stopping the
@@ -171,8 +171,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="NAT.htm">Static (one-to-one)
             NAT</ulink></entry>
@@ -182,8 +182,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></entry>
+            <entry><ulink
+            url="two-interface.htm#SNAT">Masquerading</ulink></entry>
 
             <entry><ulink url="support.htm">Support</ulink></entry>
           </row>
@@ -192,8 +192,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="configuration_file_basics.htm">Tips and
             Hints</ulink></entry>
@@ -203,22 +203,33 @@
             <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="simple_traffic_shaping.html">Traffic
             Shaping/QOS - Simple</ulink></entry>
           </row>
 
           <row>
-            <entry><ulink url="CompiledPrograms.html"><ulink
-            url="starting_and_stopping_shorewall.htm">Commands</ulink></ulink></entry>
+            <entry><ulink url="CompiledPrograms.html">Compiled Programs
+            </ulink></entry>
+
+            <entry><ulink url="MyNetwork.html">My Shorewall
+            Configuration</ulink></entry>
+
+            <entry><ulink url="traffic_shaping.htm">Traffic Shaping/QOS -
+            Complex</ulink></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="starting_and_stopping_shorewall.htm">Commands
+            </ulink></entry>
 
             <entry><ulink url="NetfilterOverview.html">Netfilter
             Overview</ulink></entry>
 
-            <entry><ulink url="traffic_shaping.htm">Traffic Shaping/QOS -
-            Complex</ulink></entry>
+            <entry><ulink url="Shorewall_Squid_Usage.html">Transparent
+            Proxy</ulink></entry>
           </row>
 
           <row>
@@ -227,41 +238,31 @@
 
             <entry><ulink url="netmap.html">Network Mapping</ulink></entry>
 
-            <entry><ulink url="Shorewall_Squid_Usage.html">Transparent
-            Proxy</ulink></entry>
+            <entry><ulink url="UPnP.html">UPnP</ulink></entry>
           </row>
 
           <row>
             <entry><ulink url="dhcp.htm">DHCP</ulink></entry>
 
-            <entry><ulink url="Multiple_Zones.html"><ulink
+            <entry><ulink
             url="NAT.htm">One-to-one NAT</ulink> (Static NAT)</ulink></entry>
 
-            <entry><ulink url="UPnP.html">UPnP</ulink></entry>
+            <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
           </row>
 
           <row>
-            <entry><ulink url="dhcp.htm"><ulink
+            <entry><ulink
             url="two-interface.htm#DNAT">DNAT</ulink> (<firstterm>Destination
             Network Address Translation</firstterm>)</ulink></entry>
 
             <entry><ulink url="OPENVPN.html">OpenVPN</ulink></entry>
 
-            <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="Dynamic.html">Dynamic Zones</ulink></entry>
-
-            <entry><ulink url="OpenVZ.html">OpenVZ</ulink></entry>
-
             <entry><ulink url="upgrade_issues.htm">Upgrade
             Issues</ulink></entry>
           </row>
 
           <row>
-            <entry><ulink url="ECN.html">ECN Disabling by host or
-            subnet</ulink></entry>
+            <entry><ulink url="Dynamic.html">Dynamic Zones</ulink></entry>
 
             <entry><ulink url="starting_and_stopping_shorewall.htm">Operating
             Shorewall</ulink></entry>
@@ -271,7 +272,8 @@
           </row>
 
           <row>
-            <entry><ulink url="Events.html">Events</ulink></entry>
+            <entry><ulink url="ECN.html">ECN Disabling by host or
+            subnet</ulink></entry>
 
             <entry><ulink url="PacketMarking.html">Packet
             Marking</ulink></entry>
@@ -280,9 +282,7 @@
           </row>
 
           <row>
-            <entry><ulink url="ECN.html"><ulink
-            url="shorewall_extension_scripts.htm">Extension Scripts</ulink>
-            (User Exits)</ulink></entry>
+            <entry><ulink url="Events.html">Events</ulink></entry>
 
             <entry><ulink url="PacketHandling.html">Packet Processing in a
             Shorewall-based Firewall</ulink></entry>
@@ -292,7 +292,8 @@
 
           <row>
             <entry><ulink
-            url="fallback.htm">Fallback/Uninstall</ulink></entry>
+            url="shorewall_extension_scripts.htm">Extension Scripts</ulink>
+            (User Exits)</ulink></entry>
 
             <entry><ulink url="ping.html">'Ping' Management</ulink></entry>
 
@@ -301,7 +302,8 @@
           </row>
 
           <row>
-            <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
+            <entry><ulink
+            url="fallback.htm">Fallback/Uninstall</ulink></entry>
 
             <entry><ulink url="two-interface.htm#DNAT">Port
             Forwarding</ulink></entry>
@@ -311,8 +313,7 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="shorewall_features.htm">Features</ulink></entry>
+            <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
 
             <entry><ulink url="ports.htm">Port Information</ulink></entry>
 
@@ -321,8 +322,8 @@
           </row>
 
           <row>
-            <entry><ulink url="Multiple_Zones.html">Forwarding Traffic on the
-            Same Interface</ulink></entry>
+            <entry><ulink
+            url="shorewall_features.htm">Features</ulink></entry>
 
             <entry><ulink url="PortKnocking.html">Port Knocking
             (deprecated)</ulink></entry>
@@ -331,7 +332,8 @@
           </row>
 
           <row>
-            <entry><ulink url="FTP.html">FTP and Shorewall</ulink></entry>
+            <entry><ulink url="Multiple_Zones.html">Forwarding Traffic on the
+            Same Interface</ulink></entry>
 
             <entry><ulink url="Events.html">Port Knocking, Auto Blacklisting
             and Other Uses of the 'Recent Match'</ulink></entry>
@@ -339,11 +341,19 @@
             <entry></entry>
           </row>
 
+          <row>
+            <entry><ulink url="FTP.html">FTP and Shorewall</ulink></entry>
+
+            <entry><ulink url="PPTP.htm">PPTP</ulink></entry>
+
+            <entry></entry>
+          </row>
+
           <row>
             <entry><ulink url="FoolsFirewall.html">Fool's
             Firewall</ulink></entry>
 
-            <entry><ulink url="PPTP.htm">PPTP</ulink></entry>
+            <entry><ulink url="ProxyARP.htm">Proxy ARP</ulink></entry>
 
             <entry></entry>
           </row>
@@ -352,7 +362,8 @@
             <entry><ulink url="Helpers.html">Helpers/Helper
             Modules</ulink></entry>
 
-            <entry><ulink url="ProxyARP.htm">Proxy ARP</ulink></entry>
+            <entry><ulink url="shorewall_quickstart_guide.htm">QuickStart
+            Guides</ulink></entry>
 
             <entry></entry>
           </row>
@@ -361,22 +372,13 @@
             <entry><ulink
             url="Install.htm">Installation/Upgrade</ulink></entry>
 
-            <entry><ulink url="shorewall_quickstart_guide.htm">QuickStart
-            Guides</ulink></entry>
-
-            <entry></entry>
-          </row>
-
-          <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="IPP2P.html">IPP2P</ulink></entry>
 
             <entry><ulink
             url="shorewall_prerequisites.htm">Requirements</ulink></entry>
@@ -385,7 +387,7 @@
           </row>
 
           <row>
-            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
+            <entry><ulink url="IPSEC-2.6.html">IPSEC</ulink></entry>
 
             <entry><ulink url="Shorewall_and_Routing.html">Routing and
             Shorewall</ulink></entry>
@@ -394,7 +396,7 @@
           </row>
 
           <row>
-            <entry><ulink url="IPv6Support.html">IPv6 Support</ulink></entry>
+            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html">Routing on One
             Interface</ulink></entry>
@@ -402,11 +404,19 @@
             <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="ISO-3661.html">ISO 3661 Country
             Codes</ulink></entry>
 
-            <entry><ulink url="samba.htm">Samba</ulink></entry>
+            <entry><ulink url="Events.html">Shorewall Events</ulink></entry>
 
             <entry></entry>
           </row>
@@ -415,15 +425,6 @@
             <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
             Filtering</ulink></entry>
 
-            <entry><ulink url="Events.html">Shorewall Events</ulink></entry>
-
-            <entry></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="kernel.htm">Kernel
-            Configuration</ulink></entry>
-
             <entry><ulink url="Shorewall-init.html">Shorewall
             Init</ulink></entry>
 
@@ -431,8 +432,8 @@
           </row>
 
           <row>
-            <entry><ulink url="KVM.html">KVM (Kernel-mode Virtual
-            Machine)</ulink></entry>
+            <entry><ulink url="kernel.htm">Kernel
+            Configuration</ulink></entry>
 
             <entry><ulink url="Shorewall-Lite.html">Shorewall
             Lite</ulink></entry>