From e9bb447537b07578081901e97b962912119b16bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= Date: Mon, 2 Mar 2015 09:58:09 -0500 Subject: [PATCH 1/4] Fix typo --- Shorewall/manpages/shorewall.xml | 16 ++++++++-------- Shorewall6/manpages/shorewall6.xml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Shorewall/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml index 362c6365e..55163c858 100644 --- a/Shorewall/manpages/shorewall.xml +++ b/Shorewall/manpages/shorewall.xml @@ -896,7 +896,7 @@ compiler-generated error and warning message. The option was added in Shorewall 4.6.0 - and causes a warning message to be issued if the line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + 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 -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 line current line + 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 Date: Mon, 2 Mar 2015 10:10:52 -0500 Subject: [PATCH 2/4] Fix typo --- Shorewall6/manpages/shorewall6.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall6/manpages/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml index a1ff36d91..5f7c63c9f 100644 --- a/Shorewall6/manpages/shorewall6.xml +++ b/Shorewall6/manpages/shorewall6.xml @@ -1839,7 +1839,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. From 5f2a8dd9cbe7265e7115324d2d67045348dd0769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= Date: Mon, 2 Mar 2015 10:12:36 -0500 Subject: [PATCH 3/4] Fix typo --- Shorewall6/manpages/shorewall6.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall6/manpages/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml index 5f7c63c9f..df006e59f 100644 --- a/Shorewall6/manpages/shorewall6.xml +++ b/Shorewall6/manpages/shorewall6.xml @@ -1783,7 +1783,7 @@ command is issued using the specified configuration directory; otherwise, a start command is performed using the - specified configuration directory. if an + specified configuration directory. If an error occurs during the compilation phase of the restart or start , the command terminates without changing the Shorewall6 From 79b6b7cf080a08d9c39ee93fe2f96a47f09f1b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= Date: Mon, 2 Mar 2015 10:27:03 -0500 Subject: [PATCH 4/4] Fix incorrectly specified directory for VARDIR --- docs/shorewall_extension_scripts.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/shorewall_extension_scripts.xml b/docs/shorewall_extension_scripts.xml index 070be242e..dae67b5b1 100644 --- a/docs/shorewall_extension_scripts.xml +++ b/docs/shorewall_extension_scripts.xml @@ -457,10 +457,10 @@ cat - VARDIR - The product state directory. Defaults /usr/share/shorewall, /usr/share/shorewall6/, /usr/share/shorewall-lite, or - /usr/share/shorewall6-lite + class="directory">/var/lib/shorewall, /var/lib/shorewall6/, /var/lib/shorewall-lite, or + /var/lib/shorewall6-lite depending on which product is running, but may be overridden by an entry in ${CONFDIR}/vardir.