From: Mark Andrews <marka@isc.org>
Date: Thu, 14 Oct 2004 02:57:54 +0000 (+0000)
Subject: regen
X-Git-Tag: v9.2.5rc1~28^2~84
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=18eedaf157f8c45e2d998b33d2a13fdcb0e49c35;p=thirdparty%2Fbind9.git

regen
---

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 9478efbbf12..60886ae3e88 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -94,7 +94,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN4066"
+HREF="Bv9ARM.ch06.html#AEN4073"
 >Zone File</A
 ></DT
 ></DL
@@ -5266,6 +5266,30 @@ old and new zone version, and the server will need to
 temporarily allocate memory to hold this complete
 difference set.
 </P
+><P
+>&#13;<B
+CLASS="command"
+>ixfr-from-differences</B
+> also accepts <B
+CLASS="command"
+>master</B
+>
+and <B
+CLASS="command"
+>slave</B
+> at the view and options levels which causes
+<B
+CLASS="command"
+>ixfr-from-differences</B
+> to apply to all <B
+CLASS="command"
+>master</B
+>
+or <B
+CLASS="command"
+>slave</B
+> zones respectively.
+</P
 ></DD
 ><DT
 ><B
@@ -5375,7 +5399,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2705"
+NAME="AEN2712"
 >6.2.16.2. Forwarding</A
 ></H3
 ><P
@@ -5443,7 +5467,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2724"
+NAME="AEN2731"
 >6.2.16.3. Dual-stack Servers</A
 ></H3
 ><P
@@ -5655,7 +5679,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2791"
+NAME="AEN2798"
 >6.2.16.5. Interfaces</A
 ></H3
 ><P
@@ -5758,7 +5782,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2818"
+NAME="AEN2825"
 >6.2.16.6. Query Address</A
 ></H3
 ><P
@@ -6266,7 +6290,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2984"
+NAME="AEN2991"
 >6.2.16.8. Bad UDP Port Lists</A
 ></H3
 ><P
@@ -6290,7 +6314,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2989"
+NAME="AEN2996"
 >6.2.16.9. Operating System Resource Limits</A
 ></H3
 ><P
@@ -6410,7 +6434,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3026"
+NAME="AEN3033"
 >6.2.16.10. Server  Resource Limits</A
 ></H3
 ><P
@@ -6533,7 +6557,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3067"
+NAME="AEN3074"
 >6.2.16.11. Periodic Task Intervals</A
 ></H3
 ><P
@@ -6898,7 +6922,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3155"
+NAME="AEN3162"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -7360,7 +7384,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3299"
+NAME="AEN3306"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -7832,7 +7856,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3438"
+NAME="AEN3445"
 >6.2.19. <B
 CLASS="command"
 >trusted-keys</B
@@ -7887,7 +7911,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3454"
+NAME="AEN3461"
 >6.2.20. <B
 CLASS="command"
 >trusted-keys</B
@@ -7975,7 +7999,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3476"
+NAME="AEN3483"
 >6.2.22. <B
 CLASS="command"
 >view</B
@@ -8619,7 +8643,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3653"
+NAME="AEN3660"
 >6.2.24. <B
 CLASS="command"
 >zone</B
@@ -8630,7 +8654,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3656"
+NAME="AEN3663"
 >6.2.24.1. Zone Types</A
 ></H3
 ><DIV
@@ -8638,7 +8662,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3658"
+NAME="AEN3665"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -8870,7 +8894,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3721"
+NAME="AEN3728"
 >6.2.24.2. Class</A
 ></H3
 ><P
@@ -8908,7 +8932,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3731"
+NAME="AEN3738"
 >6.2.24.3. Zone Options</A
 ></H3
 ><P
@@ -9678,7 +9702,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4025"
+NAME="AEN4032"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -9803,7 +9827,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4066"
+NAME="AEN4073"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -9824,7 +9848,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4071"
+NAME="AEN4078"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -9849,7 +9873,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4077"
+NAME="AEN4084"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -9930,7 +9954,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4109"
+NAME="AEN4116"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10281,7 +10305,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4261"
+NAME="AEN4268"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10363,7 +10387,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4285"
+NAME="AEN4292"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -10395,7 +10419,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4292"
+NAME="AEN4299"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10550,7 +10574,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4358"
+NAME="AEN4365"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10621,7 +10645,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4386"
+NAME="AEN4393"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10659,7 +10683,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4392"
+NAME="AEN4399"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10880,7 +10904,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4484"
+NAME="AEN4491"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10943,7 +10967,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4507"
+NAME="AEN4514"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10972,7 +10996,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4512"
+NAME="AEN4519"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -11038,7 +11062,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4534"
+NAME="AEN4541"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -11063,7 +11087,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4541"
+NAME="AEN4548"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -11129,7 +11153,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4561"
+NAME="AEN4568"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -11205,7 +11229,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4581"
+NAME="AEN4588"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -11241,7 +11265,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4592"
+NAME="AEN4599"
 >6.3.6. <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -11324,7 +11348,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4616"
