Upgrade guide and doc tweaks

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index d20a5c28265665edc1e7562b3c60844ea694c7e8..6a41ce1aa1660ee53f012aa163c4d068711955f1 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -881,7 +881,12 @@ If set, EDNS options in incoming queries are extracted and passed to the :func:`
 -  Path
 -  Default: empty
 
+.. versionchanged:: 4.7.0
+
+  Introduced the value ``no`` to disable root-hints processing.
+
 If set, the root-hints are read from this file. If empty, the default built-in root hints are used.
+
 In some special cases, processing the root hints is not needed, for example when forwarding all queries to another recursor.
 For these special cases, it is possible to disable the processing of root hints by setting the value to ``no``.
 

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 9851323dc29a5dfe4441a79ff246818ac077a981..2d7363542afc689e89e8521cbc19d67b7b5186ba 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -4,8 +4,15 @@ 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.
 
-4.5.x to 4.6.0 or master
-------------------------
+4.6.x to master
+---------------
+
+Deprecated and changed settings
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-  The :ref:`setting-hint-file` gained a special value ``no`` to indicate that no hint file should not processed.
+
+4.5.x to 4.6.0
+--------------
 
 Offensive language
 ^^^^^^^^^^^^^^^^^^