From 8bdea653250103e7ba709c77c60c997d59487cd6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 13 Aug 2015 16:12:28 -0700 Subject: [PATCH] Update manpages for new update options Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall.xml | 33 ++++++++++++++++++----- Shorewall6/manpages/shorewall6.xml | 43 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 19 deletions(-) diff --git a/Shorewall/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml index 1897d3067..2b5d70f42 100644 --- a/Shorewall/manpages/shorewall.xml +++ b/Shorewall/manpages/shorewall.xml @@ -825,6 +825,10 @@ + + + + directory @@ -2267,7 +2271,7 @@ update [-] [-] [-] [-] [-] [-] [-] - [-] [-] [ + [-] [-r] [-n][-] [ directory ] @@ -2304,11 +2308,11 @@ updated, the original is saved in a .bak file in the same directory. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the current line contains - alternative input specifications following a semicolon (";"). Such - lines will be handled incorrectly if INLINE_MATCHES is set to Yes in - The option was added in Shorewall 4.6.0 + and causes a warning message to be issued if the current line + contains alternative input specifications following a semicolon + (";"). Such lines will be handled incorrectly if INLINE_MATCHES is + set to Yes in shorewall.conf(5). The option was added in Shorewall 4.6.0. @@ -2350,9 +2354,24 @@ + The option was added in Shorewall 4.6.12. + When specified, causes shorewall-routestopped(5) + to be converted to shorewall-stoppedrules(5). + The old file is renamed with a .bak suffix. + + The option was added in Shorewall 4.6.12. + When specified, causes shorewall-notrack(5) + to be converted to shorewall-conntrack(5). + The old file is renamed with a .bak suffix. + The option was added in Shorewall 4.6.0 and is equivalent to specifying the , - and the options. + , and + the options. For a description of the other options, see the check command above. diff --git a/Shorewall6/manpages/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml index b7e851568..ebb1d2e9c 100644 --- a/Shorewall6/manpages/shorewall6.xml +++ b/Shorewall6/manpages/shorewall6.xml @@ -755,6 +755,10 @@ + + + + directory @@ -2133,24 +2137,24 @@ - update [-] + update [-] [-] [-] [-] [-] [-] [-] - [-] [-] [ + [-] [-r] [-n][-] [ directory ] Added in Shorewall 4.4.21 and causes the compiler to update - /etc/shorewall6/shorewall6.conf then validate - the configuration. The update will add options not present in the - existing file with their default values, and will move deprecated + /etc/shorewall/shorewall.conf then validate the + configuration. The update will add options not present in + the old file with their default values, and will move deprecated options with non-defaults to a deprecated options section at the bottom of the file. Your existing - shorewall6.conf file is renamed - shorewall6.conf.bak. + shorewall.conf file is renamed + shorewall.conf.bak. The option causes the updated - shorewall6.conf file to be annotated with + shorewall.conf file to be annotated with documentation. The option was added in Shorewall 4.4.26 @@ -2169,7 +2173,7 @@ The option was added in Shorewall 4.5.11. When this option is specified, the compiler will walk through the directories in the CONFIG_PATH replacing FORMAT and COMMENT entries - to compiler directives (e.g., ?FORMAT and ?COMMENT). When a file is + to compiler directives (e.g., ?FORMAT and ?COMMENT. When a file is updated, the original is saved in a .bak file in the same directory. @@ -2178,7 +2182,7 @@ contains alternative input specifications following a semicolon (";"). Such lines will be handled incorrectly if INLINE_MATCHES is set to Yes in shorewall6.conf(5). + url="/manpages6/shorewall6.conf.html">shorewall6.conf(5). The option was added in Shorewall 4.6.0. When specified, causes mangle file; if there is no mangle file in the CONFIG_PATH, one will be created in /etc/shorewall6. + class="directory">/etc/shorewall. @@ -2219,9 +2223,24 @@ + The option was added in Shorewall 4.6.12. + When specified, causes shorewall6-routestopped(5) + to be converted to shorewall6-stoppedrules(5). + The old file is renamed with a .bak suffix. + + The option was added in Shorewall 4.6.12. + When specified, causes shorewall6-notrack(5) + to be converted to shorewall6-conntrack(5). + The old file is renamed with a .bak suffix. + The option was added in Shorewall 4.6.0 and is equivalent to specifying the , - and the options. + , and + the options. For a description of the other options, see the check command above.