[35925] add more EDNS EXPIRE doc, clarify CHANGES note 3911

diff --git a/CHANGES b/CHANGES
index 1ce4b71ffbc3116339be7d9894cd9d0330b42e18..afbf620023c3804426e17162a979d98b1883e807 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-3911.  [func]          Implement EDNS EXPIRE option client side. [RT #35925]
+3911.  [func]          Implement EDNS EXPIRE option client side, allowing
+                        a slave server to set the expiration timer correctly
+                        when transferring zone data from another slave
+                        server. [RT #35925]
 
 3910.  [bug]           Fix races to free event during shutdown. [RT#36720]
 

diff --git a/README b/README
index 2ee8a4c25fc6857ff92096775d4945775ebcf523..09b0178e446aa2207185a705bcaf00102929341a 100644 (file)
--- a/README
+++ b/README
@@ -56,6 +56,10 @@ BIND 9.11.0
        BIND 9.11.0 includes a number of changes from BIND 9.10 and earlier
        releases.  New features include:
 
+       - The EDNS EXPIRE option has been implemented on the client
+         side, allowing a slave server to set the expiration timer
+         correctly when transferring zone data from another slave
+         server.
        - A new "masterfile-style" zone option controls the formatting
          of text zone files:  When set to "full", a zone file is dumped
          in single-line-per-record format.
@@ -71,8 +75,8 @@ BIND 9.11.0
        - "named -L <filename>" causes named to send log messages to
           the specified file by default instead of to the system log.
 
-        This release addresses the security flaw described in
-        CVE-2014-3214 and CVE-2014-3859.
+       This release addresses the security flaw described in
+       CVE-2014-3214 and CVE-2014-3859.
 
 BIND 9.10.0
 

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index d2acb8e3183af81d0f64dd30506fc1981cf64a3d..c37dfc2ff4497308d6eef6b424e1ecc7a8d93dab 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -10509,8 +10509,15 @@ rate-limit {
 
          <para>
            The <command>request-expire</command> clause determines
-           whether the local server, acting as a slave, will request
-           the EDNS EXPIRE value.
+            whether the local server, when acting as a slave, will
+            request the EDNS EXPIRE value.  The EDNS EXPIRE value
+            indicates the remaining time before the zone data will
+            expire and need to be be refreshed.  This is used
+            when a secondary server transfers a zone from another
+            secondary server; when transferring from the primary, the
+            expiration timer is set from the EXPIRE field of the SOA
+            record instead. 
+            The default is <command>yes</command>.
          </para>
 
          <para>