From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 9 Feb 2013 07:04:42 +0000 (-0700)
Subject: Polish debugs on more obsolete options
X-Git-Tag: SQUID_3_2_8~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d205e0e8c59cdf2eda379baddc810b2e98f5d4d;p=thirdparty%2Fsquid.git

Polish debugs on more obsolete options
---

diff --git a/src/SwapDir.cc b/src/SwapDir.cc
index a41e474150..cd5e54c48c 100644
--- a/src/SwapDir.cc
+++ b/src/SwapDir.cc
@@ -288,6 +288,10 @@ SwapDir::optionReadOnlyParse(char const *option, const char *value, int isaRecon
     if (strcmp(option, "no-store") != 0 && strcmp(option, "read-only") != 0)
         return false;
 
+    if (strcmp(option, "read-only") == 0) {
+        debugs(3, DBG_PARSE_NOTE(3), "UPGRADE WARNING: Replace cache_dir option 'read-only' with 'no-store'.");
+    }
+
     int read_only = 0;
 
     if (value)
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 8d2ee22dec..1d643c4060 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -190,6 +190,18 @@ DOC_START
 	Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
 DOC_END
 
+NAME: wais_relay_host
+TYPE: obsolete
+DOC_START
+	Replace this line with 'cache_peer' configuration.
+DOC_END
+
+NAME: wais_relay_port
+TYPE: obsolete
+DOC_START
+	Replace this line with 'cache_peer' configuration.
+DOC_END
+
 COMMENT_START
  OPTIONS FOR AUTHENTICATION
  -----------------------------------------------------------------------------