------------------------------------------------------------
revno: 13525
revision-id: squid3@treenet.co.nz-20140802134547-21jwh4ct2haosi92
parent: squid3@treenet.co.nz-20140802130128-kzs2ai9tuodyf9t9
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sat 2014-08-02 06:45:47 -0700
message:
  Docs: cleanup obsolete directive listings
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140802134547-21jwh4ct2haosi92
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 64ebc30063046b23635b6cdb669b0be335f8c8af
# timestamp: 2014-08-02 13:54:22 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140802130128-\
#   kzs2ai9tuodyf9t9
# 
# Begin patch
=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2014-08-02 13:01:28 +0000
+++ src/cf.data.pre	2014-08-02 13:45:47 +0000
@@ -176,6 +176,19 @@
 	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
+	Remove this line. Use acls with access_log directives to control access logging
+DOC_END
+
+NAME: log_icap
+TYPE: obsolete
+DOC_START
+	Remove this line. Use acls with icap_log directives to control icap logging
+DOC_END
+
 # Options Removed in 3.3
 NAME: ignore_ims_on_miss
 TYPE: obsolete
@@ -184,30 +197,60 @@
 DOC_END
 
 # Options Removed in 3.2
-NAME: ignore_expect_100
-TYPE: obsolete
-DOC_START
-	Remove this line. The HTTP/1.1 feature is now fully supported by default.
-DOC_END
-
 NAME: dns_v4_fallback
 TYPE: obsolete
 DOC_START
 	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
 DOC_END
 
+NAME: emulate_httpd_log
+TYPE: obsolete
+DOC_START
+	Replace this with an access_log directive using the format 'common' or 'combined'.
+DOC_END
+
+NAME: forward_log
+TYPE: obsolete
+DOC_START
+	Use a regular access.log with ACL limiting it to MISS events.
+DOC_END
+
 NAME: ftp_list_width
 TYPE: obsolete
 DOC_START
 	Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
 DOC_END
 
+NAME: ignore_expect_100
+TYPE: obsolete
+DOC_START
+	Remove this line. The HTTP/1.1 feature is now fully supported by default.
+DOC_END
+
+NAME: log_fqdn
+TYPE: obsolete
+DOC_START
+	Remove this option from your config. To log FQDN use %>A in the log format.
+DOC_END
+
+NAME: log_ip_on_direct
+TYPE: obsolete
+DOC_START
+	Remove this option from your config. To log server or peer names use %<A in the log format.
+DOC_END
+
 NAME: maximum_single_addr_tries
 TYPE: obsolete
 DOC_START
 	Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
 DOC_END
 
+NAME: referer_log referrer_log
+TYPE: obsolete
+DOC_START
+	Replace this with an access_log directive using the format 'referrer'.
+DOC_END
+
 NAME: update_headers
 TYPE: obsolete
 DOC_START
@@ -220,6 +263,12 @@
 	Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
 DOC_END
 
+NAME: useragent_log
+TYPE: obsolete
+DOC_START
+	Replace this with an access_log directive using the format 'useragent'.
+DOC_END
+
 # Options Removed in 3.1
 NAME: dns_testnames
 TYPE: obsolete
@@ -4113,18 +4162,6 @@
 	No responses is expected.
 DOC_END
 
-NAME: log_access
-TYPE: obsolete
-DOC_START
-	Remove this line. Use acls with access_log directives to control access logging
-DOC_END
-
-NAME: log_icap
-TYPE: obsolete
-DOC_START
-	Remove this line. Use acls with icap_log directives to control icap logging
-DOC_END
-
 NAME: stats_collection
 TYPE: acl_access
 LOC: Config.accessList.stats_collection
@@ -4216,18 +4253,6 @@
 	that log can be rotated separately by using debug_options.
 DOC_END
 
-NAME: emulate_httpd_log
-TYPE: obsolete
-DOC_START
-	Replace this with an access_log directive using the format 'common' or 'combined'.
-DOC_END
-
-NAME: log_ip_on_direct
-TYPE: obsolete
-DOC_START
-	Remove this option from your config. To log server or peer names use %<A in the log format.
-DOC_END
-
 NAME: mime_table
 TYPE: string
 DEFAULT: @DEFAULT_MIME_TABLE@
@@ -4252,18 +4277,6 @@
 	formats).  To enable this logging set log_mime_hdrs to 'on'.
 DOC_END
 
-NAME: useragent_log
-TYPE: obsolete
-DOC_START
-	Replace this with an access_log directive using the format 'useragent'.
-DOC_END
-
-NAME: referer_log referrer_log
-TYPE: obsolete
-DOC_START
-	Replace this with an access_log directive using the format 'referrer'.
-DOC_END
-
 NAME: pid_filename
 TYPE: string
 DEFAULT: @DEFAULT_PID_FILE@
@@ -4272,12 +4285,6 @@
 	A filename to write the process-id to.  To disable, enter "none".
 DOC_END
 
-NAME: log_fqdn
-TYPE: obsolete
-DOC_START
-	Remove this option from your config. To log FQDN use %>A in the log format.
-DOC_END
-
 NAME: client_netmask
 TYPE: address
 LOC: Config.Addrs.client_netmask
@@ -4290,12 +4297,6 @@
 	the last digit set to '0'.
 DOC_END
 
-NAME: forward_log
-TYPE: obsolete
-DOC_START
-	Use a regular access.log with ACL limiting it to MISS events.
-DOC_END
-
 NAME: strip_query_terms
 TYPE: onoff
 LOC: Config.onoff.strip_query_terms