From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 11 Apr 2008 02:11:22 +0000 (+1200)
Subject: update documentation
X-Git-Tag: SQUID_3_1_0_1~49^2~276^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e70ee71daf1bfc16789bb59abf92a32f2c52509e;p=thirdparty%2Fsquid.git

update documentation
---

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 53f8fe9a57..a3c8d5518f 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -242,6 +242,10 @@ This section gives a thorough account of those changes in three categories:
        Enabling this directive Squid rotates IP's per request.
         </verb>
 
+	<tag>http_port</tag>
+	<p>option 'transparent' is being deprecated in favour of 'intercept' which more clearly identifies what the option does.
+	For now option 'tproxy' remains with old behaviour meaning fully-invisible proxy using TPROXY support.</p>
+
 </descrip>
 
 
@@ -303,11 +307,6 @@ This section gives an account of those changes in three categories:
 	Linux Kernel patches from Balabit are required before building squid with this option.
 	</p>
 
-	<tag>--enable-linux-tproxy4</tag>
-	<p>New option to enable TPROXY version 4+ support in squid.
-	This options requires a linux kernel 2.6.25 or later for embeded netfilter TPROXY targets.
-	</p>
-
 </descrip>
 </p>
 
@@ -319,6 +318,13 @@ This section gives an account of those changes in three categories:
 	<p>Better support for Linux using the external DNS helper.
            The helper will compile and work with dns_nameservers on more variants of Linux than previously.</p>
 
+	<tag>--enable-linux-netfilter</tag>
+	<p>This option now enables support for all three netfilter interception targets.
+        Adding TPROXY version 4+ support to squid through the TPROXY target.
+	This options requires a linux kernel 2.6.25 or later for embeded netfilter TPROXY targets.
+	Older REDIRECT and DNAT targets work as before on HTTP ports marked 'intercept'.
+	</p>
+
 </descrip>
 </p>