diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index f3ea10d152..78f8da57cc 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.145 2001/06/27 17:48:32 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.146 2001/06/28 22:37:29 gson Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -2168,10 +2168,10 @@ the system has an interface.</para></entry>
    <optional> inet ...; </optional>
 };
 </programlisting>
-    </sect2>
-    <sect2 id="controls_statement_definition_and_usage">
-      <title><command>controls</command> Statement Definition and
-Usage</title>
+</sect2>
+
+<sect2 id="controls_statement_definition_and_usage">
+<title><command>controls</command> Statement Definition and Usage</title>
 
       <para>The <command>controls</command> statement declares control
       channels to be used by system administrators to affect the
@@ -2272,26 +2272,37 @@ Usage</title>
 };
 </programlisting>
     </sect2>
-    <sect2>
-      <title><command>key</command> Statement Definition and Usage</title>
 
-      <para>The <command>key</command> statement defines a shared
-      secret key for use with TSIG, see <xref linkend="tsig"/>.</para>
+<sect2>
+<title><command>key</command> Statement Definition and Usage</title>
 
-      <para>The <replaceable>key_id</replaceable>, also known as the
-      key name, is a domain name uniquely identifying the key. It can
-      be used in a "server" statement to cause requests sent to that
-      server to be signed with this key, or in address match lists to
-      verify that incoming requests have been signed with a key
-      matching this name, algorithm, and secret.</para>
+<para>The <command>key</command> statement defines a shared
+secret key for use with TSIG, see <xref linkend="tsig"/>.</para>
 
-      <para>The <replaceable>algorithm_id</replaceable> is a string
-      that specifies a security/authentication algorithm. The only
-      algorithm currently supported with TSIG authentication is
-      <literal>hmac-md5</literal>.  The
-      <replaceable>secret_string</replaceable> is the secret to be
-      used by the algorithm, and is treated as a base-64 encoded
-      string.</para>
+<para>
+The <command>key</command> statement can occur at the top level
+of the configuration file or inside a <command>view</command> 
+statement.  Keys defined in top-level <command>key</command>
+statements can be used in all views.  Keys intended for use in
+a <command>controls</command> statement
+(see <xref linkend="controls_statement_definition_and_usage"/>)
+must be defined at the top level.
+</para>
+
+<para>The <replaceable>key_id</replaceable>, also known as the
+key name, is a domain name uniquely identifying the key. It can
+be used in a "server" statement to cause requests sent to that
+server to be signed with this key, or in address match lists to
+verify that incoming requests have been signed with a key
+matching this name, algorithm, and secret.</para>
+
+<para>The <replaceable>algorithm_id</replaceable> is a string
+that specifies a security/authentication algorithm. The only
+algorithm currently supported with TSIG authentication is
+<literal>hmac-md5</literal>.  The
+<replaceable>secret_string</replaceable> is the secret to be
+used by the algorithm, and is treated as a base-64 encoded
+string.</para>
 
 </sect2>
     <sect2>
@@ -3927,7 +3938,8 @@ failure response other than those above.</para></entry>
 </sect3>
 
 </sect2>
