diff --git a/Shorewall-Website/download.htm b/Shorewall-Website/download.htm
index b8a790d80..1d85ea4e9 100644
--- a/Shorewall-Website/download.htm
+++ b/Shorewall-Website/download.htm
@@ -22,7 +22,7 @@ Texts. A copy of the license is included in the section entitled “GNU Free
Documentation License”.
-2004-11-26
+
2004-12-31
I strongly urge you to read and print a copy of the
href="rsync://slovakia.shorewall.net/shorewall/pdf/">rsync://slovakia.shorewall.net/shorewall/pdf/
The documentation in both XML and HTML formats is also available for
-download from the Download Sites listed in the table below.
-
+download from the Download Sites listed in the table below.
+NOTICE: There are two current Shorewall
+Release Series:
+
+
+ - The STABLE release series is 2.0. Choose this release if you
+value stability and good documentation.
+
+ - The DEVELOPMENT release series is 2.2-RC. Choose this release if
+you want the latest release and are willing to help test it.
+
+
+For additional information, see this article about the Shorewall Release Model.
Once you've printed the appropriate QuickStart Guide, download
one of the modules:
- - If you run a RedHat, Fedora, SuSE, Mandrake,
+
- Simon Matter provides RPMs taylored for Redhat and Fedora. You can download them from
+his site.
+
+ - If you run a SuSE, Mandrake,
Linux
PPC, Trustix or
TurboLinux distribution with a 2.4 or 2.6 kernel, you can
-use the RPM version (note: the RPM should also work with other
+use the standard RPM version (note: the RPM should also work with other
distributions that store init scripts in /etc/init.d and that include
chkconfig or insserv). If you find that it works in other cases, let me know so that I can mention
@@ -77,25 +95,13 @@ documentation for easy reference.
Please check the
errata to see if there are updates that apply to the version
that you have downloaded.
-NOTICE: There are two current Shorewall
-Release Series:
-
-
- - The STABLE release series is 2.0. Choose this release if you
-value stability and good documentation.
-
- - 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.
-
-
-For additional information, see this article about the Shorewall Release Model.
-If you are new to Shorewall, please do not download the Development
-version.
-
-Download Sites:
+Download Sites:
+
+
diff --git a/Shorewall-Website/shorewall_index.htm b/Shorewall-Website/shorewall_index.htm
index aaf5f5630..50ea1edca 100644
--- a/Shorewall-Website/shorewall_index.htm
+++ b/Shorewall-Website/shorewall_index.htm
@@ -31,10 +31,13 @@ to 2.x releases of Shorewall. For older versions:
The current 2.0 Stable Release is 2.0.13 -- Here are the release
notes.
-The current Developement Release is 2.2.0 RC2 -- Here
+The current Developement Release is 2.2.0 RC3 -- Here
are the release
-notes.
+ href="http://shorewall.net/pub/shorewall/2.2-Beta/shorewall-2.2.0-RC3/releasenotes.txt">release
+notes and here are the known
+problems.
+
Preparing for Shorewall 2.2 -- End of
@@ -48,7 +51,7 @@ Foundation; with no Invariant Sections, with no Front-Cover, and with
no Back-Cover Texts. A copy of the license is included in the section
entitled “GNU
Free Documentation License”.
-2004-12-26
+2004-12-31
Table of Contents
Introduction
@@ -63,7 +66,11 @@ Shorewall
Shorewall on Mandrake® with a two-interface setup?
License
News
-Shorewall
+Redhat/Fedora-specific RPMs available
+Shorewall
+2.2.0 RC3
+Shorewall
2.2.0 RC2
Shorewall
2.2.0 RC1
@@ -174,7 +181,37 @@ of the license is included in the section entitled "GNU Free
Documentation License".
News
-12/19/2004 -
+12/31/2004
+- Redhat/Fedora-specific RPMs available
+
+Simon Matter has graciously volunteered to provide RPMs taylored for
+Redhat and Fedora. You can download Simon's RPMs from http://www.invoca.ch/pub/packages/shorewall/
+
+Thanks, Simon!
+
+12/30/2004 -
+Shorewall 2.2.0 RC3
+
+Problems Corrected:
+
+ - The following error message could appear during "shorewall stop"
+or "shorewall clear":
+
+
+
+local: lo:: bad variable name
+
+
+ - The rate limiting example in /etc/shorewall/rules has been
+changed to use the RATE LIMIT column.
+ - Entries in /etc/shorewall/masq with the INTERFACE column
+containing <ifname>:: (e.g., "eth0::") would generate a progress
+message but would not generate an iptables rule.
+ - A misleading typo in /etc/shorewall/tunnels has been corrected.
+
+
+12/24/2004 -
Shorewall 2.2.0 RC2
New Features: