From f991e28308be28924b8e2352387e5db64027d602 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 19 Jun 2009 15:06:56 -0700
Subject: [PATCH] Remove Shorewall-shell syntax from the tos manpage

---
 Shorewall/releasenotes.txt |  4 +--
 manpages/shorewall-tos.xml | 54 ++++----------------------------------
 web/download.htm           | 10 +++----
 3 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index ec78fbe23..b8082658f 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -181,8 +181,8 @@ None.
     configuration files. Only locally-generated traffic is matched.
 
 4)  A new extension script, 'lib.user' has been added. This file is
-    intended to include declarations of shell functions that are called
-    by the other run-time extension scripts. 
+    intended to include declarations of shell functions that will be
+    called by the other run-time extension scripts. 
 	
 ----------------------------------------------------------------------------
                  N E W   F E A T U R E S   IN   4 . 4
diff --git a/manpages/shorewall-tos.xml b/manpages/shorewall-tos.xml
index cdab1e293..d8a87e0a9 100644
--- a/manpages/shorewall-tos.xml
+++ b/manpages/shorewall-tos.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry>
   <refmeta>
     <refentrytitle>shorewall-tos</refentrytitle>
@@ -26,38 +28,11 @@
     <para>The columns in the file are as follows.</para>
 
     <variablelist>
-      <varlistentry>
-        <term><emphasis role="bold">SOURCE</emphasis> -
-        {<emphasis>zone</emphasis>[<emphasis
-        role="bold">:</emphasis><emphasis>address</emphasis>]|<emphasis
-        role="bold">all</emphasis>|<emphasis role="bold">$FW</emphasis>}
-        (Shorewall-shell)</term>
-
-        <listitem>
-          <para>Name of a <replaceable>zone</replaceable> declared in <ulink
-          url="shorewall-zones.html">shorewall-zones</ulink>(5), <emphasis
-          role="bold">all</emphasis> or <emphasis
-          role="bold">$FW</emphasis>.</para>
-
-          <para>If not <emphasis role="bold">all</emphasis> or <emphasis
-          role="bold">$FW</emphasis>, may optionally be followed by ":" and an
-          IP address, a MAC address, a subnet specification or the name of an
-          interface.</para>
-
-          <para>Example: loc:192.168.2.3</para>
-
-          <para>MAC addresses must be prefixed with "~" and use "-" as a
-          separator.</para>
-
-          <para>Example: ~00-A0-C9-15-39-78</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis role="bold">SOURCE</emphasis> - {<emphasis
         role="bold">all</emphasis>|<emphasis>address</emphasis>]|<emphasis
         role="bold">all</emphasis>:<emphasis>address</emphasis>|<emphasis
-        role="bold">$FW</emphasis>} (Shorewall-perl)</term>
+        role="bold">$FW</emphasis>}</term>
 
         <listitem>
           <para>If <emphasis role="bold">all</emphasis>, may optionally be
@@ -73,29 +48,10 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><emphasis role="bold">DEST</emphasis> -
-        {<emphasis>zone</emphasis>[<emphasis
-        role="bold">:</emphasis><emphasis>address</emphasis>]|<emphasis
-        role="bold">all</emphasis>} (Shorewall-shell)</term>
-
-        <listitem>
-          <para>Name of a zone declared in <ulink
-          url="shorewall-zones.html">shorewall-zones</ulink>(5) or <emphasis
-          role="bold">all</emphasis>.</para>
-
-          <para>If not <emphasis role="bold">all</emphasis>, may optionally be
-          followed by ":" and an IP address or a subnet specification</para>
-
-          <para>Example: loc:192.168.2.3</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis role="bold">DEST</emphasis> - {<emphasis
         role="bold">all</emphasis>|<emphasis>address</emphasis>]|<emphasis
-        role="bold">all</emphasis>:<emphasis>address</emphasis>}
-        (Shorewall-perl)</term>
+        role="bold">all</emphasis>:<emphasis>address</emphasis>}</term>
 
         <listitem>
           <para>Example: 192.168.2.3</para>
@@ -213,4 +169,4 @@
     shorewall.conf(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tunnels(5), shorewall-zones(5)</para>
   </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/web/download.htm b/web/download.htm
index b4e31e031..55333344e 100644
--- a/web/download.htm
+++ b/web/download.htm
@@ -140,6 +140,11 @@ or both of the compilers on a single <em>administrative</em> system
 and install Shorewall-lite and/or Shorewall6-lite on the firewalls.
 Doing so will allow for
 centralized administration and configuration of the firewalls.</li>
+    <li>When RPM is used to install Shorewall, the compiler
+(shorewall-shell
+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>
   <ul>
@@ -156,11 +161,6 @@ configuration of the firewalls.<br>
     </li>
   </ul>
 </ul>
-<p>When RPM is used to install Shorewall, the compiler (shorewall-shell
-and/or shorewall-perl) and shorewall-common must be installed in a
-single execution of the
-rpm utility.<br>
-</p>
 <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