From 8f6f0c94a4018abd7d092a4c0f2dd3a30b25104a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 28 Dec 2013 15:35:08 -0800 Subject: [PATCH] Replace tcrules with mangle in the manpages Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall-accounting.xml | 2 +- Shorewall/manpages/shorewall-actions.xml | 2 +- Shorewall/manpages/shorewall-blacklist.xml | 2 +- Shorewall/manpages/shorewall-blrules.xml | 2 +- Shorewall/manpages/shorewall-conntrack.xml | 2 +- Shorewall/manpages/shorewall-ecn.xml | 2 +- Shorewall/manpages/shorewall-exclusion.xml | 2 +- Shorewall/manpages/shorewall-hosts.xml | 2 +- Shorewall/manpages/shorewall-init.xml | 2 +- Shorewall/manpages/shorewall-interfaces.xml | 2 +- Shorewall/manpages/shorewall-ipsets.xml | 2 +- Shorewall/manpages/shorewall-maclist.xml | 2 +- Shorewall/manpages/shorewall-mangle.xml | 2 +- Shorewall/manpages/shorewall-masq.xml | 4 ++-- Shorewall/manpages/shorewall-modules.xml | 2 +- Shorewall/manpages/shorewall-nat.xml | 2 +- Shorewall/manpages/shorewall-nesting.xml | 2 +- Shorewall/manpages/shorewall-netmap.xml | 2 +- Shorewall/manpages/shorewall-params.xml | 2 +- Shorewall/manpages/shorewall-policy.xml | 2 +- Shorewall/manpages/shorewall-providers.xml | 6 +++--- Shorewall/manpages/shorewall-proxyarp.xml | 2 +- Shorewall/manpages/shorewall-routes.xml | 2 +- Shorewall/manpages/shorewall-routestopped.xml | 2 +- Shorewall/manpages/shorewall-rtrules.xml | 2 +- Shorewall/manpages/shorewall-rules.xml | 2 +- Shorewall/manpages/shorewall-secmarks.xml | 2 +- Shorewall/manpages/shorewall-stoppedrules.xml | 2 +- Shorewall/manpages/shorewall-tcclasses.xml | 6 +++--- Shorewall/manpages/shorewall-tcdevices.xml | 4 ++-- Shorewall/manpages/shorewall-tcinterfaces.xml | 2 +- Shorewall/manpages/shorewall-tcpri.xml | 2 +- Shorewall/manpages/shorewall-tcrules.xml | 2 +- Shorewall/manpages/shorewall-template.xml | 2 +- Shorewall/manpages/shorewall-tos.xml | 4 ++-- Shorewall/manpages/shorewall-tunnels.xml | 2 +- Shorewall/manpages/shorewall-vardir.xml | 2 +- Shorewall/manpages/shorewall-zones.xml | 2 +- Shorewall6/manpages/shorewall6-accounting.xml | 2 +- Shorewall6/manpages/shorewall6-actions.xml | 2 +- Shorewall6/manpages/shorewall6-blacklist.xml | 2 +- Shorewall6/manpages/shorewall6-blrules.xml | 2 +- Shorewall6/manpages/shorewall6-conntrack.xml | 2 +- Shorewall6/manpages/shorewall6-exclusion.xml | 2 +- Shorewall6/manpages/shorewall6-hosts.xml | 2 +- Shorewall6/manpages/shorewall6-interfaces.xml | 2 +- Shorewall6/manpages/shorewall6-ipsets.xml | 2 +- Shorewall6/manpages/shorewall6-maclist.xml | 2 +- Shorewall6/manpages/shorewall6-masq.xml | 2 +- Shorewall6/manpages/shorewall6-modules.xml | 2 +- Shorewall6/manpages/shorewall6-nesting.xml | 2 +- Shorewall6/manpages/shorewall6-params.xml | 2 +- Shorewall6/manpages/shorewall6-policy.xml | 2 +- Shorewall6/manpages/shorewall6-providers.xml | 4 ++-- Shorewall6/manpages/shorewall6-proxyndp.xml | 2 +- Shorewall6/manpages/shorewall6-routes.xml | 2 +- Shorewall6/manpages/shorewall6-routestopped.xml | 2 +- Shorewall6/manpages/shorewall6-rtrules.xml | 2 +- Shorewall6/manpages/shorewall6-rules.xml | 2 +- Shorewall6/manpages/shorewall6-secmarks.xml | 2 +- Shorewall6/manpages/shorewall6-tcclasses.xml | 4 ++-- Shorewall6/manpages/shorewall6-tcdevices.xml | 2 +- Shorewall6/manpages/shorewall6-tcrules.xml | 2 +- Shorewall6/manpages/shorewall6-template.xml | 2 +- Shorewall6/manpages/shorewall6-tos.xml | 4 ++-- Shorewall6/manpages/shorewall6-tunnels.xml | 2 +- Shorewall6/manpages/shorewall6-vardir.xml | 2 +- Shorewall6/manpages/shorewall6-zones.xml | 2 +- 68 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Shorewall/manpages/shorewall-accounting.xml b/Shorewall/manpages/shorewall-accounting.xml index 286cd6485..a2114a968 100644 --- a/Shorewall/manpages/shorewall-accounting.xml +++ b/Shorewall/manpages/shorewall-accounting.xml @@ -804,7 +804,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-actions.xml b/Shorewall/manpages/shorewall-actions.xml index ff3c1c6a1..56bbbdfa1 100644 --- a/Shorewall/manpages/shorewall-actions.xml +++ b/Shorewall/manpages/shorewall-actions.xml @@ -142,7 +142,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-blacklist.xml b/Shorewall/manpages/shorewall-blacklist.xml index 6b24c4475..5b17feb7d 100644 --- a/Shorewall/manpages/shorewall-blacklist.xml +++ b/Shorewall/manpages/shorewall-blacklist.xml @@ -194,7 +194,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-blrules.xml b/Shorewall/manpages/shorewall-blrules.xml index a5c55a359..58d50f98d 100644 --- a/Shorewall/manpages/shorewall-blrules.xml +++ b/Shorewall/manpages/shorewall-blrules.xml @@ -323,7 +323,7 @@ shorewall6-netmap(5),shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-conntrack.xml b/Shorewall/manpages/shorewall-conntrack.xml index ae98c6b3a..d4569973a 100644 --- a/Shorewall/manpages/shorewall-conntrack.xml +++ b/Shorewall/manpages/shorewall-conntrack.xml @@ -501,7 +501,7 @@ DROP:PO - 1.2.3.4 shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-ecn.xml b/Shorewall/manpages/shorewall-ecn.xml index 40ecd1a07..45306f4c0 100644 --- a/Shorewall/manpages/shorewall-ecn.xml +++ b/Shorewall/manpages/shorewall-ecn.xml @@ -69,7 +69,7 @@ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-exclusion.xml b/Shorewall/manpages/shorewall-exclusion.xml index 3bcd0ace7..e607e4cc2 100644 --- a/Shorewall/manpages/shorewall-exclusion.xml +++ b/Shorewall/manpages/shorewall-exclusion.xml @@ -182,7 +182,7 @@ ACCEPT all!z2 net tcp 22 shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-hosts.xml b/Shorewall/manpages/shorewall-hosts.xml index e06f6b617..9153a76ec 100644 --- a/Shorewall/manpages/shorewall-hosts.xml +++ b/Shorewall/manpages/shorewall-hosts.xml @@ -283,7 +283,7 @@ vpn ppp+:192.168.3.0/24 shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-init.xml b/Shorewall/manpages/shorewall-init.xml index 7cc013cf9..f8ad07914 100644 --- a/Shorewall/manpages/shorewall-init.xml +++ b/Shorewall/manpages/shorewall-init.xml @@ -168,7 +168,7 @@ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-interfaces.xml b/Shorewall/manpages/shorewall-interfaces.xml index 479a7941c..67784e0f2 100644 --- a/Shorewall/manpages/shorewall-interfaces.xml +++ b/Shorewall/manpages/shorewall-interfaces.xml @@ -920,7 +920,7 @@ net ppp0 - shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-ipsets.xml b/Shorewall/manpages/shorewall-ipsets.xml index 9131d10f1..59a071a13 100644 --- a/Shorewall/manpages/shorewall-ipsets.xml +++ b/Shorewall/manpages/shorewall-ipsets.xml @@ -138,7 +138,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-maclist.xml b/Shorewall/manpages/shorewall-maclist.xml index cb4f798fd..2b82684aa 100644 --- a/Shorewall/manpages/shorewall-maclist.xml +++ b/Shorewall/manpages/shorewall-maclist.xml @@ -113,7 +113,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-mangle.xml b/Shorewall/manpages/shorewall-mangle.xml index ea9d11e2e..792ac8277 100644 --- a/Shorewall/manpages/shorewall-mangle.xml +++ b/Shorewall/manpages/shorewall-mangle.xml @@ -24,7 +24,7 @@ Description This file was introduced in Shorewall 4.6.0 and is intended to - replace shorewall-tcrules(5). + replace shorewall-rules(5). This file is only processed by the compiler if: diff --git a/Shorewall/manpages/shorewall-masq.xml b/Shorewall/manpages/shorewall-masq.xml index dbdc8c280..7c4812018 100644 --- a/Shorewall/manpages/shorewall-masq.xml +++ b/Shorewall/manpages/shorewall-masq.xml @@ -37,7 +37,7 @@ through a particular link. You must use entries in shorewall-rtrules(5) or PREROUTING entries in shorewall-tcrules(5) to do + url="shorewall-mangle.html">shorewall-mangle(5) to do that. @@ -712,7 +712,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-modules.xml b/Shorewall/manpages/shorewall-modules.xml index d75804594..cc5fcbbf8 100644 --- a/Shorewall/manpages/shorewall-modules.xml +++ b/Shorewall/manpages/shorewall-modules.xml @@ -92,7 +92,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-nat.xml b/Shorewall/manpages/shorewall-nat.xml index 03d3e506e..18a81ed80 100644 --- a/Shorewall/manpages/shorewall-nat.xml +++ b/Shorewall/manpages/shorewall-nat.xml @@ -155,7 +155,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-nesting.xml b/Shorewall/manpages/shorewall-nesting.xml index 0d2117ce9..e626df678 100644 --- a/Shorewall/manpages/shorewall-nesting.xml +++ b/Shorewall/manpages/shorewall-nesting.xml @@ -209,7 +209,7 @@ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-netmap.xml b/Shorewall/manpages/shorewall-netmap.xml index c36a56558..798f34a2c 100644 --- a/Shorewall/manpages/shorewall-netmap.xml +++ b/Shorewall/manpages/shorewall-netmap.xml @@ -201,7 +201,7 @@ shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-params.xml b/Shorewall/manpages/shorewall-params.xml index bd6558d92..b71484f15 100644 --- a/Shorewall/manpages/shorewall-params.xml +++ b/Shorewall/manpages/shorewall-params.xml @@ -138,7 +138,7 @@ net eth0 130.252.100.255 routefilter,norfc1918 shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-policy.xml b/Shorewall/manpages/shorewall-policy.xml index bf1c6be2f..6d4d7a67c 100644 --- a/Shorewall/manpages/shorewall-policy.xml +++ b/Shorewall/manpages/shorewall-policy.xml @@ -336,7 +336,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-providers.xml b/Shorewall/manpages/shorewall-providers.xml index 37b9b966e..22e8f4a17 100644 --- a/Shorewall/manpages/shorewall-providers.xml +++ b/Shorewall/manpages/shorewall-providers.xml @@ -77,7 +77,7 @@ A FWMARK value used in your shorewall-tcrules(5) file to + url="shorewall-mangle.html">shorewall-mangle(5) file to direct packets to this provider. If HIGH_ROUTE_MARKS=Yes in Added in Shorewall 4.5.4. Used for supporting the TPROXY - action in shorewall-tcrules(5). See http://www.shorewall.net/Shorewall_Squid_Usage.html. When specified, the MARK, DUPLICATE and GATEWAY columns should be empty, INTERFACE should be set to 'lo' and @@ -428,7 +428,7 @@ shorewall-policy(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-proxyarp.xml b/Shorewall/manpages/shorewall-proxyarp.xml index 21951d0e5..9eef0ea76 100644 --- a/Shorewall/manpages/shorewall-proxyarp.xml +++ b/Shorewall/manpages/shorewall-proxyarp.xml @@ -144,7 +144,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-routes.xml b/Shorewall/manpages/shorewall-routes.xml index f33fdb918..0cfaa95e8 100644 --- a/Shorewall/manpages/shorewall-routes.xml +++ b/Shorewall/manpages/shorewall-routes.xml @@ -101,7 +101,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-routestopped.xml b/Shorewall/manpages/shorewall-routestopped.xml index 745f5eae8..afc3392d4 100644 --- a/Shorewall/manpages/shorewall-routestopped.xml +++ b/Shorewall/manpages/shorewall-routestopped.xml @@ -222,7 +222,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-rtrules.xml b/Shorewall/manpages/shorewall-rtrules.xml index 5fad310a5..f6e02e1d0 100644 --- a/Shorewall/manpages/shorewall-rtrules.xml +++ b/Shorewall/manpages/shorewall-rtrules.xml @@ -193,7 +193,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-rules.xml b/Shorewall/manpages/shorewall-rules.xml index 99db3e89b..071dd51bb 100644 --- a/Shorewall/manpages/shorewall-rules.xml +++ b/Shorewall/manpages/shorewall-rules.xml @@ -1810,7 +1810,7 @@ shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-secmarks.xml b/Shorewall/manpages/shorewall-secmarks.xml index f78b275f8..a54fa3c41 100644 --- a/Shorewall/manpages/shorewall-secmarks.xml +++ b/Shorewall/manpages/shorewall-secmarks.xml @@ -420,7 +420,7 @@ RESTORE I:ER shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-stoppedrules.xml b/Shorewall/manpages/shorewall-stoppedrules.xml index fcde9dc13..b5581d3ac 100644 --- a/Shorewall/manpages/shorewall-stoppedrules.xml +++ b/Shorewall/manpages/shorewall-stoppedrules.xml @@ -159,7 +159,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tcclasses.xml b/Shorewall/manpages/shorewall-tcclasses.xml index 32881a297..b20ea3dc6 100644 --- a/Shorewall/manpages/shorewall-tcclasses.xml +++ b/Shorewall/manpages/shorewall-tcclasses.xml @@ -159,7 +159,7 @@ The mark value which is an integer in the range 1-255. You set mark values in the shorewall-tcrules(5) file, + url="shorewall-mangle.html">shorewall-mangle(5) file, marking the traffic you want to fit in the classes defined in here. Must be specified as '-' if the classify option is given for the interface in @@ -417,7 +417,7 @@ of the class. So the total RATE represented by an entry with 'occurs' will be the listed RATE multiplied by number. For additional information, see - tcrules + tcrules (5). @@ -778,7 +778,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcdevices(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tcdevices.xml b/Shorewall/manpages/shorewall-tcdevices.xml index b89937460..d8240aa73 100644 --- a/Shorewall/manpages/shorewall-tcdevices.xml +++ b/Shorewall/manpages/shorewall-tcdevices.xml @@ -195,7 +195,7 @@ ― When specified, Shorewall will not generate tc or Netfilter rules to classify traffic based on packet marks. You must do all classification using CLASSIFY rules in shorewall-tcrules(5). + url="shorewall-mangle.html">shorewall-mangle(5). - Use the Hierarchical Token Bucket queuing discipline. This is the default. @@ -298,7 +298,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tcinterfaces.xml b/Shorewall/manpages/shorewall-tcinterfaces.xml index ff3de41ad..af1b9bded 100644 --- a/Shorewall/manpages/shorewall-tcinterfaces.xml +++ b/Shorewall/manpages/shorewall-tcinterfaces.xml @@ -218,7 +218,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcpri(5), - shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), + shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tcpri.xml b/Shorewall/manpages/shorewall-tcpri.xml index 1ae5c72f7..7eb820ab7 100644 --- a/Shorewall/manpages/shorewall-tcpri.xml +++ b/Shorewall/manpages/shorewall-tcpri.xml @@ -160,7 +160,7 @@ shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tcrules.xml b/Shorewall/manpages/shorewall-tcrules.xml index 1520dace9..22e4a7c39 100644 --- a/Shorewall/manpages/shorewall-tcrules.xml +++ b/Shorewall/manpages/shorewall-tcrules.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> - shorewall-tcrules + shorewall-mangle 5 diff --git a/Shorewall/manpages/shorewall-template.xml b/Shorewall/manpages/shorewall-template.xml index 10ab822fb..359917b4e 100644 --- a/Shorewall/manpages/shorewall-template.xml +++ b/Shorewall/manpages/shorewall-template.xml @@ -57,7 +57,7 @@ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tos.xml b/Shorewall/manpages/shorewall-tos.xml index 5e0a3819c..da3107d5f 100644 --- a/Shorewall/manpages/shorewall-tos.xml +++ b/Shorewall/manpages/shorewall-tos.xml @@ -25,7 +25,7 @@ This file defines rules for setting Type Of Service (TOS). Its use is deprecated, beginning in Shorewall 4.5.1, in favor of the TOS target in - shorewall-tcrules (5). + shorewall-mangle (5). 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 @@ -176,7 +176,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tunnels(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-tunnels.xml b/Shorewall/manpages/shorewall-tunnels.xml index 936aca24e..375c68d8a 100644 --- a/Shorewall/manpages/shorewall-tunnels.xml +++ b/Shorewall/manpages/shorewall-tunnels.xml @@ -290,7 +290,7 @@ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), + shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-vardir.xml b/Shorewall/manpages/shorewall-vardir.xml index 2fb377747..71c62b699 100644 --- a/Shorewall/manpages/shorewall-vardir.xml +++ b/Shorewall/manpages/shorewall-vardir.xml @@ -59,7 +59,7 @@ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) diff --git a/Shorewall/manpages/shorewall-zones.xml b/Shorewall/manpages/shorewall-zones.xml index 0e6da0301..3620beb18 100644 --- a/Shorewall/manpages/shorewall-zones.xml +++ b/Shorewall/manpages/shorewall-zones.xml @@ -439,7 +439,7 @@ c:a,b ipv4 shorewall-params(5), shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5), - shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), + shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5) diff --git a/Shorewall6/manpages/shorewall6-accounting.xml b/Shorewall6/manpages/shorewall6-accounting.xml index 7f3f53905..cd84a7326 100644 --- a/Shorewall6/manpages/shorewall6-accounting.xml +++ b/Shorewall6/manpages/shorewall6-accounting.xml @@ -839,7 +839,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-actions.xml b/Shorewall6/manpages/shorewall6-actions.xml index ae4c579a1..39d2f7655 100644 --- a/Shorewall6/manpages/shorewall6-actions.xml +++ b/Shorewall6/manpages/shorewall6-actions.xml @@ -141,7 +141,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5) diff --git a/Shorewall6/manpages/shorewall6-blacklist.xml b/Shorewall6/manpages/shorewall6-blacklist.xml index 2d839cbf1..5ae79a06f 100644 --- a/Shorewall6/manpages/shorewall6-blacklist.xml +++ b/Shorewall6/manpages/shorewall6-blacklist.xml @@ -208,7 +208,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-blrules.xml b/Shorewall6/manpages/shorewall6-blrules.xml index e3fd69e72..c70ca8685 100644 --- a/Shorewall6/manpages/shorewall6-blrules.xml +++ b/Shorewall6/manpages/shorewall6-blrules.xml @@ -325,7 +325,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-conntrack.xml b/Shorewall6/manpages/shorewall6-conntrack.xml index 2e88a89f0..e50b7d5a3 100644 --- a/Shorewall6/manpages/shorewall6-conntrack.xml +++ b/Shorewall6/manpages/shorewall6-conntrack.xml @@ -396,7 +396,7 @@ DROP:PO - 2001:1.2.3::4 shorewall6-policy(5), shorewall6-providers(5), shorewall6-proxyarp(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), - shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5), + shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5) diff --git a/Shorewall6/manpages/shorewall6-exclusion.xml b/Shorewall6/manpages/shorewall6-exclusion.xml index 3fcd7ffd0..4abd50a6c 100644 --- a/Shorewall6/manpages/shorewall6-exclusion.xml +++ b/Shorewall6/manpages/shorewall6-exclusion.xml @@ -106,7 +106,7 @@ ACCEPT all!z2 net tcp 22 shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5) diff --git a/Shorewall6/manpages/shorewall6-hosts.xml b/Shorewall6/manpages/shorewall6-hosts.xml index 2c6cc8d56..578376fe9 100644 --- a/Shorewall6/manpages/shorewall6-hosts.xml +++ b/Shorewall6/manpages/shorewall6-hosts.xml @@ -203,7 +203,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5) diff --git a/Shorewall6/manpages/shorewall6-interfaces.xml b/Shorewall6/manpages/shorewall6-interfaces.xml index 0e7a1cc1b..a9940a0c1 100644 --- a/Shorewall6/manpages/shorewall6-interfaces.xml +++ b/Shorewall6/manpages/shorewall6-interfaces.xml @@ -635,7 +635,7 @@ dmz eth2 - shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-ipsets.xml b/Shorewall6/manpages/shorewall6-ipsets.xml index 1063977c0..e17c00173 100644 --- a/Shorewall6/manpages/shorewall6-ipsets.xml +++ b/Shorewall6/manpages/shorewall6-ipsets.xml @@ -134,7 +134,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-maclist.xml b/Shorewall6/manpages/shorewall6-maclist.xml index fccbde1f2..0b54fd63e 100644 --- a/Shorewall6/manpages/shorewall6-maclist.xml +++ b/Shorewall6/manpages/shorewall6-maclist.xml @@ -110,7 +110,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-masq.xml b/Shorewall6/manpages/shorewall6-masq.xml index b9e642df2..d9152b9fd 100644 --- a/Shorewall6/manpages/shorewall6-masq.xml +++ b/Shorewall6/manpages/shorewall6-masq.xml @@ -37,7 +37,7 @@ through a particular link. You must use entries in shorewall6-rtrules(5) or PREROUTING entries in shorewall-tcrules(5) to do + url="shorewall6-mangle.html">shorewall-tcrules(5) to do that. diff --git a/Shorewall6/manpages/shorewall6-modules.xml b/Shorewall6/manpages/shorewall6-modules.xml index d0fb70a38..4094da063 100644 --- a/Shorewall6/manpages/shorewall6-modules.xml +++ b/Shorewall6/manpages/shorewall6-modules.xml @@ -90,7 +90,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-nesting.xml b/Shorewall6/manpages/shorewall6-nesting.xml index 016a3cace..d67aa2880 100644 --- a/Shorewall6/manpages/shorewall6-nesting.xml +++ b/Shorewall6/manpages/shorewall6-nesting.xml @@ -112,7 +112,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-params.xml b/Shorewall6/manpages/shorewall6-params.xml index 6af7e81c8..9d48b0281 100644 --- a/Shorewall6/manpages/shorewall6-params.xml +++ b/Shorewall6/manpages/shorewall6-params.xml @@ -136,7 +136,7 @@ net eth0 - dhcp,nosmurfs shorewall6-maclist(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), - shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5), + shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-policy.xml b/Shorewall6/manpages/shorewall6-policy.xml index fd8bd47fe..c9961bfd5 100644 --- a/Shorewall6/manpages/shorewall6-policy.xml +++ b/Shorewall6/manpages/shorewall6-policy.xml @@ -337,7 +337,7 @@ shorewall6-providers(5), shorewall6-proxyarp(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-providers.xml b/Shorewall6/manpages/shorewall6-providers.xml index 7f5c8323a..c73644875 100644 --- a/Shorewall6/manpages/shorewall6-providers.xml +++ b/Shorewall6/manpages/shorewall6-providers.xml @@ -77,7 +77,7 @@ A FWMARK value used in your shorewall6-tcrules(5) file to + url="shorewall6-mangle.html">shorewall6-mangle(5) file to direct packets to this provider. If HIGH_ROUTE_MARKS=Yes in diff --git a/Shorewall6/manpages/shorewall6-proxyndp.xml b/Shorewall6/manpages/shorewall6-proxyndp.xml index face3e91c..9a75425b7 100644 --- a/Shorewall6/manpages/shorewall6-proxyndp.xml +++ b/Shorewall6/manpages/shorewall6-proxyndp.xml @@ -142,7 +142,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-routes.xml b/Shorewall6/manpages/shorewall6-routes.xml index 0a107734e..83e9467d7 100644 --- a/Shorewall6/manpages/shorewall6-routes.xml +++ b/Shorewall6/manpages/shorewall6-routes.xml @@ -100,7 +100,7 @@ shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-routestopped.xml b/Shorewall6/manpages/shorewall6-routestopped.xml index a9f89dd9e..3bb524884 100644 --- a/Shorewall6/manpages/shorewall6-routestopped.xml +++ b/Shorewall6/manpages/shorewall6-routestopped.xml @@ -191,7 +191,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-rtrules.xml b/Shorewall6/manpages/shorewall6-rtrules.xml index 3ffa107de..c4fc04182 100644 --- a/Shorewall6/manpages/shorewall6-rtrules.xml +++ b/Shorewall6/manpages/shorewall6-rtrules.xml @@ -171,7 +171,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-rules.xml b/Shorewall6/manpages/shorewall6-rules.xml index 333f21642..81e8af172 100644 --- a/Shorewall6/manpages/shorewall6-rules.xml +++ b/Shorewall6/manpages/shorewall6-rules.xml @@ -1652,7 +1652,7 @@ shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-secmarks.xml b/Shorewall6/manpages/shorewall6-secmarks.xml index cbc542431..2d4674c39 100644 --- a/Shorewall6/manpages/shorewall6-secmarks.xml +++ b/Shorewall6/manpages/shorewall6-secmarks.xml @@ -419,7 +419,7 @@ RESTORE I:ER shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-tcclasses.xml b/Shorewall6/manpages/shorewall6-tcclasses.xml index cffe47206..bda90dc91 100644 --- a/Shorewall6/manpages/shorewall6-tcclasses.xml +++ b/Shorewall6/manpages/shorewall6-tcclasses.xml @@ -155,7 +155,7 @@ The mark value which is an integer in the range 1-255. You set mark values in the shorewall6-tcrules(5) file, + url="shorewall6-mangle.html">shorewall6-mangle(5) file, marking the traffic you want to fit in the classes defined in here. Must be specified as '-' if the classify option is given for the interface in @@ -728,7 +728,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), - shorewall6-secmarks(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-secmarks(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-tcdevices.xml b/Shorewall6/manpages/shorewall6-tcdevices.xml index f1a463a91..d08133e3f 100644 --- a/Shorewall6/manpages/shorewall6-tcdevices.xml +++ b/Shorewall6/manpages/shorewall6-tcdevices.xml @@ -295,7 +295,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), - shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcrules(5), + shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-tcrules.xml b/Shorewall6/manpages/shorewall6-tcrules.xml index b4c3d414f..ced319417 100644 --- a/Shorewall6/manpages/shorewall6-tcrules.xml +++ b/Shorewall6/manpages/shorewall6-tcrules.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> - shorewall6-tcrules + shorewall6-mangle 5 diff --git a/Shorewall6/manpages/shorewall6-template.xml b/Shorewall6/manpages/shorewall6-template.xml index f8ec28a42..81e5a65ad 100644 --- a/Shorewall6/manpages/shorewall6-template.xml +++ b/Shorewall6/manpages/shorewall6-template.xml @@ -57,7 +57,7 @@ shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), - shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5), + shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-tos.xml b/Shorewall6/manpages/shorewall6-tos.xml index 24f852858..704cc1908 100644 --- a/Shorewall6/manpages/shorewall6-tos.xml +++ b/Shorewall6/manpages/shorewall6-tos.xml @@ -25,7 +25,7 @@ This file defines rules for setting Type Of Service (TOS). Its use is deprecated, beginning in Shorewall 4.5.1, in favor of the TOS target in - shorewall6-tcrules + shorewall6-mangle (5). The columns in the file are as follows. @@ -174,6 +174,6 @@ shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tunnels(5), shorewall6-zones(5) + shorewall6-mangle(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-tunnels.xml b/Shorewall6/manpages/shorewall6-tunnels.xml index d4452af10..53b20ee15 100644 --- a/Shorewall6/manpages/shorewall6-tunnels.xml +++ b/Shorewall6/manpages/shorewall6-tunnels.xml @@ -248,6 +248,6 @@ shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-zones(5) + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-vardir.xml b/Shorewall6/manpages/shorewall6-vardir.xml index 064245aeb..9693cb547 100644 --- a/Shorewall6/manpages/shorewall6-vardir.xml +++ b/Shorewall6/manpages/shorewall6-vardir.xml @@ -58,7 +58,7 @@ shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), - shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/Shorewall6/manpages/shorewall6-zones.xml b/Shorewall6/manpages/shorewall6-zones.xml index 21e429928..1767f9327 100644 --- a/Shorewall6/manpages/shorewall6-zones.xml +++ b/Shorewall6/manpages/shorewall6-zones.xml @@ -438,6 +438,6 @@ c:a,b ipv6 shorewall6-providers(5), shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5) + shorewall6-mangle(5), shorewall6-tos(5), shorewall6-tunnels(5)