diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml index 94a48f5fa..2e5de953f 100644 --- a/manpages/shorewall.conf.xml +++ b/manpages/shorewall.conf.xml @@ -169,19 +169,6 @@ - - ACCOUNTING=[Yes|No] - - - Added in Shorewall 4.5.0. If set to Yes, Shorewall accounting - is enabled (see shorewall-accounting(5)). If - not specified or set to the empty value, ACCOUNTING=Yes is - assumed. - - - ADD_IP_ALIASES=[Yes|No] @@ -1062,24 +1049,6 @@ net all DROP infothen the chain name is 'net2all' - - MASK_BITS=bits - - - Added in Shorewall 4.5.0. This option specifies the number of - bits to use as a mask for traffic shaping marks - and must be greater than or equal to TC_BITS. The default value - depends on the setting of WIDE_TC_MARKS: - - - WIDE_TC_MARKS=No - 8 bits. - - WIDE_TC_MARKS=Yes - 16 bits. - - - - MODULE_SUFFIX=["extension ...then the chain name is 'net2all' - - PROVIDER_BITS=bits - - - Added in Shorewall 4.5.0. Specifies the number of bits of the - packet/connection mark to use for the provider (routing) mark. - Provider mark values must be >= 2**PROVIDER_OFFSET and less than - 2**(PROVIDER_OFFSET + PROVIDER_BITS). The default value is 8 - bits. - - - - - PROVIDER_OFFSET=offset - - - Added in Shorewall 4.5.0. Specifies the - offset in bits from the least significate bit - of the packet/connection mark where the Provider Mark value is - stored. The default is based on the settings of HIGH_ROUTE_MARKS and - WIDE_TC_MARKS: - - - HIGH_ROUTE_MARKS=No - 0 bits. - - HIGH_ROUTE_MARKS=Yes and WIDE_TC_MARKS=No - 8 - bits. - - HIGH_ROUTE_MARKS=Yes and WIDE_TC_MARKS=Yes - 16 - bits. - - - - PKTTYPE={Yes|No} @@ -1476,28 +1409,6 @@ net all DROP infothen the chain name is 'net2all' - - TC_BITS=bits - - - Added in Shorewall 4.5.0. This option replaces WIDE_TC_MARKS - by allowing you to specify the number of bits - of the 32-bit packet/connection mark to be used for traffic shaping. - The default value is based on the settings of WIDE_TC_MARKS: - - - WIDE_TC_MARKS=No - 8 bits. - - WIDE_TC_MARKS=Yes - 14 bits. - - - Mark values specified in shorewall-tcclasses (5) must - be < 2**TC_BITS. - - - TC_ENABLED=[Yes|then the chain name is 'net2all' role="bold">no then traffic shaping is not enabled. - If you set TC_ENABLED=Simple (Shorewall 4.5.0 and later), + If you set TC_ENABLED=Simple (Shorewall 4.4.6 and later), simple traffic shaping using shorewall-tcinterfaces(5) and shorewall-tcpri(5) is @@ -1548,7 +1459,7 @@ net all DROP infothen the chain name is 'net2all' role="bold">TC_PRIOMAP=map - Added in Shorewall 4.5.0. Determines the mapping of a packet's + Added in Shorewall 4.4.6. Determines the mapping of a packet's TOS field to priority bands. See shorewall-tcpri(5). The map consists of 16 space-separated digits with