Update HTML docs for upcoming 3.x->4.x website shift

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6905 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

web/Documentation.html

@@ -30,18 +30,18 @@ License</a></span>”.<br>
 <ul>
   <li><strong>Alphabetical Index</strong> -- Over 70 articles with topics
     ranging from Accounting to Xen
-    <p><a href="Documentation_Index.html">Shorewall 3.x</a></p>
+    <p><a href="3.0/Documentation_Index.html">Shorewall 3.x</a></p>
-    <p><a href="4.0/Documentation_Index.html">Shorewall 4.x</a></p>
+    <p><a href="Documentation_Index.html">Shorewall 4.x</a></p>
   </li>
   <li><strong>FAQs</strong> -- Answers to the most commonly asked questions.
-    <p><a href="FAQ.htm">Shorewall 3.x</a></p>
+    <p><a href="3.0/FAQ.htm">Shorewall 3.x</a></p>
-    <p><a href="4.0/FAQ.htm">Shorewall 4.x</a></p>
+    <p><a href="FAQ.htm">Shorewall 4.x</a></p>
   </li>
   <li><strong>Getting Started</strong> -- Introductory Articles and Beginner
     HOWTOs
     <p><span style="font-weight: bold;"></span><a
-    href="shorewall_quickstart_guide.htm">Shorewall 3.x</a></p>
+    href="3.0/shorewall_quickstart_guide.htm">Shorewall 3.x</a></p>
-    <p><a href="4.0/shorewall_quickstart_guide.htm">Shorewall 4.x</a></p>
+    <p><a href="shorewall_quickstart_guide.htm">Shorewall 4.x</a></p>
   </li>
   <li>PPPPPPPS ( or, Paul's Principles for Practical Provision of Packet
     Processing with Shorewall ) <a
@@ -50,21 +50,21 @@ License</a></span>”.<br>
   </li>
   <li>Man Pages -- Online version of the manpages released with Shorewall
     3.4.0 and later
-    <p><a href="manpages/Manpages.html">Shorewall 3.x</a></p>
+    <p><a href="3.0/manpages/Manpages.html">Shorewall 3.x</a></p>
-    <p><a href="4.0/Manpages.html">Shorewall 4.x</a></p>
+    <p><a href="Manpages.html">Shorewall 4.x</a></p>
   </li>
-  <li><a href="4.0/shorewall_features.htm">Shorewall <span
+  <li><a href="shorewall_features.htm">Shorewall <span
     style="font-weight: bold;">Features</span></a> -- What it can do<br>
   </li>
-  <li><a href="4.0/Shorewall_Doesnt.html"><span
+  <li><a href="Shorewall_Doesnt.html"><span
     style="font-weight: bold;">Limitations</span></a> -- Some things that it
     cannot do<br>
   </li>
-  <li><a href="4.0/troubleshoot.htm"><span
+  <li><a href="troubleshoot.htm"><span
     style="font-weight: bold;">Troubleshooting</span> Guide</a> -- Look here
     when "it doesn't work"<br>
   </li>
-  <li><a href="4.0/upgrade_issues.htm"><span
+  <li><a href="upgrade_issues.htm"><span
     style="font-weight: bold;">Upgrade</span> Issues</a> -- avoid problems
     when upgrading your Shorewall installation</li>
 </ul>

web/download.htm

@@ -58,7 +58,7 @@ Series:</b></font></p>
 </ul>
 
 <p>For additional information, see this article about the <a
-href="4.0/ReleaseModel.html">Shorewall Release Model</a>. </p>
+href="ReleaseModel.html">Shorewall Release Model</a>. </p>
 
 <p>Beginning with Shorewall version 4.0.0 RC1, there are four related
 packages:</p>
@@ -91,7 +91,7 @@ To summarize:
 <p><br>
 <span style="font-weight: bold;">You probably don't want to install both a
 Shorewall compiler and Shorewall Lite on the same system. See the <a
-href="4.0/CompiledPrograms.html#Lite">Shorewall Lite Documentation</a> for
+href="CompiledPrograms.html#Lite">Shorewall Lite Documentation</a> for
 details.</span><br>
 </p>
 

web/shorewall_index.htm

@@ -75,7 +75,7 @@ create a stateful firewall.<br>
 <br>
 Shorewall is <u>not</u> a daemon. Once Shorewall has configured Netfilter,
 it's job is complete and there is no Shorewall code left running in the
-system. The <a href="4.0/starting_and_stopping_shorewall.htm">/sbin/shorewall
+system. The <a href="starting_and_stopping_shorewall.htm">/sbin/shorewall
 program can be used at any time to monitor the Netfilter firewall</a>.</p>
 
 <p style="margin-left: 0.42in;">Shorewall is not the easiest to use of the
@@ -96,7 +96,7 @@ Linux firewall solution that can handle complex and fast changing network
 environments then Shorewall is a logical choice.</p>
 
 <p style="margin-left: 0.42in;">To see some of the many things that you can
-do with Shorewall, see the <a href="4.0/shorewall_features.htm">Shorewall
+do with Shorewall, see the <a href="shorewall_features.htm">Shorewall
 Features page</a>.<br>
 </p>
 
@@ -114,7 +114,7 @@ Stable Release</span> version is  4.0.0<br>
     href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.0/known_problems.txt">known
     problems</a> and <a
     href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.0/errata/">updates</a>. 
-    <p>Read about the <a href="4.0/Shorewall-4.html">New Development Release
+    <p>Read more about the <a href="Shorewall-4.html">Release
     here</a>.<br>
     </p>
   </li>
@@ -135,25 +135,23 @@ is 3.4.5<br>
     href="http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.5/errata/">updates</a>.</li>
 </ul>
 The <span style="font-weight: bold;">current Development Release</span> is
-4.1. No packages yet been made available for this release.
+4.1. No packages yet been made available for this release. </div>
-
-<p></p>
-</div>
 
 <div style="margin-left: 40px;">
-Get them from the <a href="download.htm">download sites</a></div>
+<p>Get them from the <a href="download.htm">download sites</a></p>
+</div>
 
 <h3><a name="GettingStarted"></a>Getting Started with Shorewall</h3>
 
 <p style="margin-left: 0.42in;">New to Shorewall? Download the current Stable
 version (see above) then select the <a
-href="4.0/shorewall_quickstart_guide.htm">QuickStart Guide</a> that most
+href="shorewall_quickstart_guide.htm">QuickStart Guide</a> that most
 closely matches your environment and follow the step by step instructions.</p>
 
 <h3><a name="Info"></a>Looking for Information?</h3>
 
 <p style="margin-left: 0.42in;">The <a
-href="4.0/Documentation.html">Documentation Index</a> is a good place to
+href="Documentation.html">Documentation Index</a> is a good place to
 start as is the Site Search in the frame above.</p>
 
 <h3><a name="License"></a>License</h3>