diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index d1fee9ddd..4fd706725 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -35,115 +35,20 @@
   </articleinfo>
 
   <section>
-    <title>FAQs</title>
+    <title>Frequently Used Articles</title>
 
     <itemizedlist>
       <listitem>
         <para><ulink url="FAQ.htm">FAQs</ulink></para>
       </listitem>
-    </itemizedlist>
-  </section>
 
-  <section>
-    <title>Getting Started</title>
-
-    <para>If you are new to Shorewall, please read these two articles
-    first.</para>
-
-    <itemizedlist>
       <listitem>
-        <para><ulink url="Introduction.html">Introduction to
-        Shorewall</ulink></para>
+        <para><ulink url="GettingStarted.html">Beginner
+        Documentation</ulink></para>
       </listitem>
 
       <listitem>
-        <para><ulink url="shorewall_quickstart_guide.htm">QuickStart Guides
-        (HOWTOs)</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <para>The following article is also recommended reading for
-    newcomers.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><ulink url="configuration_file_basics.htm">Configuration File
-        Basics</ulink><blockquote>
-            <para><informaltable frame="none">
-                <tgroup cols="2">
-                  <tbody valign="middle">
-                    <row>
-                      <entry><ulink
-                      url="Documentation_Index.html#Manpages">Man
-                      Pages</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#MAC">Using MAC
-                      Addresses in Shorewall</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Comments">Comments in
-                      configuration files</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Variables">Using
-                      Shell Variables</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#COMMENT">Attach
-                      Comment to Netfilter Rules</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#dnsnames">Using DNS
-                      Names</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Continuation">Line
-                      Continuation</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Compliment">Complementing
-                      an IP address or Subnet</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#INCLUDE">INCLUDE
-                      Directive</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#IPRanges">IP Address
-                      Ranges</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Ports">Port
-                      Numbers/Service Names</ulink></entry>
-
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Levels">Shorewall
-                      Configurations (making a test
-                      configuration)</ulink></entry>
-                    </row>
-
-                    <row>
-                      <entry><ulink
-                      url="configuration_file_basics.htm#Ranges">Port
-                      Ranges</ulink></entry>
-
-                      <entry></entry>
-                    </row>
-                  </tbody>
-                </tgroup>
-              </informaltable></para>
-          </blockquote></para>
+        <para><ulink url="troubleshoot.xml">Troubleshooting</ulink></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -151,16 +56,21 @@
   <section>
     <title>Index to the Articles</title>
 
-    <para>The remainder of the Documentation supplements the QuickStart
-    Guides. Please review the appropriate guide before trying to use this
-    documentation directly.</para>
-
     <informaltable frame="none">
       <tgroup align="left" cols="3">
         <tbody>
           <row>
             <entry><ulink url="Kernel2.6.html">2.6 Kernel</ulink></entry>
 
+            <entry><ulink url="IPSEC.htm">IPSEC</ulink></entry>
+
+            <entry><ulink url="Shorewall_and_Routing.html">Routing and
+            Shorewall</ulink></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="Accounting.html">Accounting</ulink></entry>
+
             <entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
             Shorewall 2.1 or Later</ulink></entry>
 
@@ -169,7 +79,7 @@
           </row>
 
           <row>
-            <entry><ulink url="Accounting.html">Accounting</ulink></entry>
+            <entry><ulink url="Actions.html">Actions</ulink></entry>
 
             <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
 
@@ -177,7 +87,8 @@
           </row>
 
           <row>
