resolve conflicts

10 files changed, 352 insertions, 213 deletions

diff --git a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml b/usr.sbin/bind/doc/arm/Bv9ARM-book.xml
index fef31e7e058..545c33b6ec4 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml
+++ b/usr.sbin/bind/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: $ISC: Bv9ARM-book.xml,v 1.155.2.27.2.49 2004/08/16 00:55:29 marka Exp $ -->
+<!-- File: $ISC: Bv9ARM-book.xml,v 1.155.2.27.2.52 2005/02/09 03:48:57 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -679,8 +679,13 @@ of a server.</para>
               syntax and consistency.</para>
               <cmdsynopsis label="Usage">
                 <command>named-checkzone</command>
-                <arg>-dq</arg>
+                <arg>-djqvD</arg>
                 <arg>-c <replaceable>class</replaceable></arg>
+                <arg>-o <replaceable>output</replaceable></arg>
+                <arg>-t <replaceable>directory</replaceable></arg>
+                <arg>-w <replaceable>directory</replaceable></arg>
+                <arg>-k <replaceable>(ignore|warn|fail)</replaceable></arg>
+                <arg>-n <replaceable>(ignore|warn|fail)</replaceable></arg>
                 <arg choice="plain"><replaceable>zone</replaceable></arg>
                 <arg><replaceable>filename</replaceable></arg>
               </cmdsynopsis>
@@ -2707,6 +2712,7 @@ statement in the <filename>named.conf</filename> file:</para>
     <optional> flush-zones-on-shutdown <replaceable>yes_or_no</replaceable>; </optional>
     <optional> has-old-clients <replaceable>yes_or_no</replaceable>; </optional>
     <optional> host-statistics <replaceable>yes_or_no</replaceable>; </optional>
+    <optional> host-statistics-max <replaceable>number</replaceable>; </optional>
     <optional> minimal-responses <replaceable>yes_or_no</replaceable>; </optional>
     <optional> multiple-cnames <replaceable>yes_or_no</replaceable>; </optional>
     <optional> notify <replaceable>yes_or_no</replaceable> | <replaceable>explicit</replaceable>; </optional>
