regen master

diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8
index 42e6524ef34de2c8cf8132ba8c75e01f531d36d2..c80e324ea22d5bff7eb14243744f982410ec04a2 100644 (file)
--- a/bin/rndc/rndc.8
+++ b/bin/rndc/rndc.8
@@ -516,7 +516,10 @@ Status will report whether serving of stale answers is currently enabled, disabl
 .PP
 \fBsecroots \fR\fB[\-]\fR\fB \fR\fB[\fIview \&.\&.\&.\fR]\fR
 .RS 4
-Dump the server\*(Aqs security roots and negative trust anchors for the specified views\&. If no view is specified, all views are dumped\&.
+Dump the security roots (i\&.e\&., trust anchors configured via
+\fBtrusted\-keys\fR,
+\fBmanaged\-keys\fR, or
+\fBdnssec\-validation auto\fR) and negative trust anchors for the specified views\&. If no view is specified, all views are dumped\&. Security roots will indicate whether they are configured as trusted keys, managed keys, or initializing managed keys (managed keys that have not yet been updated by a successful key refresh query)\&.
 .sp
 If the first argument is "\-", then the output is returned via the
 \fBrndc\fR

diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html
index efa693d70def4c7a6bff83f28af0171bd66d0146..b1936b10d7ebd8e4e991c19ad883b5e4e859d518 100644 (file)
--- a/bin/rndc/rndc.html
+++ b/bin/rndc/rndc.html
@@ -657,9 +657,15 @@
 <dt><span class="term"><strong class="userinput"><code>secroots [<span class="optional">-</span>] [<span class="optional"><em class="replaceable"><code>view ...</code></em></span>]</code></strong></span></dt>
 <dd>
          <p>
-           Dump the server's security roots and negative trust anchors
-           for the specified views.  If no view is specified, all views
-           are dumped.
+           Dump the security roots (i.e., trust anchors
+           configured via <span class="command"><strong>trusted-keys</strong></span>,
+           <span class="command"><strong>managed-keys</strong></span>, or
+           <span class="command"><strong>dnssec-validation auto</strong></span>) and negative trust
+           anchors for the specified views.  If no view is specified, all
+           views are dumped.  Security roots will indicate whether
+           they are configured as trusted keys, managed keys, or
+           initializing managed keys (managed keys that have not yet
+           been updated by a successful key refresh query).
          </p>
          <p>
            If the first argument is "-", then the output is
@@ -822,15 +828,15 @@
 <dd>
          <p>
            When called without arguments, display the current
-            values of the <span class="command"><strong>tcp-initial-timeout</strong></span>,
+           values of the <span class="command"><strong>tcp-initial-timeout</strong></span>,
            <span class="command"><strong>tcp-idle-timeout</strong></span>,
            <span class="command"><strong>tcp-keepalive-timeout</strong></span> and
            <span class="command"><strong>tcp-advertised-timeout</strong></span> options.
-            When called with arguments, update these values. This
-            allows an administrator to make rapid adjustments when
-            under a denial of service attack.  See the descriptions of
-            these options in the BIND 9 Administrator Reference Manual
-            for details of their use.
+           When called with arguments, update these values. This
+           allows an administrator to make rapid adjustments when
+           under a denial of service attack.  See the descriptions of
+           these options in the BIND 9 Administrator Reference Manual
+           for details of their use.
          </p>
        </dd>
 <dt><span class="term"><strong class="userinput"><code>thaw [<span class="optional"><em class="replaceable"><code>zone</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em> [<span class="optional"><em class="replaceable"><code>view</code></em></span>]</span>]</span>]</code></strong></span></dt>

diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index 571a1acb6c3178b427ef2bb12ae14bb5e0b52da0..6b660ce232cca3a9d7309aef2ef85a729f6abfac 100644 (file)
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -673,9 +673,15 @@
 <dt><span class="term"><strong class="userinput"><code>secroots [<span class="optional">-</span>] [<span class="optional"><em class="replaceable"><code>view ...</code></em></span>]</code></strong></span></dt>
 <dd>
          <p>
-           Dump the server's security roots and negative trust anchors
-           for the specified views.  If no view is specified, all views
-           are dumped.
+           Dump the security roots (i.e., trust anchors
+           configured via <span class="command"><strong>trusted-keys</strong></span>,
+           <span class="command"><strong>managed-keys</strong></span>, or
+           <span class="command"><strong>dnssec-validation auto</strong></span>) and negative trust
+           anchors for the specified views.  If no view is specified, all
+           views are dumped.  Security roots will indicate whether
+           they are configured as trusted keys, managed keys, or
+           initializing managed keys (managed keys that have not yet
+           been updated by a successful key refresh query).
          </p>
          <p>
            If the first argument is "-", then the output is
@@ -838,15 +844,15 @@
 <dd>
          <p>
            When called without arguments, display the current
-            values of the <span class="command"><strong>tcp-initial-timeout</strong></span>,
+           values of the <span class="command"><strong>tcp-initial-timeout</strong></span>,
            <span class="command"><strong>tcp-idle-timeout</strong></span>,
            <span class="command"><strong>tcp-keepalive-timeout</strong></span> and
            <span class="command"><strong>tcp-advertised-timeout</strong></span> options.
-            When called with arguments, update these values. This
-            allows an administrator to make rapid adjustments when
-            under a denial of service attack.  See the descriptions of
-            these options in the BIND 9 Administrator Reference Manual
-            for details of their use.
+           When called with arguments, update these values. This
+           allows an administrator to make rapid adjustments when
+           under a denial of service attack.  See the descriptions of
+           these options in the BIND 9 Administrator Reference Manual
+           for details of their use.
          </p>
        </dd>
 <dt><span class="term"><strong class="userinput"><code>thaw [<span class="optional"><em class="replaceable"><code>zone</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em> [<span class="optional"><em class="replaceable"><code>view</code></em></span>]</span>]</span>]</code></strong></span></dt>