-            <entry><ulink url="Actions.html">Actions</ulink></entry>
+            <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
+            (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
 
             <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
             Filtering</ulink></entry>
@@ -187,8 +98,8 @@
           </row>
 
           <row>
-            <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
-            (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
+            <entry><ulink url="traffic_shaping.htm">Bandwidth
+            Control</ulink></entry>
 
             <entry><ulink url="kernel.htm">Kernel
             Configuration</ulink></entry>
@@ -198,8 +109,8 @@
           </row>
 
           <row>
-            <entry><ulink url="traffic_shaping.htm">Bandwidth
-            Control</ulink></entry>
+            <entry><ulink
+            url="blacklisting_support.htm">Blacklisting</ulink></entry>
 
             <entry><ulink url="PortKnocking.html#Limit">Limiting per-IPaddress
             Connection Rate</ulink></entry>
@@ -209,8 +120,8 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="blacklisting_support.htm">Blacklisting</ulink></entry>
+            <entry>Bridge: <ulink url="bridge.html">With physdev match
+            support</ulink></entry>
 
             <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
 
@@ -219,7 +130,7 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink url="bridge.html">With physdev match
+            <entry>Bridge: <ulink url="NewBridge.html">Without physdev match
             support</ulink></entry>
 
             <entry><ulink url="Macros.html">Macros</ulink></entry>
@@ -228,8 +139,8 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink url="NewBridge.html">Without physdev match
-            support</ulink></entry>
+            <entry>Bridge: <ulink url="SimpleBridge.html">No control of
+            traffic through the bridge</ulink></entry>
 
             <entry><ulink url="MAC_Validation.html">MAC
             Verification</ulink></entry>
@@ -239,8 +150,8 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink url="SimpleBridge.html">No control of
-            traffic through the bridge</ulink></entry>
+            <entry><ulink
+            url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
 
             <entry><ulink url="MultiISP.html">Multiple Internet Connections
             from a Single Firewall</ulink></entry>
@@ -251,8 +162,8 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
+            <entry><ulink url="CompiledPrograms.html">Compiled Firewall
+            Programs</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html">Multiple Zones Through One
             Interface</ulink></entry>
@@ -262,8 +173,8 @@
           </row>
 
           <row>
-            <entry><ulink url="CompiledPrograms.html">Compiled Firewall
-            Programs</ulink></entry>
+            <entry><ulink url="configuration_file_basics.htm">Configuration
+            File Basics</ulink></entry>
 
             <entry><ulink url="XenMyWay-Routed.html">My Shorewall
             Configuration</ulink></entry>
@@ -408,15 +319,6 @@
 
             <entry></entry>
           </row>
-
-          <row>
-            <entry><ulink url="IPSEC.htm">IPSEC</ulink></entry>
-
-            <entry><ulink url="Shorewall_and_Routing.html">Routing and
-            Shorewall</ulink></entry>
-
-            <entry></entry>
-          </row>
         </tbody>
       </tgroup>
     </informaltable>
diff --git a/manpages/shorewall-providers.xml b/manpages/shorewall-providers.xml
index 440977d85..c9da4930d 100644
--- a/manpages/shorewall-providers.xml
+++ b/manpages/shorewall-providers.xml
@@ -90,9 +90,9 @@
 
         <listitem>
           <para>The name of an existing table to duplicate to create this
-          routing. May be <option>main</option> or the name of a previous
-          provider. You may select only certain entries from the table to copy
-          by using the COPY column below.</para>
+          routing table. May be <option>main</option> or the name of a
+          previously listed provider. You may select only certain entries from
+          the table to copy by using the COPY column below.</para>
         </listitem>
       </varlistentry>
 
diff --git a/web/Documentation.html b/web/Documentation.html
index 5dbe0aa1d..29362479c 100644
--- a/web/Documentation.html
+++ b/web/Documentation.html
@@ -20,7 +20,7 @@ Texts. A copy of the license is included in the section entitled “<span
  class="quote"><a href="GnuCopyright.htm" target="_self">GNU Free
 Documentation License</a></span>”.<br>
 </p>
-<p>2007-01-13<br>
+<p>2007-01-19<br>
 </p>
 <hr style="width: 100%; height: 2px;"> <br>
 <ul>
@@ -30,9 +30,9 @@ Articles</a> <a href="http://gomix.homelinux.net/gomix/shorewall/">(En
 Español)</a></li>
   <li><a href="FAQ.htm"><span style="font-weight: bold;">FAQ</span>s<br>
     </a></li>
-  <li><a href="shorewall_quickstart_guide.htm">QuickStart Guides
-(<span style="font-weight: bold;">HOWTO</span>s for setting up
-Shorewall in popular configurations)</a></li>
+  <li><a href="GettingStarted.html"><span style="font-weight: bold;"></span>Getting
+Started (Introductory Documents and Beginner HOWTOs)</a><br>
+  </li>
   <li><a href="manpages/Manpages.html">Shorewall 3.4 <span
  style="font-weight: bold;">Manpages</span></a><br>
   </li>