diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 491743291..80bb091b2 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -1087,10 +1087,12 @@ net all DROP infothen the chain name is 'net-all' Beginning with Shorewall 5.0.0, it is no longer necessary to set INLINE_MATCHES=Yes in order to be able to specify your own - iptables text in a rule. You may simply preface that text with a - pair of semicolons (";;"). If alternate input is also specified in - the rule, it should appear before the semicolons and may be - separated from normal column input by a single semicolon. + iptables text in a rule and INLINE_MATCHES=Yes is deprecated. + Beginning with 5.0.0, you may simply preface your text with a pair + of semicolons (";;"). If alternate input is also specified in the + rule, it should appear before the semicolons and may be separated + from normal column input by a single semicolon or enclosed in curly + braces ("{....}"). diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 5cd2d782b..6393259b2 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -920,13 +920,13 @@ net all DROP infothen the chain name is 'net-all' Added in Shorewall 4.6.0. Traditionally in shorewall6-rules(5), + url="/manpages6/shorewall6-rules.html">shorewall6-rules(5), a semicolon separates column-oriented specifications on the left from alternative specificaitons on the right.. When INLINE_MATCHES=Yes is specified, the specifications on the right are interpreted as if INLINE had been specified in the ACTION column. This also applies to - shorewall6-masq(5) and + shorewall6-masq(5) and shorewall6-mangle(5) which also support INLINE. If not specified or if specified as the empty value, the value 'No' is assumed for backward @@ -934,10 +934,12 @@ net all DROP infothen the chain name is 'net-all' Beginning with Shorewall 5.0.0, it is no longer necessary to set INLINE_MATCHES=Yes in order to be able to specify your own - iptables text in a rule. You may simply preface that text with a - pair of semicolons (";;"). If alternate input is also specified in - the rule, it should appear before the semicolons and may be - separated from normal column input by a single semicolon. + iptables text in a rule and INLINE_MATCHES=Yes is deprecated. + Beginning with 5.0.0, you may simply preface your text with a pair + of semicolons (";;"). If alternate input is also specified in the + rule, it should appear before the semicolons and may be separated + from normal column input by a single semicolon or enclosed in curly + braces ("{....}").