regen master

diff --git a/bin/confgen/rndc-confgen.8 b/bin/confgen/rndc-confgen.8
index bc3ff321cc081417df8a4a38f47071283686c53b..18bb8fc58189a09ffa65dc8a3e319abd64e040f6 100644 (file)
--- a/bin/confgen/rndc-confgen.8
+++ b/bin/confgen/rndc-confgen.8
@@ -111,7 +111,7 @@ as directed\&.
 .PP
 \-A \fIalgorithm\fR
 .RS 4
-Specifies the algorithm to use for the TSIG key\&. Available choices are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and hmac\-sha512\&. The default is hmac\-md5\&.
+Specifies the algorithm to use for the TSIG key\&. Available choices are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and hmac\-sha512\&. The default is hmac\-md5 or if MD5 was disabled hmac\-sha256\&.
 .RE
 .PP
 \-b \fIkeysize\fR

diff --git a/bin/confgen/rndc-confgen.html b/bin/confgen/rndc-confgen.html
index ede2c9052f973cfebeaa97ebd39d2ec3f363c8a3..b261c45b48e97112f3f70ec9ed634e4ea0703116 100644 (file)
--- a/bin/confgen/rndc-confgen.html
+++ b/bin/confgen/rndc-confgen.html
@@ -81,7 +81,8 @@
 <dd><p>
             Specifies the algorithm to use for the TSIG key.  Available
             choices are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256,
-            hmac-sha384 and hmac-sha512.  The default is hmac-md5.
+            hmac-sha384 and hmac-sha512.  The default is hmac-md5 or
+            if MD5 was disabled hmac-sha256.
           </p></dd>
 <dt><span class="term">-b <em class="replaceable"><code>keysize</code></em></span></dt>
 <dd><p>

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index d4fb191cf2b5509dfbf24a4bb04ce9ddbbcd189f..5f3f5dbbc58f1ded66abeb04c3804023d39577fe 100644 (file)
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -261,7 +261,9 @@ hmac\-sha384, or
 hmac\-sha512\&. If
 \fIhmac\fR
 is not specified, the default is
-hmac\-md5\&.
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&.
 .sp
 NOTE: You should use the
 \fB\-k\fR

diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 18512804e4ee7c54dba44a472a2069f065a21d29..cc2d1b8f2c445da71606301ba9e479465d08d3b5 100644 (file)
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -237,7 +237,8 @@
            <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
            <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
            <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-           is not specified, the default is <code class="literal">hmac-md5</code>.
