diff --git a/doc/arm/Bv9ARM.ch05.html b/doc/arm/Bv9ARM.ch05.html
index 46fca0ffe9..f7329b9ca2 100644
--- a/doc/arm/Bv9ARM.ch05.html
+++ b/doc/arm/Bv9ARM.ch05.html
@@ -188,7 +188,7 @@ CLASS="filename"
 be configured to act as a lightweight resolver daemon using the
 <B
 CLASS="command"
->lwres{}</B
+>lwres</B
 > statement in <TT
 CLASS="filename"
 >named.conf</TT
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 99477169e5..728d1ed165 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -88,7 +88,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3260"
+HREF="Bv9ARM.ch06.html#AEN3242"
 >Zone File</A
 ></DT
 ></DL
@@ -2591,7 +2591,7 @@ CLASS="programlisting"
 ><B
 CLASS="command"
 >lwres</B
->
+> {
     [<SPAN
 CLASS="optional"
 > listen-on { <TT
@@ -2636,6 +2636,7 @@ CLASS="replaceable"
 ></TT
 >; </SPAN
 >]
+};
 </PRE
 ></DIV
 ><DIV
@@ -3502,6 +3503,15 @@ CLASS="replaceable"
 >number</I
 ></TT
 > ; </SPAN
+>]
+    [<SPAN
+CLASS="optional"
+> port <TT
+CLASS="replaceable"
+><I
+>ip_port</I
+></TT
+>; </SPAN
 >]
 };
 </PRE
@@ -3511,7 +3521,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1897"
+NAME="AEN1899"
 >6.2.14. <B
 CLASS="command"
 >options</B
@@ -3858,6 +3868,37 @@ CLASS="acronym"
 ></DIV
 ></TD
 ></TR
+><TR
+><TD
+WIDTH="153"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+><B
+CLASS="command"
+>port</B
+></P
+></TD
+><TD
+WIDTH="303"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+>&#13;The UDP/TCP port number the server uses for receiving and sending DNS protocol traffic.
+The default is 53.  This option is mainly intended for server testing;
+a server using a port other than 53 will not be able to communicate with
+the global DNS.
+The <B
+CLASS="command"
+>port</B
+> option should be placed at
+the beginning of the options block, before
+any other options that take port numbers or IP addresses,
+to ensure that the port value takes effect for all addresses
+used by the server.</P
+>
+</TD
+></TR
 ></TABLE
 ><P
 ></P
@@ -4097,53 +4138,19 @@ WIDTH="287"
 ALIGN="LEFT"
 VALIGN="MIDDLE"
 ><P
->(Information present outside of the authoritative
-nodes in the zone is called <I
-CLASS="emphasis"
->glue</I
-> information).
-If <TT
+>This option is obsolete.
+In BIND 8, <TT
 CLASS="userinput"
 ><B
->yes</B
+>fetch-glue yes</B
 ></TT
-> (the default), the server will fetch
-glue resource records it doesn't have when constructing the additional
-data section of a response. <B
-CLASS="command"
->fetch-glue</B
-> <TT
-CLASS="userinput"
-><B
->no</B
-></TT
-> can
-be used in conjunction with <B
-CLASS="command"
->recursion</B
-> <TT
-CLASS="userinput"
-><B
->no</B
-></TT
-> to
-prevent the server's cache from growing or becoming corrupted (at
-the cost of requiring more work from the client).</P
-><DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->Not yet
-implemented in <SPAN
-CLASS="acronym"
->BIND</SPAN
-> 9.</P
-></BLOCKQUOTE
-></DIV
-></TD
+>
+caused the server to attempt to fetch glue resource records it
+didn't have when constructing the additional
+data section of a response.  This is now considered a bad idea
+and BIND 9 never does it.</P
+>
+</TD
 ></TR
 ><TR
 ><TD
@@ -4168,7 +4175,8 @@ CLASS="acronym"
 > 8, and is ignored by <SPAN
 CLASS="acronym"
 >BIND</SPAN
