From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 2 Aug 2014 13:45:47 +0000 (-0700)
Subject: Docs: cleanup obsolete directive listings
X-Git-Tag: SQUID_3_5_0_1~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74d81220fe02ad9d91593366d4d7ee1176bd6476;p=thirdparty%2Fsquid.git

Docs: cleanup obsolete directive listings
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 526776f45c..19bd8656b8 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -176,6 +176,19 @@ 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
+	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,16 +197,22 @@ DOC_START
 DOC_END
 
 # Options Removed in 3.2
-NAME: ignore_expect_100
+NAME: dns_v4_fallback
 TYPE: obsolete
 DOC_START
-	Remove this line. The HTTP/1.1 feature is now fully supported by default.
+	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
 DOC_END
 
-NAME: dns_v4_fallback
+NAME: emulate_httpd_log
 TYPE: obsolete
 DOC_START
-	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
+	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
@@ -202,12 +221,36 @@ 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 @@ DOC_START
 	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 @@ DOC_START
 	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 @@ DOC_START
 	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 @@ DOC_START
 	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 @@ DOC_START
 	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 @@ DOC_START
 	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