+           is not specified, the default is <code class="literal">hmac-md5</code>
+           or if MD5 was disabled <code class="literal">hmac-sha256</code>.
          </p>
 <p>
            NOTE: You should use the <code class="option">-k</code> option and

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 4f7063208899504a8d752079bf3dd0df959697c5..f631e07c3a37aae185436d6a9875eebb5b205a5b 100644 (file)
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -216,8 +216,19 @@ options {
        coresize \fIsize\fR;
        datasize \fIsize\fR;
        directory \fIquoted_string\fR;
+       dnstap { \fImessage_type\fR; \&.\&.\&. };
+       dnstap\-output ( file | unix ) \fIpath_name\fR;
+       dnstap\-identity ( \fIstring\fR | hostname | none );
+       dnstap\-version ( \fIstring\fR | none );
        dump\-file \fIquoted_string\fR;
        files \fIsize\fR;
+       fstrm\-set\-buffer\-hint \fInumber\fR;
+       fstrm\-set\-flush\-timeout \fInumber\fR;
+       fstrm\-set\-input\-queue\-size \fInumber\fR;
+       fstrm\-set\-output\-notify\-threshold \fInumber\fR;
+       fstrm\-set\-output\-queue\-model ( \fImpsc\fR | \fIspsc\fR ) ;
+       fstrm\-set\-output\-queue\-size \fInumber\fR;
+       fstrm\-set\-reopen\-interval \fInumber\fR;
        heartbeat\-interval \fIinteger\fR;
        host\-statistics \fIboolean\fR; // not implemented
        host\-statistics\-max \fInumber\fR; // not implemented

diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index da8309a19adfb129922ff30138b6a9379cb35a54..1c5bc08e28e54268dd206f09ba16a7938f60d730 100644 (file)
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -159,8 +159,19 @@ options
        coresize <em class="replaceable"><code>size</code></em>;<br>
        datasize <em class="replaceable"><code>size</code></em>;<br>
        directory <em class="replaceable"><code>quoted_string</code></em>;<br>
+       dnstap { <em class="replaceable"><code>message_type</code></em>; ... };<br>
+       dnstap-output ( <code class="literal">file</code> | <code class="literal">unix</code> ) <em class="replaceable"><code>path_name</code></em>;<br>
+       dnstap-identity ( <em class="replaceable"><code>string</code></em> | <code class="literal">hostname</code> | <code class="literal">none</code> );<br>
+       dnstap-version ( <em class="replaceable"><code>string</code></em> | <code class="literal">none</code> );<br>
        dump-file <em class="replaceable"><code>quoted_string</code></em>;<br>
        files <em class="replaceable"><code>size</code></em>;<br>
+       fstrm-set-buffer-hint <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-flush-timeout <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-input-queue-size <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-output-notify-threshold <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-output-queue-model ( <em class="replaceable"><code>mpsc</code></em> | <em class="replaceable"><code>spsc</code></em> ) ;<br>
+       fstrm-set-output-queue-size <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-reopen-interval <em class="replaceable"><code>number</code></em>;<br>
        heartbeat-interval <em class="replaceable"><code>integer</code></em>;<br>
        host-statistics <em class="replaceable"><code>boolean</code></em>; // not implemented<br>
        host-statistics-max <em class="replaceable"><code>number</code></em>; // not implemented<br>

diff --git a/bin/nsupdate/nsupdate.1 b/bin/nsupdate/nsupdate.1
index c216daa6358830aa885e657d0b4e1b76b0ea9137..06e001e9ffee60c8f05a4b99ac1e5194a1c1586e 100644 (file)
--- a/bin/nsupdate/nsupdate.1
+++ b/bin/nsupdate/nsupdate.1
@@ -209,7 +209,9 @@ hmac\-sha384, or
 hmac\-sha512\&. If
 \fIhmac\fR
 is not specified, the default is
-hmac\-md5\&.
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&.
 .sp
 NOTE: Use of the
 \fB\-y\fR
@@ -284,7 +286,9 @@ Specifies that all updates are to be TSIG\-signed using the
 pair\&. If
 \fIhmac\fR
 is specified, then it sets the signing algorithm in use; the default is
-hmac\-md5\&. The
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&. The
 \fBkey\fR
 command overrides any key specified on the command line via
 \fB\-y\fR

diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index a9445e90fe42196cc4482f8bd6df3dbeeda70310..0d63402aa5964d41d04b96dc06454a352a50c5c0 100644 (file)
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -201,7 +201,8 @@
            <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
            <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
            <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-           is not specified, the default is <code class="literal">hmac-md5</code>.
+           is not specified, the default is <code class="literal">hmac-md5</code>
+           or if MD5 was disabled <code class="literal">hmac-sha256</code>.
          </p>
 <p>
            NOTE: Use of the <code class="option">-y</code> option is discouraged because the
@@ -326,7 +327,8 @@
              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
              If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
              signing algorithm in use; the default is
-             <code class="literal">hmac-md5</code>.  The <span class="command"><strong>key</strong></span>
+             <code class="literal">hmac-md5</code> or if MD5 was disabled
+             <code class="literal">hmac-sha256</code>.  The <span class="command"><strong>key</strong></span>
              command overrides any key specified on the command line via
              <code class="option">-y</code> or <code class="option">-k</code>.
            </p></dd>

diff --git a/bin/pkcs11/pkcs11-tokens.8 b/bin/pkcs11/pkcs11-tokens.8
index fc966493be8393ffa26b1ed24ad3563939171525..caf32dba52d619a46796b70155bc675dd2a03d60 100644 (file)
--- a/bin/pkcs11/pkcs11-tokens.8
+++ b/bin/pkcs11/pkcs11-tokens.8
@@ -51,7 +51,7 @@ lists the PKCS#11 available tokens with defaults from the slot/token scan perfor
 Specify the PKCS#11 provider module\&. This must be the full path to a shared library object implementing the PKCS#11 API for the device\&.
 .RE
 .PP
-\-e
+\-v
 .RS 4
 Make the PKCS#11 libisc initialization verbose\&.
 .RE

diff --git a/bin/pkcs11/pkcs11-tokens.html b/bin/pkcs11/pkcs11-tokens.html
index 79853754415515295b777fb34b313281fc5311b0..3bcf2016fb31695120633edc0745fdbbc7e32116 100644 (file)
--- a/bin/pkcs11/pkcs11-tokens.html
+++ b/bin/pkcs11/pkcs11-tokens.html
@@ -1,17 +1,9 @@
 <!--
  - Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
  - 
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- - 
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <html>
 <head>
@@ -46,7 +38,7 @@
             path to a shared library object implementing the PKCS#11 API
             for the device.
           </p></dd>
-<dt><span class="term">-e</span></dt>
+<dt><span class="term">-v</span></dt>
 <dd><p>
             Make the PKCS#11 libisc initialization verbose.
           </p></dd>

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 001dd5a722f7a2f36be9eb4381feb74ea7b4f48d..1b601980825c88593e9f9905379800202c08a0de 100644 (file)
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -2276,6 +2276,14 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     [<span class="optional"> dnstap-output ( <code class="literal">file</code> | <code class="literal">unix</code> ) <em class="replaceable"><code>path_name</code></em>; </span>]
     [<span class="optional"> dnstap-identity ( <em class="replaceable"><code>string</code></em> | <code class="literal">hostname</code> | <code class="literal">none</code> ); </span>]
     [<span class="optional"> dnstap-version ( <em class="replaceable"><code>string</code></em> | <code class="literal">none</code> ); </span>]
+    [<span class="optional"> fstrm-set-buffer-hint <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> fstrm-set-flush-timeout <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> fstrm-set-input-queue-size <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> fstrm-set-output-notify-threshold <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> fstrm-set-output-queue-model ( <em class="replaceable"><code>mpsc</code></em> |
+                        <em class="replaceable"><code>spsc</code></em> ) ; </span>]
+    [<span class="optional"> fstrm-set-output-queue-size <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> fstrm-set-reopen-interval <em class="replaceable"><code>number</code></em> ; </span>]
     [<span class="optional"> geoip-directory <em class="replaceable"><code>path_name</code></em>; </span>]
     [<span class="optional"> key-directory <em class="replaceable"><code>path_name</code></em>; </span>]
     [<span class="optional"> managed-keys-directory <em class="replaceable"><code>path_name</code></em>; </span>]
@@ -2732,6 +2740,67 @@ badresp:1,adberr:0,findfail:0,valfail:0]
                 For more information on <span class="command"><strong>dnstap</strong></span>, see
                 <a class="link" href="http://dnstap.info" target="_top">http://dnstap.info</a>.
               </p>