-> 9.  To achieve the intended effect
+> 9.
+To achieve the intended effect
 of
 <B
 CLASS="command"
@@ -4214,46 +4222,9 @@ WIDTH="287"
 ALIGN="LEFT"
 VALIGN="MIDDLE"
 ><P
->If <TT
-CLASS="userinput"
-><B
->yes</B
-></TT
->, then statistics
-are kept for every host that the nameserver interacts with. The
-default is <TT
-CLASS="userinput"
-><B
->no</B
-></TT
->.</P
-><DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->turning on <B
-CLASS="command"
->host-statistics</B
-> can consume
-huge amounts of memory.</P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->Not yet implemented in <SPAN
-CLASS="acronym"
->BIND</SPAN
-> 9.</P
-></BLOCKQUOTE
-></DIV
+>In BIND 8, this enables keeping of
+statistics for every host that the nameserver interacts with.
+Not implemented in BIND 9.</P
 ></TD
 ></TR
 ><TR
@@ -4636,7 +4607,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2192"
+NAME="AEN2185"
 >6.2.14.2. Forwarding</A
 ></H3
 ><P
@@ -5007,7 +4978,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2299"
+NAME="AEN2292"
 >6.2.14.5. Interfaces</A
 ></H3
 ><P
@@ -5102,7 +5073,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2325"
+NAME="AEN2318"
 >6.2.14.6. Query Address</A
 ></H3
 ><P
@@ -5329,46 +5300,20 @@ servers to find out if zone serial numbers have changed. Each such
 query uses a minute amount of the slave server's network bandwidth,
 but more importantly each query uses a small amount of memory in
 the slave server while waiting for the master server to respond.
-The <B
+In BIND 8, the <B
 CLASS="command"
 >serial-queries</B
-> option sets the maximum number
+> option set the maximum number
 of concurrent serial-number queries allowed to be outstanding at
-any given time. The default is 4.</P
-><DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->If a server loads a large (tens or
-                    hundreds of thousands) number of slave zones, then
-                    this limit should be raised to the high hundreds
-                    or low thousands, otherwise the slave server may
-                    never actually become aware of zone changes in the
-                    master servers. Beware, though, that setting this
-                    limit arbitrarily high can spend a considerable
-                    amount of your slave server's network, CPU, and
-                    memory resources. As with all tunable limits, this
-                    one should be changed gently and monitored for its
-                    effects.</P
-></BLOCKQUOTE
-></DIV
->
-<DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->Not yet implemented in <SPAN
-CLASS="acronym"
->BIND</SPAN
-> 9.</P
-></BLOCKQUOTE
-></DIV
+any given time.  BIND 9 does not limit the number of outstanding
+serial queries and ignores the The <B
+CLASS="command"
+>serial-queries</B
+> option;
+instead, it limits the rate at which the queries are sent.
+The maximum rate is currently fixed at 20 queries
+per second but may become configurable in a future release.  
+</P
 >
 </TD
 ></TR
@@ -5594,7 +5539,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2455"
+NAME="AEN2444"
 >6.2.14.8. Resource Limits</A
 ></H3
 ><P
@@ -5798,26 +5743,8 @@ WIDTH="288"
 ALIGN="LEFT"
 VALIGN="MIDDLE"
 ><P
->The <B
-CLASS="command"
->max-ixfr-log-size</B
-> will
-be used in a future release of the server to limit the size of the
-transaction log kept for Incremental Zone Transfer.</P
-><DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->Not
-yet implemented in <SPAN
-CLASS="acronym"
->BIND</SPAN
-> 9.</P
-></BLOCKQUOTE
-></DIV
+>This option is obsolete; it is accepted
+and ignored for BIND 8 compatibility.</P
 ></TD
 ></TR
 ><TR
@@ -5927,7 +5854,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2544"
+NAME="AEN2529"
 >6.2.14.9. Periodic Task Intervals</A
 ></H3
 ><DIV
