From bbd9ff0a255a6fec06fd6ce286c3ef18ec805a0a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 28 Jun 2009 07:21:47 -0700
Subject: [PATCH] Add more verbage to the Download page and correct some typos

---
 web/download.htm | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/web/download.htm b/web/download.htm
index 55333344e..8a20bc12c 100644
--- a/web/download.htm
+++ b/web/download.htm
@@ -38,7 +38,7 @@
   </tbody>
 </table>
 <p> </p>
-<hr><span style="font-weight: bold;">2009-06-19</span>
+<hr><span style="font-weight: bold;">2009-06-28</span>
 <h2><a name="Which"></a>Package Information</h2>
 <p><b>Before trying to install, we strongly urge you to read and print
 a
@@ -106,7 +106,7 @@ installed.<br>
 In Shorewall version <span style="font-weight: bold;">4.4.*</span>,
 the Shorewall-common, Shorewall-shell and
 Shorewall-perl packages are discontinued and replaced with a single <span
- style="font-weight: bold;">Shorewall</span> package which combined the
+ style="font-weight: bold;">Shorewall</span> package which combines the
 functions of Shorewall-common and Shorewall-perl. The shell-based
 compiler is retired. So with Shorewall 4.4 onward, there are four
 packages:<br>
@@ -127,11 +127,14 @@ installed.</li>
 </ul>
 To summarize:
 <ul>
-  <li>If you are installing Shorewall 4.2 or earlier:<br>
+  <li>If you are installing <span style="font-weight: bold;">Shorewall
+4.2 or earlier</span>:<br>
   </li>
   <ul>
     <li>On at least one system in your network, you must install one or
-both of the compilers (Shorewall-shell and/or Shorewall-perl), the
+both of the compilers (Shorewall-shell and/or Shorewall-perl; <span
+ style="font-weight: bold;">Shorewall-perl is highly recommended</span>),
+the
 Shorewall-common package and possibly the Shorewall6 package.</li>
     <li>If you only have a single firewall, then that system should be
 your firewall system.</li>
@@ -146,15 +149,17 @@ and/or shorewall-perl) and shorewall-common must be installed in a
 single execution of the
 rpm utility.</li>
   </ul>
-  <li>If you are installing Shorewall 4.4 or later:</li>
+  <li>If you are installing <span style="font-weight: bold;">Shorewall
+4.4 or later</span>:</li>
   <ul>
     <li>On at least one system in your network, you must install the
 Shorewall package. If you need IPv6 firewalls then you must also
-install the Shoreall6 package.</li>
+install the Shorewall6 package.</li>
     <li>If you have a single firewall, then that system should be your
 firewall system.</li>
     <li>If you have more than one firewall, you may wish to install
-Shorewall on a single <span style="font-style: italic;">administrative</span>
+Shorewall (and possibly Shorewall6) on a single <span
+ style="font-style: italic;">administrative</span>
 system and install Shorewall-lite and/or Shorewall6-lite on the
 firewalls. Doing so will allow for centralized administration and
 configuration of the firewalls.<br>
@@ -164,7 +169,7 @@ configuration of the firewalls.<br>
 <p>Here are the <a href="Install.htm">installation instructions</a>.</p>
 <h2><a name="Distros"></a>Distribution-specific Download Sites</h2>
 <p>Once you've printed the appropriate QuickStart Guide, download the
-appropriate modules:</p>
+appropriate Packages:</p>
 <ul>
   <li>
     <p style="margin-bottom: 0in;">Simon Matter provides RPMs tailored
@@ -205,13 +210,20 @@ installing the RPM.</p>
   <li>
     <p style="margin-bottom: 0in;">If you run <a
  href="http://www.debian.org/"><b>Debian</b></a> and would like a .deb
-package, Shorewall is included in both the <a
- href="http://packages.debian.org/testing/net/">Debian
+package, Shorewall is included in the <a
+ href="http://packages.debian.org/stable/net/">Debian Stable Branch</a>,
+the <a href="http://packages.debian.org/testing/net/">Debian
 Testing Branch</a> and the <a
  href="http://packages.debian.org/unstable/net/">Debian
-Unstable Branch</a>. Additionally, packages for the current Debian
+Unstable Branch</a>. For new installations, it is highly recommended
+that you install the shorewall-common and shorewall-perl packages
+rather than the shorewall package.<br>
+    <br>
+Additionally, packages for the current Debian
 stable release are available from the package maintainer's <a
- href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.<br>
+ href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.
+Those packages are almost always more up-to-date than the ones in the
+Debian Stable Branch.<br>
     <br>
     </p>
   </li>