diff --git a/Shorewall/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml index 73e3593b5..3c2191458 100644 --- a/Shorewall/manpages/shorewall.xml +++ b/Shorewall/manpages/shorewall.xml @@ -774,7 +774,7 @@ used for debugging. See http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace. - The nolock prevents the command from + The option prevents the command from attempting to acquire the Shorewall lockfile. It is useful if you need to include shorewall commands in /etc/shorewall/started. @@ -877,10 +877,11 @@ and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line 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 + contains alternative input specifications following a semicolon + (";"). Such lines will be handled incorrectly if INLINE_MATCHES is + set to Yes in shorewall.conf(5). @@ -920,18 +921,17 @@ compile -- -) to suppress the 'Compiling...' message normally generated by /sbin/shorewall. - When -e is specified, the compilation is being performed on a - system other than where the compiled script will run. This option - disables certain configuration options that require the script to be - compiled where it is to be run. The use of -e requires the presence - of a configuration file named capabilities - which may be produced using the command shorewall-lite show -f capabilities > - capabilities on a system with Shorewall Lite + When is specified, the compilation is being + performed on a system other than where the compiled script will run. + This option disables certain configuration options that require the + script to be compiled where it is to be run. The use of + requires the presence of a configuration file named capabilities + which may be produced using the command shorewall-lite show -f + capabilities > capabilities on a system with Shorewall Lite installed - The -c option was added in - Shorewall 4.5.17 and causes conditional compilation of a script. The + The option was added in Shorewall 4.5.17 + and causes conditional compilation of a script. The script specified by pathname (or implied if pathname is omitted) is compiled if it doesn't exist or if there is any file in the @@ -951,8 +951,8 @@ and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + The option was added in Shorewall 4.6.0 and + causes a warning message to be issued if the line current line contains alternative input specifications following a semicolon (";"). Such lines will be handled incorrectly if INLINE_MATCHES is set to Yes in The -x option causes actual packet and byte counts to be displayed. Without that option, these - counts are abbreviated. The -m - option causes any MAC addresses included in Shorewall log messages - to be displayed. + counts are abbreviated. + + The -m option causes any MAC + addresses included in Shorewall log messages to be displayed. The -l option causes the rule number for each Netfilter rule to be displayed. @@ -1188,8 +1189,8 @@ and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + The option was added in Shorewall 4.6.0 and + causes a warning message to be issued if the line 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.5.3 causes Shorewall to avoid updating the routing table(s). - The option was added in Shorewall 4.5.3 + The option was added in Shorewall 4.5.3 causes the compiler to run under the Perl debugger. The option was added in Shorewall 4.5.3 and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + The option was added in Shorewall 4.6.0 + and causes a warning message to be issued if the line 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.5.3 + The option was added in Shorewall 4.5.3 and causes Shorewall to look in the given directory first for configuration files. @@ -1350,8 +1351,8 @@ and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + The option was added in Shorewall 4.6.0 + and causes a warning message to be issued if the line current line contains alternative input specifications following a semicolon (";"). Such lines will be handled incorrectly if INLINE_MATCHES is set to Yes in conntrack utility must be installed to use this option. - The option causes the compiler to run + The option causes the compiler to run under the Perl debugger. The option suppresses the compilation step @@ -1398,15 +1399,15 @@ and performs the compilation step unconditionally, overriding the AUTOMAKE setting in shorewall.conf(5). When - both and are present, the + both and are present, the result is determined by the option that appears last. The option was added in Shorewall 4.5.3 and causes a Perl stack trace to be included with each compiler-generated error and warning message. - The -i option was added in Shorewall 4.6.0 and causes a - warning message to be issued if the line current line contains + The option was added in Shorewall 4.6.0 + and causes a warning message to be issued if the line current line contains alternative input specifications following a semicolon (";"). Such lines will be handled incorrectly if INLINE_MATCHES is set to Yes in Added in Shorewall 4.6.2. Displays the dynamic chain along with any chains produced by entries in - shorewall-blrules(5).The -x + shorewall-blrules(5). The -x option is passed directly through to iptables and causes actual packet and byte counts to be displayed. Without this option, those counts are abbreviated. @@ -1739,7 +1740,7 @@ Displays the Netfilter nat table using the command - iptables -t nat -L -n -v.The + iptables -t nat -L -n -v. The -x option is passed directly through to iptables and causes actual packet and byte counts to be displayed. Without this option, those counts are @@ -1772,7 +1773,7 @@ Displays the Netfilter raw table using the command - iptables -t raw -L -n -v.The + iptables -t raw -L -n -v. The -x option is passed directly through to iptables and causes actual packet and byte counts to be displayed. Without this option, those counts are