CHANGES and release note for [GL #3700]

diff --git a/CHANGES b/CHANGES
index a5e1482b856f9c4513bb938dbf5d20ecebde8724..e2dd7d298def3276c8c70a90f90499e511f6ceb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6220.  [func]          Deprecate the 'dialup' and 'heartbeat-interval'
+                       options. [GL #3700]
+
 6219.  [bug]           Ignore 'max-zone-ttl' on 'dnssec-policy insecure'.
                        [GL #4032]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 6901989603697e025e287f52a911b56f9e8d80a6..312e07bfffb5c7cedec7bcb81b48b15ddd505d4e 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -27,9 +27,12 @@ Removed Features
 
 - The 'auto-dnssec' configuration option has now been removed. Please
   use :any:`dnssec-policy` or manual signing instead. The following options
-  have become obsolete: :any:`dnskey-sig-validity`, :any:`dnssec-dnskey-kskonly`,
-  :any:`dnssec-update-mode`, :any:`sig-validity-interval`, and
-  :any:`update-check-ksk`. :gl:`#3672`.
+  have become obsolete: :any:`dnskey-sig-validity`,
+  :any:`dnssec-dnskey-kskonly`, :any:`dnssec-update-mode`,
+  :any:`sig-validity-interval`, and :any:`update-check-ksk`. :gl:`#3672`.
+
+- The :any:`dialup` and :any:`heartbeat-interval` options have been
+  deprecated and will be removed in a future release. :gl:`#3700`
 
 Feature Changes
 ~~~~~~~~~~~~~~~