From: Tinderbox User <tbox@isc.org>
Date: Thu, 16 May 2013 01:04:57 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.10.0a1~336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197486d6a95ef23b1b414e96577bad21e57801cd;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index afc506d5fbe..20e4b95ce62 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -187,7 +187,7 @@ options {
 	random\-device \fIquoted_string\fR;
 	recursive\-clients \fIinteger\fR;
 	serial\-query\-rate \fIinteger\fR;
-	server\-id ( \fIquoted_string\fR | none |;
+	server\-id ( \fIquoted_string\fR | hostname | none );
 	stacksize \fIsize\fR;
 	statistics\-file \fIquoted_string\fR;
 	statistics\-interval \fIinteger\fR; // not yet implemented
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index e32239ba082..31aa9495ba0 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -184,7 +184,7 @@ options
 	random-device <em class="replaceable"><code>quoted_string</code></em>;<br>
 	recursive-clients <em class="replaceable"><code>integer</code></em>;<br>
 	serial-query-rate <em class="replaceable"><code>integer</code></em>;<br>
-	server-id ( <em class="replaceable"><code>quoted_string</code></em> | none |;<br>
+	server-id ( <em class="replaceable"><code>quoted_string</code></em> | hostname | none );<br>
 	stacksize <em class="replaceable"><code>size</code></em>;<br>
 	statistics-file <em class="replaceable"><code>quoted_string</code></em>;<br>
 	statistics-interval <em class="replaceable"><code>integer</code></em>; // not yet implemented<br>
@@ -362,7 +362,7 @@ options
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544595"></a><h2>VIEW</h2>
+<a name="id2544596"></a><h2>VIEW</h2>
 <div class="literallayout"><p><br>
 view <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>optional_class</code></em> {<br>
 	match-clients { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
@@ -527,7 +527,7 @@ view
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545317"></a><h2>ZONE</h2>
+<a name="id2545318"></a><h2>ZONE</h2>
 <div class="literallayout"><p><br>
 zone <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>optional_class</code></em> {<br>
 	type ( master | slave | stub | hint | redirect |<br>
@@ -624,12 +624,12 @@ zone
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545706"></a><h2>FILES</h2>
+<a name="id2545707"></a><h2>FILES</h2>
 <p><code class="filename">/etc/named.conf</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545718"></a><h2>SEE ALSO</h2>
+<a name="id2545719"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named-checkconf</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,