From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 31 Jan 2015 16:34:08 +0000 (-0800)
Subject: Docs: removal of log_access and log_icap in 3.4
X-Git-Tag: merge-candidate-3-v1~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8f70484e33c33d66c01ebc12f3a4ffb1cffa0c9;p=thirdparty%2Fsquid.git

Docs: removal of log_access and log_icap in 3.4
---

diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml
index 503790bcb5..d4ff5ee079 100644
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -347,6 +347,12 @@ This section gives a thorough account of those changes in three categories:
 <sect1>Removed tags<label id="removedtags">
 <p>
 <descrip>
+	<tag>log_access</tag>
+	<p>Removed. Use access_log with ACLs instead
+
+	<tag>log_icap</tag>
+	<p>Removed. Use icap_log with ACLs instead
+
 	<tag>storeurl_access</tag>
 	<p>Replaced by <em>store_id_access</em>.
 
diff --git a/src/cf.data.pre b/src/cf.data.pre
index b780dd11c4..2ba9e26c79 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -155,6 +155,7 @@ DOC_START
 	Remove this line. Use always_direct or cache_peer_access ACLs instead if you need to prevent cache_peer use.
 DOC_END
 
+# Options removed in 3.4
 NAME: log_access
 TYPE: obsolete
 DOC_START