CHANGES and release note for [GL #2918]

diff --git a/CHANGES b/CHANGES
index 829500559e971985d7461dbc59ac570140595642..3beb71654710d3228572cca2895649a6e74682db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+5929.  [func]          The use of the "max-zone-ttl" option in "zone" and
+                       "options" blocks is now deprecated; this should
+                       now be configured as part of "dnssec-policy"
+                       instead. The old option still works in zones
+                       with no "dnssec-policy" configured, but a warning
+                       will be logged when loading configuration. Its
+                       functionality will be removed in a future release.
+                       Using "max-zone-ttl" and "dnssec-policy" in the
+                       same zone is now a fatal error. [GL #2918]
+
 5928.  [placeholder]
 
 5927.  [bug]           A race was possible in dns_dispatch_connect()

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index b604010fcc0430f99739564ee1193f1975656300..acbec4e529c5bab95978ec71afed1bedccdb928e 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -32,6 +32,12 @@ Removed Features
 
 - None.
 
+- The use of the ``max-zone-ttl`` option in ``options`` and ``zone``
+  blocks has been deprecated; it should now be configured as part of
+  ``dnssec-policy``. A warning is logged if this option is used in
+  ``options`` or ``zone``. In a future release, it will become
+  nonoperational. :gl:`#2918`
+
 Feature Changes
 ~~~~~~~~~~~~~~~