From a95dc83de543e0a5637f50c9b2e3facadbcb1f3c Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Thu, 9 Feb 2017 01:04:58 +0000
Subject: [PATCH] regen master

---
 doc/arm/Bv9ARM.ch06.html | 15 ++++++++++++++-
 doc/arm/Bv9ARM.ch09.html | 38 ++++++++++++++++++++++++++------------
 doc/arm/notes.html       | 38 ++++++++++++++++++++++++++------------
 doc/misc/options         |  4 +++-
 4 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 59e702a2a2..6fdae6a61b 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -2434,7 +2434,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
   [ <span class="command"><strong>server-id</strong></span> <em class="replaceable"><code>server_id_string</code></em> ; ]
   [ <span class="command"><strong>directory</strong></span> <em class="replaceable"><code>path_name</code></em> ; ]
   [ <span class="command"><strong>dnstap {</strong></span> <em class="replaceable"><code>message_type</code></em> ; ... <span class="command"><strong>}</strong></span> ; ]
-  [ <span class="command"><strong>dnstap-output</strong></span> ( <code class="option">file</code> | <code class="option">unix</code> ) <em class="replaceable"><code>path_name</code></em> ; ]
+  [ <span class="command"><strong>dnstap-output</strong></span> ( <code class="option">file</code> | <code class="option">unix</code> ) <em class="replaceable"><code>path_name</code></em> [ <span class="command"><strong>size</strong></span> <em class="replaceable"><code>size_spec</code></em> ] [ <span class="command"><strong>versions</strong></span> ( <em class="replaceable"><code>number</code></em> | <code class="option">unlimited</code> ) ] ; ]
   [ <span class="command"><strong>dnstap-identity</strong></span> ( <em class="replaceable"><code>string</code></em> | <code class="option">hostname</code> | <code class="option">none</code> ) ; ]
   [ <span class="command"><strong>dnstap-version</strong></span> ( <em class="replaceable"><code>string</code></em> | <code class="option">none</code> ) ; ]
   [ <span class="command"><strong>fstrm-set-buffer-hint</strong></span> <em class="replaceable"><code>number</code></em> ; ]
@@ -3010,6 +3010,19 @@ badresp:1,adberr:0,findfail:0,valfail:0]
                 (provided with <span class="command"><strong>libfstrm</strong></span>) is listening on
                 the socket.)
               </p>
+              <p>
+                If the first argument is <code class="literal">file</code>, then
+                two additional options can be added:
+                <span class="command"><strong>size</strong></span> indicates the size to which a
+                <span class="command"><strong>dnstap</strong></span> log file can grow before being
+                rolled to a new file, and <span class="command"><strong>versions</strong></span>
+                specifies the number of rolled log files to retain. These
+                are similar to the <span class="command"><strong>size</strong></span> and
+                <span class="command"><strong>versions</strong></span> options in a
+                <span class="command"><strong>logging</strong></span> channel.  The default
+                is to allow <span class="command"><strong>dnstap</strong></span> log files to grow to
+                any size without rolling.
+              </p>
               <p>
                 <span class="command"><strong>dnstap-output</strong></span> can only be set globally
                 in <span class="command"><strong>options</strong></span>. Currently, it can only be
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index ebec1569e0..2af0c377cd 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -176,6 +176,26 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_features"></a>New Features</h3></div></div></div>
     <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+        <p>
