From: Tinderbox User <tbox@isc.org>
Date: Thu, 29 Oct 2015 02:56:15 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.11.0a1~327^2~32
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=eadee66609d24bee478aa750cea3c8b3cc1e7579;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 4904d7d9726..92ecc610d35 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -257,7 +257,6 @@ options {
 	transfers\-per\-ns \fIinteger\fR;
 	transfers\-in \fIinteger\fR;
 	transfers\-out \fIinteger\fR;
-	use\-ixfr \fIboolean\fR;
 	version ( \fIquoted_string\fR | none );
 	allow\-recursion { \fIaddress_match_element\fR; \&.\&.\&. };
 	allow\-recursion\-on { \fIaddress_match_element\fR; \&.\&.\&. };
@@ -410,6 +409,7 @@ options {
 	serial\-queries \fIinteger\fR; // obsolete
 	treat\-cr\-as\-space \fIboolean\fR; // obsolete
 	use\-id\-pool \fIboolean\fR; // obsolete
+	use\-ixfr \fIboolean\fR; // obsolete
 };
 .fi
 .if n \{\
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 9305b59078d..06ddc413d28 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -200,7 +200,6 @@ options
 	transfers-per-ns <em class="replaceable"><code>integer</code></em>;<br>
 	transfers-in <em class="replaceable"><code>integer</code></em>;<br>
 	transfers-out <em class="replaceable"><code>integer</code></em>;<br>
-	use-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
 	version ( <em class="replaceable"><code>quoted_string</code></em> | none );<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>
@@ -368,6 +367,7 @@ options
 	serial-queries <em class="replaceable"><code>integer</code></em>; // obsolete<br>
 	treat-cr-as-space <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
 	use-id-pool <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
+	use-ixfr <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
 };<br>
 </p></div>
 </div>
diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index 74cc725937e..2433118222e 100644
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -219,7 +219,6 @@ options
 	transfers-per-ns <em class="replaceable"><code>integer</code></em>;<br>
 	transfers-in <em class="replaceable"><code>integer</code></em>;<br>
 	transfers-out <em class="replaceable"><code>integer</code></em>;<br>
-	use-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
 	version ( <em class="replaceable"><code>quoted_string</code></em> | none );<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>
@@ -387,6 +386,7 @@ options
 	serial-queries <em class="replaceable"><code>integer</code></em>; // obsolete<br>
 	treat-cr-as-space <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
 	use-id-pool <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
+	use-ixfr <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
 };<br>
 </p></div>
 </div>
diff --git a/doc/misc/options b/doc/misc/options
index 6e6ac785c2c..3d6a5bfb7ba 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -318,7 +318,7 @@ options {
         update-check-ksk <boolean>;
         use-alt-transfer-source <boolean>;
         use-id-pool <boolean>; // obsolete
-        use-ixfr <boolean>;
+        use-ixfr <boolean>; // obsolete
         use-queryport-pool <boolean>; // obsolete
         use-v4-udp-ports { <portrange>; ... };
         use-v6-udp-ports { <portrange>; ... };