pullup:

1172.   [doc]           Add CERT, GPOS, KX, NAPTR, NSAP, PX and TXT to
                        table of RR types in ARM.

diff --git a/CHANGES b/CHANGES
index b2ab178e4cda845b71cce71dd33ccd4570d911bc..7944523dd7d50f7ae325ba007551d0fb18f0f4b0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@
 1173.  [bug]           Potential memory leaks in isc_log_create() and
                        isc_log_settag(). [RT #2336]
 
+1172.  [doc]           Add CERT, GPOS, KX, NAPTR, NSAP, PX and TXT to 
+                       table of RR types in ARM.
+
 1165.  [bug]           We were rejecting notify-source{-v6} in zone clauses.
 
 1164.  [bug]           Empty masters clauses in slave / stub zones were not

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 5d549eaa25485aaed6fc5bad672153cfe68470f3..3bdad868f25c32406048e55f38009a398c60fef8 100644 (file)
--- 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.155.2.15 2002/01/22 06:16:25 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.16 2002/01/23 01:41:17 gson Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -4699,6 +4699,10 @@ or historical (h) and no longer in general use):</para>
 Experimental.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>CERT</para></entry>
+<entry colname = "2"><para>holds a digital certificate.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>CNAME</para></entry>
 <entry colname = "2"><para>identifies the canonical name of an alias.</para></entry>
 </row>
@@ -4709,6 +4713,10 @@ Replaces the domain name specified with another name to be looked
 up. Described in RFC 2672.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>GPOS</para></entry>
+<entry colname = "2"><para>Specifies the global position. Superseded by LOC.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>HINFO</para></entry>
 <entry colname = "2"><para>identifies the CPU and OS used by a host.</para></entry>
 </row>
@@ -4723,6 +4731,11 @@ Experimental.</para></entry>
 DNS name.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>KX</para></entry>
+<entry colname = "2"><para>identifies a key exchanger for this
+DNS name.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>LOC</para></entry>
 <entry colname = "2"><para>(x) for storing GPS info. See RFC 1876.
 Experimental.</para></entry>
@@ -4733,6 +4746,14 @@ Experimental.</para></entry>
  See RFC 974 for details.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>NAPTR</para></entry>
+<entry colname = "2"><para>name authority pointer.</para></entry>
+</row>
+<row rowsep = "0">
+<entry colname = "1"><para>NSAP</para></entry>
+<entry colname = "2"><para>a network service access point.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>NS</para></entry>
 <entry colname = "2"><para>the authoritative nameserver for the
 domain.</para></entry>
@@ -4750,6 +4771,11 @@ See RFC 2535 for details.</para></entry>
 name space.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>PX</para></entry>
+<entry colname = "2"><para>provides mappings between RFC 822 and X.400
+addresses.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>RP</para></entry>
 <entry colname = "2"><para>(x) information on persons responsible
 for the domain. Experimental.</para></entry>
@@ -4774,6 +4800,10 @@ in the secure DNS. See RFC 2535 for details.</para></entry>
 services (replaces WKS).</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para>TXT</para></entry>
+<entry colname = "2"><para>text records.</para></entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para>WKS</para></entry>
 <entry colname = "2"><para>(h) information about which well known
 network services, such as SMTP, that a domain supports. Historical,