@@ -2720,7 +2726,7 @@ statement in the <filename>named.conf</filename> file:</para>
     <optional> forward ( <replaceable>only</replaceable> | <replaceable>first</replaceable> ); </optional>
     <optional> forwarders { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
     <optional> dual-stack-servers <optional>port <replaceable>ip_port</replaceable></optional> { ( <replaceable>domain_name</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> | <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ) ; ... }; </optional>
-    <optional> check-names ( <replaceable>master</replaceable> | <replaceable>slave</replaceable> | <replaceable> response</replaceable> )( <replaceable>warn</replaceable> | <replaceable>fail</replaceable> | <replaceable>ignore</replaceable> ); </optional>
+    <optional> check-names ( <replaceable>master</replaceable> | <replaceable>slave</replaceable> | <replaceable>response</replaceable> )( <replaceable>warn</replaceable> | <replaceable>fail</replaceable> | <replaceable>ignore</replaceable> ); </optional>
     <optional> allow-notify { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-query { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-transfer { <replaceable>address_match_list</replaceable> }; </optional>
@@ -2791,8 +2797,8 @@ statement in the <filename>named.conf</filename> file:</para>
     <optional> edns-udp-size <replaceable>number</replaceable>; </optional>
     <optional> root-delegation-only <optional> exclude { <replaceable>namelist</replaceable> } </optional> ; </optional>
     <optional> querylog <replaceable>yes_or_no</replaceable> ; </optional>
-};
     <optional> disable-algorithms <replaceable>domain</replaceable> { <replaceable>algorithm</replaceable>; <optional> <replaceable>algorithm</replaceable>; </optional> }; </optional>
+};
 </programlisting>
 </sect2>
 
@@ -3338,6 +3344,28 @@ If <command>querylog</command> is not specified then the query logging
 is determined by the presence of the logging category <command>queries</command>.
 </para></listitem></varlistentry>
 
+<varlistentry><term><command>check-names</command></term>
+<listitem>
+<para>
+This option is used to restrict the character set and syntax of
+certain domain names in master files and/or DNS responses received
+from the network.  The default varies according to usage area.  For
+<command>master</command> zones the default is <command>fail</command>.
+For <command>slave</command> zones the default is <command>warn</command>.
+For answer received from the network (<command>response</command>)
+the default is <command>ignore</command>.
+</para>
+<para>The rules for legal hostnames / mail domains are derived from RFC 952
+and RFC 821 as modified by RFC 1123.
+</para>
+<para><command>check-names</command> applies to the owner names of A, AAA and
+MX records.  It also applies to the domain names in the RDATA of NS, SOA and MX
+records.  It also applies to the RDATA of PTR records where the owner name
+indicated that it is a reverse lookup of a hostname (the owner name ends in
+IN-ADDR.ARPA, IP6.ARPA, IP6.INT).
+</para>
+</listitem></varlistentry>
+
 </variablelist>
 
 </sect3>
@@ -3820,6 +3848,12 @@ will be automatically removed.  The default is
 <literal>unlimited</literal>.</para>
 </listitem></varlistentry>
 
+<varlistentry><term><command>host-statistics-max</command></term>
+<listitem><para>In BIND 8, specifies the maximum number of host statistic
+entries to be kept.
+Not implemented in BIND 9.
+</para></listitem></varlistentry>
+
 <varlistentry><term><command>recursive-clients</command></term>
 <listitem><para>The maximum number of simultaneous recursive lookups
 the server will perform on behalf of clients.  The default is
@@ -4728,7 +4762,8 @@ The default is the empty list.</para>
 <listitem><para>
 This option is used to restrict the character set and syntax of
 certain domain names in master files and/or DNS responses received from the
-network.
+network.  The default varies according to zone type.  For <command>master</command> zones the default is <command>fail</command>.  For <command>slave</command>
+zones the default is <command>warn</command>.
 </para>
 </listitem></varlistentry>
 
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch03.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch03.html
index 204d64ced91..37362d5daef 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch03.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch03.html
@@ -651,9 +651,24 @@ CLASS="command"
 ><B
 CLASS="command"
 >named-checkzone</B
->  [-dq] [-c <VAR
+>  [-djqvD] [-c <VAR
 CLASS="replaceable"
 >class</VAR
+>] [-o <VAR
+CLASS="replaceable"
+>output</VAR
+>] [-t <VAR
+CLASS="replaceable"
+>directory</VAR
+>] [-w <VAR
+CLASS="replaceable"
+>directory</VAR
+>] [-k <VAR
+CLASS="replaceable"
+>(ignore|warn|fail)</VAR
+>] [-n <VAR
+CLASS="replaceable"
+>(ignore|warn|fail)</VAR
 >]  <VAR
 CLASS="replaceable"
 >zone</VAR
@@ -1318,7 +1333,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN679"
+NAME="AEN689"
 >3.3.2. Signals</A
 ></H2
 ><P
@@ -1333,7 +1348,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN683"
+NAME="AEN693"
 ></A
 ><TABLE
 CELLPADDING="3"
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch04.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch04.html
index a1f90b4c512..8a4ab28875c 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch04.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch04.html
@@ -96,7 +96,7 @@ HREF="Bv9ARM.ch04.html#incremental_zone_transfers"
 ></DT
 ><DT
 >4.4. <A
-HREF="Bv9ARM.ch04.html#AEN757"
+HREF="Bv9ARM.ch04.html#AEN767"
 >Split DNS</A
 ></DT
 ><DT
@@ -106,12 +106,12 @@ HREF="Bv9ARM.ch04.html#tsig"
 ></DT
 ><DT
 >4.6. <A
-HREF="Bv9ARM.ch04.html#AEN917"
+HREF="Bv9ARM.ch04.html#AEN927"
 >TKEY</A
 ></DT
 ><DT
 >4.7. <A
-HREF="Bv9ARM.ch04.html#AEN932"
+HREF="Bv9ARM.ch04.html#AEN942"
 >SIG(0)</A
 ></DT
 ><DT
@@ -121,7 +121,7 @@ HREF="Bv9ARM.ch04.html#DNSSEC"
 ></DT
 ><DT
 >4.9. <A
-HREF="Bv9ARM.ch04.html#AEN1001"
+HREF="Bv9ARM.ch04.html#AEN1011"
 >IPv6 Support in <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -338,7 +338,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN757"
+NAME="AEN767"
 >4.4. Split DNS</A
 ></H1
 ><P
@@ -756,7 +756,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN848"
+NAME="AEN858"
 >4.5.1. Generate Shared Keys for Each Pair of Hosts</A
 ></H2
 ><P
@@ -780,7 +780,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN853"
+NAME="AEN863"
 >4.5.1.1. Automatic Generation</A
 ></H3
 ><P
@@ -820,7 +820,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN864"
+NAME="AEN874"
 >4.5.1.2. Manual Generation</A
 ></H3
 ><P
@@ -841,7 +841,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN869"
+NAME="AEN879"
 >4.5.2. Copying the Shared Secret to Both Machines</A
 ></H2
 ><P
@@ -853,7 +853,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN872"
+NAME="AEN882"
 >4.5.3. Informing the Servers of the Key's Existence</A
 ></H2
 ><P
@@ -907,7 +907,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN884"
+NAME="AEN894"
 >4.5.4. Instructing the Server to Use the Key</A
 ></H2
 ><P
@@ -991,7 +991,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN900"
+NAME="AEN910"
 >4.5.5. TSIG Key Based Access Control</A
 ></H2
 ><P
@@ -1037,7 +1037,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN913"
+NAME="AEN923"
 >4.5.6. Errors</A
 ></H2
 ><P
@@ -1066,7 +1066,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN917"
+NAME="AEN927"
 >4.6. TKEY</A
 ></H1
 ><P
@@ -1133,7 +1133,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN932"
+NAME="AEN942"
 >4.7. SIG(0)</A
 ></H1
 ><P
@@ -1220,7 +1220,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN952"
+NAME="AEN962"
 >4.8.1. Generating Keys</A
 ></H2
 ><P
@@ -1298,7 +1298,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN972"
+NAME="AEN982"
 >4.8.2. Signing the Zone</A
 ></H2
 ><P
@@ -1378,7 +1378,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN994"
+NAME="AEN1004"
 >4.8.3. Configuring Servers</A
 ></H2
 ><P
@@ -1406,7 +1406,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN1001"
+NAME="AEN1011"
 >4.9. IPv6 Support in <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -1486,7 +1486,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1019"
+NAME="AEN1029"
 >4.9.1. Address Lookups Using AAAA Records</A
 ></H2
 ><P
@@ -1512,7 +1512,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1025"
+NAME="AEN1035"
 >4.9.2. Address to Name Lookups Using Nibble Format</A
 ></H2
 ><P
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch05.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch05.html
index 2ae7f2ec130..dd59488d938 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch05.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch05.html
@@ -84,7 +84,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >5.1. <A
-HREF="Bv9ARM.ch05.html#AEN1034"
+HREF="Bv9ARM.ch05.html#AEN1044"
 >The Lightweight Resolver Library</A
 ></DT
 ><DT
@@ -99,7 +99,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN1034"
+NAME="AEN1044"
 >5.1. The Lightweight Resolver Library</A
 ></H1
 ><P
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
index a83ec38ef3f..8cd4c7022db 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
+++ b/usr.sbin/bind/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#AEN4015"
+HREF="Bv9ARM.ch06.html#AEN4050"
 >Zone File</A
 ></DT
 ></DL
@@ -151,7 +151,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN1076"
+NAME="AEN1086"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -623,7 +623,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1241"
+NAME="AEN1251"
 >6.1.1.1. Syntax</A
 ></H3
 ><PRE
@@ -654,7 +654,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1249"
+NAME="AEN1259"
 >6.1.1.2. Definition and Usage</A
 ></H3
 ><P
@@ -768,7 +768,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1280"
+NAME="AEN1290"
 >6.1.2. Comment Syntax</A
 ></H2
 ><P
@@ -787,7 +787,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1285"
+NAME="AEN1295"
 >6.1.2.1. Syntax</A
 ></H3
 ><P
@@ -819,7 +819,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1294"
+NAME="AEN1304"
 >6.1.2.2. Definition and Usage</A
 ></H3
 ><P
@@ -932,7 +932,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN1318"
+NAME="AEN1328"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -1132,7 +1132,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1401"
+NAME="AEN1411"
 >6.2.1. <B
 CLASS="command"
 >acl</B
@@ -1181,7 +1181,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN1414"
+NAME="AEN1424"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -1264,7 +1264,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1445"
+NAME="AEN1455"
 >6.2.3. <B
 CLASS="command"
 >controls</B
@@ -1578,7 +1578,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1524"
+NAME="AEN1534"
 >6.2.5. <B
 CLASS="command"
 >include</B
@@ -1596,7 +1596,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1529"
+NAME="AEN1539"
 >6.2.6. <B
 CLASS="command"
 >include</B
@@ -1625,7 +1625,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1536"
+NAME="AEN1546"
 >6.2.7. <B
 CLASS="command"
 >key</B
@@ -1653,7 +1653,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1543"
+NAME="AEN1553"
 >6.2.8. <B
 CLASS="command"
 >key</B
@@ -1735,7 +1735,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1563"
+NAME="AEN1573"
 >6.2.9. <B
 CLASS="command"
 >logging</B
@@ -1877,7 +1877,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1603"
+NAME="AEN1613"
 >6.2.10. <B
 CLASS="command"
 >logging</B
@@ -1940,7 +1940,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN1619"
+NAME="AEN1629"
 >6.2.10.1. The <B
 CLASS="command"
 >channel</B
@@ -2456,7 +2456,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN1743"
+NAME="AEN1753"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -2783,7 +2783,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1873"
+NAME="AEN1883"
 >6.2.11. <B
 CLASS="command"
 >lwres</B
@@ -2864,7 +2864,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1897"
+NAME="AEN1907"
 >6.2.12. <B
 CLASS="command"
 >lwres</B
@@ -2938,7 +2938,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1916"
+NAME="AEN1926"
 >6.2.13. <B
 CLASS="command"
 >masters</B
@@ -2987,7 +2987,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1931"
+NAME="AEN1941"
 >6.2.14. <B
 CLASS="command"
 >masters</B
@@ -3005,7 +3005,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1936"
+NAME="AEN1946"
 >6.2.15. <B
 CLASS="command"
 >options</B
@@ -3175,6 +3175,13 @@ CLASS="replaceable"
 >]
     [<SPAN
 CLASS="optional"
+> host-statistics-max <VAR
+CLASS="replaceable"
+>number</VAR
+>; </SPAN
+>]
+    [<SPAN
+CLASS="optional"
 > minimal-responses <VAR
 CLASS="replaceable"
 >yes_or_no</VAR
@@ -3322,7 +3329,7 @@ CLASS="replaceable"
 >slave</VAR
 > | <VAR
 CLASS="replaceable"
-> response</VAR
+>response</VAR
 > )( <VAR
 CLASS="replaceable"
 >warn</VAR
@@ -3953,7 +3960,6 @@ CLASS="replaceable"
 >yes_or_no</VAR
 > ; </SPAN
 >]
-};
     [<SPAN
 CLASS="optional"
 > disable-algorithms <VAR
@@ -3970,6 +3976,7 @@ CLASS="replaceable"
 >; </SPAN
 >] }; </SPAN
 >]
