diff --git a/docs/FAQ.xml b/docs/FAQ.xml index b6fe59021..63d3605ef 100644 --- a/docs/FAQ.xml +++ b/docs/FAQ.xml @@ -2127,81 +2127,9 @@ eth0 eth1 # eth1 = interface to local netwo (FAQ 60) What are the compatibility restrictions between Shorewall and Shorewall Lite - Answer: See the following table - (C = Completely compatible with all features available, P1 = Compatible - but not all Shorewall features available, P2 = Compatible but not all - Shorewall LIte features available, I = incompatible). - - - - - - - - - - Shorewall Lite 3.2.0 - - Shorewall Lite 3.2.1 - - Shorewall Lite 3.2.2 - - Shorewall Lite 3.2.3 and later - - - - - - Shorewall 3.2.0 - - C - - C - - P2 - - P2 - - - - Shorewall 3.2.1 - - C - - C - - C - - P2 - - - - Shorewall 3.2.2 - - P1 - - P1 - - C - - C - - - - Shorewall 3.2.3 and - later - - P1 - - P1 - - C - - C - - - - + Answer: Beginning with version + 3.2.3, there are no compatibility constraints between Shorewall and + Shorewall-lite. diff --git a/docs/traffic_shaping.xml b/docs/traffic_shaping.xml index 02dc3d836..c037e23c5 100644 --- a/docs/traffic_shaping.xml +++ b/docs/traffic_shaping.xml @@ -898,9 +898,9 @@ ppp0 5000kbit 500kbit tcclasses file #INTERFACE MARK RATE CEIL PRIORITY OPTIONS -ppp0 1 full full 1 tcp-ack,tos-minimize-delay -ppp0 2 9*full/10 9*full/10 2 default -ppp0 3 8*full/10 8*full/10 2 +ppp0 1 5*full full 1 tcp-ack,tos-minimize-delay +ppp0 2 3*full/10 9*full/10 2 default +ppp0 3 2*full/10 8*full/10 2