@@ -6231,7 +6158,7 @@ CLASS="programlisting"
     { localhost;				   // IF   the local host
         { localnets;				   // THEN first fit on the
             192.168.1/24;			   //   following nets
-            { 192,168.2/24; 192.168.3/24; }; }; };
+            { 192.168.2/24; 192.168.3/24; }; }; };
     { 192.168.1/24;				   // IF   on class C 192.168.1
         { 192.168.1/24;				   // THEN use .1, or .2 or .3
             { 192.168.2/24; 192.168.3/24; }; }; };
@@ -6250,7 +6177,7 @@ local host and hosts on directly connected networks. It is similar
 to the behavior of the address sort in <SPAN
 CLASS="acronym"
 >BIND</SPAN
-> 8.x. Responses sent
+> 4.9.x. Responses sent
 to queries from the local host will favor any of the directly connected
 networks. Responses sent to queries from any other hosts on a directly
 connected network will prefer addresses on that same network. Responses
@@ -6526,20 +6453,6 @@ CLASS="literal"
 >1800</TT
 > (30 minutes).</P
 >
-<DIV
-CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
-><P
-><B
->Note: </B
->Not yet implemented in <SPAN
-CLASS="acronym"
->BIND</SPAN
-> 9.</P
-></BLOCKQUOTE
-></DIV
->
 </TD
 ></TR
 ><TR
@@ -6685,7 +6598,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2736"
+NAME="AEN2718"
 >6.2.14.14. Deprecated Features</A
 ></H3
 ><P
@@ -6962,7 +6875,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2806"
+NAME="AEN2788"
 >6.2.17. <B
 CLASS="command"
 >trusted-keys</B
@@ -7037,7 +6950,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2822"
+NAME="AEN2804"
 >6.2.18. <B
 CLASS="command"
 >trusted-keys</B
@@ -7072,7 +6985,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2830"
+NAME="AEN2812"
 >6.2.19. <B
 CLASS="command"
 >view</B
@@ -7126,7 +7039,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2842"
+NAME="AEN2824"
 >6.2.20. <B
 CLASS="command"
 >view</B
@@ -7642,7 +7555,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2963"
+NAME="AEN2945"
 >6.2.22. <B
 CLASS="command"
 >zone</B
@@ -7653,7 +7566,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2966"
+NAME="AEN2948"
 >6.2.22.1. Zone Types</A
 ></H3
 ><DIV
@@ -7877,7 +7790,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3023"
+NAME="AEN3005"
 >6.2.22.2. Class</A
 ></H3
 ><P
@@ -7915,7 +7828,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3033"
+NAME="AEN3015"
 >6.2.22.3. Zone Options</A
 ></H3
 ><DIV
@@ -8705,7 +8618,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3260"
+NAME="AEN3242"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -8726,7 +8639,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3265"
+NAME="AEN3247"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -9442,7 +9355,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3479"
+NAME="AEN3461"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -9760,7 +9673,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3580"
+NAME="AEN3562"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10159,7 +10072,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3701"
+NAME="AEN3683"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10257,7 +10170,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3728"
+NAME="AEN3710"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10282,7 +10195,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3735"
+NAME="AEN3717"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -10352,7 +10265,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3755"
+NAME="AEN3737"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -10428,7 +10341,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3774"
+NAME="AEN3756"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -10468,7 +10381,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3785"
+NAME="AEN3767"
 >6.3.6. <SPAN
 CLASS="acronym"
 >BIND</SPAN
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 68d460fe21..f11907b87d 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -83,7 +83,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN3876"
+HREF="Bv9ARM.ch07.html#AEN3858"
 ><B
 CLASS="command"
 >chroot</B
@@ -95,7 +95,7 @@ UNIX servers)</A
 ></DT
 ><DT
 >7.3. <A
-HREF="Bv9ARM.ch07.html#AEN3922"
+HREF="Bv9ARM.ch07.html#AEN3904"
 >Dynamic Updates</A
 ></DT
 ></DL
