From: Evan Hunt <each@isc.org>
Date: Wed, 9 Nov 2011 05:55:02 +0000 (+0000)
Subject: 3213.	[doc]		Clarify ixfr-from-differences behavior. [RT #25188]
X-Git-Tag: v9.6-ESV-R6b1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9421c8ac3d5cbadf1cef6654322f5acfb4d0d34b;p=thirdparty%2Fbind9.git

3213.	[doc]		Clarify ixfr-from-differences behavior. [RT #25188]
---

diff --git a/CHANGES b/CHANGES
index 14c67d4427f..f8e9e0000d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3213.	[doc]		Clarify ixfr-from-differences behavior. [RT #25188]
+
 3212.	[bug]		rbtdb.c: failed to remove a node from the deadnodes
 			list prior to adding a reference to it leading a
 			possible assertion failure. [RT #23219]
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index a7c611a5cae..92b28f74dd7 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.380.14.36 2011/11/03 22:06:50 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.380.14.37 2011/11/09 05:55:02 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -1772,11 +1772,13 @@ controls {
       </para>
 
       <para>
-        When acting as a slave, <acronym>BIND</acronym> 9 will
-        attempt to use IXFR unless
-        it is explicitly disabled. For more information about disabling
-        IXFR, see the description of the <command>request-ixfr</command> clause
-        of the <command>server</command> statement.
+        When acting as a slave, <acronym>BIND</acronym> 9 will attempt
+        to use IXFR unless it is explicitly disabled via the
+        <command>request-ixfr</command> option or the use of
+        <command>ixfr-from-differences</command>.  For
+        more information about disabling IXFR, see the description
+        of the <command>request-ixfr</command> clause of the
+        <command>server</command> statement.
       </para>
     </sect1>