- <sect2 id="server_statement_grammar">
+
+<sect2 id="server_statement_grammar">
 <title><command>server</command> Statement Grammar</title>
 
 <programlisting>server <replaceable>ip_addr</replaceable> {
@@ -3942,12 +3954,24 @@ failure response other than those above.</para></entry>
 </programlisting>
 
 </sect2>
-<sect2 id="server_statement_definition_and_usage"><title><command>server</command> Statement Definition
-and Usage</title>
 
-<para>The <command>server</command> statement defines the characteristics
+<sect2 id="server_statement_definition_and_usage">
+<title><command>server</command> Statement Definition and Usage</title>
+
+<para>The <command>server</command> statement defines characteristics
 to be associated with a remote nameserver.</para>
 
+<para>
+The <command>server</command> statement can occur at the top level of the
+configuration file or inside a <command>view</command> statement.  
+If a <command>view</command> statement contains
+one or more <command>server</command> statements, only those
+apply to the view and any top-level ones are ignored.
+If a view contains no <command>server</command> statements,
+any top-level <command>server</command> statements are used as
+defaults.
+</para>
+
 <para>If you discover that a remote server is giving out bad data,
 marking it as bogus will prevent further queries to it. The default
 value of <command>bogus</command> is <command>no</command>.</para>
@@ -4004,7 +4028,10 @@ to be signed by this key.</para>
 
 <para>Although the grammar of the <command>keys</command> clause
 allows for multiple keys, only a single key per server is currently
-supported.</para></sect2>
+supported.</para>
+
+</sect2>
+
 <sect2><title><command>trusted-keys</command> Statement Grammar</title>
 <programlisting>trusted-keys {
     <replaceable>string</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ;
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 0c1f89c7a5..2e81c24087 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -91,7 +91,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3472"
+HREF="Bv9ARM.ch06.html#AEN3485"
 >Zone File</A
 ></DT
 ></DL
@@ -1459,8 +1459,7 @@ NAME="controls_statement_definition_and_usage"
 >6.2.4. <B
 CLASS="command"
 >controls</B
-> Statement Definition and
-Usage</A
+> Statement Definition and Usage</A
 ></H2
 ><P
 >The <B
@@ -1765,22 +1764,46 @@ CLASS="command"
 CLASS="command"
 >key</B
 > statement defines a shared
-      secret key for use with TSIG, see <A
+secret key for use with TSIG, see <A
 HREF="Bv9ARM.ch04.html#tsig"
 >Section 4.4</A
 >.</P
 ><P
+>&#13;The <B
+CLASS="command"
+>key</B
+> statement can occur at the top level
+of the configuration file or inside a <B
+CLASS="command"
+>view</B
+> 
+statement.  Keys defined in top-level <B
+CLASS="command"
+>key</B
+>
+statements can be used in all views.  Keys intended for use in
+a <B
+CLASS="command"
+>controls</B
+> statement
+(see <A
+HREF="Bv9ARM.ch06.html#controls_statement_definition_and_usage"
+>Section 6.2.4</A
+>)
+must be defined at the top level.
+</P
+><P
 >The <TT
 CLASS="replaceable"
 ><I
 >key_id</I
 ></TT
 >, also known as the
-      key name, is a domain name uniquely identifying the key. It can
-      be used in a "server" statement to cause requests sent to that
-      server to be signed with this key, or in address match lists to
-      verify that incoming requests have been signed with a key
-      matching this name, algorithm, and secret.</P
+key name, is a domain name uniquely identifying the key. It can
+be used in a "server" statement to cause requests sent to that
+server to be signed with this key, or in address match lists to
+verify that incoming requests have been signed with a key
+matching this name, algorithm, and secret.</P
 ><P
 >The <TT
 CLASS="replaceable"
@@ -1788,27 +1811,27 @@ CLASS="replaceable"
 >algorithm_id</I
 ></TT
 > is a string
-      that specifies a security/authentication algorithm. The only
-      algorithm currently supported with TSIG authentication is
-      <TT
+that specifies a security/authentication algorithm. The only
+algorithm currently supported with TSIG authentication is
+<TT
 CLASS="literal"
 >hmac-md5</TT
 >.  The
-      <TT
+<TT
 CLASS="replaceable"
 ><I
 >secret_string</I
 ></TT
 > is the secret to be
-      used by the algorithm, and is treated as a base-64 encoded
-      string.</P
+used by the algorithm, and is treated as a base-64 encoded
+string.</P
 ></DIV
 ><DIV
 CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1535"
+NAME="AEN1541"
 >6.2.9. <B
 CLASS="command"
 >logging</B
@@ -1968,7 +1991,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1575"
+NAME="AEN1581"
 >6.2.10. <B
 CLASS="command"
 >logging</B
@@ -2031,7 +2054,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1591"
+NAME="AEN1597"
 >6.2.10.1. The <B
 CLASS="command"
 >channel</B
@@ -2473,7 +2496,7 @@ CLASS="acronym"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN1695"
+NAME="AEN1701"
 ></A
 ><P
 ></P
@@ -2841,7 +2864,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1805"
+NAME="AEN1811"
 >6.2.11. <B
 CLASS="command"
 >lwres</B
@@ -2938,7 +2961,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1829"
+NAME="AEN1835"
 >6.2.12. <B
 CLASS="command"
 >lwres</B
@@ -3012,7 +3035,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1848"
+NAME="AEN1854"
 >6.2.13. <B
 CLASS="command"
 >options</B
@@ -3953,7 +3976,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2062"
+NAME="AEN2068"
 >6.2.14. <B
 CLASS="command"
 >options</B
@@ -4912,7 +4935,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2350"
+NAME="AEN2356"
 >6.2.14.2. Forwarding</A
 ></H3
 ><P
@@ -5116,7 +5139,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2415"
+NAME="AEN2421"
 >6.2.14.4. Interfaces</A
 ></H3
 ><P
@@ -5211,7 +5234,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2441"
+NAME="AEN2447"
 >6.2.14.5. Query Address</A
 ></H3
 ><P
@@ -5642,7 +5665,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2580"
+NAME="AEN2586"
 >6.2.14.7. Operating System Resource Limits</A
 ></H3
 ><P
@@ -5762,7 +5785,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2617"
+NAME="AEN2623"
 >6.2.14.8. Server  Resource Limits</A
 ></H3
 ><P
@@ -5846,7 +5869,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2645"
+NAME="AEN2651"
 >6.2.14.9. Periodic Task Intervals</A
 ></H3
 ><P
@@ -6213,7 +6236,7 @@ CLASS="command"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2733"
+NAME="AEN2739"
 ></A
 ><P
 ></P
@@ -6600,7 +6623,7 @@ number is identical to the number in the beginning line.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2845"
+NAME="AEN2851"
 ></A
 ><P
 ></P
@@ -6838,16 +6861,43 @@ NAME="server_statement_definition_and_usage"
 >6.2.16. <B
 CLASS="command"
 >server</B
-> Statement Definition
-and Usage</A
+> Statement Definition and Usage</A
 ></H2
 ><P
 >The <B
 CLASS="command"
 >server</B
-> statement defines the characteristics
+> statement defines characteristics
 to be associated with a remote nameserver.</P
 ><P
+>&#13;The <B
+CLASS="command"
+>server</B
+> statement can occur at the top level of the
+configuration file or inside a <B
+CLASS="command"
+>view</B
+> statement.  
+If a <B
+CLASS="command"
+>view</B
+> statement contains
+one or more <B
+CLASS="command"
+>server</B
+> statements, only those
+apply to the view and any top-level ones are ignored.
+If a view contains no <B
+CLASS="command"
+>server</B
+> statements,
+any top-level <B
+CLASS="command"
+>server</B
+> statements are used as
+defaults.
+</P
+><P
 >If you discover that a remote server is giving out bad data,
 marking it as bogus will prevent further queries to it. The default
 value of <B
@@ -7009,7 +7059,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2953"
+NAME="AEN2966"
 >6.2.17. <B
 CLASS="command"
 >trusted-keys</B
@@ -7084,7 +7134,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2969"
+NAME="AEN2982"
 >6.2.18. <B
 CLASS="command"
 >trusted-keys</B
@@ -7119,7 +7169,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2977"
+NAME="AEN2990"
 >6.2.19. <B
 CLASS="command"
 >view</B
@@ -7182,7 +7232,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2991"
+NAME="AEN3004"
 >6.2.20. <B
 CLASS="command"
 >view</B
@@ -7812,7 +7862,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3138"
+NAME="AEN3151"
 >6.2.22. <B
 CLASS="command"
 >zone</B
@@ -7823,13 +7873,13 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3141"
+NAME="AEN3154"
 >6.2.22.1. Zone Types</A
 ></H3
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3143"
+NAME="AEN3156"
 ></A
 ><P
 ></P
@@ -8067,7 +8117,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3198"
+NAME="AEN3211"
 >6.2.22.2. Class</A
 ></H3
 ><P
@@ -8105,7 +8155,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3208"
+NAME="AEN3221"
 >6.2.22.3. Zone Options</A
 ></H3
 ><P
@@ -8746,7 +8796,7 @@ CLASS="varname"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3442"
+NAME="AEN3455"
 ></A
 ><P
 ></P
@@ -8853,7 +8903,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3472"
+NAME="AEN3485"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -8874,7 +8924,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3477"
+NAME="AEN3490"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -8897,7 +8947,7 @@ HREF="Bv9ARM.ch06.html#rrset_ordering"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3483"
+NAME="AEN3496"
 ></A
 ><P
 ></P
@@ -9008,7 +9058,7 @@ or historical (h) and no longer in general use):</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3515"
+NAME="AEN3528"
 ></A
 ><P
 ></P
@@ -9385,7 +9435,7 @@ are currently valid in the DNS:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3627"
+NAME="AEN3640"
 ></A
 ><P
 ></P
@@ -9437,7 +9487,7 @@ data that describes the resource:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3643"
+NAME="AEN3656"
 ></A
 ><P
 ></P
@@ -9614,7 +9664,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3691"
+NAME="AEN3704"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -9644,7 +9694,7 @@ knowledge of the typical representation for the data.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3698"
+NAME="AEN3711"
 ></A
 ><P
 ></P
@@ -9853,7 +9903,7 @@ domain names.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3764"
+NAME="AEN3777"
 ></A
 ><P
 ></P
@@ -9944,7 +9994,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3792"
+NAME="AEN3805"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -9977,7 +10027,7 @@ pointed to by the CNAME.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3798"
+NAME="AEN3811"
 ></A
 ><P
 ></P
@@ -10273,7 +10323,7 @@ used in a zone file.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3890"
+NAME="AEN3903"
 ></A
 ><P
 ></P
@@ -10356,7 +10406,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3913"
+NAME="AEN3926"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10380,7 +10430,7 @@ CLASS="optional"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3918"
+NAME="AEN3931"
 ></A
 ><P
 ></P
@@ -10460,7 +10510,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3940"
+NAME="AEN3953"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10485,7 +10535,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3947"
+NAME="AEN3960"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -10555,7 +10605,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3967"
+NAME="AEN3980"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -10637,7 +10687,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3987"
+NAME="AEN4000"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -10677,7 +10727,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3998"
+NAME="AEN4011"
 >6.3.6. <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -10756,7 +10806,7 @@ CLASS="literal"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4018"
+NAME="AEN4031"
 ></A
 ><P
 ></P
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 773ef49ad3..7ffedccf9a 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -86,7 +86,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4090"
+HREF="Bv9ARM.ch07.html#AEN4103"
 ><B
 CLASS="command"
 >chroot</B
@@ -188,7 +188,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4090"
+NAME="AEN4103"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -267,7 +267,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4113"
+NAME="AEN4126"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -340,7 +340,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4131"
+NAME="AEN4144"
 >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 779efbbc29..ae1c26620e 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -78,17 +78,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4152"
+HREF="Bv9ARM.ch08.html#AEN4165"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4157"
+HREF="Bv9ARM.ch08.html#AEN4170"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4162"
+HREF="Bv9ARM.ch08.html#AEN4175"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -98,7 +98,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4152"
+NAME="AEN4165"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -106,7 +106,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4154"
+NAME="AEN4167"
 >8.1.1. It's not working; how can I figure out what's wrong?</A
 ></H2
 ><P
@@ -122,7 +122,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4157"
+NAME="AEN4170"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -151,7 +151,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4162"
+NAME="AEN4175"
 >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 e0c2253dcb..603961f207 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -72,7 +72,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4178"
+HREF="Bv9ARM.ch09.html#AEN4191"
 >Acknowledgements</A
 ></DT
 ><DT
@@ -85,7 +85,7 @@ CLASS="acronym"
 ></DT
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4219"
+HREF="Bv9ARM.ch09.html#AEN4232"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -103,7 +103,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4178"
+NAME="AEN4191"
 >A.1. Acknowledgements</A
 ></H1
 ><DIV
@@ -111,7 +111,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4180"
+NAME="AEN4193"
 >A.1.1. A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -246,7 +246,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4210"
+NAME="AEN4223"
 >A.2.1.1. HS = hesiod</A
 ></H3
 ><P
@@ -267,7 +267,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4215"
+NAME="AEN4228"
 >A.2.1.2. CH = chaos</A
 ></H3
 ><P
@@ -285,7 +285,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4219"
+NAME="AEN4232"
 >A.3. General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -324,7 +324,7 @@ Unicast address scheme. For more information, see RFC 2374.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4230"
+NAME="AEN4243"
 ></A
 ><P
 ></P
@@ -543,7 +543,7 @@ VALIGN="MIDDLE"
 <DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4299"
+NAME="AEN4312"
 ></A
 ><P
 ></P
@@ -726,7 +726,7 @@ unicast address consists of:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4354"
+NAME="AEN4367"
 ></A
 ><P
 ></P
@@ -886,19 +886,19 @@ TARGET="_top"
 </P
 ><H3
 ><A
-NAME="AEN4398"
+NAME="AEN4411"
 >Bibliography</A
 ></H3
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4399"
+NAME="AEN4412"
 >Standards</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4401"
+NAME="AEN4414"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -915,7 +915,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4408"
+NAME="AEN4421"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -932,7 +932,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4415"
+NAME="AEN4428"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -956,7 +956,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4424"
+NAME="AEN4437"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -976,7 +976,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4432"
+NAME="AEN4445"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -996,7 +996,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4440"
+NAME="AEN4453"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -1016,7 +1016,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4448"
+NAME="AEN4461"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -1033,7 +1033,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4455"
+NAME="AEN4468"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -1059,7 +1059,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4472"
+NAME="AEN4485"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -1088,13 +1088,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4491"
+NAME="AEN4504"
 >Proposed Standards Still Under Development</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4496"
+NAME="AEN4509"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -1117,7 +1117,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4508"
+NAME="AEN4521"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -1137,7 +1137,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4520"
+NAME="AEN4533"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -1154,7 +1154,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4528"
+NAME="AEN4541"
 >Other Important RFCs About <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1163,7 +1163,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4531"
+NAME="AEN4544"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -1183,7 +1183,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4539"
+NAME="AEN4552"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -1215,7 +1215,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4560"
+NAME="AEN4573"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -1235,13 +1235,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4571"
+NAME="AEN4584"
 >Resource Record Types</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4573"
+NAME="AEN4586"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -1270,7 +1270,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4591"
+NAME="AEN4604"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1293,7 +1293,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4603"
+NAME="AEN4616"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1314,7 +1314,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4614"
+NAME="AEN4627"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1341,7 +1341,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4631"
+NAME="AEN4644"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1365,7 +1365,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4643"
+NAME="AEN4656"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1386,7 +1386,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4651"
+NAME="AEN4664"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1406,7 +1406,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4659"
+NAME="AEN4672"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1415,7 +1415,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4662"
+NAME="AEN4675"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1435,7 +1435,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4670"
+NAME="AEN4683"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1452,7 +1452,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4677"
+NAME="AEN4690"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1469,7 +1469,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4684"
+NAME="AEN4697"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1492,7 +1492,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4698"
+NAME="AEN4711"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1501,7 +1501,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4701"
+NAME="AEN4714"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1521,7 +1521,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4709"
+NAME="AEN4722"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1541,7 +1541,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4717"
+NAME="AEN4730"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1561,7 +1561,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4725"
+NAME="AEN4738"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1581,7 +1581,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4736"
+NAME="AEN4749"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1604,7 +1604,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4748"
+NAME="AEN4761"
 >Other <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1613,7 +1613,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4754"
+NAME="AEN4767"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1630,7 +1630,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4761"
+NAME="AEN4774"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1650,7 +1650,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4769"
+NAME="AEN4782"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1670,7 +1670,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4777"
+NAME="AEN4790"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1687,7 +1687,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4784"
+NAME="AEN4797"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1710,7 +1710,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4798"
+NAME="AEN4811"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1727,13 +1727,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4805"
+NAME="AEN4818"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4807"
+NAME="AEN4820"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1784,7 +1784,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4828"
+NAME="AEN4841"
 >A.4.3. Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -1794,13 +1794,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN4832"
+NAME="AEN4845"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4833"
+NAME="AEN4846"
 ></A
 ><P
 ><SPAN
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 82a52fda99..397e197cb7 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -442,8 +442,7 @@ HREF="Bv9ARM.ch06.html#controls_statement_definition_and_usage"
 ><B
 CLASS="command"
 >controls</B
-> Statement Definition and
-Usage</A
+> Statement Definition and Usage</A
 ></DT
 ><DT
 >6.2.5. <A
@@ -479,7 +478,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.9. <A
-HREF="Bv9ARM.ch06.html#AEN1535"
+HREF="Bv9ARM.ch06.html#AEN1541"
 ><B
 CLASS="command"
 >logging</B
@@ -487,7 +486,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.10. <A
-HREF="Bv9ARM.ch06.html#AEN1575"
+HREF="Bv9ARM.ch06.html#AEN1581"
 ><B
 CLASS="command"
 >logging</B
@@ -495,7 +494,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.11. <A
-HREF="Bv9ARM.ch06.html#AEN1805"
+HREF="Bv9ARM.ch06.html#AEN1811"
 ><B
 CLASS="command"
 >lwres</B
@@ -503,7 +502,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.12. <A
-HREF="Bv9ARM.ch06.html#AEN1829"
+HREF="Bv9ARM.ch06.html#AEN1835"
 ><B
 CLASS="command"
 >lwres</B
@@ -511,7 +510,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.13. <A
-HREF="Bv9ARM.ch06.html#AEN1848"
+HREF="Bv9ARM.ch06.html#AEN1854"
 ><B
 CLASS="command"
 >options</B
@@ -519,7 +518,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.14. <A
-HREF="Bv9ARM.ch06.html#AEN2062"
+HREF="Bv9ARM.ch06.html#AEN2068"
 ><B
 CLASS="command"
 >options</B
@@ -539,12 +538,11 @@ HREF="Bv9ARM.ch06.html#server_statement_definition_and_usage"
 ><B
 CLASS="command"
 >server</B
-> Statement Definition
-and Usage</A
+> Statement Definition and Usage</A
 ></DT
 ><DT
 >6.2.17. <A
-HREF="Bv9ARM.ch06.html#AEN2953"
+HREF="Bv9ARM.ch06.html#AEN2966"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -552,7 +550,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.18. <A
-HREF="Bv9ARM.ch06.html#AEN2969"
+HREF="Bv9ARM.ch06.html#AEN2982"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -561,7 +559,7 @@ and Usage</A
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN2977"
+HREF="Bv9ARM.ch06.html#AEN2990"
 ><B
 CLASS="command"
 >view</B
@@ -569,7 +567,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN2991"
+HREF="Bv9ARM.ch06.html#AEN3004"
 ><B
 CLASS="command"
 >view</B
@@ -586,7 +584,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN3138"
+HREF="Bv9ARM.ch06.html#AEN3151"
 ><B
 CLASS="command"
 >zone</B
@@ -596,7 +594,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3472"
+HREF="Bv9ARM.ch06.html#AEN3485"
 >Zone File</A
 ></DT
 ><DD
@@ -608,7 +606,7 @@ HREF="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them"
 ></DT
 ><DT
 >6.3.2. <A
-HREF="Bv9ARM.ch06.html#AEN3792"
+HREF="Bv9ARM.ch06.html#AEN3805"
 >Discussion of MX Records</A
 ></DT
 ><DT
@@ -618,17 +616,17 @@ HREF="Bv9ARM.ch06.html#Setting_TTLs"
 ></DT
 ><DT
 >6.3.4. <A
-HREF="Bv9ARM.ch06.html#AEN3913"
+HREF="Bv9ARM.ch06.html#AEN3926"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN3940"
+HREF="Bv9ARM.ch06.html#AEN3953"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN3998"
+HREF="Bv9ARM.ch06.html#AEN4011"
 ><SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -658,7 +656,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4090"
+HREF="Bv9ARM.ch07.html#AEN4103"
 ><B
 CLASS="command"
 >chroot</B
@@ -672,7 +670,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4113"
+HREF="Bv9ARM.ch07.html#AEN4126"
 >The <B
 CLASS="command"
 >chroot</B
@@ -680,7 +678,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4131"
+HREF="Bv9ARM.ch07.html#AEN4144"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -704,26 +702,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4152"
+HREF="Bv9ARM.ch08.html#AEN4165"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4154"
+HREF="Bv9ARM.ch08.html#AEN4167"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4157"
+HREF="Bv9ARM.ch08.html#AEN4170"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4162"
+HREF="Bv9ARM.ch08.html#AEN4175"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -737,14 +735,14 @@ HREF="Bv9ARM.ch09.html"
 ><DL
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4178"
+HREF="Bv9ARM.ch09.html#AEN4191"
 >Acknowledgements</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4180"
+HREF="Bv9ARM.ch09.html#AEN4193"
 >A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -774,7 +772,7 @@ HREF="Bv9ARM.ch09.html#classes_of_resource_records"
 ></DD
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4219"
+HREF="Bv9ARM.ch09.html#AEN4232"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -808,7 +806,7 @@ HREF="Bv9ARM.ch09.html#internet_drafts"
 ></DT
 ><DT
 >A.4.3. <A
-HREF="Bv9ARM.ch09.html#AEN4828"
+HREF="Bv9ARM.ch09.html#AEN4841"
 >Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN