From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Jan 2014 03:04:03 +0000 (-0800)
Subject: Release Notes update for 2.5
X-Git-Tag: SQUID_3_5_0_1~436
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f5964c375ca25cc5b0da49e4a6812fe11679707;p=thirdparty%2Fsquid.git

Release Notes update for 2.5
---

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index f8dbc8fde3..48888bb54f 100644
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -95,7 +95,18 @@ This section gives a thorough account of those changes in three categories:
 <sect1>New tags<label id="newtags">
 <p>
 <descrip>
-	<p><em>There are no removed squid.conf directives in Squid-3.5.</em>
+	<tag>collapsed_forwarding</tag>
+	<p>Ported from Squid-2 with no configuration or visible behaviour changes.
+           Collapsing of requests is performed across SMP workers.
+
+	<tag>send_hit</tag>
+	<p>New configuration directive to enable/disable sending cached content
+	   based on ACL selection. ACL can be based on client request or cached
+	   response details.
+
+	<tag>store_miss</tag>
+	<p>New configuration directive to enable/disable caching of MISS responses.
+	   ACL can be based on any request or response details.
 
 </descrip>
 
@@ -211,9 +222,6 @@ This section gives an account of those changes in three categories:
 	<tag>cache_vary</tag>
 	<p>Not yet ported from 2.6
 
-	<tag>collapsed_forwarding</tag>
-	<p>Not yet ported from 2.6
-
 	<tag>error_map</tag>
 	<p>Not yet ported from 2.6