@@ -180,7 +180,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3876"
+NAME="AEN3858"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -259,7 +259,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3899"
+NAME="AEN3881"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -315,7 +315,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3914"
+NAME="AEN3896"
 >7.2.2. Using the <B
 CLASS="command"
 >setuid</B
@@ -346,21 +346,43 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3922"
+NAME="AEN3904"
 >7.3. Dynamic Updates</A
 ></H1
 ><P
->Access to the dynamic update facility should be strictly limited.
-In earlier versions of <SPAN
+>Access to the dynamic
+update facility should be strictly limited.  In earlier versions of
+<SPAN
 CLASS="acronym"
 >BIND</SPAN
-> the only way to do this was based on
-the IP address of the host requesting the update. <SPAN
-CLASS="acronym"
->BIND9</SPAN
-> also
-supports authenticating updates cryptographically by means of transaction
-signatures (TSIG). The use of TSIG is strongly recommended.</P
+> the only way to do this was based on the IP
+address of the host requesting the update, by listing an IP address or
+network prefix in the <B
+CLASS="command"
+>allow-update</B
+> zone option.
+This method is insecure since the source address of the update UDP packet
+is easily forged.  Also note that if the IP addresses allowed by the
+<B
+CLASS="command"
+>allow-update</B
+> option include the address of a slave
+server which performs forwarding of dynamic updates, the master can be
+trivially attacked by sending the update to the slave, which will
+forward it to the master with its own source IP address causing the
+master to approve it without question.</P
+><P
+>For these reasons, we strongly recommend that updates be
+cryptographically authenticated by means transaction signatures (TSIG).
+That is, the <B
+CLASS="command"
+>allow-update</B
+> option should list only
+TSIG key names, not IP addresses. Alternatively, the new 
+<B
+CLASS="command"
+>update-policy</B
+> option can be used.</P
 ><P
 >Some sites choose to keep all dynamically updated DNS data
 in a subdomain and delegate that subdomain to a separate zone. This
diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
index 74f51ea56c..584b57c5ac 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -75,17 +75,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN3930"
+HREF="Bv9ARM.ch08.html#AEN3916"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN3936"
+HREF="Bv9ARM.ch08.html#AEN3922"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN3941"
+HREF="Bv9ARM.ch08.html#AEN3927"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -95,7 +95,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3930"
+NAME="AEN3916"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -103,7 +103,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3932"
+NAME="AEN3918"
 >8.1.1. It's not working; how can I figure out what's wrong?</A
 ></H2
 ><P
@@ -123,7 +123,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3936"
+NAME="AEN3922"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -152,7 +152,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3941"
+NAME="AEN3927"
 >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 596445cc11..b26610c286 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -69,7 +69,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN3957"
+HREF="Bv9ARM.ch09.html#AEN3943"
 >Acknowledgements</A
 ></DT
 ><DT
@@ -82,7 +82,7 @@ CLASS="acronym"
 ></DT
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN3998"
+HREF="Bv9ARM.ch09.html#AEN3984"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -100,7 +100,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3957"
+NAME="AEN3943"
 >A.1. Acknowledgements</A
 ></H1
 ><DIV
@@ -108,7 +108,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3959"
+NAME="AEN3945"
 >A.1.1. A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -243,7 +243,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3989"
+NAME="AEN3975"
 >A.2.1.1. HS = hesiod</A
 ></H3
 ><P
@@ -264,7 +264,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3994"
+NAME="AEN3980"
 >A.2.1.2. CH = chaos</A
 ></H3
 ><P
@@ -282,7 +282,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3998"
+NAME="AEN3984"
 >A.3. General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -293,7 +293,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4001"
+NAME="AEN3987"
 >A.3.1. IPv6 addresses (A6)</A
 ></H2
 ><P
@@ -863,19 +863,19 @@ TARGET="_top"
 >.</P
 ><H3
 ><A
-NAME="AEN4177"
+NAME="AEN4163"
 >Bibliography</A
 ></H3
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4178"
+NAME="AEN4164"
 >Standards</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4180"
