From 85d91edf46d1c1cf75383568a8b3c1e211db6c4f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 29 Jun 2007 14:28:06 +0000
Subject: [PATCH] Tweak installation instructions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6701 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/releasenotes.txt | 16 ++++++++--------
 docs/Shorewall-4.xml              |  2 +-
 docs/Shorewall-perl.xml           |  2 +-
 manpages/shorewall.xml            |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index d0c73a21d..042b94027 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -60,20 +60,20 @@ Migration Considerations:
 
     You must either:
 
-	rpm -U shorewall-4.0.0.noarch.rpm shorewall-shell-4.0.0.noarch.rpm
+	rpm -U shorewall-4.0.0.noarch.rpm \
+	    shorewall-shell-4.0.0.noarch.rpm
 
     or
 
-	rpm -U shorewall-4.0.0.noarch.rpm shorewall-perl-4.0.0.noarch.rpm
+	rpm -U shorewall-4.0.0.noarch.rpm \
+	    shorewall-perl-4.0.0.noarch.rpm
 	
     or
-	rpm -i shorewall-shell-4.0.0.noarch.rpm
-	rpm -U shorewall-4.0.0.noarch.rpm
-
-    or
-	rpm -i shorewall-perl-4.0.0.noarch.rpm
-	rpm -U shorewall-4.0.0.noarch.rpm
 
+	rpm -U shorewall-4.0.0.noarch.rpm \
+	    shorewall-perl-4.0.0.noarch.rpm \
+	    shorewall-shell-4.0.0.noarch.rpm
+ 
     If you are upgrading using the tarball, you must install either
     shorewall-shell or shorewall-perl before you upgrade
     Shorewall. Otherwise, the install.sh script fails with:
diff --git a/docs/Shorewall-4.xml b/docs/Shorewall-4.xml
index 98933cad5..89301173c 100644
--- a/docs/Shorewall-4.xml
+++ b/docs/Shorewall-4.xml
@@ -126,7 +126,7 @@
     Shorewall-shell and/or Shorewall-perl; in fact, if you are using the
     tarball for your installation, you must install Shorewall-shell and/or
     Shorewall-perl <emphasis role="bold">before</emphasis> you upgrade
-    Shorewall.</para>
+    Shorewall. See the release notes.</para>
   </section>
 
   <section id="Prereqs">
diff --git a/docs/Shorewall-perl.xml b/docs/Shorewall-perl.xml
index 39fc3711f..8c26b167b 100644
--- a/docs/Shorewall-perl.xml
+++ b/docs/Shorewall-perl.xml
@@ -521,7 +521,7 @@ eth0             eth1:!192.168.4.9       ...</programlisting></para>
 
     <para>or</para>
 
-    <programlisting><command>rpm -ivh shorewall-pl-4.0.0-0Betax.noarch.rpm</command></programlisting>
+    <programlisting><command>rpm -ivh shorewall-perl-4.0.0-0Betax.noarch.rpm</command></programlisting>
 
     <para>Note that you can also install the current Shorewall 4.0.0 Beta
     version of Shorewall. If you do that and still want access to the legacy
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index ab88382c6..b06057282 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -1019,8 +1019,8 @@
 
                 <para>If the <emphasis role="bold">t</emphasis> option and the
                 <option>chain</option> keyword both omitted and any of the
-                listed <replaceable>chain</replaceable>s do not exist,
-                a</para>
+                listed <replaceable>chain</replaceable>s do not exist, a usage
+                message is displayed.</para>
               </listitem>
             </varlistentry>