From: Tinderbox User <tbox@isc.org>
Date: Sun, 18 Oct 2015 01:07:32 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.11.0a1~340
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e2b184f84e846bbcb764b6f0aef5dcd583d3d7a1;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 146136758ac..5acd0d420c2 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -6007,10 +6007,10 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
                   without waiting for the SERVFAIL TTL to expire.
                 </p>
 <p>
-                  The maximum value is <code class="literal">300</code>
-                  (5 minutes); any higher value will be silently
-                  reduced.  The default is <code class="literal">10</code>
-                  seconds.
+                  The maximum value is <code class="literal">30</code>
+                  seconds; any higher value will be silently
+                  reduced. The default is <code class="literal">1</code>
+                  second.
                 </p>
 </dd>
 <dt><span class="term"><span class="command"><strong>max-ncache-ttl</strong></span></span></dt>
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index fc8e9008ee6..709145e4525 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -288,7 +288,7 @@
 	  the cache times out.  This reduces the frequency of retries
 	  when a query is persistently failing, which can be a burden
 	  on recursive serviers.  The SERVFAIL cache timeout is controlled
-	  by <code class="option">servfail-ttl</code>, which defaults to 10 seconds
+	  by <code class="option">servfail-ttl</code>, which defaults to 1 second
 	  and has an upper limit of 30.
 	</p></li>
 <li class="listitem"><p>
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 74ddf3fb4fd..e126d78c163 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -249,7 +249,7 @@
 	  the cache times out.  This reduces the frequency of retries
 	  when a query is persistently failing, which can be a burden
 	  on recursive serviers.  The SERVFAIL cache timeout is controlled
-	  by <code class="option">servfail-ttl</code>, which defaults to 10 seconds
+	  by <code class="option">servfail-ttl</code>, which defaults to 1 second
 	  and has an upper limit of 30.
 	</p></li>
 <li class="listitem"><p>