From af4124861945ff151b84c3bc08ac2f3f898e4ec4 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 30 Sep 2004 19:10:56 +0000
Subject: [PATCH] Website Updates

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1656 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-Website/download.htm        | 21 +++++++++++++++------
 Shorewall-Website/shoreline.htm       |  9 +++------
 Shorewall-Website/shorewall_index.htm |  6 +++---
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Shorewall-Website/download.htm b/Shorewall-Website/download.htm
index 9d11187ec..1d751066c 100644
--- a/Shorewall-Website/download.htm
+++ b/Shorewall-Website/download.htm
@@ -77,11 +77,20 @@ documentation for easy reference.</p>
 <p>Please check the <font color="#ff0000"> <a href="errata.htm">
 errata</a></font> to see if there are updates that apply to the version
 that you have downloaded.</p>
-<p><font color="#ff0000"><b>WARNING - YOU CAN <u>NOT</u> SIMPLY
-INSTALL THE RPM AND ISSUE A "shorewall start" COMMAND. SOME
-CONFIGURATION IS REQUIRED BEFORE THE FIREWALL WILL START. Once you have
-completed configuration of your firewall, you can enable startup by
-removing the file /etc/shorewall/startup_disabled.</b></font></p>
+<p><font color="#ff0000"><b>NOTICE: There are two current Shorewall
+Release Series:<br>
+</b></font></p>
+<ul>
+  <li>The STABLE release series is 2.0. Choose this release if you
+value stability and good documentation.<br>
+  </li>
+  <li>The DEVELOPMENT release series is 2.1. Choose this release if you
+want the latest features (and bugs) with marginal documentation and are
+willing to help test the new features.<br>
+  </li>
+</ul>
+For additional information, see this article about the<a
+ href="ReleaseModel.html"> Shorewall Release Model</a>.<br>
 <p><b></b></p>
 <h2>If you are new to Shorewall, please do not download the Development
 version.<br>
@@ -174,7 +183,7 @@ version.<br>
         <td valign="top">securityopensource.org.br<br>
         </td>
         <td valign="top"><a
- href="http://shorewall.securityopensource.org.br/pub/shorewall/">Browse</a><br>
+ href="http://shorewall.securityopensource.org.br/pub/">Browse</a><br>
         </td>
         <td valign="top">N/A<br>
         </td>
diff --git a/Shorewall-Website/shoreline.htm b/Shorewall-Website/shoreline.htm
index ff0308703..c71227153 100644
--- a/Shorewall-Website/shoreline.htm
+++ b/Shorewall-Website/shoreline.htm
@@ -27,11 +27,11 @@ 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>2003-12-30<br>
+<p>2004-09-05<br>
 </p>
 <hr style="width: 100%; height: 2px;">
-<p style="text-align: left;"><img border="3" src="images/Tom.jpg"
- alt="Aging Geek - June 2003" width="320" height="240"> </p>
+<p style="text-align: left;"><img src="images/Tom.jpg"
+ alt="Aging Geek - June 2003" border="3" height="240" width="320"> </p>
 <div style="text-align: left;">"The Aging Geek" -- June 2003<br>
 </div>
 <p align="center"><br>
@@ -74,8 +74,5 @@ I live with my wife Tarry.&nbsp; </p>
 </ul>
 <p>For information about our home network see <a href="myfiles.htm">my
 Shorewall Configuration files.</a></p>
-<p>All of our other systems are made by <a href="http://www.compaq.com"
- target="_top">Compaq</a>
-(part of the new <a href="http://www.hp.com/" target="_top">HP</a>).</p>
 </body>
 </html>
diff --git a/Shorewall-Website/shorewall_index.htm b/Shorewall-Website/shorewall_index.htm
index 5216ed181..7572d1b92 100644
--- a/Shorewall-Website/shorewall_index.htm
+++ b/Shorewall-Website/shorewall_index.htm
@@ -28,8 +28,8 @@ to 2.0.x releases of Shorewall. For older versions:</p>
  target="_top">here</a>. </p>
   </li>
 </ul>
-<p>The current 2.0 Stable Release is 2.0.8 -- Here are the <a
- href="http://shorewall.net/pub/shorewall/2.0/shorewall-2.0.8/releasenotes.txt">release
+<p>The current 2.0 Stable Release is 2.0.9 -- Here are the <a
+ href="http://shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/releasenotes.txt">release
 notes</a>.<br>
 The current 2.1 Developement Release is 2.1.9 -- Here
 are the <a
@@ -46,7 +46,7 @@ entitled “<a
  href="../../../../vfat/Ursa/Shorewall/Shorewall-Website/GnuCopyright.htm"
  target="_self">GNU
 Free Documentation License</a>”.</p>
-<p>2004-09-23</p>
+<p>2004-09-24</p>
 <hr>
 <h3>Table of Contents</h3>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Intro">Introduction