Prep for 3.2.0.5

diff --git a/ChangeLog b/ChangeLog
index f17af38232d00ca7e8ad78883fc83c7850c81855..9aec19e1e71ea807fef57df40e505c2b47b3a95d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Changes to squid-3.2.0.5 (12 Feb 2011):
+
+       - Regression Fix: profiler should not be built by default
+       - Regression Bug 3081: assertion failed: AsyncCallQueue
+       - Regression Bug 2948: Requests for FTP active downloads cause failed assertion
+       - Bug 3089: FTP command output overrides directory listing
+       - Bug 2870: --disable-auth does not work
+       - Bug 2586: multiple memory leaks during reconfigure
+       - Bug 2581: FTP directory listing sometimes fails
+       - Port from 2.7: maximum staleness limits
+       - HTTP/1.1: Support RFC 5861 Cache-Control: stale-if-error option
+       - HTTP/1.1: Support configurable status codes for deny_info
+       - Support upcoming "fresh message creation" eCAP API
+       - Aggregate SNMP responses when using SMP with multiple workers
+       - Several more Solaris, Windows and ICC support fixes
+       - ... all bug fixes and updates from 3.1.11
+       - ... and more code cleanup shufflings
+       - ... and several documentation updates
+
 Changes to squid-3.2.0.4 (22 Dec 2010):
 
        - Port 2.x: cache_dir min-size setting

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 6fa64cd30277e89b1369aef0ed8968e82d2f4afa..e3f728589c7b863eab7b20e92e17542fbb1de5b8 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.2.0.4 release notes</title>
+<title>Squid 3.2.0.5 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.2.0.4 for testing.
+The Squid Team are pleased to announce the release of Squid-3.2.0.5 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.2/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
 
@@ -76,8 +76,9 @@ Most user-facing changes are reflected in squid.conf (see below).
    must coordinate caching activities (in-between environments are in a gray
    area requiring case-by-case analysis).
 
-<p>Cache manager and SNMP statistics are reported from a worker point of
-   view, for now.
+<p>Cache manager statistics are reported from a worker point of view, for now.
+   Though some reports are combined. SNMP statistics are combined across all
+   workers.
 
 <p>Startup, reconfiguration, shutdown, and log rotation are handled as for a
    monolithic Squid. Abnormally terminated workers are restarted while