+	  Query logic has been substantially refactored (e.g. query_find
+	  function has been split into smaller functions) for improved
+	  readability, maintainability and testability. [RT #43929]
+	</p>
+      </li>
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>dnstap</strong></span> logfiles can now be configured to
+	  automatically roll when they reach a specified size. If
+	  <span class="command"><strong>dnstap-output</strong></span> is configured with mode
+	  <code class="literal">file</code>, then it can take optional
+	  <span class="command"><strong>size</strong></span> and <span class="command"><strong>versions</strong></span>
+	  key-value arguments to set the logfile rolling parameters.
+	  (These have the same semantics as the corresponding
+	  options in a <span class="command"><strong>logging</strong></span> channel statement.)
+	  [RT #44502]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>dig +ednsopt</strong></span> now accepts the names
@@ -220,7 +240,7 @@
 	  always have the name ".", which can be ambiguous.)
 	</p>
 	<p>
-	  In the event you need to manipulate a a zone actually
+	  In the event you need to manipulate a zone actually
 	  called "-redirect", use a trailing dot: "-redirect."
 	</p>
 	<p>
@@ -260,12 +280,6 @@
 	  was sent. [RT #43595]
 	</p>
       </li>
-<li class="listitem">
-	<p>
-	  The built in mangaged keys for the global root zone have been
-	  updated to include the upcoming key signing key (keyid 20326).
-	</p>
-      </li>
 <li class="listitem">
 	<p>
 	  Expanded and improved the YAML output from
@@ -299,15 +313,15 @@
       </li>
 <li class="listitem">
 	<p>
-	  Named could deadlock there were multiple changes to
-	  NSEC/NSEC3 parameters for a zone being processed at the
-	  same time. [RT #42770]
+	  <span class="command"><strong>named</strong></span> could deadlock if multiple changes
+	  to NSEC/NSEC3 parameters for the same zone were being processed
+	  at the same time. [RT #42770]
 	</p>
       </li>
 <li class="listitem">
 	<p>
-	  Named could trigger a assertion when sending notify
-	  messages. [RT #44019]
+	  <span class="command"><strong>named</strong></span> could trigger an assertion when
+	  sending NOTIFY messages. [RT #44019]
 	</p>
       </li>
 <li class="listitem">
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 1dfe51826a..a0d1fb6359 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -139,6 +139,26 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_features"></a>New Features</h3></div></div></div>
     <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+        <p>
+	  Query logic has been substantially refactored (e.g. query_find
+	  function has been split into smaller functions) for improved
+	  readability, maintainability and testability. [RT #43929]
+	</p>
+      </li>
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>dnstap</strong></span> logfiles can now be configured to
+	  automatically roll when they reach a specified size. If
+	  <span class="command"><strong>dnstap-output</strong></span> is configured with mode
+	  <code class="literal">file</code>, then it can take optional
+	  <span class="command"><strong>size</strong></span> and <span class="command"><strong>versions</strong></span>
+	  key-value arguments to set the logfile rolling parameters.
+	  (These have the same semantics as the corresponding
+	  options in a <span class="command"><strong>logging</strong></span> channel statement.)
+	  [RT #44502]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>dig +ednsopt</strong></span> now accepts the names
@@ -183,7 +203,7 @@
 	  always have the name ".", which can be ambiguous.)
 	</p>
 	<p>
-	  In the event you need to manipulate a a zone actually
+	  In the event you need to manipulate a zone actually
 	  called "-redirect", use a trailing dot: "-redirect."
 	</p>
 	<p>
@@ -223,12 +243,6 @@
 	  was sent. [RT #43595]
 	</p>
       </li>
-<li class="listitem">
-	<p>
-	  The built in mangaged keys for the global root zone have been
-	  updated to include the upcoming key signing key (keyid 20326).
-	</p>
-      </li>
 <li class="listitem">
 	<p>
 	  Expanded and improved the YAML output from
@@ -262,15 +276,15 @@
       </li>
 <li class="listitem">
 	<p>
-	  Named could deadlock there were multiple changes to
-	  NSEC/NSEC3 parameters for a zone being processed at the
-	  same time. [RT #42770]
+	  <span class="command"><strong>named</strong></span> could deadlock if multiple changes
+	  to NSEC/NSEC3 parameters for the same zone were being processed
+	  at the same time. [RT #42770]
 	</p>
       </li>
 <li class="listitem">
 	<p>
-	  Named could trigger a assertion when sending notify
-	  messages. [RT #44019]
+	  <span class="command"><strong>named</strong></span> could trigger an assertion when
+	  sending NOTIFY messages. [RT #44019]
 	</p>
       </li>
 <li class="listitem">
diff --git a/doc/misc/options b/doc/misc/options
index 8acf6045b7..b32e37a7c9 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -153,7 +153,9 @@ options {
             resolver ) [ ( query | response ) ]; ... }; // not configured
         dnstap-identity ( <quoted_string> | none |
             hostname ); // not configured
-        dnstap-output ( file | unix ) <quoted_string>; // not configured
+        dnstap-output ( file | unix ) <quoted_string> [
+            size ( unlimited | <size> ) ] [ versions (
+            unlimited | <integer> ) ]; // not configured
         dnstap-version ( <quoted_string> | none ); // not configured
         dscp <integer>;
         dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port