Polish debugs on more obsolete options

diff --git a/src/SwapDir.cc b/src/SwapDir.cc
index 384125dc51b7ee569a26a8e302481b51bfe28431..6a89039d990e5c5d9b85b3d5662686edf3f34246 100644 (file)
--- a/src/SwapDir.cc
+++ b/src/SwapDir.cc
@@ -290,6 +290,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'.");
+    }
+
     bool read_only = 0;
 
     if (value)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 14739ffc0df7da5ab409106ca7ea4879547a1a20..0d53a8f5951338270162a3a722d90a0b07dd2aec 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -198,6 +198,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
  -----------------------------------------------------------------------------