From d0ffef73fdee75f30e33c628a31d031616ad9433 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 5 Aug 2014 19:32:46 -0700
Subject: [PATCH] [35925] add more EDNS EXPIRE doc, clarify CHANGES note 3911

---
 CHANGES                 |  5 ++++-
 README                  |  8 ++++++--
 doc/arm/Bv9ARM-book.xml | 11 +++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1ce4b71ffb..afbf620023 100644
--- 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 2ee8a4c25f..09b0178e44 100644
--- 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 d2acb8e318..c37dfc2ff4 100644
--- 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>