+};
 </PRE
 ></DIV
 ><DIV
@@ -4490,7 +4497,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN2390"
+NAME="AEN2402"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -5281,6 +5288,54 @@ CLASS="command"
 >.
 </P
 ></DD
+><DT
+><B
+CLASS="command"
+>check-names</B
+></DT
+><DD
+><P
+>&#13;This option is used to restrict the character set and syntax of
+certain domain names in master files and/or DNS responses received
+from the network.  The default varies according to usage area.  For
+<B
+CLASS="command"
+>master</B
+> zones the default is <B
+CLASS="command"
+>fail</B
+>.
+For <B
+CLASS="command"
+>slave</B
+> zones the default is <B
+CLASS="command"
+>warn</B
+>.
+For answer received from the network (<B
+CLASS="command"
+>response</B
+>)
+the default is <B
+CLASS="command"
+>ignore</B
+>.
+</P
+><P
+>The rules for legal hostnames / mail domains are derived from RFC 952
+and RFC 821 as modified by RFC 1123.
+</P
+><P
+><B
+CLASS="command"
+>check-names</B
+> applies to the owner names of A, AAA and
+MX records.  It also applies to the domain names in the RDATA of NS, SOA and MX
+records.  It also applies to the RDATA of PTR records where the owner name
+indicated that it is a reverse lookup of a hostname (the owner name ends in
+IN-ADDR.ARPA, IP6.ARPA, IP6.INT).
+</P
+></DD
 ></DL
 ></DIV
 ></DIV
