From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 16 Aug 2015 07:45:04 +0000 (-0700)
Subject: Docs: update intercept/tproxy related text
X-Git-Tag: SQUID_4_0_1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ae256ce11018868ab616ac2e6d154fa1f3580a;p=thirdparty%2Fsquid.git

Docs: update intercept/tproxy related text
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 12fb8ebb53..fafd40be9e 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1448,7 +1448,7 @@ DOC_START
 
 	SECURITY WARNING: Usage of this option is dangerous
 	and should not be used trivially. Correct configuration
-	of follow_x_forewarded_for with a limited set of trusted
+	of follow_x_forwarded_for with a limited set of trusted
 	sources is required to prevent abuse of your proxy.
 DOC_END
 
@@ -1826,13 +1826,13 @@ DOC_START
 
 	Modes:
 
-	   intercept	Support for IP-Layer interception of
-			outgoing requests without browser settings.
-			NP: disables authentication and IPv6 on the port.
+	   intercept	Support for IP-Layer NAT interception delivering
+			traffic to this Squid port.
+			NP: disables authentication on the port.
 
-	   tproxy	Support Linux TPROXY for spoofing outgoing
-			connections using the client IP address.
-			NP: disables authentication and maybe IPv6 on the port.
+	   tproxy	Support Linux TPROXY (or BSD divert-to) with spoofing
+			of outgoing connections using the client IP address.
+			NP: disables authentication on the port.
 
 	   accel	Accelerator / reverse proxy mode