+NAME="AEN4166"
 ></A
 ><P
 >[RFC974]&nbsp;C. Partridge, <I
@@ -889,7 +889,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4187"
+NAME="AEN4173"
 ></A
 ><P
 >[RFC1034]&nbsp;P.V. Mockapetris, <I
@@ -903,7 +903,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4194"
+NAME="AEN4180"
 ></A
 ><P
 >[RFC1035]&nbsp;P. V. Mockapetris, <I
@@ -924,7 +924,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4203"
+NAME="AEN4189"
 ></A
 ><P
 >[RFC2181]&nbsp;R., R. Bush Elz, <I
@@ -941,7 +941,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4211"
+NAME="AEN4197"
 ></A
 ><P
 >[RFC2308]&nbsp;M. Andrews, <I
@@ -958,7 +958,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4219"
+NAME="AEN4205"
 ></A
 ><P
 >[RFC1995]&nbsp;M. Ohta, <I
@@ -975,7 +975,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4227"
+NAME="AEN4213"
 ></A
 ><P
 >[RFC1996]&nbsp;P. Vixie, <I
@@ -989,7 +989,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4234"
+NAME="AEN4220"
 ></A
 ><P
 >[RFC2136]&nbsp;P. Vixie, S. Thomson, Y. Rekhter, and J. Bound, <I
@@ -1003,7 +1003,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4251"
+NAME="AEN4237"
 ></A
 ><P
 >[RFC2845]&nbsp;P. Vixie, O. Gudmundsson, D. Eastlake, 3rd, and B. Wellington, <I
@@ -1020,13 +1020,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4270"
+NAME="AEN4256"
 >Proposed Standards Still Under Development</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4275"
+NAME="AEN4261"
 ></A
 ><P
 >[RFC1886]&nbsp;S. Thomson and C. Huitema, <I
@@ -1043,7 +1043,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4287"
+NAME="AEN4273"
 ></A
 ><P
 >[RFC2065]&nbsp;D. Eastlake, 3rd and C. Kaufman, <I
@@ -1057,7 +1057,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4299"
+NAME="AEN4285"
 ></A
 ><P
 >[RFC2137]&nbsp;D. Eastlake, 3rd, <I
@@ -1071,7 +1071,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4307"
+NAME="AEN4293"
 >Other Important RFCs About <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1080,7 +1080,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4310"
+NAME="AEN4296"
 ></A
 ><P
 >[RFC1535]&nbsp;E. Gavron, <I
@@ -1097,7 +1097,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4318"
+NAME="AEN4304"
 ></A
 ><P
 >[RFC1536]&nbsp;A. Kumar, J. Postel, C. Neuman, P. Danzig, and S. Miller, <I
@@ -1114,7 +1114,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4339"
+NAME="AEN4325"
 ></A
 ><P
 >[RFC1982]&nbsp;R. Elz and R. Bush, <I
@@ -1128,13 +1128,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4350"
+NAME="AEN4336"
 >Resource Record Types</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4352"
+NAME="AEN4338"
 ></A
 ><P
 >[RFC1183]&nbsp;C.F. Everhart, L. A. Mamakos, R. Ullmann, and P. Mockapetris, <I
@@ -1151,7 +1151,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4370"
+NAME="AEN4356"
 ></A
 ><P
 >[RFC1706]&nbsp;B. Manning and R. Colella, <I
@@ -1168,7 +1168,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4382"
+NAME="AEN4368"
 ></A
 ><P
 >[RFC2168]&nbsp;R. Daniel and M. Mealling, <I
@@ -1183,7 +1183,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4393"
+NAME="AEN4379"
 ></A
 ><P
 >[RFC1876]&nbsp;C. Davis, P. Vixie, T., and I. Dickinson, <I
@@ -1198,7 +1198,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4410"
+NAME="AEN4396"
 ></A
 ><P
 >[RFC2052]&nbsp;A. Gulbrandsen and P. Vixie, <I