+NAME="AEN4623"
 ></A
 ><TABLE
 CELLPADDING="3"
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 03f7aa30dd6..7b2e38ac358 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -89,7 +89,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4709"
+HREF="Bv9ARM.ch07.html#AEN4716"
 ><B
 CLASS="command"
 >chroot</B
@@ -197,7 +197,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4709"
+NAME="AEN4716"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -275,7 +275,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4732"
+NAME="AEN4739"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -351,7 +351,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4750"
+NAME="AEN4757"
 >7.2.2. Using the <B
 CLASS="command"
 >setuid</B
diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
index 321d8d0ceb2..93e00248bc0 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -81,17 +81,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4771"
+HREF="Bv9ARM.ch08.html#AEN4778"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4776"
+HREF="Bv9ARM.ch08.html#AEN4783"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4781"
+HREF="Bv9ARM.ch08.html#AEN4788"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -101,7 +101,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4771"
+NAME="AEN4778"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -109,7 +109,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4773"
+NAME="AEN4780"
 >8.1.1. It's not working; how can I figure out what's wrong?</A
 ></H2
 ><P
@@ -125,7 +125,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4776"
+NAME="AEN4783"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -154,7 +154,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4781"
+NAME="AEN4788"
 >8.3. Where Can I Get Help?</A
 ></H1
 ><P
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index fc6636c240a..30b315fccdb 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -74,7 +74,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4797"
+HREF="Bv9ARM.ch09.html#AEN4804"
 >Acknowledgments</A
 ></DT
 ><DT
@@ -97,7 +97,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4797"
+NAME="AEN4804"
 >A.1. Acknowledgments</A
 ></H1
 ><DIV
@@ -105,7 +105,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4799"
+NAME="AEN4806"
 >A.1.1. A Brief History of the <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -271,7 +271,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4835"
+NAME="AEN4842"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -410,7 +410,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4904"
+NAME="AEN4911"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -608,19 +608,19 @@ TARGET="_top"
 </P
 ><H3
 ><A
-NAME="AEN4972"
+NAME="AEN4979"
 >Bibliography</A
 ></H3
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4973"
+NAME="AEN4980"
 >Standards</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4975"
+NAME="AEN4982"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -637,7 +637,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4982"
+NAME="AEN4989"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -654,7 +654,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4989"
+NAME="AEN4996"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -678,7 +678,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4998"
+NAME="AEN5005"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -698,7 +698,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5006"
+NAME="AEN5013"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -718,7 +718,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5014"
+NAME="AEN5021"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -738,7 +738,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5022"
+NAME="AEN5029"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -755,7 +755,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5029"
+NAME="AEN5036"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -781,7 +781,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5046"
+NAME="AEN5053"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -810,13 +810,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5065"
+NAME="AEN5072"
 >Proposed Standards Still Under Development</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5070"
+NAME="AEN5077"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -839,7 +839,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5082"
+NAME="AEN5089"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -859,7 +859,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5094"
+NAME="AEN5101"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -876,7 +876,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5102"
+NAME="AEN5109"
 >Other Important RFCs About <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -885,7 +885,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5105"
+NAME="AEN5112"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -905,7 +905,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5113"
+NAME="AEN5120"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -937,7 +937,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5134"
+NAME="AEN5141"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -957,13 +957,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5145"
+NAME="AEN5152"
 >Resource Record Types</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5147"
+NAME="AEN5154"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -992,7 +992,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5165"
+NAME="AEN5172"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1015,7 +1015,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5177"
+NAME="AEN5184"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1036,7 +1036,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5188"
+NAME="AEN5195"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1063,7 +1063,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5205"
+NAME="AEN5212"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1087,7 +1087,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5217"
+NAME="AEN5224"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1108,7 +1108,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5225"
+NAME="AEN5232"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1128,7 +1128,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5233"
+NAME="AEN5240"
 ><ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1137,7 +1137,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5236"
+NAME="AEN5243"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1157,7 +1157,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5244"
+NAME="AEN5251"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1174,7 +1174,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5251"
+NAME="AEN5258"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1191,7 +1191,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5258"
+NAME="AEN5265"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1214,7 +1214,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5272"
+NAME="AEN5279"
 ><ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1223,7 +1223,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5275"
+NAME="AEN5282"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1243,7 +1243,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5283"
+NAME="AEN5290"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1263,7 +1263,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5291"
+NAME="AEN5298"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1283,7 +1283,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5302"
+NAME="AEN5309"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1306,7 +1306,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5314"
+NAME="AEN5321"
 >Other <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1315,7 +1315,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5320"
+NAME="AEN5327"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1332,7 +1332,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5327"
+NAME="AEN5334"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1352,7 +1352,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5335"
+NAME="AEN5342"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1372,7 +1372,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5343"
+NAME="AEN5350"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1389,7 +1389,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5350"
+NAME="AEN5357"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1412,7 +1412,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5364"
+NAME="AEN5371"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1429,13 +1429,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5371"
+NAME="AEN5378"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5373"
+NAME="AEN5380"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1486,7 +1486,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN5394"
+NAME="AEN5401"
 >A.3.3. Other Documents About <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -1496,13 +1496,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN5398"
