9.1.2rc1

10 files changed, 216 insertions, 121 deletions

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index a7b1fafd..83bde2f1 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.72.2.15 2001/03/19 20:26:20 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.72.2.17 2001/04/26 18:19:27 gson Exp $ -->
 
 <book>
 
@@ -2050,8 +2050,8 @@ the system has an interface.</para></entry>
     <sect2>
       <title><command>controls</command> Statement Grammar</title>
 <programlisting><command>controls</command> {
-   inet ( ip_addr | * ) <optional> port ip_port </optional> allow <replaceable> address_match_list </replaceable>
-                keys <replaceable> key_list </replaceable>;
+   inet ( ip_addr | * ) <optional> port ip_port </optional> allow { <replaceable> address_match_list </replaceable> }
+                keys { <replaceable> key_list </replaceable> };
    <optional> inet ...; </optional>
 };
 </programlisting>
@@ -3990,6 +3990,11 @@ file by appending ".<filename>jnl</filename>" to the name of the
 zone file.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para><command>ixfr-tmp-file</command></para></entry>
+<entry colname = "2"><para>Was an undocumented optino in <acronym>BIND</acronym> 8.
+Ignored in <acronym>BIND</acronym> 9.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para><command>max-transfer-time-in</command></para></entry>
 <entry colname = "2"><para>See the description of
 <command>max-transfer-time-in</command> in <xref linkend="zone_transfers"/>.</para></entry>
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 214b1b23..52c8f8c9 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -90,7 +90,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3420"
+HREF="Bv9ARM.ch06.html#AEN3428"
 >Zone File</A
 ></DT
 ></DL
@@ -1430,18 +1430,18 @@ CLASS="command"
    inet ( ip_addr | * ) [<SPAN
 CLASS="optional"
 > port ip_port </SPAN
->] allow <TT
+>] allow { <TT
 CLASS="replaceable"
 ><I
 > address_match_list </I
 ></TT
->
-                keys <TT
+> }
+                keys { <TT
 CLASS="replaceable"
 ><I
 > key_list </I
 ></TT
->;
+> };
    [<SPAN
 CLASS="optional"
 > inet ...; </SPAN
@@ -8734,6 +8734,32 @@ VALIGN="MIDDLE"
 ><P
 ><B
 CLASS="command"
+>ixfr-tmp-file</B
+></P
+></TD
+><TD
+WIDTH="273"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+>Was an undocumented optino in <SPAN
+CLASS="acronym"
+>BIND</SPAN
+> 8.
+Ignored in <SPAN
+CLASS="acronym"
+>BIND</SPAN
+> 9.</P
+></TD
+></TR
+><TR
+><TD
+WIDTH="159"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+><B
+CLASS="command"
 >max-transfer-time-in</B
 ></P
 ></TD
@@ -9177,7 +9203,7 @@ CLASS="varname"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3390"
+NAME="AEN3398"
 ></A
 ><P
 ></P
@@ -9284,7 +9310,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3420"
+NAME="AEN3428"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -9305,7 +9331,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3425"
+NAME="AEN3433"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -9328,7 +9354,7 @@ HREF="Bv9ARM.ch06.html#rrset_ordering"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3431"
+NAME="AEN3439"
 ></A
 ><P
 ></P
@@ -9439,7 +9465,7 @@ or historical (h) and no longer in general use):</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3463"
+NAME="AEN3471"
 ></A
 ><P
 ></P
@@ -9816,7 +9842,7 @@ are currently valid in the DNS:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3575"
+NAME="AEN3583"
 ></A
 ><P
 ></P
@@ -9868,7 +9894,7 @@ data that describes the resource:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3591"
+NAME="AEN3599"
 ></A
 ><P
 ></P
@@ -10045,7 +10071,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3639"
+NAME="AEN3647"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -10075,7 +10101,7 @@ knowledge of the typical representation for the data.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3646"
+NAME="AEN3654"
 ></A
 ><P
 ></P
@@ -10284,7 +10310,7 @@ domain names.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3712"
+NAME="AEN3720"
 ></A
 ><P
 ></P
@@ -10375,7 +10401,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3740"
+NAME="AEN3748"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10408,7 +10434,7 @@ pointed to by the CNAME.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3746"
+NAME="AEN3754"
 ></A
 ><P
 ></P
@@ -10703,7 +10729,7 @@ used in a zone file.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3838"
+NAME="AEN3846"
 ></A
 ><P
 ></P
@@ -10786,7 +10812,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3861"
+NAME="AEN3869"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10810,7 +10836,7 @@ CLASS="optional"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3866"
+NAME="AEN3874"
 ></A
 ><P
 ></P