+<p>
+                The fstrm library has a number of tunables that are exposed
+                in <code class="filename">named.conf</code>, and can be modified
+                if necessary to improve performance or prevent loss of data.
+                These are:
+              </p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-buffer-hint</strong></span>: The
+                    threshold number of bytes to accumulate in the output
+                    buffer before forcing a buffer flush. The minimum is
+                    1K, the maximum is 64K, and the default is 8K.
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-flush-timeout</strong></span>: The number
+                    of seconds to allow unflushed data to remain in the
+                    output buffer. The minimum is 1 second, the maximum is
+                    600 seconds (10 minutes), and the default is 1 second.
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-output-notify-threshold</strong></span>:
+                    The number of outstanding queue entries to allow on
+                    an input queue before waking the I/O thread.
+                    The minimum is 1 and the default is 32.
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-output-queue-model</strong></span>:
+                    Controls the queuing semantics to use for queue
+                    objects. The default is <code class="literal">mpsc</code>
+                    (multiple producer, single consumer); the other
+                    option is <code class="literal">spsc</code> (single producer,
+                    single consumer).
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-input-queue-size</strong></span>: The
+                    number of queue entries to allocate for each
+                    input queue. The minimum is 2, the maximum is 16384,
+                    and the default is 512.
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-output-queue-size</strong></span>:
+                    The number of queue entries to allocate for each
+                    output queue. The minimum is 2, the maximum is
+                    system-dependent and based on <code class="option">IOV_MAX</code>,
+                    and the default is 64.
+                  </li>
+<li class="listitem">
+                    <span class="command"><strong>fstrm-set-reopen-interval</strong></span>:
+                    The number of seconds to wait between attempts to
+                    reopen a closed output stream. The minimum is 1 second,
+                    the maximum is 600 seconds (10 minutes), and the default
+                    is 5 seconds.
+                  </li>
+</ul></div>
+<p>
+                Note that all of the above minimum, maximum, and default
+                values are set by the <span class="command"><strong>libfstrm</strong></span> library,
+                and may be subject to change in future versions of the
+                library. See the <span class="command"><strong>libfstrm</strong></span> documentation
+                for more information.
+              </p>
 </dd>
 <dt><span class="term"><span class="command"><strong>dnstap-output</strong></span></span></dt>
 <dd>

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 84fbbb70413734d3bcbbfbfa878e3812a7a6cf08..4c2212ac87462f48e87a3085f70a3f5a600b32de 100644 (file)
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -255,7 +255,8 @@
            <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
            <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
            <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-           is not specified, the default is <code class="literal">hmac-md5</code>.
