From: Evan Hunt <each@isc.org>
Date: Thu, 10 Aug 2017 04:47:43 +0000 (-0700)
Subject: [master] revise CHANGES and release notes to say glue-cache is on by default
X-Git-Tag: v9.12.0a1~126
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f8786917ac9b780d41f80fa37bd784b37e152171;p=thirdparty%2Fbind9.git

[master] revise CHANGES and release notes to say glue-cache is on by default
---

diff --git a/CHANGES b/CHANGES
index 0b20a7479a5..ea34d8a2293 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,9 +42,7 @@
 			[RT #44696]
 
 4664.	[func]		Add a "glue-cache" option to enable or disable the
-			glue cache. The default is "no" to reduce memory
-			usage, but enabling this option will improve
-			performance in delegation-heavy zones. [RT #45125]
+			glue cache. The default is "yes". [RT #45125]
 
 4663.	[cleanup]	Clarify error message printed by dnssec-dsfromkey.
 			[RT #21731]
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index ac9a802bf4b..486a76b912e 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6408,10 +6408,9 @@ options {
 		<para>
 		  The glue cache uses memory proportional to the number
 		  of delegations in the zone. The default setting is
-		  <userinput>yes</userinput> which improves performance
+		  <userinput>yes</userinput>, which improves performance
 		  at the cost of increased memory usage for the zone. If
-		  you don't want this, please set it to
-		  <userinput>no</userinput>.
+		  you don't want this, set it to <userinput>no</userinput>.
 		</para>
 		<para>
 		  The glue cache is only used when
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 34d669ec382..81376bfc1d1 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -230,10 +230,8 @@
 	    <para>
 	      In place of the acache, <command>named</command> can now use
 	      a glue cache to speed up retrieval of glue records when sending
-	      delegation responses. Use <command>glue-cache yes;</command>
-	      to enable this feature. Because it increases memory usage,
-	      the glue cache is disabled by default, but it can signifiantly
-	      increase performance when serving delegation-heavy zones.
+	      delegation responses.  Unlike acache, this feature is on by
+	      default; use <command>glue-cache no;</command> to disable it.
 	    </para>
 	  </listitem>
 	  <listitem>