From 35b90c270928b527095626b7311d5f12a070107a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 27 Oct 2015 08:16:06 -0700 Subject: [PATCH] Update documentation for 'remote-' vs. 'remote_' Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall.xml | 14 +++++++------- Shorewall6/manpages/shorewall6.xml | 14 +++++++------- docs/Shorewall-5.xml | 4 ++-- docs/upgrade_issues.xml | 19 +++++++++++++------ 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Shorewall/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml index 570c46985..d808a5ce6 100644 --- a/Shorewall/manpages/shorewall.xml +++ b/Shorewall/manpages/shorewall.xml @@ -424,7 +424,7 @@ -options - + @@ -448,7 +448,7 @@ -options - + @@ -472,7 +472,7 @@ -options - + @@ -1522,7 +1522,7 @@ This command was re-implemented in Shorewall 5.0.0. The pre-5.0.0 reload command is now called - remote_restart (see below). + remote-restart (see below). Reload is similar to shorewall start except that it assumes that the firewall is already @@ -1575,7 +1575,7 @@ - remote_start + remote-start [-] [-] [- root-user-name] [-] [-] [ directory ] @@ -1637,7 +1637,7 @@ - remote_reload + remote-reload [-] [-] [- root-user-name] [-] [-] [ @@ -1699,7 +1699,7 @@ - remote_restart + remote-restart [-] [-] [- root-user-name] [-] [-] [ diff --git a/Shorewall6/manpages/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml index 16fa452b2..9ec51fa37 100644 --- a/Shorewall6/manpages/shorewall6.xml +++ b/Shorewall6/manpages/shorewall6.xml @@ -378,7 +378,7 @@ -options - + @@ -402,7 +402,7 @@ -options - + @@ -426,7 +426,7 @@ -options - + @@ -1457,7 +1457,7 @@ This command was re-implemented in Shorewall 5.0.0. The pre-5.0.0 reload command is now called - remote_restart (see below). + remote-restart (see below). Reload is similar to shorewall6 start except that it assumes that the firewall is already started. @@ -1511,7 +1511,7 @@ - remote_reload + remote-reload [-] [-] [- root-user-name] [-] [-] [ @@ -1573,7 +1573,7 @@ - remote_ restart + remote- restart [-] [-] [- root-user-name] [-] [-] [ @@ -1636,7 +1636,7 @@ - remote_start + remote-start [-] [-] [- root-user-name] [-] [-] [ directory ] diff --git a/docs/Shorewall-5.xml b/docs/Shorewall-5.xml index 2b50eeb3a..5b27dc171 100644 --- a/docs/Shorewall-5.xml +++ b/docs/Shorewall-5.xml @@ -323,7 +323,7 @@ load The function performed by the Shorewall-4 load - command is now performed by the remote_start + command is now performed by the remote-start command. @@ -334,7 +334,7 @@ the same function as the restart command did in Shorewall 4. The action taken by the Shorewall-4 reload command is now performed by the - remote_restart command. + remote-restart command. For those that can't get used to the idea of using reload in place of restart, a diff --git a/docs/upgrade_issues.xml b/docs/upgrade_issues.xml index 91c00e3e6..7241bd244 100644 --- a/docs/upgrade_issues.xml +++ b/docs/upgrade_issues.xml @@ -37,7 +37,7 @@ Thomas M. Eastep - + @@ -78,6 +78,13 @@ zones. +
+ Version >= 5.0.0 + + See the Shorewall 5 + documentation. +
+
Version >= 4.6.0 @@ -85,7 +92,7 @@ Beginning with Shorewall 4.6.0, ection headers are now preceded by '?' (e.g., '?SECTION ...'). If your configuration contains any bare - 'SECTION' entries, the following warning is issued: + 'SECTION' entries, the following warning is issued: WARNING: 'SECTION' is deprecated in favor of '?SECTION' - consider running 'shorewall update -D' ... @@ -111,7 +118,7 @@ - Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are + Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are deprecated and a warning will be issued for each FORMAT-1 action or macro found. @@ -119,8 +126,8 @@ WARNING: FORMAT-1 macros are deprecated and support will be dropped in a future release. - To eliminate these warnings, add the following line before the - first rule in the action or macro: + To eliminate these warnings, add the following line before the + first rule in the action or macro: ?FORMAT 2 @@ -325,7 +332,7 @@ ?ENDIF. - +