From e60076cb255dad2e746377c2eac627f8dae8702e Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 17 Jun 2009 07:02:45 +0000
Subject: [PATCH] Change "dynamic" to "ddns-autoconf" (forgot to do this in the
 ticket, see 19284)

---
 doc/arm/Bv9ARM-book.xml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index d39a78ec41..9748e0cfee 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.413 2009/06/12 02:33:21 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.414 2009/06/17 07:02:45 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -1653,17 +1653,14 @@ controls {
 	Dynamic update is enabled by including an
 	<command>allow-update</command>, <command>update-policy</command>
 	clause in the <command>zone</command> statement, or by setting the
-	<command>dynamic</command> option to <userinput>yes</userinput>
-	and creating a <filename>ddns.key</filename> file (see
-	<command>ddns-confgen</command>.)
+	<command>ddns-autconf</command> option to <userinput>yes</userinput>.
       </para>
       
       <para>
-	If the zone's <command>dynamic</command> option is set to
-	<userinput>yes</userinput>, and if a <filename>ddns.key</filename>
-	file exists and contains a valid TSIG key, and if no other dynamic
-	update policy has been set for the zone, then updates to the zone
-	will be permitted for the key <filename>ddns.key</filename>.
+	If the zone's <command>ddns-autoconf</command> option is set to
+	<userinput>yes</userinput>, then updates to the zone
+	will be permitted for the key <filename>ddns.key</filename>,
+        which will be generated by <command>named</command> at startup.
       </para>
 
       <para>
@@ -9736,15 +9733,14 @@ zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replacea
               </varlistentry>
 
               <varlistentry>
-                <term><command>dynamic</command></term>
+                <term><command>ddns-autoconf</command></term>
                 <listitem>
                   <para>
                     If this flag is set to <userinput>yes</userinput> in
-                    a master zone, <command>named</command> will
-                    automatically generate a TSIG session key for use
+                    a master zone, the zone will be set to allow dynamic
+                    updates using a TSIG session key generated by
+                    <command>named</command> and stored in a file for use
                     by <command>nsupdate -l</command> on the local system,
-                    and the zone will be marked to allow dynamic updates
-                    using this key.
                   </para>
                 </listitem>
               </varlistentry>