Prep for 3.1.2

diff --git a/ChangeLog b/ChangeLog
index 802cdb28884ccb1f2a47e84f8ab4a49d49a03d09..6594557cf17b8f4376ec75d9ab6ced6b47af9d60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes to squid-3.1.2 (01 May 2010):
+
+       - Bug 2913: Fix DB auth warning in new perl version
+       - Bug 2904: Prevent automake creating incomplete files
+       - Bug 2899: Regression: Restore lost rfc1738_unescape() data type
+       - Bug 2895: Regression: TPROXY2 compile errors
+       - Bug 2879: Regression: headers end-finding
+       - Bug 2874: Accept literal IPv6 address in icap_service URL
+       - Bug 2860: Regression: WCCPv1 handshake
+       - Bug 2848: Pass TCP_RST to client on early disconnect
+       - Debian Bug 578047: Correct behaviour of --enable-ipv6
+       - HTTP/1.1: Advertise 1.1 on replies
+       - AIX / UNIX build fixes
+       - Cygwin build fixes
+       - squidclient: -k option to test connection keep-alive or close
+       - Improved helper build for wider compatibility
+       - Ensure the PID file directory exists on install
+
 Changes to squid-3.1.1 (29 Mar 2010):
 
        - Bug 2873: undefined symbol

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index ab5a25973663fd8d281925cd6499339d6427b906..40ddc80ad218d68a0807af675ea0fa27ea1ea0f1 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.1 release notes</title>
+<title>Squid 3.1.2 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.1.
+The Squid Team are pleased to announce the release of Squid-3.1.2.
 
 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">.
 
@@ -84,11 +84,13 @@ Snapshots generated from 3.HEAD continue to be highly volatile.
 
 <p>All this is previous policy you should be accustomed to. Now we get to the new numbering change.
 
-<p>Initial branch packages will be generated with a 3.X.0.Z version as testing packages.
+<p>Initial branch packages will be generated with a 3.X.0.Z version as beta testing packages.
 Packages and Snapshots generated with these 3-dot numbers are expected to be relatively stable regarding feature behaviors.
 Suitable for testing, but without any guarantees under production loads. This replaces both the old PRE and RC packages.
 
-<p>If a large number of bugs are found several *.0.Z packages may be attempted before any is considered production-ready.
+<p>If a large number of bugs are found several *.0.Z packages may be attempted before any is fully frozen for production use.
+ To be frozen as stable the code must be compiling well and have passed a period of 14 days with no new bugs reported against
+ the new code added in that release.
 
 <p>When one of these Squid-3.X.0.Z packages passes our bug-free standards a 3.X.Y numbered release will be made.