update documentation

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 53f8fe9a57647b161cfa6a07299a54ce8f868344..a3c8d5518f6785ff4cc774d94c50b1112f96b5a7 100644 (file)
--- 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.\r
         </verb>\r
 \r
+       <tag>http_port</tag>\r
+       <p>option 'transparent' is being deprecated in favour of 'intercept' which more clearly identifies what the option does.\r
+       For now option 'tproxy' remains with old behaviour meaning fully-invisible proxy using TPROXY support.</p>\r
+\r
 </descrip>\r
 \r
 \r
@@ -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.\r
        </p>\r
 \r
-       <tag>--enable-linux-tproxy4</tag>\r
-       <p>New option to enable TPROXY version 4+ support in squid.\r
-       This options requires a linux kernel 2.6.25 or later for embeded netfilter TPROXY targets.\r
-       </p>\r
-\r
 </descrip>\r
 </p>\r
 \r
@@ -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.\r
            The helper will compile and work with dns_nameservers on more variants of Linux than previously.</p>\r
 \r
+       <tag>--enable-linux-netfilter</tag>\r
+       <p>This option now enables support for all three netfilter interception targets.\r
+        Adding TPROXY version 4+ support to squid through the TPROXY target.\r
+       This options requires a linux kernel 2.6.25 or later for embeded netfilter TPROXY targets.\r
+       Older REDIRECT and DNAT targets work as before on HTTP ports marked 'intercept'.\r
+       </p>\r
+\r
 </descrip>\r
 </p>\r
 \r