Note that api-config-dir and include-dir should be the same for dynamic updates of...

Plus fix assorted typos. Fixes #11439

diff --git a/pdns/recursordist/docs/http-api/endpoint-servers-config.rst b/pdns/recursordist/docs/http-api/endpoint-servers-config.rst
index 713402d57759323b58de2552cfd31a55e50b8335..0d96dbd9e83c641244bf83adc742e6b9d4935062 100644 (file)
--- a/pdns/recursordist/docs/http-api/endpoint-servers-config.rst
+++ b/pdns/recursordist/docs/http-api/endpoint-servers-config.rst
@@ -7,6 +7,9 @@
   .. note::
     Only :ref:`setting-allow-from` and :ref:`setting-allow-notify-from` can be set.
 
+  .. note::
+    For configuration changes to work :ref:`setting-include-dir` and :ref:`setting-api-config-dir` should have the same value.
+
   :param server_id: The name of the server
   :param config_setting_name: The name of the setting to change
 

diff --git a/pdns/recursordist/docs/lua-config/proxymapping.rst b/pdns/recursordist/docs/lua-config/proxymapping.rst
index 888494633fa56b97975446e792a1123821c5235f..bd12475ee0a0a07f18dbcfc41ce500cfe26a9c93 100644 (file)
--- a/pdns/recursordist/docs/lua-config/proxymapping.rst
+++ b/pdns/recursordist/docs/lua-config/proxymapping.rst
@@ -37,7 +37,7 @@ The following function is available to configure table based proxy mapping.
 Reloading the Lua configuration will replace the current configuration with the new one.
 If the subnets specified in multiple :func:`addProxyMapping` calls overlap, the most specific one is used.
 By default, the address *before* mapping ``S`` is used for internal logging and ``Protobuf`` messages.
-See :func:`protobufServer` on how to tune the source address logged in ``Protobuf` messages.
+See :func:`protobufServer` on how to tune the source address logged in ``Protobuf`` messages.
 
 .. function:: addProxyMapping(subnet, ip)
 

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index b0ce7271e079ae350d1b9db2116d421d8ab8971e..5c54e02098ebeec494db646d9547f0368bcb7484 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -154,6 +154,7 @@ Allow ``trustanchor.server CH TXT`` and ``negativetrustanchor.server CH TXT`` qu
 -  Default: unset
 
 Directory where the REST API stores its configuration and zones.
+For configuration updates to work, :ref:`setting-include-dir` should have the same value.
 
 .. _setting-api-key:
 

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 17fc67694b4ee3729e1a7032c7d28549253eaea0..281efe35e448962e7d3cd6a23caa919cdef45e42 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -20,7 +20,7 @@ This has the consequence that authoritative nameservers will be contacted over I
 
 New settings
 ^^^^^^^^^^^^
-- The :ref:`settings-save-parent-ns-set` setting has been introduced, enabling fallback cases if the parent ``NS`` set contains names not in the child ``NS`` set.
+- The :ref:`setting-save-parent-ns-set` setting has been introduced, enabling fallback cases if the parent ``NS`` set contains names not in the child ``NS`` set.
 
 Deprecated and changed settings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^