+NAME="AEN5405"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5399"
+NAME="AEN5406"
 ></A
 ><P
 ><SPAN
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index ee2a8a424e0..c3fb5778d39 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -536,7 +536,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN3438"
+HREF="Bv9ARM.ch06.html#AEN3445"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -544,7 +544,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN3454"
+HREF="Bv9ARM.ch06.html#AEN3461"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -561,7 +561,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN3476"
+HREF="Bv9ARM.ch06.html#AEN3483"
 ><B
 CLASS="command"
 >view</B
@@ -578,7 +578,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.24. <A
-HREF="Bv9ARM.ch06.html#AEN3653"
+HREF="Bv9ARM.ch06.html#AEN3660"
 ><B
 CLASS="command"
 >zone</B
@@ -588,7 +588,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN4066"
+HREF="Bv9ARM.ch06.html#AEN4073"
 >Zone File</A
 ></DT
 ><DD
@@ -600,7 +600,7 @@ HREF="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them"
 ></DT
 ><DT
 >6.3.2. <A
-HREF="Bv9ARM.ch06.html#AEN4386"
+HREF="Bv9ARM.ch06.html#AEN4393"
 >Discussion of MX Records</A
 ></DT
 ><DT
@@ -610,17 +610,17 @@ HREF="Bv9ARM.ch06.html#Setting_TTLs"
 ></DT
 ><DT
 >6.3.4. <A
-HREF="Bv9ARM.ch06.html#AEN4507"
+HREF="Bv9ARM.ch06.html#AEN4514"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN4534"
+HREF="Bv9ARM.ch06.html#AEN4541"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN4592"
+HREF="Bv9ARM.ch06.html#AEN4599"
 ><ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -650,7 +650,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4709"
+HREF="Bv9ARM.ch07.html#AEN4716"
 ><B
 CLASS="command"
 >chroot</B
@@ -664,7 +664,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4732"
+HREF="Bv9ARM.ch07.html#AEN4739"
 >The <B
 CLASS="command"
 >chroot</B
@@ -672,7 +672,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4750"
+HREF="Bv9ARM.ch07.html#AEN4757"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -696,26 +696,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4771"
+HREF="Bv9ARM.ch08.html#AEN4778"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4773"
+HREF="Bv9ARM.ch08.html#AEN4780"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4776"
+HREF="Bv9ARM.ch08.html#AEN4783"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4781"
+HREF="Bv9ARM.ch08.html#AEN4788"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -729,14 +729,14 @@ HREF="Bv9ARM.ch09.html"
 ><DL
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4797"
+HREF="Bv9ARM.ch09.html#AEN4804"
 >Acknowledgments</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4799"
+HREF="Bv9ARM.ch09.html#AEN4806"
 >A Brief History of the <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -783,7 +783,7 @@ HREF="Bv9ARM.ch09.html#internet_drafts"
 ></DT
 ><DT
 >A.3.3. <A
-HREF="Bv9ARM.ch09.html#AEN5394"
+HREF="Bv9ARM.ch09.html#AEN5401"
 >Other Documents About <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
diff --git a/doc/misc/options b/doc/misc/options
index a272f56429a..129e8f6e4f0 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -84,6 +84,7 @@ options {
         dnssec-enable <boolean>;
         dnssec-lookaside <string> trust-anchor <string>;
         dnssec-must-be-secure <string> <boolean>;
+        ixfr-from-differences <ixfrdiff>;
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -97,7 +98,6 @@ options {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
-        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
         max-journal-size <size_no_default>;
@@ -172,6 +172,7 @@ view <string> <optional_class> {
                 database <string>;
                 delegation-only <boolean>;
                 check-names ( fail | warn | ignore );
+                ixfr-from-differences <boolean>;
                 allow-query { <address_match_element>; ... };
                 allow-transfer { <address_match_element>; ... };
                 allow-update-forwarding { <address_match_element>; ... };
@@ -187,7 +188,6 @@ view <string> <optional_class> {
                 forward ( first | only );
                 forwarders [ port <integer> ] { ( <ipv4_address> |
                     <ipv6_address> ) [ port <integer> ]; ... };
-                ixfr-from-differences <boolean>;
                 maintain-ixfr-base <boolean>; // obsolete
                 max-ixfr-log-size <size>; // obsolete
                 max-journal-size <size_no_default>;
@@ -265,6 +265,7 @@ view <string> <optional_class> {
         dnssec-enable <boolean>;
         dnssec-lookaside <string> trust-anchor <string>;
         dnssec-must-be-secure <string> <boolean>;
+        ixfr-from-differences <ixfrdiff>;
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -278,7 +279,6 @@ view <string> <optional_class> {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
-        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
         max-journal-size <size_no_default>;
@@ -331,6 +331,7 @@ zone <string> <optional_class> {
         database <string>;
         delegation-only <boolean>;
         check-names ( fail | warn | ignore );
+        ixfr-from-differences <boolean>;
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -344,7 +345,6 @@ zone <string> <optional_class> {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
-        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
         max-journal-size <size_no_default>;