Update CHANGES and doc to reflect changes in master

diff --git a/CHANGES b/CHANGES
index d6b353b0aeda0442b0491cccc9f5b591875b3034..318c9d32c8f7abcc1565e282e8811e815f864f34 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4983.  [func]          Add the ability to not return a DNS COOKIE option
+                       when one is present in the request (answer-cookie no;).
+                       [GL #173]
+
 4982.  [cleanup]       Return FORMERR if the question section is empty
                        and no COOKIE option is present; this restores
                        older behavior except in the newly specified
@@ -48,9 +52,7 @@
 
 4967.  [cleanup]       Add "answer-cookie" to the parser, marked obsolete.
 
-4966.  [func]          Add the ability to not return a DNS COOKIE option
-                       when one is present in the request (answer-cookie no;).
-                       [GL #173]
+4966.  [placeholder]
 
 4965.  [func]          Add support for marking options as deprecated.
                        [GL #322]

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index c5037334eca321df2ad06a0e9dc2d3ce911a7b22..9aa63163e9be3281bbf8f26b74e078d7fc0be199 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6112,15 +6112,15 @@ options {
                  options level, not per-view.
                </para>
                <para>
-                 <command>answer-cookie</command> is only intended as an
-                 available measure, for use when <command>named</command>
+                 <command>answer-cookie no</command> is intended as a
+                 temporary measure, for use when <command>named</command>
                  shares an IP address with other servers that do not yet
                  support DNS COOKIE.  A mismatch between servers on the same
-                 address is not expected to cause operational problems, but the
-                 option to disable COOKIE responses so that all servers have
-                 the same behavior is provided out of an abundance of
-                 caution. DNS COOKIE is an important security mechanism and
-                 should not be disabled unless absolutely necessary.
+                 address is not expected to cause operational problems, but
+                 the option to disable COOKIE responses so that all servers
+                 have the same behavior is provided out of an abundance of
+                 caution. DNS COOKIE is an important security mechanism,
+                 and should not be disabled unless absolutely necessary.
                </para>
              </listitem>
            </varlistentry>

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 8efcdd6564604ee205e3da30de17f0f7c7f94c34..42e724fa1d9c2a9be89ea16e4cda96cea9448715 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -208,13 +208,13 @@
          add 'answer-cookie no;' to named.conf. [GL #173]
        </para>
        <para>
-         <command>answer-cookie</command> is only intended as an available
+         <command>answer-cookie</command> is only intended as a temporary
          measure, for use when <command>named</command> shares an IP address
          with other servers that do not yet support DNS COOKIE.  A mismatch
          between servers on the same address is not expected to cause
          operational problems, but the option to disable COOKIE responses so
          that all servers have the same behavior is provided out of an
-         abundance of caution. DNS COOKIE is an important security mechanism
+         abundance of caution. DNS COOKIE is an important security mechanism,
          and should not be disabled unless absolutely necessary.
        </para>
       </listitem>