[v9_6] fix built-in zone doc

3499.	[doc]		Corrected ARM documentation of built-in zones.
			[RT #32694]
(cherry picked from commit 298ca122505a151384a3bf3f0bb0819ed60c66e2)
(cherry picked from commit a0d472b36e25fcf91ddc34fc5c8a780b9dc94eb7)
(cherry picked from commit b2ae46acbca96cbf7e998bcc00c1c98a9569a21e)

diff --git a/CHANGES b/CHANGES
index 01351e2fc0628b2a5ff67f48a829c0847475fb36..feb5d0ea82d4034571462bb9b61673f86e11fdec 100644 (file)
--- 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 1cdabd49416555526c2e52f6b8c83c44a387668c..dc946d8f6e4d82d976718d54914cd84ca32d6924 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -8041,12 +8041,15 @@ 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> and
+            <command>recursion</command> are
+            always set to <userinput>no</userinput>.
+          </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>