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 before you upgrade
- Shorewall.
+ Shorewall. See the release notes.
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 ...
or
- rpm -ivh shorewall-pl-4.0.0-0Betax.noarch.rpm
+ rpm -ivh shorewall-perl-4.0.0-0Betax.noarch.rpmNote 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 @@
If the t option and the
keyword both omitted and any of the
- listed chains do not exist,
- a
+ listed chains do not exist, a usage
+ message is displayed.