@@ -10890,7 +10916,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3888"
+NAME="AEN3896"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10915,7 +10941,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3895"
+NAME="AEN3903"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -10985,7 +11011,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3915"
+NAME="AEN3923"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -11067,7 +11093,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3935"
+NAME="AEN3943"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -11107,7 +11133,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3946"
+NAME="AEN3954"
 >6.3.6. <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -11186,7 +11212,7 @@ CLASS="literal"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3966"
+NAME="AEN3974"
 ></A
 ><P
 ></P
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 1a98e7a7..e15b4528 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -85,7 +85,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4038"
+HREF="Bv9ARM.ch07.html#AEN4046"
 ><B
 CLASS="command"
 >chroot</B
@@ -187,7 +187,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4038"
+NAME="AEN4046"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -266,7 +266,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4061"
+NAME="AEN4069"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -322,7 +322,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4076"
+NAME="AEN4084"
 >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 7cfca08d..3d4da82c 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -77,17 +77,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4096"
+HREF="Bv9ARM.ch08.html#AEN4104"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4102"
+HREF="Bv9ARM.ch08.html#AEN4110"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4107"
+HREF="Bv9ARM.ch08.html#AEN4115"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -97,7 +97,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4096"
+NAME="AEN4104"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -105,7 +105,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4098"
+NAME="AEN4106"
 >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="AEN4102"
+NAME="AEN4110"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -154,7 +154,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4107"
+NAME="AEN4115"
 >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 9cf404b0..cb8eaf78 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -71,7 +71,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4123"
+HREF="Bv9ARM.ch09.html#AEN4131"
 >Acknowledgements</A
 ></DT
 ><DT
@@ -84,7 +84,7 @@ CLASS="acronym"
 ></DT
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4164"
+HREF="Bv9ARM.ch09.html#AEN4172"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -102,7 +102,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4123"
+NAME="AEN4131"
 >A.1. Acknowledgements</A
 ></H1
 ><DIV
@@ -110,7 +110,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4125"
+NAME="AEN4133"
 >A.1.1. A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -245,7 +245,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4155"
+NAME="AEN4163"
 >A.2.1.1. HS = hesiod</A
 ></H3
 ><P
@@ -266,7 +266,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4160"
+NAME="AEN4168"
 >A.2.1.2. CH = chaos</A
 ></H3
 ><P
@@ -284,7 +284,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4164"
+NAME="AEN4172"
 >A.3. General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -323,7 +323,7 @@ Unicast address scheme. For more information, see RFC 2374.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4175"
+NAME="AEN4183"
 ></A
 ><P
 ></P
@@ -542,7 +542,7 @@ VALIGN="MIDDLE"
 <DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4244"
+NAME="AEN4252"
 ></A
 ><P
 ></P
@@ -725,7 +725,7 @@ unicast address consists of:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4299"
+NAME="AEN4307"
 ></A
 ><P
 ></P
@@ -883,19 +883,19 @@ TARGET="_top"
 >.</P
 ><H3
 ><A
-NAME="AEN4343"
+NAME="AEN4351"
 >Bibliography</A
 ></H3
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4344"
+NAME="AEN4352"
 >Standards</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4346"
+NAME="AEN4354"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -912,7 +912,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4353"
+NAME="AEN4361"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -929,7 +929,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4360"
+NAME="AEN4368"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -953,7 +953,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4369"
+NAME="AEN4377"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -973,7 +973,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4377"
+NAME="AEN4385"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -993,7 +993,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4385"
+NAME="AEN4393"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -1013,7 +1013,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4393"
+NAME="AEN4401"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -1030,7 +1030,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4400"
+NAME="AEN4408"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -1056,7 +1056,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4417"
+NAME="AEN4425"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -1085,13 +1085,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4436"
+NAME="AEN4444"
 >Proposed Standards Still Under Development</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4441"
+NAME="AEN4449"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -1114,7 +1114,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4453"
+NAME="AEN4461"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -1134,7 +1134,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4465"
+NAME="AEN4473"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -1151,7 +1151,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4473"
+NAME="AEN4481"
 >Other Important RFCs About <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1160,7 +1160,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4476"
+NAME="AEN4484"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -1180,7 +1180,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4484"
+NAME="AEN4492"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -1212,7 +1212,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4505"
+NAME="AEN4513"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -1232,13 +1232,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4516"
+NAME="AEN4524"
 >Resource Record Types</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4518"