@@ -5289,7 +5344,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2669"
+NAME="AEN2695"
 >6.2.16.2. Forwarding</A
 ></H3
 ><P
@@ -5357,7 +5412,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2688"
+NAME="AEN2714"
 >6.2.16.3. Dual-stack Servers</A
 ></H3
 ><P
@@ -5569,7 +5624,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2755"
+NAME="AEN2781"
 >6.2.16.5. Interfaces</A
 ></H3
 ><P
@@ -5672,7 +5727,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2782"
+NAME="AEN2808"
 >6.2.16.6. Query Address</A
 ></H3
 ><P
@@ -6180,7 +6235,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2948"
+NAME="AEN2974"
 >6.2.16.8. Bad UDP Port Lists</A
 ></H3
 ><P
@@ -6204,7 +6259,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2953"
+NAME="AEN2979"
 >6.2.16.9. Operating System Resource Limits</A
 ></H3
 ><P
@@ -6324,7 +6379,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2990"
+NAME="AEN3016"
 >6.2.16.10. Server  Resource Limits</A
 ></H3
 ><P
@@ -6374,6 +6429,18 @@ CLASS="literal"
 ><DT
 ><B
 CLASS="command"
+>host-statistics-max</B
+></DT
+><DD
+><P
+>In BIND 8, specifies the maximum number of host statistic
+entries to be kept.
+Not implemented in BIND 9.
+</P
+></DD
+><DT
+><B
+CLASS="command"
 >recursive-clients</B
 ></DT
 ><DD
@@ -6447,7 +6514,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3031"
+NAME="AEN3062"
 >6.2.16.11. Periodic Task Intervals</A
 ></H3
 ><P
@@ -6812,7 +6879,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3119"
+NAME="AEN3150"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -7274,7 +7341,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3263"
+NAME="AEN3294"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -7746,7 +7813,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3402"
+NAME="AEN3433"
 >6.2.19. <B
 CLASS="command"
 >trusted-keys</B
@@ -7801,7 +7868,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3418"
+NAME="AEN3449"
 >6.2.20. <B
 CLASS="command"
 >trusted-keys</B
@@ -7889,7 +7956,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3440"
+NAME="AEN3471"
 >6.2.22. <B
 CLASS="command"
 >view</B
