Prep for 3.1.18

diff --git a/ChangeLog b/ChangeLog
index bdabd5e1f88cc8ce948068d51ee6689272727a79..7210a9e6ba64c623ab38add071d52be6f98758f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -286,6 +286,10 @@ 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.18 (03 Dec 2011):
+
+       - Regression: compile error in FTP
+
 Changes to squid-3.1.17 (03 Dec 2011):
 
        - Bug 3432: Crash logging FTP errors

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 152f61439bd44fb0090ecd0cd4ebc1001f32be9b..63e4f842bb02fefd748edc0362448ac5c2dd3dc7 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -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.17
+The Squid Team are pleased to announce the release of Squid-3.1.18
 
 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">.
 
@@ -1129,7 +1129,7 @@ NOCOMMENT_START
        %<{Hdr:;member}   HTTP reply header list member using ; as
                          list separator. ; can be any non-alphanumeric
                          character.
-       %%                The percent symbol
+       %%                The percent symbol (available from 3.1.17)
        </verb>
 
        <tag>forwarded_for</tag>