diff --git a/CHANGES b/CHANGES index f1738576fc..5304920b94 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 580fa050c3..b6be674411 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + BIND 9 Administrator Reference Manual @@ -1921,11 +1921,13 @@ controls { - When acting as a slave, BIND 9 will - attempt to use IXFR unless - it is explicitly disabled. For more information about disabling - IXFR, see the description of the request-ixfr clause - of the server statement. + When acting as a slave, BIND 9 will attempt + to use IXFR unless it is explicitly disabled via the + request-ixfr option or the use of + ixfr-from-differences. For + more information about disabling IXFR, see the description + of the request-ixfr clause of the + server statement.