From 5f051fc61b9134619d1b79b4f76d48edbca9a3f7 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 10 Jun 2012 15:31:31 -0700
Subject: [PATCH] Unify document indexes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/Documentation_Index.xml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index f16eecae4..0c97664fd 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -38,33 +38,41 @@
     <title>Frequently Used Articles</title>
 
     <informaltable frame="none" orient="land">
-      <tgroup cols="2">
+      <tgroup cols="1">
         <tbody>
           <row>
             <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
-
-            <entry align="justify"><ulink url="GettingStarted.html">Beginner
-            Documentation</ulink></entry>
           </row>
 
           <row>
             <entry><ulink url="Manpages.html">IPv4 Manpages</ulink></entry>
-
-            <entry><ulink
-            url="troubleshoot.htm">Troubleshooting</ulink></entry>
           </row>
 
           <row>
             <entry><ulink url="Manpages6.html">IPv6 Manpages</ulink></entry>
+          </row>
 
-            <entry><ulink url="4.2/Documentation_Index.html">Shorewall 4.0/4.2
+          <row>
+            <entry><ulink url="GettingStarted.html">Beginner
             Documentation</ulink></entry>
           </row>
+
+          <row>
+            <entry><ulink
+            url="troubleshoot.htm">Troubleshooting</ulink></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>
   </section>
 
+  <section>
+    <title>Documentation for Earlier Versions</title>
+
+    <para><ulink url="4.2/Documentation_Index.html">Shorewall 4.0/4.2
+    Documentation</ulink></para>
+  </section>
+
   <section id="Index">
     <title>Index to the HOWTOs and Other Articles</title>
 
@@ -134,7 +142,8 @@
             <entry><ulink url="Audit.html">AUDIT Target
             support</ulink></entry>
 
-            <entry><ulink url="Manpages.html">Man Pages</ulink></entry>
+            <entry>Manpages (<ulink url="Manpages.html">IPv4</ulink>) (<ulink
+            url="Manpages6.html">IPv6</ulink>)</entry>
 
             <entry><ulink url="Shorewall_Squid_Usage.html">Squid with
             Shorewall</ulink></entry>