@@ -1216,7 +1216,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4422"
+NAME="AEN4408"
 ></A
 ><P
 >[RFC2163]&nbsp;A. Allocchio, <I
@@ -1234,7 +1234,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4430"
+NAME="AEN4416"
 ></A
 ><P
 >[RFC2230]&nbsp;R. Atkinson, <I
@@ -1251,7 +1251,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4438"
+NAME="AEN4424"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1260,7 +1260,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4441"
+NAME="AEN4427"
 ></A
 ><P
 >[RFC1101]&nbsp;P. V. Mockapetris, <I
@@ -1277,7 +1277,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4449"
+NAME="AEN4435"
 ></A
 ><P
 >[RFC1123]&nbsp;Braden, <I
@@ -1291,7 +1291,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4456"
+NAME="AEN4442"
 ></A
 ><P
 >[RFC1591]&nbsp;J. Postel, <I
@@ -1305,7 +1305,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4463"
+NAME="AEN4449"
 ></A
 ><P
 >[RFC2317]&nbsp;H. Eidnes, G. de Groot, and P. Vixie, <I
@@ -1319,7 +1319,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4477"
+NAME="AEN4463"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1328,7 +1328,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4480"
+NAME="AEN4466"
 ></A
 ><P
 >[RFC1537]&nbsp;P. Beertema, <I
@@ -1345,7 +1345,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4488"
+NAME="AEN4474"
 ></A
 ><P
 >[RFC1912]&nbsp;D. Barr, <I
@@ -1362,7 +1362,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4496"
+NAME="AEN4482"
 ></A
 ><P
 >[RFC1912]&nbsp;D. Barr, <I
@@ -1379,7 +1379,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4504"
+NAME="AEN4490"
 ></A
 ><P
 >[RFC2010]&nbsp;B. Manning and P. Vixie, <I
@@ -1393,7 +1393,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4515"
+NAME="AEN4501"
 ></A
 ><P
 >[RFC2219]&nbsp;M. Hamilton and R. Wright, <I
@@ -1410,7 +1410,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4527"
+NAME="AEN4513"
 >Other <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1419,7 +1419,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4533"
+NAME="AEN4519"
 ></A
 ><P
 >[RFC1464]&nbsp;R. Rosenbaum, <I
@@ -1433,7 +1433,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4540"
+NAME="AEN4526"
 ></A
 ><P
 >[RFC1713]&nbsp;A. Romao, <I
@@ -1450,7 +1450,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4548"
+NAME="AEN4534"
 ></A
 ><P
 >[RFC1794]&nbsp;T. Brisco, <I
@@ -1467,7 +1467,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4556"
+NAME="AEN4542"
 ></A
 ><P
 >[RFC2240]&nbsp;O. Vaughan, <I
@@ -1481,7 +1481,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4563"
+NAME="AEN4549"
 ></A
 ><P
 >[RFC2345]&nbsp;J. Klensin, T. Wolf, and G. Oglesby, <I
@@ -1495,7 +1495,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4577"
+NAME="AEN4563"
 ></A
 ><P
 >[RFC2352]&nbsp;O. Vaughan, <I
@@ -1509,13 +1509,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4584"
+NAME="AEN4570"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4586"
+NAME="AEN4572"
 ></A
 ><P
 >[RFC1712]&nbsp;C. Farrell, M. Schulze, S. Pleitner, and D. Baldoni, <I
@@ -1554,7 +1554,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4607"
+NAME="AEN4593"
 >A.4.3. Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -1564,13 +1564,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN4611"
+NAME="AEN4597"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4612"
+NAME="AEN4598"
 ></A
 ><P
 >Paul Albitz and Cricket Liu, <I
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 7cc0e6208f..0942729a62 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -487,7 +487,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.14. <A
-HREF="Bv9ARM.ch06.html#AEN1897"
+HREF="Bv9ARM.ch06.html#AEN1899"
 ><B
 CLASS="command"
 >options</B
@@ -514,7 +514,7 @@ and Usage</A
 ></DT
 ><DT
 >6.2.17. <A
