From ed15792642a7597304ade4532b48e8a4d75be7b1 Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Wed, 16 Sep 2015 11:25:21 -0400
Subject: [PATCH 1/3] move the nocookie-udp-size from server statement to
 options

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

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index b2e64eb803..7a74c3d868 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4811,6 +4811,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     <optional> require-server-cookie <replaceable>yes_or_no</replaceable>; </optional>
     <optional> cookie-algorithm <replaceable>secret_string</replaceable>; </optional>
     <optional> cookie-secret <replaceable>secret_string</replaceable>; </optional>
+    <optional> nocookie-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> request-nsid <replaceable>yes_or_no</replaceable>; </optional>
     <optional> rfc2308-type1 <replaceable>yes_or_no</replaceable>; </optional>
     <optional> use-id-pool <replaceable>yes_or_no</replaceable>; </optional>
@@ -6514,6 +6515,19 @@ options {
 	      </listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term><command>nocookie-udp-size</command></term>
+	      <listitem>
+		</para>
+		  The <command>nocookie-udp-size</command> option sets the
+		  maximum size of UDP responses that will be sent to
+		  queries without a valid server COOKIE.  The command
+		  <command>max-udp-size</command> option may further limit
+		  the response size.
+		</para>
+	      </listitem>
+	    </varlistentry>
+
 	    <varlistentry>
 	      <term><command>sit-secret</command></term>
 	      <listitem>
@@ -10799,7 +10813,6 @@ example.com                 CNAME   rpz-tcp-only.
     <optional> edns <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> edns-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> edns-version <replaceable>number</replaceable> ; </optional>
-    <optional> nocookie-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> max-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> tcp-only <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> transfers <replaceable>number</replaceable> ; </optional>
@@ -10964,14 +10977,6 @@ example.com                 CNAME   rpz-tcp-only.
 	    that is blocking large replies from <command>named</command>.
 	  </para>
 
-	  <para>
-	    The <command>nocookie-udp-size</command> option sets the
-	    maximum size of UDP responses that will be sent to
-	    queries without a valid server COOKIE.  The command
-	    <command>max-udp-size</command> option may further limit
-	    the response size.
-	  </para>
-
 	  <para>
 	    The <command>tcp-only</command> option sets the transport
 	    protocol to TCP. The default is to use the UDP transport

From 205c17fd0d1d7a3acf58a6da80f759465b1b76e2 Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Wed, 16 Sep 2015 11:34:56 -0400
Subject: [PATCH 2/3] improve the nocookie-udp-size documentation

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

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 7a74c3d868..e4d61edbb9 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6519,11 +6519,11 @@ options {
 	      <term><command>nocookie-udp-size</command></term>
 	      <listitem>
 		</para>
-		  The <command>nocookie-udp-size</command> option sets the
-		  maximum size of UDP responses that will be sent to
-		  queries without a valid server COOKIE.  The command
-		  <command>max-udp-size</command> option may further limit
-		  the response size.
+		  Sets the maximum size of UDP responses that will be
+		  sent to queries without a valid server COOKIE. A value
+		  below 128 will be silently raised to 128. The default
+		  value is 4096, but the <command>max-udp-size</command>
+		  option may further limit the response size.
 		</para>
 	      </listitem>
 	    </varlistentry>

From f07aac863957edadd8bb3aaebc90cb337ff4551c Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Wed, 16 Sep 2015 10:40:02 -0500
Subject: [PATCH 3/3] fix docbook tag mistake

Fix my mistake in my new branch that I just introduced.
---
 doc/arm/Bv9ARM-book.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index e4d61edbb9..dfee50f144 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6518,7 +6518,7 @@ options {
 	    <varlistentry>
 	      <term><command>nocookie-udp-size</command></term>
 	      <listitem>
-		</para>
+		<para>
 		  Sets the maximum size of UDP responses that will be
 		  sent to queries without a valid server COOKIE. A value
 		  below 128 will be silently raised to 128. The default