Remove leftover 'dnssec-keys' references

The option 'dnssec-keys' was introduced in 9.15 and also renamed to
'trust-anchors'. Rename the leftover references to 'trust-anchors'.

(cherry picked from commit e6b335c2ab6ae106718c18595afbe5945b1cc905)

diff --git a/doc/arm/managed-keys.rst b/doc/arm/managed-keys.rst
index c9f75461ef6d1db1db3191395b50e5b33447d44a..42aa722e2802fbfb1f4f4241ea06b9618155b027 100644 (file)
--- a/doc/arm/managed-keys.rst
+++ b/doc/arm/managed-keys.rst
@@ -32,7 +32,7 @@ Validating Resolver
 ~~~~~~~~~~~~~~~~~~~
 
 To configure a validating resolver to use :rfc:`5011` to maintain a trust
-anchor, configure the trust anchor using a ``dnssec-keys`` statement and
+anchor, configure the trust anchor using a ``trust-anchors`` statement and
 the ``initial-key`` keyword. Information about this can be found in
 :ref:`trust-anchors`.
 

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 236df957dda8523aa6ee4c1b1dc92e8316211ed5..0f34930543daaf109ba9203faf29075e7059726a 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1887,10 +1887,10 @@ Boolean Options
 ``trust-anchor-telemetry``
    This causes ``named`` to send specially formed queries once per day to
    domains for which trust anchors have been configured via, e.g.,
-   ``dnssec-keys`` or ``dnssec-validation auto``.
+   ``trust-anchors`` or ``dnssec-validation auto``.
 
    The query name used for these queries has the form
-   "_ta-xxxx(-xxxx)(...)".<domain>, where each "xxxx" is a group of four
+   ``_ta-xxxx(-xxxx)(...).<domain>``, where each "xxxx" is a group of four
    hexadecimal digits representing the key ID of a trusted DNSSEC key.
    The key IDs for each domain are sorted smallest to largest prior to
    encoding. The query type is NULL.
@@ -4643,7 +4643,7 @@ not used to validate answers; it is superseded by the key or keys stored
 in the managed keys database.
 
 The next time ``named`` runs after an ``initial-key`` or ``initial-ds`` has been *removed*
-from the ``dnssec-keys`` statement (or changed to a ``static-key`` or ``static-ds``), the
+from the ``trust-anchors`` statement (or changed to a ``static-key`` or ``static-ds``), the
 corresponding zone is removed from the managed keys database, and
 :rfc:`5011` key maintenance is no longer used for that domain.