@@ -8523,7 +8590,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3614"
+NAME="AEN3645"
 >6.2.24. <B
 CLASS="command"
 >zone</B
@@ -8534,7 +8601,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3617"
+NAME="AEN3648"
 >6.2.24.1. Zone Types</A
 ></H3
 ><DIV
@@ -8542,7 +8609,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3619"
+NAME="AEN3650"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -8774,7 +8841,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3682"
+NAME="AEN3713"
 >6.2.24.2. Class</A
 ></H3
 ><P
@@ -8812,7 +8879,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3692"
+NAME="AEN3723"
 >6.2.24.3. Zone Options</A
 ></H3
 ><P
@@ -8956,7 +9023,20 @@ CLASS="command"
 ><P
 >&#13;This option is used to restrict the character set and syntax of
 certain domain names in master files and/or DNS responses received from the
-network.
+network.  The default varies according to zone type.  For <B
+CLASS="command"
+>master</B
+> zones the default is <B
+CLASS="command"
+>fail</B
+>.  For <B
+CLASS="command"
+>slave</B
+>
+zones the default is <B
+CLASS="command"
+>warn</B
+>.
 </P
 ></DD
 ><DT
@@ -9548,7 +9628,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN3974"
+NAME="AEN4009"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -9673,7 +9753,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4015"
+NAME="AEN4050"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -9694,7 +9774,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4020"
+NAME="AEN4055"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -9719,7 +9799,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4026"
+NAME="AEN4061"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -9800,7 +9880,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4058"
+NAME="AEN4093"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10151,7 +10231,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4210"
+NAME="AEN4245"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10233,7 +10313,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4234"
+NAME="AEN4269"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -10265,7 +10345,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4241"
+NAME="AEN4276"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10420,7 +10500,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4307"
+NAME="AEN4342"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10491,7 +10571,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4335"
+NAME="AEN4370"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10529,7 +10609,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4341"
+NAME="AEN4376"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10750,7 +10830,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4433"
+NAME="AEN4468"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10813,7 +10893,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4456"
+NAME="AEN4491"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10842,7 +10922,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4461"
+NAME="AEN4496"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -10908,7 +10988,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4483"
+NAME="AEN4518"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10933,7 +11013,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4490"
+NAME="AEN4525"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -10999,7 +11079,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4510"
+NAME="AEN4545"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -11075,7 +11155,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4530"
+NAME="AEN4565"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -11111,7 +11191,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4541"
+NAME="AEN4576"
 >6.3.6. <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -11194,7 +11274,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4565"
+NAME="AEN4600"
 ></A
 ><TABLE
 CELLPADDING="3"
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html
index a7c47077387..9e5cc9b8f3f 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html
+++ b/usr.sbin/bind/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#AEN4658"
+HREF="Bv9ARM.ch07.html#AEN4693"
 ><B
 CLASS="command"
 >chroot</B
@@ -197,7 +197,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4658"
+NAME="AEN4693"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -275,7 +275,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4681"
+NAME="AEN4716"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -351,7 +351,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4699"
+NAME="AEN4734"
 >7.2.2. Using the <B
 CLASS="command"
 >setuid</B
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
index fe173a8f47a..94d3d795246 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
@@ -81,17 +81,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4720"
+HREF="Bv9ARM.ch08.html#AEN4755"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4725"
+HREF="Bv9ARM.ch08.html#AEN4760"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4730"
+HREF="Bv9ARM.ch08.html#AEN4765"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -101,7 +101,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4720"
+NAME="AEN4755"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -109,7 +109,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4722"
+NAME="AEN4757"
 >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="AEN4725"
+NAME="AEN4760"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -154,7 +154,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4730"
+NAME="AEN4765"
 >8.3. Where Can I Get Help?</A
 ></H1
 ><P
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
index 130257c2411..ea6202b2eb8 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
@@ -74,7 +74,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4746"
+HREF="Bv9ARM.ch09.html#AEN4781"
 >Acknowledgments</A
 ></DT
 ><DT
@@ -97,7 +97,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4746"
+NAME="AEN4781"
 >A.1. Acknowledgments</A
 ></H1
 ><DIV
@@ -105,7 +105,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4748"
+NAME="AEN4783"
 >A.1.1. A Brief History of the <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -271,7 +271,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4784"
+NAME="AEN4819"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -410,7 +410,7 @@ CLASS="informaltable"
 ><P
 ></P
 ><A
-NAME="AEN4853"
+NAME="AEN4888"
 ></A
 ><TABLE
 CELLPADDING="3"
@@ -608,19 +608,19 @@ TARGET="_top"
 </P
 ><H3
 ><A
-NAME="AEN4921"
+NAME="AEN4956"
 >Bibliography</A
 ></H3
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4922"
+NAME="AEN4957"
 >Standards</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4924"
