From be42a3b1abcf47ef2962c104d9da8c1e49df5884 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Fri, 21 May 2021 15:32:41 +0200 Subject: [PATCH] Correctly update local-ipv6 deprecation info --- docs/settings.rst | 2 +- docs/upgrading.rst | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index ba875f02b2..fc9524cba9 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -817,7 +817,7 @@ Fail to start if one or more of the ``local-ipv6`` -------------- .. deprecated:: 4.5.0 - Remove, use :ref:`setting-local-address` + Use :ref:`setting-local-address` instead .. _setting-local-ipv6-nonexist-fail: diff --git a/docs/upgrading.rst b/docs/upgrading.rst index b80049b466..38f290762a 100644 --- a/docs/upgrading.rst +++ b/docs/upgrading.rst @@ -26,9 +26,12 @@ Then, disable the setting again, because it has a serious performance impact on On secondaries, it is recommended to re-transfer, using ``pdns_control retrieve ZONE``, with :ref:`setting-upgrade-unknown-types` enabled, all zones that have records of those types, or ``TYPExx``, for numbers 45 and 62. Leave the setting on until all zones have been re-transferred. -Wording changes +Changed options ^^^^^^^^^^^^^^^ +Renamed options +~~~~~~~~~~~~~~~ + Various settings have been renamed. Their old names still work in 4.5.x, but will be removed in the release after it. @@ -47,6 +50,10 @@ Changed defaults - The default value of the :ref:`setting-max-nsec3-iterations` option has been changed from ``500`` to ``100``. - The default value of the ``timeout`` parameter for :func:`ifportup` and :func:`ifurlup` functions has been changed from ``1`` to ``2`` seconds. +Removed options +~~~~~~~~~~~~~~~ +- :ref:`setting-local-ipv6` has been removed. IPv4 and IPv6 listen addresses should now be set with :ref:`setting-local-address`. + 4.3.x to 4.4.0 -------------- @@ -186,10 +193,14 @@ New settings This sets the maximum number of steps that will be performed when loading a BIND zone with the ``$GENERATE`` directive. The default is 0, which is unlimited. -Removed settings -^^^^^^^^^^^^^^^^ +Deprecated settings +^^^^^^^^^^^^^^^^^^^ -- :ref:`setting-local-ipv6` has been deprecated, and will be removed in 4.4.0. IPv4 and IPv6 listen addresses can now be set with :ref:`setting-local-address`. The default for the latter has been changed to ``0.0.0.0, ::``. +- :ref:`setting-local-ipv6` has been deprecated and will be removed in 4.5.0. Both IPv4 and IPv6 listen addresses can now be set with :ref:`setting-local-address`. The default for the latter has been changed to ``0.0.0.0, ::``. + +Changed defaults +^^^^^^^^^^^^^^^^ +- :ref:`setting-local-address` now defaults to ``0.0.0.0, ::``. Schema changes ^^^^^^^^^^^^^^ -- 2.47.2