+           is not specified, the default is <code class="literal">hmac-md5</code>
+           or if MD5 was disabled <code class="literal">hmac-sha256</code>.
          </p>
 <p>
            NOTE: You should use the <code class="option">-k</code> option and

diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index e6009928416d9b1fc27c2b8ef730e1050cc0f4b4..58716970428a3dbd575a03d5910174acee928f63 100644 (file)
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -177,8 +177,19 @@ options
        coresize <em class="replaceable"><code>size</code></em>;<br>
        datasize <em class="replaceable"><code>size</code></em>;<br>
        directory <em class="replaceable"><code>quoted_string</code></em>;<br>
+       dnstap { <em class="replaceable"><code>message_type</code></em>; ... };<br>
+       dnstap-output ( <code class="literal">file</code> | <code class="literal">unix</code> ) <em class="replaceable"><code>path_name</code></em>;<br>
+       dnstap-identity ( <em class="replaceable"><code>string</code></em> | <code class="literal">hostname</code> | <code class="literal">none</code> );<br>
+       dnstap-version ( <em class="replaceable"><code>string</code></em> | <code class="literal">none</code> );<br>
        dump-file <em class="replaceable"><code>quoted_string</code></em>;<br>
        files <em class="replaceable"><code>size</code></em>;<br>
+       fstrm-set-buffer-hint <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-flush-timeout <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-input-queue-size <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-output-notify-threshold <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-output-queue-model ( <em class="replaceable"><code>mpsc</code></em> | <em class="replaceable"><code>spsc</code></em> ) ;<br>
+       fstrm-set-output-queue-size <em class="replaceable"><code>number</code></em>;<br>
+       fstrm-set-reopen-interval <em class="replaceable"><code>number</code></em>;<br>
        heartbeat-interval <em class="replaceable"><code>integer</code></em>;<br>
        host-statistics <em class="replaceable"><code>boolean</code></em>; // not implemented<br>
        host-statistics-max <em class="replaceable"><code>number</code></em>; // not implemented<br>