+NAME="AEN4959"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -637,7 +637,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4931"
+NAME="AEN4966"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -654,7 +654,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4938"
+NAME="AEN4973"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -678,7 +678,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4947"
+NAME="AEN4982"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -698,7 +698,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4955"
+NAME="AEN4990"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -718,7 +718,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4963"
+NAME="AEN4998"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -738,7 +738,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4971"
+NAME="AEN5006"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -755,7 +755,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4978"
+NAME="AEN5013"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -781,7 +781,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4995"
+NAME="AEN5030"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -810,13 +810,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5014"
+NAME="AEN5049"
 >Proposed Standards Still Under Development</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5019"
+NAME="AEN5054"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -839,7 +839,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5031"
+NAME="AEN5066"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -859,7 +859,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5043"
+NAME="AEN5078"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -876,7 +876,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5051"
+NAME="AEN5086"
 >Other Important RFCs About <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -885,7 +885,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5054"
+NAME="AEN5089"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -905,7 +905,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5062"
+NAME="AEN5097"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -937,7 +937,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5083"
+NAME="AEN5118"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -957,13 +957,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5094"
+NAME="AEN5129"
 >Resource Record Types</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5096"
+NAME="AEN5131"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -992,7 +992,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5114"
+NAME="AEN5149"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1015,7 +1015,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5126"
+NAME="AEN5161"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1036,7 +1036,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5137"
+NAME="AEN5172"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1063,7 +1063,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5154"
+NAME="AEN5189"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1087,7 +1087,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5166"
+NAME="AEN5201"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1108,7 +1108,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5174"
+NAME="AEN5209"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1128,7 +1128,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5182"
+NAME="AEN5217"
 ><ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1137,7 +1137,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5185"
+NAME="AEN5220"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1157,7 +1157,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5193"
+NAME="AEN5228"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1174,7 +1174,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5200"
+NAME="AEN5235"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1191,7 +1191,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5207"
+NAME="AEN5242"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1214,7 +1214,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5221"
+NAME="AEN5256"
 ><ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1223,7 +1223,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5224"
+NAME="AEN5259"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1243,7 +1243,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5232"
+NAME="AEN5267"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1263,7 +1263,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5240"
+NAME="AEN5275"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1283,7 +1283,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5251"
+NAME="AEN5286"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1306,7 +1306,7 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5263"
+NAME="AEN5298"
 >Other <ACRONYM
 CLASS="acronym"
 >DNS</ACRONYM
@@ -1315,7 +1315,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5269"
+NAME="AEN5304"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1332,7 +1332,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5276"
+NAME="AEN5311"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1352,7 +1352,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5284"
+NAME="AEN5319"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1372,7 +1372,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5292"
+NAME="AEN5327"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1389,7 +1389,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5299"
+NAME="AEN5334"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1412,7 +1412,7 @@ STYLE="margin-left: 0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5313"
+NAME="AEN5348"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1429,13 +1429,13 @@ STYLE="margin-left: 0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN5320"
+NAME="AEN5355"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5322"
+NAME="AEN5357"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1486,7 +1486,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN5343"
+NAME="AEN5378"
 >A.3.3. Other Documents About <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -1496,13 +1496,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN5347"
+NAME="AEN5382"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN5348"
+NAME="AEN5383"
 ></A
 ><P
 ><SPAN
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.html b/usr.sbin/bind/doc/arm/Bv9ARM.html
index bf8b49e9679..21d46214cc8 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.html
@@ -191,7 +191,7 @@ HREF="Bv9ARM.ch03.html#AEN347"
 ></DT
 ><DT
 >3.3.2. <A
-HREF="Bv9ARM.ch03.html#AEN679"
+HREF="Bv9ARM.ch03.html#AEN689"
 >Signals</A
 ></DT
 ></DL
@@ -231,7 +231,7 @@ HREF="Bv9ARM.ch04.html#incremental_zone_transfers"
 ></DT
 ><DT
 >4.4. <A
-HREF="Bv9ARM.ch04.html#AEN757"
+HREF="Bv9ARM.ch04.html#AEN767"
 >Split DNS</A
 ></DT
 ><DT
@@ -243,44 +243,44 @@ HREF="Bv9ARM.ch04.html#tsig"
 ><DL
 ><DT
 >4.5.1. <A
-HREF="Bv9ARM.ch04.html#AEN848"
+HREF="Bv9ARM.ch04.html#AEN858"
 >Generate Shared Keys for Each Pair of Hosts</A
 ></DT
 ><DT
 >4.5.2. <A
-HREF="Bv9ARM.ch04.html#AEN869"
+HREF="Bv9ARM.ch04.html#AEN879"
 >Copying the Shared Secret to Both Machines</A
 ></DT
 ><DT
 >4.5.3. <A
-HREF="Bv9ARM.ch04.html#AEN872"
+HREF="Bv9ARM.ch04.html#AEN882"
 >Informing the Servers of the Key's Existence</A
 ></DT
 ><DT
 >4.5.4. <A
