Update Release Notes for TPROXY changes.

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 21232f92d26a261e214c8bfc8048a71cb174f454..53f8fe9a57647b161cfa6a07299a54ce8f868344 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -298,6 +298,16 @@ This section gives an account of those changes in three categories:
           but please report the bugs anyway.\r
         </p>\r
 \r
+       <tag>--enable-linux-tproxy2</tag>\r
+       <p>New option to enable TPROXY version 2 support in squid (previously known as --enable-linux-tproxy).\r
+       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
@@ -308,7 +318,7 @@ This section gives an account of those changes in three categories:
        <tag>--disable-internl-dns</tag>\r
        <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
+\r
 </descrip>\r
 </p>\r
 \r
@@ -334,6 +344,8 @@ porting one of these from Squid-2 to Squid-3 is most welcome.
 <p>The following configure options have been removed.\r
 \r
 <descrip>\r
+       <tag>--enable-linux-tproxy</tag>\r
+       <p>Replaced by --enable-linux-tproxy2 to make way for differences in TPROXY v2 and v4 support.</p>\r
 \r
 </descrip>\r
 \r