From: Tinderbox User <tbox@isc.org>
Date: Fri, 11 Mar 2016 01:05:28 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.11.0a1~41
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=832fa787d4a13fa89d64f868e51016ff4adb0d89;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 1fad994d789..1d7e8aa7cc8 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -7527,7 +7527,7 @@ example.com                 CNAME   rpz-tcp-only.
 <p>
             With both methods when named gets a NXDOMAIN response
             it examines a seperate namespace to see if the NXDOMAIN
-            response should be replaced with a alternative response.
+            response should be replaced with an alternative response.
           </p>
 <p>
             With a redirect zone (<span class="command"><strong>zone "." { type redirect; };</strong></span>), the
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 30bf3c71814..aaabecce92a 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -533,6 +533,12 @@
 	  rndc commands are allowed for querying information from named.
 	  By default, control channel access is read-write.
 	</p></li>
+<li class="listitem"><p>
+	  When loading managed signed zones detect if the RRSIG's
+	  inception time is in the future and regenerate the RRSIG
+	  immediately. This helps when the system's clock needs to
+	  be reset backwards.
+	</p></li>
 </ul></div>
 </div>
 <div class="section">
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 4ed8ba8f1b0..bfddddcdac9 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -494,6 +494,12 @@
 	  rndc commands are allowed for querying information from named.
 	  By default, control channel access is read-write.
 	</p></li>
+<li class="listitem"><p>
+	  When loading managed signed zones detect if the RRSIG's
+	  inception time is in the future and regenerate the RRSIG
+	  immediately. This helps when the system's clock needs to
+	  be reset backwards.
+	</p></li>
 </ul></div>
 </div>
 <div class="section">