Prep for 3.1.0.17

diff --git a/ChangeLog b/ChangeLog
index fba1997e3e2092f3fb10f7d8329f420f5813806e..f9c203ed7f12a8da1049c99b63f96d3174fd6a2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Changes to squid-3.1.0.17 (24 Feb 2010):
+
+       - Regression Fix: Non-English error page UTF encoding
+       - Bug 2616: reduce IdleConnList::removeFD messages
+       - Bug 1843: multicast-siblings cache_peer option
+       - Port from 2.7: X509 certificate alias-domain handling
+       - Add adapted_http_access option
+       - NTLMv2 support for fake NTLM helper
+
 Changes to squid-3.1.0.16 (01 Feb 2010):
 
        - Regression Fix: Make Squid abort on all config parse failures.

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index bafa824ef9c069ed009331070a5539b718c174df..1dc8403fee5e5f79d1e1a4743a759774d15453dc 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.0.16 release notes</title>
+<title>Squid 3.1.0.17 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.1.0.16 for testing.
+The Squid Team are pleased to announce the release of Squid-3.1.0.17 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.