From b7b8e298f63679bf2106a8539790246b1d3bf4a9 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Thu, 19 Oct 2017 01:09:18 +0000
Subject: [PATCH] regen master

---
 doc/arm/Bv9ARM.ch09.html | 30 ++++++++++++++++++------------
 doc/arm/notes.html       | 30 ++++++++++++++++++------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 473dd3dede..e72f976b33 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -145,10 +145,12 @@
 <li class="listitem">
 	    <p>
 	      The additional cache ("acache") was found not to
-	      significantly improve performance and has been removed;
-	      the <span class="command"><strong>acache-enable</strong></span> and
-	      <span class="command"><strong>acache-cleaning-interval</strong></span> options are now
-	      deprecated.
+	      significantly improve performance and has been removed.
+	      As a result, the <span class="command"><strong>acache-enable</strong></span> and
+	      <span class="command"><strong>acache-cleaning-interval</strong></span> options no longer
+	      have any effect. For backwards compatibility, BIND will
+	      accept their presence in a configuration file, but
+	      will log a warning.
 	    </p>
 	  </li>
 <li class="listitem">
@@ -161,15 +163,16 @@
 	  </li>
 <li class="listitem">
 	    <p>
-	      The <span class="command"><strong>additional-from-cache</strong></span>
-	      and <span class="command"><strong>additional-from-auth</strong></span> options have been
-	      deprecated.
+	      <span class="command"><strong>minimal-responses</strong></span> is now set
+	      to <code class="literal">no-auth-recursive</code> by default.
 	    </p>
 	  </li>
 <li class="listitem">
 	    <p>
-	      <span class="command"><strong>minimal-responses</strong></span> is now set
-	      to <code class="literal">no-auth-recursive</code> by default.
+	      The <span class="command"><strong>additional-from-cache</strong></span>
+	      and <span class="command"><strong>additional-from-auth</strong></span> options no longer
+	      have any effect. <span class="command"><strong>named</strong></span> will log a warning
+	      if they are set.
 	    </p>
 	  </li>
 <li class="listitem">
@@ -517,9 +520,12 @@
       </li>
 <li class="listitem">
 	<p>
-	  As noted above, <span class="command"><strong>acache-enable</strong></span> and
-	  <span class="command"><strong>acache-cleaning-interval</strong></span> are now
-	  deprecated.
+	  As noted above, the <span class="command"><strong>acache-enable</strong></span>,
+	  <span class="command"><strong>acache-cleaning-interval</strong></span>,
+	  <span class="command"><strong>additional-from-cache</strong></span> and
+	  <span class="command"><strong>additional-from-auth</strong></span> options are no longer
+	  effective and <span class="command"><strong>named</strong></span> will log a warning if
+	  they are set.
 	</p>
       </li>
 </ul></div>
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 68c5ed226d..059ef60013 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -105,10 +105,12 @@
 <li class="listitem">
 	    <p>
 	      The additional cache ("acache") was found not to
-	      significantly improve performance and has been removed;
-	      the <span class="command"><strong>acache-enable</strong></span> and
-	      <span class="command"><strong>acache-cleaning-interval</strong></span> options are now
-	      deprecated.
+	      significantly improve performance and has been removed.
+	      As a result, the <span class="command"><strong>acache-enable</strong></span> and
+	      <span class="command"><strong>acache-cleaning-interval</strong></span> options no longer
+	      have any effect. For backwards compatibility, BIND will
+	      accept their presence in a configuration file, but
+	      will log a warning.
 	    </p>
 	  </li>
 <li class="listitem">
@@ -121,15 +123,16 @@
 	  </li>
 <li class="listitem">
 	    <p>
-	      The <span class="command"><strong>additional-from-cache</strong></span>
-	      and <span class="command"><strong>additional-from-auth</strong></span> options have been
-	      deprecated.
+	      <span class="command"><strong>minimal-responses</strong></span> is now set
+	      to <code class="literal">no-auth-recursive</code> by default.
 	    </p>
 	  </li>
 <li class="listitem">
 	    <p>
-	      <span class="command"><strong>minimal-responses</strong></span> is now set
-	      to <code class="literal">no-auth-recursive</code> by default.
+	      The <span class="command"><strong>additional-from-cache</strong></span>
+	      and <span class="command"><strong>additional-from-auth</strong></span> options no longer
+	      have any effect. <span class="command"><strong>named</strong></span> will log a warning
+	      if they are set.
 	    </p>
 	  </li>
 <li class="listitem">
@@ -477,9 +480,12 @@
       </li>
 <li class="listitem">
 	<p>
-	  As noted above, <span class="command"><strong>acache-enable</strong></span> and
-	  <span class="command"><strong>acache-cleaning-interval</strong></span> are now
-	  deprecated.
+	  As noted above, the <span class="command"><strong>acache-enable</strong></span>,
+	  <span class="command"><strong>acache-cleaning-interval</strong></span>,
+	  <span class="command"><strong>additional-from-cache</strong></span> and
+	  <span class="command"><strong>additional-from-auth</strong></span> options are no longer
+	  effective and <span class="command"><strong>named</strong></span> will log a warning if
+	  they are set.
 	</p>
       </li>
 </ul></div>