Docs of new behaviour: do not do old-style by default

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index b289f4b4487fde2184ebefbf4bd0c662b7b48df6..0cf825a6122db945265a1d96302399afe5ba024e 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -4,19 +4,14 @@ Upgrade Guide
 Before upgrading, it is advised to read the :doc:`changelog/index`.
 When upgrading several versions, please read **all** notes applying to the upgrade.
 
-5.1.1 to 5.1.2, 5.0.8 to 5.0.9 and 4.9.8 to 4.9.9
--------------------------------------------------
-
-New settings
-^^^^^^^^^^^^
-- The :ref:`setting-yaml-recordcache.max_rrset_size` setting has been introduced to limit the number of records in a result set.
-- The :ref:`setting-yaml-recordcache.limit_qtype_any` setting has been introduced to limit the number of records in answers to ANY queries.
-
 5.1.0 to master
 ----------------
 
 Changed behaviour
 ^^^^^^^^^^^^^^^^^
+Parsing of old-style settings is no longer enabled by default.
+Convert to YAML or pass ``--enable-old-settings` on the command line.
+
 The way :ref:`setting-yaml-incoming.max_tcp_clients` is enforced has changed.
 If there are too many incoming TCP connections, new connections will be accepted but then closed immediately.
 Previously, excess connections would linger in the OS listen queue until timeout or until processing of incoming TCP connections resumed due to the number of connections being processed dropping below the limit.
@@ -25,6 +20,14 @@ There is a new metric ``tcp-overflow`` that counts the connections closed immedi
 The ``outqueries-per-query`` value reported in the log by the periodic statistics function is now reported as ``outqueries-per-query-perc`` as it is a percentage.
 A value of 1 means that on average each 100 incoming queries lead to a single query to an authoritative server.
 
+5.1.1 to 5.1.2, 5.0.8 to 5.0.9 and 4.9.8 to 4.9.9
+-------------------------------------------------
+
+New settings
+^^^^^^^^^^^^
+- The :ref:`setting-yaml-recordcache.max_rrset_size` setting has been introduced to limit the number of records in a result set.
+- The :ref:`setting-yaml-recordcache.limit_qtype_any` setting has been introduced to limit the number of records in answers to ANY queries.
+
 5.0.6 to 5.1.0
 --------------
 

diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/settings/docs-new-preamble-in.rst
index 94aa4a222a3f0139485ad4da3a68003b9a7be7b3..28faf8e846197bfde8430568e82e0d9d21a47ac3 100644 (file)
--- a/pdns/recursordist/settings/docs-new-preamble-in.rst
+++ b/pdns/recursordist/settings/docs-new-preamble-in.rst
@@ -16,7 +16,7 @@ Settings on the command line are processed after the file-based settings are pro
    if that fails, it will be processed as old-style configuration.
    Packages will stop installing a old-style ``recursor.conf`` file and start installing a default ``recursor.conf`` file containing YAML syntax.
 
-   With the release of 5.2.0, the default will be to expect a YAML configuration file and reading of old-style ``recursor.conf`` files will have to be enabled specifically by providing a command line option.
+   With the release of 5.2.0, the default will be to expect a YAML configuration file and reading of old-style ``recursor.conf`` files will have to be enabled specifically by providing a command line option ``--enable-old-settings``.
 
    In a future release support for the "old-style" ``recursor.conf`` settings file will be dropped.
 

diff --git a/pdns/recursordist/settings/docs-old-preamble-in.rst b/pdns/recursordist/settings/docs-old-preamble-in.rst
index 297d542d72bae03cadeaa8a2938a45b0992d99e1..e3f12a5be352237d807b44bae9aceb498855102d 100644 (file)
--- a/pdns/recursordist/settings/docs-old-preamble-in.rst
+++ b/pdns/recursordist/settings/docs-old-preamble-in.rst
@@ -6,7 +6,8 @@ The command line overrides the configuration file.
 .. note::
    Starting with version 5.0.0, :program:`Recursor` supports a new YAML syntax for configuration files.
    A configuration using the old style syntax can be converted to a YAML configuration using the instructions in :doc:`appendices/yamlconversion`.
-   In a future release support for the "old-style" settings described here will be dropped.
+   Starting with version 5.2.0, parsing of old-style settings must be explicitly enabled using a command line argument ``--enable-old-settings`.
+   In a future release support for the old-style settings described here will be dropped.
    See :doc:`yamlsettings` for details.
 
 .. note::