Replace two leftover ttlval with duration

Since the introduction of durations, all ttlval configuration types
are replaced with durations.  Duration is an ISO 8601 duration, a
TTL-style value, or a number.  These two references were missed and
are now also replaced.

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index e07c2b80498f7f264a7aca3ba9d51d551946aa53..b31a3af32abd96d76a5efc66c8147f978444fc6d 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -1017,7 +1017,7 @@ zone <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
 
     <literallayout class="normal">
 dnssec-policy <replaceable>string</replaceable> {
-       dnskey-ttl <replaceable>ttlval</replaceable>;
+       dnskey-ttl <replaceable>duration</replaceable>;
        keys { ( csk | ksk | zsk ) key-directory lifetime <replaceable>duration</replaceable> algorithm <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ] ; ... };
        parent-ds-ttl <replaceable>duration</replaceable>;
        parent-propagation-delay <replaceable>duration</replaceable>;

diff --git a/doc/arm/dnssec-policy.grammar.xml b/doc/arm/dnssec-policy.grammar.xml
index c7df40c4d3dd2f130e9360dd54eb5843e1c771c0..20bc9300971c47b51053736c610da3fd49a5d461 100644 (file)
--- a/doc/arm/dnssec-policy.grammar.xml
+++ b/doc/arm/dnssec-policy.grammar.xml
@@ -13,7 +13,7 @@
 
 <programlisting>
 <command>dnssec-policy</command> <replaceable>string</replaceable> {
-    <command>dnskey-ttl</command> <replaceable>ttlval</replaceable>;
+    <command>dnskey-ttl</command> <replaceable>duration</replaceable>;
     <command>keys</command> { ( csk | ksk | zsk ) key-directory <replaceable>duration</replaceable> <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ] ; ... };
     <command>parent-ds-ttl</command> <replaceable>duration</replaceable>;
     <command>parent-propagation-delay</command> <replaceable>duration</replaceable>;