diff --git a/Shorewall/manpages/shorewall-accounting.xml b/Shorewall/manpages/shorewall-accounting.xml index 47ca9695b..c0ba3602a 100644 --- a/Shorewall/manpages/shorewall-accounting.xml +++ b/Shorewall/manpages/shorewall-accounting.xml @@ -81,13 +81,9 @@ Section headers have the form: - + section-name - The optional "?" was added in Shorewalll 4.6.0 and is preferred. - Existing configurations may be converted to use this form using the - shorewall update command. - When sections are enabled: @@ -357,19 +353,14 @@ - [?]COMMENT + ?COMMENT The remainder of the line is treated as a comment which is attached to subsequent rules until another COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + ?COMMENT. diff --git a/Shorewall/manpages/shorewall-blrules.xml b/Shorewall/manpages/shorewall-blrules.xml index c1684d203..6f3e2d299 100644 --- a/Shorewall/manpages/shorewall-blrules.xml +++ b/Shorewall/manpages/shorewall-blrules.xml @@ -186,20 +186,15 @@ - [?]COMMENT + ?COMMENT The rest of the line will be attached as a comment to the Netfilter rule(s) generated by the following entries. The comment will appear delimited by "/* ... */" in the output of "shorewall show <chain>". To stop the comment from being - attached to further rules, simply include COMMENT on a line by - itself. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + attached to further rules, simply include ?COMMENT on a line + by itself. diff --git a/Shorewall/manpages/shorewall-conntrack.xml b/Shorewall/manpages/shorewall-conntrack.xml index 4c570e28b..c5617ab9e 100644 --- a/Shorewall/manpages/shorewall-conntrack.xml +++ b/Shorewall/manpages/shorewall-conntrack.xml @@ -56,7 +56,7 @@ format. - [?]FORMAT + ?FORMAT format @@ -64,21 +64,14 @@ role="bold">1,2 or 3. - Format 3 was introduced in Shorewall 4.5.10. The optional '?' was - introduced in Shorewall 4.5.11 and ?FORMAT is the preferred form; the form - without the '?' is deprecated. + Format 3 was introduced in Shorewall 4.5.10. Comments may be attached to Netfilter rules generated from entries - in this file through the use of COMMENT lines. These lines begin with the - word COMMENT; the remainder of the line is treated as a comment which is - attached to subsequent rules until another COMMENT line is found or until + in this file through the use of ?COMMENT lines. These lines begin with + ?COMMENT; the remainder of the line is treated as a comment which is + attached to subsequent rules until another ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a - line with only the word COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for COMMENT - and is preferred. - + line containing only ?COMMENT. The columns in the file are as follows (where the column name is followed by a different name in parentheses, the different name is used in diff --git a/Shorewall/manpages/shorewall-interfaces.xml b/Shorewall/manpages/shorewall-interfaces.xml index fc2f33d28..aa1558183 100644 --- a/Shorewall/manpages/shorewall-interfaces.xml +++ b/Shorewall/manpages/shorewall-interfaces.xml @@ -54,12 +54,9 @@ The format is specified by a line as follows:
- [?]FORMAT {1|2} + ?FORMAT {1|2}
- The optional '?' was introduced in Shorewall 4.5.11 and ?FORMAT is - the preferred form; the form without the '?' is deprecated. - The columns in the file are as follows. diff --git a/Shorewall/manpages/shorewall-mangle.xml b/Shorewall/manpages/shorewall-mangle.xml index b2e837aea..49c6786f1 100644 --- a/Shorewall/manpages/shorewall-mangle.xml +++ b/Shorewall/manpages/shorewall-mangle.xml @@ -207,7 +207,7 @@ shorewall show mangle To stop the comment from being attached to further - rules, simply include COMMENT on a line by itself. + rules, simply include ?COMMENT on a line by itself. diff --git a/Shorewall/manpages/shorewall-masq.xml b/Shorewall/manpages/shorewall-masq.xml index 21bc009c7..cb59f2d98 100644 --- a/Shorewall/manpages/shorewall-masq.xml +++ b/Shorewall/manpages/shorewall-masq.xml @@ -51,7 +51,7 @@ role="bold">+]interfacelist[:[digit]][:[dest-address[,dest-address]...[exclusion]]|[?]COMMENT} + role="bold">,dest-address]...[exclusion]]|?COMMENT} Outgoing interfacelist. This may be a @@ -113,17 +113,12 @@ url="/manpages/shorewall-nat.html">shorewall-nat(5). Comments may be attached to Netfilter rules generated from - entries in this file through the use of COMMENT lines. These lines - begin with the word COMMENT; the remainder of the line is treated as - a comment which is attached to subsequent rules until another - COMMENT line is found or until the end of the file is reached. To - stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for - COMMENT and is preferred. - + entries in this file through the use of ?COMMENT lines. These lines + begin with ?COMMENT; the remainder of the line is treated as a + comment which is attached to subsequent rules until another ?COMMENT + line is found or until the end of the file is reached. To stop + adding comments to rules, use a line containing only + ?COMMENT. Beginning with Shorewall 4.6.0, a new syntax is also accepted. With the exception of the leading '+', the interfacelist and diff --git a/Shorewall/manpages/shorewall-nat.xml b/Shorewall/manpages/shorewall-nat.xml index 5b26fc984..e58080895 100644 --- a/Shorewall/manpages/shorewall-nat.xml +++ b/Shorewall/manpages/shorewall-nat.xml @@ -44,25 +44,20 @@ EXTERNAL - - {address|[?]COMMENT} + {address|?COMMENT} External IP Address - this should NOT be the primary IP address of the interface named in the next column and must not be a DNS Name. - If you put COMMENT in this column, the rest of the line will + If you put ?COMMENT in this column, the rest of the line will be attached as a comment to the Netfilter rule(s) generated by the following entries in the file. The comment will appear delimited by "/* ... */" in the output of "shorewall show nat" To stop the comment from being attached to further rules, - simply include COMMENT on a line by itself. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for - COMMENT and is preferred. - + simply include ?COMMENT on a line by itself. diff --git a/Shorewall/manpages/shorewall-rules.xml b/Shorewall/manpages/shorewall-rules.xml index 6023b906a..7765761d6 100644 --- a/Shorewall/manpages/shorewall-rules.xml +++ b/Shorewall/manpages/shorewall-rules.xml @@ -42,12 +42,8 @@ The rules file is divided into sections. Each section is introduced - by a "Section Header" which is a line beginning with [?]SECTION and - followed by the section name. - - The optional "?" was added in Shorewalll 4.6.0 and is preferred. - Existing configurations may be converted to use this form using the - shorewall update command. + by a "Section Header" which is a line beginning with ?SECTION and followed + by the section name. Sections are as follows and must appear in the order listed: @@ -142,7 +138,7 @@ role="bold">ESTABLISHED and RELATED sections and place all of your non-blacklisting rules in the NEW section (That's after the line that - reads SECTION NEW'). + reads ?SECTION NEW'). @@ -305,20 +301,15 @@ - [?]COMMENT + ?COMMENT the rest of the line will be attached as a comment to the Netfilter rule(s) generated by the following entries. The comment will appear delimited by "/* ... */" in the output of "shorewall show <chain>". To stop the comment from being - attached to further rules, simply include COMMENT on a line by - itself. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + attached to further rules, simply include ?COMMENT on a line + by itself. diff --git a/Shorewall/manpages/shorewall-secmarks.xml b/Shorewall/manpages/shorewall-secmarks.xml index 820acaf62..33edfb571 100644 --- a/Shorewall/manpages/shorewall-secmarks.xml +++ b/Shorewall/manpages/shorewall-secmarks.xml @@ -43,7 +43,7 @@ SECMARK - - {SAVE|RESTORE|context|COMMENT + {SAVE|RESTORE|context|?COMMENT comment} @@ -78,19 +78,14 @@ - [?]COMMENT + ?COMMENT The remainder of the line is treated as a comment which - is attached to subsequent rules until another COMMENT line is + is attached to subsequent rules until another ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + ?COMMENT. diff --git a/Shorewall/manpages/shorewall-tunnels.xml b/Shorewall/manpages/shorewall-tunnels.xml index d47a4e560..aafef2135 100644 --- a/Shorewall/manpages/shorewall-tunnels.xml +++ b/Shorewall/manpages/shorewall-tunnels.xml @@ -43,7 +43,7 @@ role="bold">ipip|gre|l2tp|pptpclient|pptpserver|[?]COMMENT|{pptpserver|?COMMENT|{openvpn|openvpnclient|openvpnserver}[:{ Comments may be attached to Netfilter rules generated from - entries in this file through the use of COMMENT lines. These lines - begin with the word COMMENT; the remainder of the line is treated as - a comment which is attached to subsequent rules until another - COMMENT line is found or until the end of the file is reached. To - stop adding comments to rules, use a line with only the word - COMMENT. + entries in this file through the use of /COMMENT lines. These lines + begin with ?COMMENT; the remainder of the line is treated as a + comment which is attached to subsequent rules until another ?COMMENT + line is found or until the end of the file is reached. To stop + adding comments to rules, use a line containing only + ?COMMENT. Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for diff --git a/Shorewall6/manpages/shorewall6-accounting.xml b/Shorewall6/manpages/shorewall6-accounting.xml index f8903ed89..077282ebf 100644 --- a/Shorewall6/manpages/shorewall6-accounting.xml +++ b/Shorewall6/manpages/shorewall6-accounting.xml @@ -299,19 +299,14 @@ - [?]COMMENT + ?COMMENT The remainder of the line is treated as a comment which - is attached to subsequent rules until another COMMENT line is + is attached to subsequent rules until another ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + ?COMMENT. diff --git a/Shorewall6/manpages/shorewall6-blrules.xml b/Shorewall6/manpages/shorewall6-blrules.xml index 9c95c6ad3..9f2903c11 100644 --- a/Shorewall6/manpages/shorewall6-blrules.xml +++ b/Shorewall6/manpages/shorewall6-blrules.xml @@ -187,20 +187,15 @@ - [?]COMMENT + ?COMMENT the rest of the line will be attached as a comment to the Netfilter rule(s) generated by the following entries. The comment will appear delimited by "/* ... */" in the output of "shorewall6 show <chain>". To stop the comment from - being attached to further rules, simply include COMMENT on a + being attached to further rules, simply include ?COMMENT on a line by itself. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - diff --git a/Shorewall6/manpages/shorewall6-conntrack.xml b/Shorewall6/manpages/shorewall6-conntrack.xml index ea661658f..54b770674 100644 --- a/Shorewall6/manpages/shorewall6-conntrack.xml +++ b/Shorewall6/manpages/shorewall6-conntrack.xml @@ -56,7 +56,7 @@ format. - [?]FORMAT + ?FORMAT format @@ -64,21 +64,14 @@ role="bold">1,2 or 3. - Format 3 was introduced in Shorewall 4.5.10. The optional '?' was - introduced in Shorewall 4.5.11 and ?FORMAT is the preferred form; the form - without the '?' is deprecated. + Format 3 was introduced in Shorewall 4.5.10. Comments may be attached to Netfilter rules generated from entries - in this file through the use of COMMENT lines. These lines begin with the - word COMMENT; the remainder of the line is treated as a comment which is - attached to subsequent rules until another COMMENT line is found or until + in this file through the use of ?COMMENT lines. These lines begin with + ?COMMENT; the remainder of the line is treated as a comment which is + attached to subsequent rules until another ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a - line with only the word COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for COMMENT - and is preferred. - + line with only ?COMMENT. The columns in the file are as follows (where the column name is followed by a different name in parentheses, the different name is used in diff --git a/Shorewall6/manpages/shorewall6-interfaces.xml b/Shorewall6/manpages/shorewall6-interfaces.xml index 83ccb32b1..97e5afa3f 100644 --- a/Shorewall6/manpages/shorewall6-interfaces.xml +++ b/Shorewall6/manpages/shorewall6-interfaces.xml @@ -54,12 +54,9 @@ The format is specified by a line as follows:
- [?]FORMAT {1|2} + ?FORMAT {1|2}
- The optional '?' was introduced in Shorewall 4.5.11 and ?FORMAT is - the preferred form; the form without the '?' is deprecated. - The columns in the file are as follows. diff --git a/Shorewall6/manpages/shorewall6-mangle.xml b/Shorewall6/manpages/shorewall6-mangle.xml index f52db8668..060d58565 100644 --- a/Shorewall6/manpages/shorewall6-mangle.xml +++ b/Shorewall6/manpages/shorewall6-mangle.xml @@ -208,7 +208,7 @@ shorewall show mangle To stop the comment from being attached to further - rules, simply include COMMENT on a line by itself. + rules, simply include ?COMMENT on a line by itself. diff --git a/Shorewall6/manpages/shorewall6-masq.xml b/Shorewall6/manpages/shorewall6-masq.xml index 69cb565c5..54ad6afb2 100644 --- a/Shorewall6/manpages/shorewall6-masq.xml +++ b/Shorewall6/manpages/shorewall6-masq.xml @@ -50,7 +50,7 @@ INTERFACE:DEST - {[+]interfacelist|[:[dest-address[,dest-address]...[exclusion]]|[?]COMMENT} + role="bold">,dest-address]...[exclusion]]|?COMMENT} Outgoing interfacelist. This may be a @@ -86,17 +86,12 @@ as are ipset names preceded by a plus sign '+'. Comments may be attached to Netfilter rules generated from - entries in this file through the use of COMMENT lines. These lines - begin with the word COMMENT; the remainder of the line is treated as - a comment which is attached to subsequent rules until another - COMMENT line is found or until the end of the file is reached. To - stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for - COMMENT and is preferred. - + entries in this file through the use of ?COMMENT lines. These lines + begin with ?COMMENT; the remainder of the line is treated as a + comment which is attached to subsequent rules until another ?COMMENT + line is found or until the end of the file is reached. To stop + adding comments to rules, use a line containing only + ?COMMENT. Beginning with Shorewall 4.6.0, a new syntax is also accepted. With the exception of the leading '+', the interfacelist and diff --git a/Shorewall6/manpages/shorewall6-nat.xml b/Shorewall6/manpages/shorewall6-nat.xml index d5c9c1031..51667570b 100644 --- a/Shorewall6/manpages/shorewall6-nat.xml +++ b/Shorewall6/manpages/shorewall6-nat.xml @@ -31,8 +31,7 @@ If all you want to do is simple port forwarding, do NOT use this file. See http://www.shorewall.net/FAQ.htm#faq1. - + url="/FAQ.htm#faq1">http://www.shorewall.net/FAQ.htm#faq1. The columns in the file are as follows (where the column name is @@ -42,25 +41,20 @@ EXTERNAL - - {address|[?]COMMENT} + {address|?COMMENT} External IP Address - this should NOT be the primary IP address of the interface named in the next column and must not be a DNS Name. - If you put COMMENT in this column, the rest of the line will + If you put ?COMMENT in this column, the rest of the line will be attached as a comment to the Netfilter rule(s) generated by the following entries in the file. The comment will appear delimited by "/* ... */" in the output of "shorewall show nat" To stop the comment from being attached to further rules, - simply include COMMENT on a line by itself. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for - COMMENT and is preferred. - + simply include ?COMMENT on a line by itself. diff --git a/Shorewall6/manpages/shorewall6-rules.xml b/Shorewall6/manpages/shorewall6-rules.xml index d4c3b67b6..8df91fc36 100644 --- a/Shorewall6/manpages/shorewall6-rules.xml +++ b/Shorewall6/manpages/shorewall6-rules.xml @@ -35,12 +35,8 @@ request. All rules are terminating except LOG and QUEUE rules. The rules file is divided into sections. Each section is introduced - by a "Section Header" which is a line beginning with [?]SECTION and - followed by the section name. - - The optional "?" was added in Shorewalll 4.6.0 and is preferred. - Existing configurations may be converted to use this form using the - shorewall6 update command. + by a "Section Header" which is a line beginning with ?SECTION and followed + by the section name. Sections are as follows and must appear in the order listed: @@ -134,7 +130,7 @@ states, then it is suggested that you omit the ESTABLISHED and RELATED sections and place all of your rules in - the NEW section (That's after the line that reads SECTION NEW'). + the NEW section (That's after the line that reads ?SECTION NEW'). diff --git a/Shorewall6/manpages/shorewall6-secmarks.xml b/Shorewall6/manpages/shorewall6-secmarks.xml index fb5aa0ad3..ae6387b3d 100644 --- a/Shorewall6/manpages/shorewall6-secmarks.xml +++ b/Shorewall6/manpages/shorewall6-secmarks.xml @@ -43,8 +43,7 @@ SECMARK - - {SAVE|RESTORE|context|[?]COMMENT - comment} + {SAVE|RESTORE|context|?COMMENT} @@ -78,19 +77,14 @@ - [?]COMMENT + ?COMMENT The remainder of the line is treated as a comment which - is attached to subsequent rules until another COMMENT line is + is attached to subsequent rules until another ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym - for COMMENT and is preferred. - + ?COMMENT. diff --git a/Shorewall6/manpages/shorewall6-tunnels.xml b/Shorewall6/manpages/shorewall6-tunnels.xml index 0ea8180ab..2d056c1a8 100644 --- a/Shorewall6/manpages/shorewall6-tunnels.xml +++ b/Shorewall6/manpages/shorewall6-tunnels.xml @@ -44,7 +44,7 @@ role="bold">ipsecnat|gre|l2tp|pptpclient|pptpserver|{pptpserver|?COMMENT|{openvpn|openvpnclient|openvpnserver}[:{ Comments may be attached to Netfilter rules generated from - entries in this file through the use of COMMENT lines. These lines - begin with the word COMMENT; the remainder of the line is treated as - a comment which is attached to subsequent rules until another - COMMENT line is found or until the end of the file is reached. To + entries in this file through the use of ?COMMENT lines. These lines + begin with the word ?COMMENT; the remainder of the line is treated + as a comment which is attached to subsequent rules until another + ?COMMENT line is found or until the end of the file is reached. To stop adding comments to rules, use a line with only the word - COMMENT. - - - Beginning with Shorewall 4.5.11, ?COMMENT is a synonym for - COMMENT and is preferred. - + ?COMMENT.