-HREF="Bv9ARM.ch04.html#AEN884"
+HREF="Bv9ARM.ch04.html#AEN894"
 >Instructing the Server to Use the Key</A
 ></DT
 ><DT
 >4.5.5. <A
-HREF="Bv9ARM.ch04.html#AEN900"
+HREF="Bv9ARM.ch04.html#AEN910"
 >TSIG Key Based Access Control</A
 ></DT
 ><DT
 >4.5.6. <A
-HREF="Bv9ARM.ch04.html#AEN913"
+HREF="Bv9ARM.ch04.html#AEN923"
 >Errors</A
 ></DT
 ></DL
 ></DD
 ><DT
 >4.6. <A
-HREF="Bv9ARM.ch04.html#AEN917"
+HREF="Bv9ARM.ch04.html#AEN927"
 >TKEY</A
 ></DT
 ><DT
 >4.7. <A
-HREF="Bv9ARM.ch04.html#AEN932"
+HREF="Bv9ARM.ch04.html#AEN942"
 >SIG(0)</A
 ></DT
 ><DT
@@ -292,24 +292,24 @@ HREF="Bv9ARM.ch04.html#DNSSEC"
 ><DL
 ><DT
 >4.8.1. <A
-HREF="Bv9ARM.ch04.html#AEN952"
+HREF="Bv9ARM.ch04.html#AEN962"
 >Generating Keys</A
 ></DT
 ><DT
 >4.8.2. <A
-HREF="Bv9ARM.ch04.html#AEN972"
+HREF="Bv9ARM.ch04.html#AEN982"
 >Signing the Zone</A
 ></DT
 ><DT
 >4.8.3. <A
-HREF="Bv9ARM.ch04.html#AEN994"
+HREF="Bv9ARM.ch04.html#AEN1004"
 >Configuring Servers</A
 ></DT
 ></DL
 ></DD
 ><DT
 >4.9. <A
-HREF="Bv9ARM.ch04.html#AEN1001"
+HREF="Bv9ARM.ch04.html#AEN1011"
 >IPv6 Support in <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
@@ -319,12 +319,12 @@ CLASS="acronym"
 ><DL
 ><DT
 >4.9.1. <A
-HREF="Bv9ARM.ch04.html#AEN1019"
+HREF="Bv9ARM.ch04.html#AEN1029"
 >Address Lookups Using AAAA Records</A
 ></DT
 ><DT
 >4.9.2. <A
-HREF="Bv9ARM.ch04.html#AEN1025"
+HREF="Bv9ARM.ch04.html#AEN1035"
 >Address to Name Lookups Using Nibble Format</A
 ></DT
 ></DL
@@ -343,7 +343,7 @@ CLASS="acronym"
 ><DL
 ><DT
 >5.1. <A
-HREF="Bv9ARM.ch05.html#AEN1034"
+HREF="Bv9ARM.ch05.html#AEN1044"
 >The Lightweight Resolver Library</A
 ></DT
 ><DT
@@ -377,7 +377,7 @@ HREF="Bv9ARM.ch06.html#address_match_lists"
 ></DT
 ><DT
 >6.1.2. <A
-HREF="Bv9ARM.ch06.html#AEN1280"
+HREF="Bv9ARM.ch06.html#AEN1290"
 >Comment Syntax</A
 ></DT
 ></DL
@@ -391,7 +391,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ><DL
 ><DT
 >6.2.1. <A
-HREF="Bv9ARM.ch06.html#AEN1401"
+HREF="Bv9ARM.ch06.html#AEN1411"
 ><B
 CLASS="command"
 >acl</B
@@ -408,7 +408,7 @@ Usage</A
 ></DT
 ><DT
 >6.2.3. <A
-HREF="Bv9ARM.ch06.html#AEN1445"
+HREF="Bv9ARM.ch06.html#AEN1455"
 ><B
 CLASS="command"
 >controls</B
@@ -424,7 +424,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.5. <A
-HREF="Bv9ARM.ch06.html#AEN1524"
+HREF="Bv9ARM.ch06.html#AEN1534"
 ><B
 CLASS="command"
 >include</B
@@ -432,7 +432,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.6. <A
-HREF="Bv9ARM.ch06.html#AEN1529"
+HREF="Bv9ARM.ch06.html#AEN1539"
 ><B
 CLASS="command"
 >include</B
@@ -440,7 +440,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.7. <A
-HREF="Bv9ARM.ch06.html#AEN1536"
+HREF="Bv9ARM.ch06.html#AEN1546"
 ><B
 CLASS="command"
 >key</B
@@ -448,7 +448,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.8. <A
-HREF="Bv9ARM.ch06.html#AEN1543"
+HREF="Bv9ARM.ch06.html#AEN1553"
 ><B
 CLASS="command"
 >key</B
@@ -456,7 +456,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.9. <A
-HREF="Bv9ARM.ch06.html#AEN1563"
+HREF="Bv9ARM.ch06.html#AEN1573"
 ><B
 CLASS="command"
 >logging</B
