From d23ac0da55b05df38c0f5aca7b6b22ea133a0dbb Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 22 Dec 2009 18:57:11 +1300
Subject: [PATCH] Prep for 3.0.STABLE21

---
 ChangeLog                          | 11 +++++++++++
 doc/release-notes/release-3.0.sgml |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 463374c33d..76d2fcbae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -263,6 +263,17 @@ Changes to squid-3.1.0.1 (27 Oct 2008):
 	- Bug #2223: Follow XFF extensions added
 	- ... and many code and documentation cleanups
 
+Changes to squid-3.0.STABLE21 (22 Dec 2009):
+
+	- Bug 2830: Clarify where NULL byte is in headers.
+	- Bug 2778: Linking issues using SunCC
+	- Bug 2395: FTP errors not displayed
+	- Bug 2155: Assertion failures on malformed Content-Range response headers
+	- Fix parsing and a few bugs in ACL time type
+	- Fix RFC keep-alive compliance on intercepted replies
+	- Improved security hardening on %nn parser
+	- Replace several GCC-specific code snippets.
+
 Changes to squid-3.0.STABLE20 (29 Oct 2009):
 
 	- Bug 2794: ESI parsing on FreeBSD
diff --git a/doc/release-notes/release-3.0.sgml b/doc/release-notes/release-3.0.sgml
index 4456cfdf48..fd92162f39 100644
--- a/doc/release-notes/release-3.0.sgml
+++ b/doc/release-notes/release-3.0.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.0.STABLE20 release notes</title>
+<title>Squid 3.0.STABLE21 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.0.STABLE20.
+The Squid Team are pleased to announce the release of Squid-3.0.STABLE21.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.0/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
 
-- 
2.47.3