From: Jeremy C. Reed <jreed@isc.org>
Date: Tue, 10 Nov 2015 03:10:01 +0000 (-0500)
Subject: add simpara to some note tags
X-Git-Tag: v9.11.0a1~325
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e08c32f45fb3341a422092b59d9753afceaf2ae3;p=thirdparty%2Fbind9.git

add simpara to some note tags

So generated "Note" header isn't on same line as content.

Also removed one place that said "Note" (so doesn't say
"Note Note").
---

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index c1537de7eee..0b5bd707cf5 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -1344,13 +1344,13 @@ controls {
 	protocol is specified in RFC 1996.
       </para>
 
-      <note>
+      <note><simpara>
 	As a slave zone can also be a master to other slaves, <command>named</command>,
 	by default, sends <command>NOTIFY</command> messages for every zone
 	it loads.  Specifying <command>notify master-only;</command> will
 	cause <command>named</command> to only send <command>NOTIFY</command> for master
 	zones that it loads.
-      </note>
+      </simpara></note>
 
     </section>
 
@@ -2320,10 +2320,10 @@ options {
 };
 </programlisting>
 
-	<note>
+	<note><simpara>
 	  None of the keys listed in this example are valid.  In particular,
 	  the root key is not valid.
-	</note>
+	</simpara></note>
 
 	<para>
 	  When DNSSEC validation is enabled and properly configured,
@@ -8008,14 +8008,14 @@ avoid-v6-udp-ports {};
 		  <command>use-alt-transfer-source</command> is
 		  set.
 		</para>
-		<note>
+		<note><simpara>
 		  If you do not wish the alternate transfer source
 		  to be used, you should set
 		  <command>use-alt-transfer-source</command>
 		  appropriately and you should not depend upon
 		  getting an answer back to the first refresh
 		  query.
-		</note>
+		</simpara></note>
 	      </listitem>
 	    </varlistentry>
 
@@ -9589,12 +9589,12 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 	    to be deployed to channel the query load away from the
 	    infrastructure servers.
 	  </para>
-	  <note>
+	  <note><simpara>
 	    The real parent servers for these zones should disable all
 	    empty zone under the parent zone they serve.  For the real
 	    root servers, this is all built-in empty zones.  This will
 	    enable them to return referrals to deeper in the tree.
-	  </note>
+	  </simpara></note>
 	  <variablelist>
 	    <varlistentry>
 	      <term><command>empty-server</command></term>
@@ -17068,11 +17068,11 @@ allow-query { !{ !10/8; any; }; key example; };
 	    to which you want <acronym>BIND</acronym>
 	    to write.
 	  </para>
-	  <note>
-	    Note that if the <command>named</command> daemon is running as an
+	  <note><simpara>
+	    If the <command>named</command> daemon is running as an
 	    unprivileged user, it will not be able to bind to new restricted
 	    ports if the server is reloaded.
-	  </note>
+	  </simpara></note>
 	</section>
       </section>