@@ -464,7 +464,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.10. <A
-HREF="Bv9ARM.ch06.html#AEN1603"
+HREF="Bv9ARM.ch06.html#AEN1613"
 ><B
 CLASS="command"
 >logging</B
@@ -472,7 +472,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.11. <A
-HREF="Bv9ARM.ch06.html#AEN1873"
+HREF="Bv9ARM.ch06.html#AEN1883"
 ><B
 CLASS="command"
 >lwres</B
@@ -480,7 +480,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.12. <A
-HREF="Bv9ARM.ch06.html#AEN1897"
+HREF="Bv9ARM.ch06.html#AEN1907"
 ><B
 CLASS="command"
 >lwres</B
@@ -488,7 +488,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.13. <A
-HREF="Bv9ARM.ch06.html#AEN1916"
+HREF="Bv9ARM.ch06.html#AEN1926"
 ><B
 CLASS="command"
 >masters</B
@@ -496,7 +496,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.14. <A
-HREF="Bv9ARM.ch06.html#AEN1931"
+HREF="Bv9ARM.ch06.html#AEN1941"
 ><B
 CLASS="command"
 >masters</B
@@ -504,7 +504,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.15. <A
-HREF="Bv9ARM.ch06.html#AEN1936"
+HREF="Bv9ARM.ch06.html#AEN1946"
 ><B
 CLASS="command"
 >options</B
@@ -536,7 +536,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN3402"
+HREF="Bv9ARM.ch06.html#AEN3433"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -544,7 +544,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN3418"
+HREF="Bv9ARM.ch06.html#AEN3449"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -561,7 +561,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN3440"
+HREF="Bv9ARM.ch06.html#AEN3471"
 ><B
 CLASS="command"
 >view</B
@@ -578,7 +578,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.24. <A
-HREF="Bv9ARM.ch06.html#AEN3614"
+HREF="Bv9ARM.ch06.html#AEN3645"
 ><B
 CLASS="command"
 >zone</B
@@ -588,7 +588,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN4015"
+HREF="Bv9ARM.ch06.html#AEN4050"
 >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#AEN4335"
+HREF="Bv9ARM.ch06.html#AEN4370"
 >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#AEN4456"
+HREF="Bv9ARM.ch06.html#AEN4491"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN4483"
+HREF="Bv9ARM.ch06.html#AEN4518"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN4541"
+HREF="Bv9ARM.ch06.html#AEN4576"
 ><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#AEN4658"
+HREF="Bv9ARM.ch07.html#AEN4693"
 ><B
 CLASS="command"
 >chroot</B
@@ -664,7 +664,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4681"
+HREF="Bv9ARM.ch07.html#AEN4716"
 >The <B
 CLASS="command"
 >chroot</B
@@ -672,7 +672,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4699"
+HREF="Bv9ARM.ch07.html#AEN4734"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -696,26 +696,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4720"
+HREF="Bv9ARM.ch08.html#AEN4755"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4722"
+HREF="Bv9ARM.ch08.html#AEN4757"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4725"
+HREF="Bv9ARM.ch08.html#AEN4760"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4730"
+HREF="Bv9ARM.ch08.html#AEN4765"
 >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#AEN4746"
+HREF="Bv9ARM.ch09.html#AEN4781"
 >Acknowledgments</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4748"
+HREF="Bv9ARM.ch09.html#AEN4783"
 >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#AEN5343"
+HREF="Bv9ARM.ch09.html#AEN5378"
 >Other Documents About <ACRONYM
 CLASS="acronym"
 >BIND</ACRONYM
diff --git a/usr.sbin/bind/doc/misc/migration b/usr.sbin/bind/doc/misc/migration
index 5599c4bc85c..2e247311617 100644
--- a/usr.sbin/bind/doc/misc/migration
+++ b/usr.sbin/bind/doc/misc/migration
@@ -119,6 +119,15 @@ line.
 $GENERATE: The "$$" construct for getting a literal $ into a domain
 name is deprecated.  Use \$ instead.
 
+2.6. TXT records are no longer automatically split.
+
+Some versions of BIND accepted strings in TXT RDATA consisting of more
+than 255 characters and silently split them to be able to encode the
+strings in a protocol conformant way. You may now see errors like this
+        dns_rdata_fromtext: local.db:119: ran out of space
+if you have TXT RRs with too longs strings. Make sure to split the
+string in the zone data file at or before a single one reaches 255
+characters.
 
 3. Interoperability Impact of New Protocol Features
 
@@ -243,4 +252,4 @@ necessary, the umask should be set explicitly in the script used to
 start the named process.
 
 
-$ISC: migration,v 1.37.2.3.2.2 2004/03/06 13:16:19 marka Exp $
+$ISC: migration,v 1.37.2.3.2.3 2004/11/22 22:33:09 marka Exp $