From: Evan Hunt <each@isc.org>
Date: Tue, 26 Feb 2013 19:51:16 +0000 (-0800)
Subject: [master] fix built-in zone doc
X-Git-Tag: v9.10.0a1~487
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=298ca122505a151384a3bf3f0bb0819ed60c66e2;p=thirdparty%2Fbind9.git

[master] fix built-in zone doc

3499.	[doc]		Corrected ARM documentation of built-in zones.
			[RT #32694]
---

diff --git a/CHANGES b/CHANGES
index 7793c318514..a6164e8c000 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3499.	[doc]		Corrected ARM documentation of built-in zones.
+			[RT #32694]
+
 3498.	[bug]		zone statistics for zones which matched a potential
 			empty zone could have their zone-statistics setting
 			overridden.
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 85cf919814d..c947b93ed6a 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -9159,12 +9159,18 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
             built-in view (see <xref linkend="view_statement_grammar"/>) of
             class
             <command>CHAOS</command> which is separate from the
-            default view of
-            class <command>IN</command>; therefore, any global
-            server options
-            such as <command>allow-query</command> do not apply
-            the these zones.
-            If you feel the need to disable these zones, use the options
+            default view of class <command>IN</command>. Most global
+            configuration options (<command>allow-query</command>,
+            etc) will apply to this view, but some are locally
+            overridden: <command>notify</command>,
+            <command>recursion</command> and
+            <command>allow-new-zones</command> are
+            always set to <userinput>no</userinput>, and
+            <command>rate-limit</command> is set to allow
+            three responses per second.
+          </para>
+          <para>
+            If you need to disable these zones, use the options
             below, or hide the built-in <command>CHAOS</command>
             view by
             defining an explicit view of class <command>CHAOS</command>