From e074e5be72ba6ae3435d4dd259cd49b249984346 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 1 Jul 2011 14:28:38 +1200
Subject: [PATCH] Prep for 3.1.13

---
 ChangeLog                          |  6 ++++++
 doc/release-notes/release-3.1.sgml | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ece97cbf7c..14cf7a7c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -196,6 +196,12 @@ Changes to squid-3.2.0.1 (03 Aug 2010):
 	- ... and a great many testing improvements
 	- ... and many documentation updates
 
+Changes to squid-3.1.13 (01 Jul 2011):
+
+	- Regression Bug 3239: problems with myip/myport upgrade
+	- Bug 3153: hung ICAP RESPMOD transactions
+	- Update ssl_crtd to use 'OK' status inline with other helpers
+
 Changes to squid-3.1.12.3 (18 Jun 2011):
 
 	- Bug 3236: Port of %oa, %<lp and %<lp and %<la log format options
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 668ccccfce..6bcca49bc6 100644
--- 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.12.3 release notes</title>
+<title>Squid 3.1.13 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.12.3
+The Squid Team are pleased to announce the release of Squid-3.1.13
 
 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">.
 
@@ -24,7 +24,8 @@ We welcome feedback and bug reports. If you find a new bug, please see <url url=
 
 <sect1>Known issues
 <p>
-Although this release is deemed good enough for use in many setups, please note the existence of <url url="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&target_milestone=3.1&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit&order=bugs.bug_severity" name="open bugs against Squid-3.1">.
+Although this release is deemed good enough for use in many setups, please note the existence of 
+<url url="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&amp;target_milestone=3.1&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;cmdtype=doit&amp;order=bugs.bug_severity" name="open bugs against Squid-3.1">.
 
 <p>Some issues to note as currently known in this release which are not able to be fixed in the 3.1 series are:
 
@@ -38,6 +39,7 @@ Although this release is deemed good enough for use in many setups, please note
 <itemize>
 	<item>Windows support is still largely missing.
 	<item>AIX support for building with the IBM compiler is broken.
+	<item>OpenSSL 1.0.0 support is incomplete.
 </itemize>
 
 
@@ -1230,7 +1232,7 @@ NOCOMMENT_START
 	<p>%Hs tag deprecated and replaced by request/reply specific &gt;Hs and &lt;Hs
 	<p>New <em>%&lt;la</em> Local IP address of the last server or peer connection. Ported from 2.7 where it is called <em>%oa</em>.
 	<p>New <em>%&lt;lp</em> Local port number of the last server or peer connection.
-	<p>New <em>%&gt;ha,/em> to log HTTP request headers after adaptation and redirection.
+	<p>New <em>%&gt;ha</em> to log HTTP request headers after adaptation and redirection.
 	<p>HTTP request/reply format tags may now be optionally prefixed with http::.
 	   Old forms will be deprecated in some as yet undecided future release.
 	<verb>
-- 
2.47.2