More documentation updates

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

Shorewall-common/lib.base

@@ -21,11 +21,17 @@
 #	along with this program; if not, write to the Free Software
 #	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
-# This library contains the code common to all Shorewall components. It is copied into
+# This library contains the code common to all Shorewall components.
-# the compiled script with the -e compiler flag is specified and is loaded by
+#
-# /sbin/shorewall, /usr/share/shorewall/compiler and /usr/share/shorewall/firewall. It
+# - It is copied into the compiled script with the -e compiler flag is specified to
-# is also released as part of Shorewall Lite where it is used by /sbin/shorewall-lite
+#   shorewall-shell.
-# and /usr/share/shorewall-lite/shorecap.
+# - It is loaded by /sbin/shorewall.
+# - It is loaded by /usr/share/shorewall/firewall.
+# - It is loaded by /usr/share/shorewall-shell/compiler.
+# - It is released as part of Shorewall Lite where it is used by /sbin/shorewall-lite
+#   and /usr/share/shorewall-lite/shorecap.
+# - It is released as part of Shorewall Perl where it is copied into the compiled script
+#   by the compiler.
 #
 
 SHOREWALL_LIBVERSION=40000

Shorewall-common/shorewall-common.spec

@@ -26,8 +26,8 @@ a multi-function gateway/ router/server or on a standalone GNU/Linux system.
 Shorewall offers two alternative firewall compilers, shorewall-perl and
 shorewall-shell. The shorewall-perl compilers is suggested for new installed
 systems and shorewall-shell is provided for backwards compability and smooth
-system upgrades because shorewall perl is not fully compatible with all legacy
+legacy system upgrades because shorewall perl is not fully compatible with
-configurations.
+all legacy configurations.
 
 %prep
 

Shorewall-shell/shorewall-shell.spec

@@ -13,7 +13,9 @@ Source: %{name}-%{version}.tgz
 URL: http://www.shorewall.net/
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: iptables iproute shorewall-common = 4.0.0-0RC1
+Requires: iptables
+Requires: iproute
+Requires: shorewall-common >= 4.0.0-0RC1
 Provides: shorewall_compiler = %{version}-%{release}
 Provides: shorewall = %{version}-%{release}
 Obsoletes: shorewall < 4.0.0-0Beta7
@@ -25,8 +27,8 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
 a multi-function gateway/ router/server or on a standalone GNU/Linux system.
 
 Shorewall-shell is a part of Shorewall that alows running shorewall with
-legacy configurations. Shorewall-perl is preferred compiler, please use it
+legacy configurations. Shorewall-perl is the preferred compiler, please use
-for new installations.
+it for new installations.
 
 %prep
 

docs/Shorewall-4.xml

@@ -171,6 +171,48 @@
     document</ulink> for details.</para>
   </section>
 
+  <section id="Compatibility">
+    <title>Package Compatibility Matrix</title>
+
+    <para>The following table indicates which versions of the compilers are
+    supported by each version of Shorewall-common.</para>
+
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colname="_2" colnum="2" />
+
+        <colspec colname="_3" />
+
+        <tbody>
+          <row>
+            <entry align="center"><emphasis
+            role="bold">Package</emphasis></entry>
+
+            <entry align="center" nameend="_3" namest="_2"
+            valign="middle"><emphasis role="bold">Compatible
+            With</emphasis></entry>
+          </row>
+
+          <row>
+            <entry>Shorewall-common 4.0.0-RC1</entry>
+
+            <entry>Shorewall-shell 4.0.0-RC1</entry>
+
+            <entry>Shorewall-perl 4.0.0-RC1</entry>
+          </row>
+
+          <row>
+            <entry></entry>
+
+            <entry></entry>
+
+            <entry></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+
   <section id="CompilerSelection">
     <title>Compiler Selection</title>