Mention dnstapNODFrameStreamServer

diff --git a/pdns/recursordist/docs/lua-config/protobuf.rst b/pdns/recursordist/docs/lua-config/protobuf.rst
index 4e72b35e358e21f6738fa7feb9b1941450753be9..82804f0ae235425ac8dd4c941e6727c02e9c82e1 100644 (file)
--- a/pdns/recursordist/docs/lua-config/protobuf.rst
+++ b/pdns/recursordist/docs/lua-config/protobuf.rst
@@ -139,7 +139,7 @@ The recursor must have been built with configure ``--enable-dnstap`` to make thi
   * ``queueNotifyThreshold=0``: unsigned
   * ``reopenInterval=0``: unsigned
 
-.. function:: dnstapNODFrameStreamServer(servers, [, options])
+.. function:: dnstapNODFrameStreamServer(servers [, options])
 
   .. versionadded:: 4.8.0
 

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 7e3bef496a1ae79a8649aa2ba95995024ade1e31..b6d65e75a0e9dfde32795de0e3b82aba6f89909f 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -14,11 +14,6 @@ Switch to old style logging by setting the :ref:`setting-structured-logging` set
 When using ``systemd``, structured logging information will be sent to ``journald`` using formatted text strings that list the key-value pairs and are human readable.
 Switch to native key-value pair logging (more suitable for automated log processing) by setting :ref:`setting-structured-logging-backend` on the command line to ``systemd-journal``.
 
-XPF Removed
-^^^^^^^^^^^
-The experimental XPF support was removed.
-If you are using this feature, switch to the Proxy Protocol (:ref:`setting-proxy-protocol-from`).
-
 New settings
 ^^^^^^^^^^^^
 - The :ref:`setting-max-ns-per-resolve` setting to limit the number of NS records processed to resolve a name has been introduced.
@@ -27,11 +22,6 @@ New settings
 - The :ref:`setting-edns-padding-out` setting to control EDNS padding for outgoing DoT has been introduced.
 - The :ref:`setting-structured-logging-backend` setting to control the type of structured logging to ``journald`` has been introduced.
 
-Removed settings
-^^^^^^^^^^^^^^^^
-- The :ref:`setting-xpf-allow-from` setting was removed
-- The :ref:`setting-xpf-rr-code` setting was removed.
-
 :program:`pdns_recursor` changes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 THe ``--config`` command line option now implements the ``check``, ``default`` and ``diff`` keywords.
@@ -179,7 +169,6 @@ That means that they will be answered with ``127.0.0.1``, ``::1`` or a negative
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 For the commands that write to a file, the file to be dumped to is now opened by the :program:`rec_control` command itself using the credentials and the current working directory of the user running :program:`rec_control`.
 A single minus *-* can be used as a filename to write the data to the standard output stream.
-Additionally, a single minus *-* can be used as a filename to write the data to the standard output stream.
 Previously the file was opened by the recursor, possibly in its chroot environment.
 
 New settings