diff --git a/doc/arm/man.nsupdate.html b/doc/arm/man.nsupdate.html
index 1fa8c2af9dcfdfd7407c758e419b892d8ab4fe30..f27389b075e0033577df336f232efc3e2d67d5ca 100644 (file)
--- a/doc/arm/man.nsupdate.html
+++ b/doc/arm/man.nsupdate.html
@@ -219,7 +219,8 @@
            <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
            <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
            <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-           is not specified, the default is <code class="literal">hmac-md5</code>.
+           is not specified, the default is <code class="literal">hmac-md5</code>
+           or if MD5 was disabled <code class="literal">hmac-sha256</code>.
          </p>
 <p>
            NOTE: Use of the <code class="option">-y</code> option is discouraged because the
@@ -344,7 +345,8 @@
              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
              If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
              signing algorithm in use; the default is
-             <code class="literal">hmac-md5</code>.  The <span class="command"><strong>key</strong></span>
+             <code class="literal">hmac-md5</code> or if MD5 was disabled
+             <code class="literal">hmac-sha256</code>.  The <span class="command"><strong>key</strong></span>
              command overrides any key specified on the command line via
              <code class="option">-y</code> or <code class="option">-k</code>.
            </p></dd>

diff --git a/doc/arm/man.pkcs11-tokens.html b/doc/arm/man.pkcs11-tokens.html
index 4a085046d1b2fe11794651ab4a783dec98ce10f8..f7b637127315bea61610425e285ffc7cef7bdd5f 100644 (file)
--- a/doc/arm/man.pkcs11-tokens.html
+++ b/doc/arm/man.pkcs11-tokens.html
@@ -35,7 +35,7 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">pkcs11-tokens</code>  [<code class="option">-m <em class="replaceable"><code>module</code></em></code>]</p></div>
+<div class="cmdsynopsis"><p><code class="command">pkcs11-tokens</code>  [<code class="option">-m <em class="replaceable"><code>module</code></em></code>] [<code class="option">-v</code>]</p></div>
 </div>
 <div class="refsection">
 <a name="id-1.14.37.7"></a><h2>DESCRIPTION</h2>
@@ -54,6 +54,10 @@
             path to a shared library object implementing the PKCS#11 API
             for the device.
           </p></dd>
+<dt><span class="term">-v</span></dt>
+<dd><p>
+            Make the PKCS#11 libisc initialization verbose.
+          </p></dd>
 </dl></div>
 </div>
 <div class="refsection">

diff --git a/doc/arm/man.rndc-confgen.html b/doc/arm/man.rndc-confgen.html
index 8899d2aec424941d864d26e42abae4df5a9924ac..d7968fd41ef4dc1017a68b8e715cb28e5efb8e23 100644 (file)
--- a/doc/arm/man.rndc-confgen.html
+++ b/doc/arm/man.rndc-confgen.html
@@ -99,7 +99,8 @@
 <dd><p>
             Specifies the algorithm to use for the TSIG key.  Available
             choices are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256,
-            hmac-sha384 and hmac-sha512.  The default is hmac-md5.
+            hmac-sha384 and hmac-sha512.  The default is hmac-md5 or
+            if MD5 was disabled hmac-sha256.
           </p></dd>
 <dt><span class="term">-b <em class="replaceable"><code>keysize</code></em></span></dt>
 <dd><p>

diff --git a/doc/misc/options b/doc/misc/options
index e4922a3e7e23ac79a138bf4da0ba14ccd6723b8f..99fb00934a8121a0b4f0460bc92fd0741376ea39 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -168,6 +168,13 @@ options {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+        fstrm-set-buffer-hint <integer>; // not configured
+        fstrm-set-flush-timeout <integer>; // not configured
+        fstrm-set-input-queue-size <integer>; // not configured
+        fstrm-set-output-notify-threshold <integer>; // not configured
+        fstrm-set-output-queue-model ( spsc | mpsc ); // not configured
+        fstrm-set-output-queue-size <integer>; // not configured
+        fstrm-set-reopen-interval <integer>; // not configured
         geoip-directory ( <quoted_string> | none ); // not configured
         geoip-use-ecs ( <quoted_string> | none ); // not configured
         has-old-clients <boolean>; // obsolete