rec: better phrased --enable-old-settings warning

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 03ee74ce2605a7f12353817e32f29acb4b044008..2c0f123617b89135327a1ef1b480b7d63b1a7305 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -3271,9 +3271,11 @@ int main(int argc, char** argv)
       }
       else {
         if (!::arg().mustDo("enable-old-settings")) {
-          startupLog->info(Logr::Error, "Old-style settings syntax not enabled by default anymore. Use YAML or enable with --enable-old-settings on the command line", "configname", Logging::Loggable(configname));
+          startupLog->info(Logr::Error, "Old-style settings syntax not supported by default anymore", "configname", Logging::Loggable(configname));
+          startupLog->info(Logr::Error, "Convert to YAML settings. If not feasible use --enable-old-settings on the command line. This option will be removed in a future release.");
           return EXIT_FAILURE;
         }
+        startupLog->info(Logr::Warning, "Convert to YAML settings. The --enable-old-settings option on the command line will be removed in a future release.");
       }
     }
 

diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/settings/docs-new-preamble-in.rst
index 602e369118decf4fccea48f6cbcbf7d58d838266..8eed3fe3fd890179d43ccd67e10062eb485e0a01 100644 (file)
--- a/pdns/recursordist/settings/docs-new-preamble-in.rst
+++ b/pdns/recursordist/settings/docs-new-preamble-in.rst
@@ -162,7 +162,7 @@ A forward zone is defined as:
     - Socket Address
     - ...
   recurse: Boolean, default false
-  allow_notify: Boolean, default false
+  notify_allowed: Boolean, default false
 
 An example of a ``forward_zones`` entry, which consists of a sequence of `Forward Zone`_ entries:
 
@@ -499,7 +499,7 @@ As of version 5.2.0, a forwarding catalog zone entry is defined as:
      - name: optional group name
        forwarders: [] Sequence of SocketAddress
        recurse: bool, default false
-       notify: bool, default false
+       notify_allowed: bool, default false
 
 Names instead of IP addresess can be used for ``addresses`` if :ref:`setting-yaml-recursor.system_resolver_ttl` is set.
 An example of a :ref:`setting-yaml-recursor.forwarding_catalog_zones` entry, which is a sequence of `ForwardingCatalogZone`_: