diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml index b9a9a7eed..6c1ac35d3 100644 --- a/manpages/shorewall-accounting.xml +++ b/manpages/shorewall-accounting.xml @@ -144,8 +144,8 @@ - DEST PORT(S) — Value: - {-|DEST PORT(S) — {-|any|all|ipp2p-option|port-name-or-number[,port-name-or-number]...} diff --git a/manpages/shorewall-exclusion.xml b/manpages/shorewall-exclusion.xml index 35136c62e..f313c8e61 100644 --- a/manpages/shorewall-exclusion.xml +++ b/manpages/shorewall-exclusion.xml @@ -32,14 +32,19 @@ lowaddress-highaddress No embedded whitespace is allowed. + + Exclusion can appear after a list of addresses and/or address + ranges. In that case, the final list of address is formed by taking the + first list and then removing the addresses defined in the + exclusion. - Example + Examples - Example 1 + Example 1 - All IPv4 addresses except 192.168.3.4 !192.168.3.4 @@ -47,7 +52,8 @@ - Example 2 + Example 2 - All IPv4 addresses except the network 192.168.1.0/24 + and the host 10.2.3.4 !192.168.1.0/24,10.1.3.4 @@ -55,12 +61,22 @@ - Example 3 + Example 3 - All IPv4 addresses except the range + 192.168.1.3-192.168.1.12 and the network 10.0.0.0/8 !192.168.1.3-192.168.1.12,10.0.0.0/8 + + + Example 4 - The network 192.168.1.0/24 except hosts 192.168.1.3 + and 192.168.1.9 + + + 192.168.1.0/24!192.168.1.3,192.168.1.9 + + diff --git a/manpages/shorewall-tunnels.xml b/manpages/shorewall-tunnels.xml index f6d6ed554..946d8c457 100644 --- a/manpages/shorewall-tunnels.xml +++ b/manpages/shorewall-tunnels.xml @@ -21,6 +21,13 @@ Description + The tunnels file is used to define rules for encapsulated (usually + encrypted) traffic to pass between the Shorewall system and a remote + gateway. Traffic flowing through the tunnel is handled using the normal + zone/policy/rule mechanism. See http://www.shorewall.net/VPNBasics.html + for details. + The columns in the file are as follows.