From 7eaaf0be97e920f58a4b2b84dc770f1e89b1b657 Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Mon, 21 Sep 2015 09:34:29 -0500
Subject: [PATCH] move nosit-udp-size doc

This is for ticket #39570.
I didn't have this reviewed for v9_10, but was reviewed for the
master but had different option names.

Moved some docs from server statement to options.
While there add a missing related option from grammar.
Also improved docs a little for nosit-udp-size.

Note I didn't add a changelog entry. The documentation was already
there and only modified a little.
---
 doc/arm/Bv9ARM-book.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index bce81fda3a..63e40bf57d 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4788,6 +4788,8 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     <optional> notify <replaceable>yes_or_no</replaceable> | <replaceable>explicit</replaceable> | <replaceable>master-only</replaceable>; </optional>
     <optional> recursion <replaceable>yes_or_no</replaceable>; </optional>
     <optional> request-sit <replaceable>yes_or_no</replaceable>; </optional>
+    <optional> nosit-udp-size <replaceable>number</replaceable> ; </optional>
+    <optional> sit-secret <replaceable>secret_string</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>
@@ -6396,6 +6398,20 @@ options {
 	      </listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term><command>nosit-udp-size</command></term>
+	      <listitem>
+		<para>
+		  Sets the maximum size of UDP responses that will
+		  be sent to queries without a valid source identity
+		  token.  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>
+
 	    <varlistentry>
 	      <term><command>sit-secret</command></term>
 	      <listitem>
@@ -10538,7 +10554,6 @@ example.com                 CNAME   rpz-tcp-only.
     <optional> request-sit <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> edns <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> edns-udp-size <replaceable>number</replaceable> ; </optional>
-    <optional> nosit-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> max-udp-size <replaceable>number</replaceable> ; </optional>
     <optional> transfers <replaceable>number</replaceable> ; </optional>
     <optional> transfer-format <replaceable>( one-answer | many-answers )</replaceable> ; ]</optional>
@@ -10673,14 +10688,6 @@ example.com                 CNAME   rpz-tcp-only.
 	    replies from <command>named</command>.
 	  </para>
 
-	  <para>
-	    The <command>nosit-udp-size</command> option sets the
-	    maximum size of UDP responses that will be sent to
-	    queries without a valid source identity token.  The command
-	    <command>max-udp-size</command> option may further limit
-	    the response size.
-	  </para>
-
 	  <para>
 	    The server supports two zone transfer methods. The first, <command>one-answer</command>,
 	    uses one DNS message per resource record transferred. <command>many-answers</command> packs