+NAME="AEN4526"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -1267,7 +1267,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4536"
+NAME="AEN4544"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1290,7 +1290,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4548"
+NAME="AEN4556"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1311,7 +1311,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4559"
+NAME="AEN4567"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1338,7 +1338,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4576"
+NAME="AEN4584"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1362,7 +1362,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4588"
+NAME="AEN4596"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1383,7 +1383,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4596"
+NAME="AEN4604"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1403,7 +1403,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4604"
+NAME="AEN4612"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1412,7 +1412,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4607"
+NAME="AEN4615"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1432,7 +1432,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4615"
+NAME="AEN4623"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1449,7 +1449,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4622"
+NAME="AEN4630"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1466,7 +1466,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4629"
+NAME="AEN4637"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1489,7 +1489,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4643"
+NAME="AEN4651"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1498,7 +1498,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4646"
+NAME="AEN4654"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1518,7 +1518,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4654"
+NAME="AEN4662"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1538,7 +1538,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4662"
+NAME="AEN4670"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1558,7 +1558,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4670"
+NAME="AEN4678"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1578,7 +1578,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4681"
+NAME="AEN4689"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1601,7 +1601,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4693"
+NAME="AEN4701"
 >Other <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1610,7 +1610,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4699"
+NAME="AEN4707"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1627,7 +1627,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4706"
+NAME="AEN4714"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1647,7 +1647,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4714"
+NAME="AEN4722"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1667,7 +1667,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4722"
+NAME="AEN4730"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1684,7 +1684,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4729"
+NAME="AEN4737"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1707,7 +1707,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4743"
+NAME="AEN4751"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1724,13 +1724,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4750"
+NAME="AEN4758"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4752"
+NAME="AEN4760"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1781,7 +1781,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4773"
+NAME="AEN4781"
 >A.4.3. Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -1791,13 +1791,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN4777"
+NAME="AEN4785"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4778"
+NAME="AEN4786"
 ></A
 ><P
 ><SPAN
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 2c0fc75d..36becdab 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -568,7 +568,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3420"
+HREF="Bv9ARM.ch06.html#AEN3428"
 >Zone File</A
 ></DT
 ><DD
@@ -580,7 +580,7 @@ HREF="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them"
 ></DT
 ><DT
 >6.3.2. <A
-HREF="Bv9ARM.ch06.html#AEN3740"
+HREF="Bv9ARM.ch06.html#AEN3748"
 >Discussion of MX Records</A
 ></DT
 ><DT
@@ -590,17 +590,17 @@ HREF="Bv9ARM.ch06.html#Setting_TTLs"
 ></DT
 ><DT
 >6.3.4. <A
-HREF="Bv9ARM.ch06.html#AEN3861"
+HREF="Bv9ARM.ch06.html#AEN3869"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN3888"
+HREF="Bv9ARM.ch06.html#AEN3896"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN3946"
+HREF="Bv9ARM.ch06.html#AEN3954"
 ><SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -630,7 +630,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4038"
+HREF="Bv9ARM.ch07.html#AEN4046"
 ><B
 CLASS="command"
 >chroot</B
@@ -644,7 +644,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4061"
+HREF="Bv9ARM.ch07.html#AEN4069"
 >The <B
 CLASS="command"
 >chroot</B
@@ -652,7 +652,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4076"
+HREF="Bv9ARM.ch07.html#AEN4084"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -676,26 +676,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4096"
+HREF="Bv9ARM.ch08.html#AEN4104"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4098"
+HREF="Bv9ARM.ch08.html#AEN4106"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4102"
+HREF="Bv9ARM.ch08.html#AEN4110"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4107"
+HREF="Bv9ARM.ch08.html#AEN4115"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -709,14 +709,14 @@ HREF="Bv9ARM.ch09.html"
 ><DL
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4123"
+HREF="Bv9ARM.ch09.html#AEN4131"
 >Acknowledgements</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4125"
+HREF="Bv9ARM.ch09.html#AEN4133"
 >A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -746,7 +746,7 @@ HREF="Bv9ARM.ch09.html#classes_of_resource_records"
 ></DD
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4164"
+HREF="Bv9ARM.ch09.html#AEN4172"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -780,7 +780,7 @@ HREF="Bv9ARM.ch09.html#internet_drafts"
 ></DT
 ><DT
 >A.4.3. <A
-HREF="Bv9ARM.ch09.html#AEN4773"
+HREF="Bv9ARM.ch09.html#AEN4781"
 >Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
diff --git a/doc/man/bin/rndc.8 b/doc/man/bin/rndc.8
index 3aaf7368..a1c6bdfe 100644
--- a/doc/man/bin/rndc.8
+++ b/doc/man/bin/rndc.8
@@ -13,7 +13,7 @@
 .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-.\" $Id: rndc.8,v 1.11.4.2 2001/01/24 17:33:18 bwelling Exp $
+.\" $Id: rndc.8,v 1.11.4.3 2001/03/29 18:24:20 gson Exp $
 
 .Dd Jun 30, 2000
 .Dt RDNC 8