-HREF="Bv9ARM.ch06.html#AEN2806"
+HREF="Bv9ARM.ch06.html#AEN2788"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -522,7 +522,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.18. <A
-HREF="Bv9ARM.ch06.html#AEN2822"
+HREF="Bv9ARM.ch06.html#AEN2804"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -531,7 +531,7 @@ and Usage</A
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN2830"
+HREF="Bv9ARM.ch06.html#AEN2812"
 ><B
 CLASS="command"
 >view</B
@@ -539,7 +539,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN2842"
+HREF="Bv9ARM.ch06.html#AEN2824"
 ><B
 CLASS="command"
 >view</B
@@ -556,7 +556,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN2963"
+HREF="Bv9ARM.ch06.html#AEN2945"
 ><B
 CLASS="command"
 >zone</B
@@ -566,7 +566,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3260"
+HREF="Bv9ARM.ch06.html#AEN3242"
 >Zone File</A
 ></DT
 ><DD
@@ -578,7 +578,7 @@ HREF="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them"
 ></DT
 ><DT
 >6.3.2. <A
-HREF="Bv9ARM.ch06.html#AEN3580"
+HREF="Bv9ARM.ch06.html#AEN3562"
 >Discussion of MX Records</A
 ></DT
 ><DT
@@ -588,17 +588,17 @@ HREF="Bv9ARM.ch06.html#Setting_TTLs"
 ></DT
 ><DT
 >6.3.4. <A
-HREF="Bv9ARM.ch06.html#AEN3701"
+HREF="Bv9ARM.ch06.html#AEN3683"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN3728"
+HREF="Bv9ARM.ch06.html#AEN3710"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN3785"
+HREF="Bv9ARM.ch06.html#AEN3767"
 ><SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -628,7 +628,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN3876"
+HREF="Bv9ARM.ch07.html#AEN3858"
 ><B
 CLASS="command"
 >chroot</B
@@ -642,7 +642,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN3899"
+HREF="Bv9ARM.ch07.html#AEN3881"
 >The <B
 CLASS="command"
 >chroot</B
@@ -650,7 +650,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN3914"
+HREF="Bv9ARM.ch07.html#AEN3896"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -660,7 +660,7 @@ CLASS="command"
 ></DD
 ><DT
 >7.3. <A
-HREF="Bv9ARM.ch07.html#AEN3922"
+HREF="Bv9ARM.ch07.html#AEN3904"
 >Dynamic Updates</A
 ></DT
 ></DL
@@ -674,26 +674,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN3930"
+HREF="Bv9ARM.ch08.html#AEN3916"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN3932"
+HREF="Bv9ARM.ch08.html#AEN3918"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN3936"
+HREF="Bv9ARM.ch08.html#AEN3922"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN3941"
+HREF="Bv9ARM.ch08.html#AEN3927"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -707,14 +707,14 @@ HREF="Bv9ARM.ch09.html"
 ><DL
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN3957"
+HREF="Bv9ARM.ch09.html#AEN3943"
 >Acknowledgements</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN3959"
+HREF="Bv9ARM.ch09.html#AEN3945"
 >A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -744,7 +744,7 @@ HREF="Bv9ARM.ch09.html#classes_of_resource_records"
 ></DD
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN3998"
+HREF="Bv9ARM.ch09.html#AEN3984"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -754,7 +754,7 @@ CLASS="acronym"
 ><DL
 ><DT
 >A.3.1. <A
-HREF="Bv9ARM.ch09.html#AEN4001"
+HREF="Bv9ARM.ch09.html#AEN3987"
 >IPv6 addresses (A6)</A
 ></DT
 ></DL
@@ -778,7 +778,7 @@ HREF="Bv9ARM.ch09.html#internet_drafts"
 ></DT
 ><DT
 >A.4.3. <A
-HREF="Bv9ARM.ch09.html#AEN4607"
+HREF="Bv9ARM.ch09.html#AEN4593"
 >Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN