regen master

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index f631e07c3a37aae185436d6a9875eebb5b205a5b..7d0a0a1dacfc23d81be0c8d1ac3348d6f091dee3 100644 (file)
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -455,6 +455,10 @@ view \fIstring\fR \fIoptional_class\fR {
                \fIstring\fR \fIinteger\fR \fIinteger\fR \fIinteger\fR \fIquoted_string\fR;
                [\&.\&.\&.]
        };
+       managed\-keys {
+               \fIdomain_name\fR \fBinitial\-key\fR \fIflags\fR \fIprotocol\fR \fIalgorithm\fR \fIkey\fR;
+               [\&.\&.\&.]
+       };
        allow\-recursion { \fIaddress_match_element\fR; \&.\&.\&. };
        allow\-recursion\-on { \fIaddress_match_element\fR; \&.\&.\&. };
        sortlist { \fIaddress_match_element\fR; \&.\&.\&. };

diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 53aaaf1b2f5b9cd8271011823cc62ae08267c19c..42655e4e7aa4099d200fb1119b20daa072bcdf48 100644 (file)
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -413,6 +413,11 @@ view
                <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>quoted_string</code></em>;<br>
                [<span class="optional">...</span>]<br>
        };<br>
+<br>
+       managed-keys {<br>
+               <em class="replaceable"><code>domain_name</code></em> <code class="constant">initial-key</code> <em class="replaceable"><code>flags</code></em> <em class="replaceable"><code>protocol</code></em> <em class="replaceable"><code>algorithm</code></em> <em class="replaceable"><code>key</code></em>;<br>
+               [<span class="optional">...</span>]<br>
+       };<br>
 <br>
        allow-recursion { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
        allow-recursion-on { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>

diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index 09cdaacad28780648ad98807a7bc516868583d3d..824ae9cb7fb5bf1033c14d456912488b2e04dfcf 100644 (file)
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -431,6 +431,11 @@ view
                <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>integer</code></em> <em class="replaceable"><code>quoted_string</code></em>;<br>
                [<span class="optional">...</span>]<br>
        };<br>
+<br>
+       managed-keys {<br>
+               <em class="replaceable"><code>domain_name</code></em> <code class="constant">initial-key</code> <em class="replaceable"><code>flags</code></em> <em class="replaceable"><code>protocol</code></em> <em class="replaceable"><code>algorithm</code></em> <em class="replaceable"><code>key</code></em>;<br>
+               [<span class="optional">...</span>]<br>
+       };<br>
 <br>
        allow-recursion { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
        allow-recursion-on { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>