Update notes, changes for #1612

(cherry picked from commit e273b95a8b2e2e232391da967e5cc2bd0b65fda5)

diff --git a/CHANGES b/CHANGES
index 07568fccf310bd15a28fae11dfe1daf0fdb18bca..292279d21822bded58a326558cb5c11a6d4ab953 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 5452.  [bug]           The "blackhole" ACL was accidentally disabled with
                        respect to client queries. [GL #1936]
 
+5451.  [func]          Add 'rndc dnssec -status' command. [GL #1612]
+
 5449.  [bug]           Fix a socket shutdown race in netmgr udp. [GL #1938]
 
 5448.  [bug]           Fix a race condition in isc__nm_tcpdns_send().

diff --git a/doc/man/rndc.8in b/doc/man/rndc.8in
index 30e1dd6a0e582f61e06d51040000630b18c69997..dc265a31b0324b5124f39afb8be854293393a096 100644 (file)
--- a/doc/man/rndc.8in
+++ b/doc/man/rndc.8in
@@ -164,7 +164,7 @@ See also \fBrndc addzone\fP and \fBrndc modzone\fP\&.
 .TP
 \fBdnssec\fP [\fB\-status\fP \fIzone\fP [\fIclass\fP [\fIview\fP]]
 Show the DNSSEC signing state for the specified zone.  Requires the
-zone to have a \fBdnssec-policy\fP.
+zone to have a "dnssec\-policy".
 .TP
 \fBdnstap\fP ( \fB\-reopen\fP | \fB\-roll\fP [\fInumber\fP] )
 Close and re\-open DNSTAP output files. \fBrndc dnstap \-reopen\fP allows

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index b226a8f8e1672cc2bf434fc757c5c8e278f25111..f3076de73209ddab7b89539d5016a49945710bfd 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -29,7 +29,9 @@ New Features
 Feature Changes
 ~~~~~~~~~~~~~~~
 
-- None.
+- New ``rndc`` command ``rndc dnssec -status`` that shows the current
+  DNSSEC policy and keys in use, the key states and rollover status.
+  [GL #1612]
 
 Bug Fixes
 ~~~~~~~~~