From: Evan Hunt <each@isc.org>
Date: Thu, 10 Jan 2013 19:59:21 +0000 (-0800)
Subject: [master] clarify managed-keys syntax
X-Git-Tag: v9.10.0a1~587
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54ca2413348024c6d03904c01486c952c3d4a3bc;p=thirdparty%2Fbind9.git

[master] clarify managed-keys syntax
---

diff --git a/CHANGES b/CHANGES
index 1d660d50ffc..aff42394e87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3463.	[doc]		Clarify managed-keys syntax in ARM. [RT 32232]
+
+3462.	[doc]		Clarify server selection behavior of dig when using
+			-4 or -6 options. [RT #32181]
+
 3461.	[bug]		Negative responses could incorrectly have AD=1
 			set. [RT #32237]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 47c2c7d42eb..47826a1b492 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -10239,8 +10239,8 @@ ns.domain.com.rpz-nsdname   CNAME   .
           <title><command>managed-keys</command> Statement Grammar</title>
 
 <programlisting><command>managed-keys</command> {
-    <replaceable>string</replaceable> initial-key <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ;
-    <optional> <replaceable>string</replaceable> initial-key <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ; <optional>...</optional></optional>
+    <replaceable>name</replaceable> <literal>initial-key</literal> <replaceable>flags</replaceable> <replaceable>protocol</replaceable> <replaceable>algorithm</replaceable> <replaceable>key-data</replaceable> ;
+    <optional> <replaceable>name</replaceable> <literal>initial-key</literal> <replaceable>flags</replaceable> <replaceable>protocol</replaceable> <replaceable>algorithm</replaceable> <replaceable>key-data</replaceable> ; <optional>...</optional></optional>
 };
 </programlisting>
 
@@ -10348,13 +10348,16 @@ ns.domain.com.rpz-nsdname   CNAME   .
             <command>named</command>.)
 	  </para>
 	  <para>
-	    If the <command>dnssec-lookaside</command> option is
+	    If the <command>dnssec-validation</command> option is
 	    set to <userinput>auto</userinput>, <command>named</command>
 	    will automatically initialize a managed key for the
-	    zone <literal>dlv.isc.org</literal>.  The key that is
-	    used to initialize the key maintenance process is built
-	    into <command>named</command>, and can be overridden
-	    from <command>bindkeys-file</command>.
+            root zone.  Similarly, if the <command>dnssec-lookaside</command>
+            option is set to <userinput>auto</userinput>,
+            <command>named</command> will automatically initialize
+            a managed key for the zone <literal>dlv.isc.org</literal>.
+            In both cases, the key that is used to initialize the key
+            maintenance process is built into <command>named</command>,
+            and can be overridden from <command>bindkeys-file</command>.
 	  </para>
 	</sect2>