Prep for 3.1.0.18

diff --git a/ChangeLog b/ChangeLog
index 7fdcc65875768c8221cd106a89c82712ac728963..f770458364176a6d37f3eaa4f6435f44e3ccd712 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Changes to squid-3.1.0.18 (14 Mar 2010):
+
+       - Regression Fix: IPv4-mapped prefix, broken in 3.1.0.16
+       - Bug 2869: Remove unused external reference
+       - Bug 2866: Support OpenSSL 1.0
+       - Bug 2813: Random unix_group crash at startup
+       - Send HTTP1.1 compliant 417 responses
+       - Associate external acl message with the request
+       - Various Digest parser fixes
+       - ... and all bug fixes from 3.0 up to 3.0.STABLE25
+
 Changes to squid-3.1.0.17 (24 Feb 2010):
 
        - Regression Fix: Non-English error page UTF encoding

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index d2fb8ad7002bd8f2ac68ddbfdad2837ba7125713..c86411401174d804cdfca91e4f05a4560b840348 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.17 release notes</title>
+<title>Squid 3.1.0.18 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.17 for testing.
+The Squid Team are pleased to announce the release of Squid-3.1.0.18 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">.