@@ -31,7 +31,7 @@
 .Op Fl s Ar server
 .Op Fl v
 .Op Fl y Ar key_id
-.Ar command ....
+.Ar command
 .Sh DESCRIPTION
 This command allows the system administrator to control the operation
 of a name server.
diff --git a/doc/misc/migration b/doc/misc/migration
index ead3b866..35501a62 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -139,6 +139,8 @@ name is deprecated.  Use \$ instead.
 
 3. Interoperability Impact of New Protocol Features
 
+3.1 EDNS0
+
 BIND 9 uses EDNS0 (RFC2671) to advertise its receive buffer size.  It
 also sets an EDNS flag bit in queries to indicate that it wishes to
 receive DNSSEC responses; this flag bit usage is not yet standardized,
@@ -156,6 +158,19 @@ authoritative servers use this server will be very slow or fail
 completely.  We have contacted the manufacturer of the name server in
 case, and they are working on a solution.
 
+3.2. Zone transfers
+
+Outgoing zone transfers now use the "many-answers" format by default.
+This format is not understood by certain old versions of BIND 4.  
+You can work around this problem using the option "transfer-format
+one-answer;", but since these old versions all have known security
+problems, the correct fix is to upgrade the slave servers.
+
+Some BIND 9 users have reported interoperability problems with zone
+transfers to Microsoft DNS servers that were solved by specifying
+"transfer-format one-answer;", but we are still lacking detailed
+information about this issue.
+
 
 4. Unrestricted Character Set
 
@@ -215,4 +230,4 @@ directing queries for a given domain to a particular set of name
 servers.
 
 
-$Id: migration,v 1.17.2.6 2001/03/19 18:07:45 gson Exp $
+$Id: migration,v 1.17.2.7 2001/04/25 17:35:20 gson Exp $
diff --git a/doc/misc/migration-4to9 b/doc/misc/migration-4to9
new file mode 100644
index 00000000..96eeb1f0
--- /dev/null
+++ b/doc/misc/migration-4to9
@@ -0,0 +1,48 @@
+Copyright (C) 2000, 2001  Internet Software Consortium.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
+		   BIND 4 to BIND 9 Migration Notes
+
+To transition from BIND 4 to BIND 9 you first need to convert your
+configuration file to the new format.  There is a conversion tool in
+contrib/named-bootconf that allows you to do this.
+
+	named-bootconf.sh < /etc/named.boot > /etc/named.conf
+
+BIND 9 uses a system assigned port for the UDP queries it makes rather
+than port 53 that BIND 4 uses.  This may conflict with some firewalls.
+The following directives in /etc/named.conf allows you to specify
+a port to use.
+
+	query-source address * port 53;
+	transfer-source * port 53;
+	notify-source * port 53;
+
+BIND 9 no longer uses the minimum field to specify the TTL of records
+without a explicit TTL.  Use the $TTL directive to specify a default TTL
+before the first record without a explicit TTL.
+
+	$TTL 3600
+	@	IN	SOA	ns1.example.com. hostmaster.example.com. (
+				2001021100
+				7200
+				1200
+				3600000
+				7200 )
+
+BIND 9 does not support multiple CNAMEs with the same owner name.
+	
+	Illegal:
+	www.example.com. CNAME host1.example.com.
+	www.example.com. CNAME host2.example.com.
+
+BIND 9 does not support "CNAMEs with other data" with the same owner name,
+ignoring the DNSSEC records (SIG, NXT, KEY) that BIND 4 did not support.
+
+	Illegal:
+	www.example.com. CNAME host1.example.com.
+	www.example.com. MX 10 host2.example.com.
+
+BIND 9 is less tolerant of errors in master files, so check your logs and
+fix any errors reported.  The named-checkzone program can also be to check
+master files.
diff --git a/doc/misc/options b/doc/misc/options
index dfd06fb2..18df7af8 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -1,7 +1,7 @@
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: options,v 1.54.2.6 2001/03/16 18:19:44 bwelling Exp $
+$Id: options,v 1.54.2.7 2001/04/26 18:19:38 gson Exp $
 
 This is a summary of the implementation status of the various named.conf
 options in BIND 9.
@@ -177,7 +177,8 @@ zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
 zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   type slave;						    Yes
   [ file path_name; ]					    Yes
-  [ ixfr-base  path_name; ]				    Obsolete
+  [ ixfr-base path_name; ]				    Obsolete
+  [ ixfr-tmp-file path_name; ]				    Obsolete
   masters [ port ip_port ] { ip_addr; [ ip_addr; ... ] };   Yes
   [ forward ( only | first ); ]				    Yes
   [ forwarders { [ ip_addr ; [ ip_addr ; ... ] ] }; ]	    Yes