1903. [doc] Review ARM for BIND 9.4.

CHANGES

+1903.	[doc]		Review ARM for BIND 9.4.
+
 1902.	[port]		Use uintptr_t if available. [RT #14606]
 
 1901.	[func]		Support for SPF rdata type. [RT #15033]

bin/check/named-checkconf.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.12 2005/05/13 01:35:38 marka Exp $ -->
-<refentry>
+<!-- $Id: named-checkconf.docbook,v 1.13 2005/07/19 04:55:19 marka Exp $ -->
+<refentry id="man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>
   </refentryinfo>

bin/check/named-checkzone.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.21 2005/06/20 01:09:42 marka Exp $ -->
-<refentry>
+<!-- $Id: named-checkzone.docbook,v 1.22 2005/07/19 04:55:19 marka Exp $ -->
+<refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
   </refentryinfo>

bin/dig/dig.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.23 2005/06/07 00:15:58 marka Exp $ -->
-<refentry>
+<!-- $Id: dig.docbook,v 1.24 2005/07/19 04:55:19 marka Exp $ -->
+<refentry id="man.dig">
 
   <refentryinfo>
     <date>Jun 30, 2000</date>

bin/dig/host.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: host.docbook,v 1.9 2005/05/13 01:35:39 marka Exp $ -->
-<refentry>
+<!-- $Id: host.docbook,v 1.10 2005/07/19 04:55:20 marka Exp $ -->
+<refentry id="man.host">
 
   <refentryinfo>
     <date>Jun 30, 2000</date>

bin/dnssec/dnssec-keygen.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keygen.docbook,v 1.12 2005/05/13 01:35:39 marka Exp $ -->
-<refentry>
+<!-- $Id: dnssec-keygen.docbook,v 1.13 2005/07/19 04:55:20 marka Exp $ -->
+<refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>
   </refentryinfo>

bin/dnssec/dnssec-signzone.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-signzone.docbook,v 1.19 2005/06/28 02:55:09 marka Exp $ -->
-<refentry>
+<!-- $Id: dnssec-signzone.docbook,v 1.20 2005/07/19 04:55:20 marka Exp $ -->
+<refentry id="man.dnssec-signzone">
   <refentryinfo>
     <date>June 30, 2000</date>
   </refentryinfo>

bin/named/named.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.10 2005/05/13 01:35:40 marka Exp $ -->
-<refentry>
+<!-- $Id: named.docbook,v 1.11 2005/07/19 04:55:21 marka Exp $ -->
+<refentry id="man.named">
   <refentryinfo>
     <date>June 30, 2000</date>
   </refentryinfo>

bin/rndc/rndc-confgen.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc-confgen.docbook,v 1.9 2005/05/13 01:35:41 marka Exp $ -->
-<refentry>
+<!-- $Id: rndc-confgen.docbook,v 1.10 2005/07/19 04:55:21 marka Exp $ -->
+<refentry id="man.rndc-confgen">
   <refentryinfo>
     <date>Aug 27, 2001</date>
   </refentryinfo>

bin/rndc/rndc.conf.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc.conf.docbook,v 1.11 2005/05/13 01:35:42 marka Exp $ -->
-<refentry>
+<!-- $Id: rndc.conf.docbook,v 1.12 2005/07/19 04:55:21 marka Exp $ -->
+<refentry id="man.rndc.conf">
   <refentryinfo>
     <date>June 30, 2000</date>
   </refentryinfo>

bin/rndc/rndc.docbook

@@ -18,8 +18,8 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc.docbook,v 1.13 2005/05/13 01:35:42 marka Exp $ -->
-<refentry>
+<!-- $Id: rndc.docbook,v 1.14 2005/07/19 04:55:21 marka Exp $ -->
+<refentry id="man.rndc">
   <refentryinfo>
     <date>June 30, 2000</date>
   </refentryinfo>

configure.in

@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.385 $)
+AC_REVISION($Revision: 1.386 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -2063,6 +2063,10 @@ NOM_PATH_FILE(XSLT_DOCBOOK_STYLE_XHTML, docbook/xhtml/docbook.xsl, $docbook_xsl_
 NOM_PATH_FILE(XSLT_DOCBOOK_STYLE_MAN, docbook/manpages/docbook.xsl, $docbook_xsl_trees)
 NOM_PATH_FILE(XSLT_DOCBOOK_CHUNK_HTML, docbook/html/chunk.xsl, $docbook_xsl_trees)
 NOM_PATH_FILE(XSLT_DOCBOOK_CHUNK_XHTML, docbook/xhtml/chunk.xsl, $docbook_xsl_trees)
+NOM_PATH_FILE(XSLT_DOCBOOK_CHUNKTOC_HTML, docbook/html/chunktoc.xsl, $docbook_xsl_trees)
+NOM_PATH_FILE(XSLT_DOCBOOK_CHUNKTOC_XHTML, docbook/xhtml/chunktoc.xsl, $docbook_xsl_trees)
+NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_HTML, docbook/html/maketoc.xsl, $docbook_xsl_trees)
+NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML, docbook/xhtml/maketoc.xsl, $docbook_xsl_trees)
 
 #
 # Same dance for db2latex
@@ -2243,6 +2247,7 @@ AC_OUTPUT(
 	doc/arm/Makefile
 	doc/misc/Makefile
 	isc-config.sh
+	doc/xsl/Makefile
 	doc/xsl/isc-docbook-chunk.xsl
 	doc/xsl/isc-docbook-html.xsl
 	doc/xsl/isc-docbook-latex.xsl

doc/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:04:41 marka Exp $
+# $Id: Makefile.in,v 1.6 2005/07/19 04:55:21 marka Exp $
 
 # This Makefile is a placeholder.  It exists merely to make
 # sure that its directory gets created in the object directory
@@ -23,7 +23,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-SUBDIRS = arm misc
+SUBDIRS = arm misc xsl
 TARGETS =
 
 @BIND9_MAKE_RULES@

doc/arm/.cvsignore

@@ -7,3 +7,6 @@ Bv9ARM.idx
 Bv9ARM.log
 Bv9ARM.out
 Bv9ARM.tex
+Bv9ARM.tex.tmp
+Bv9ARM.toc
+releaseinfo.xml

doc/arm/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2005/05/13 01:35:43 marka Exp $
+# $Id: Makefile.in,v 1.15 2005/07/19 04:55:22 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -21,43 +21,44 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_RULES@
 
+@BIND9_VERSION@
+
 MANOBJS = Bv9ARM.html
 
 PDFOBJS = Bv9ARM.pdf
 
-distclean::
-	rm -f validate.sh
-	rm -f nominum-docbook-html.dsl nominum-docbook-print.dsl
-	rm -f HTML.index HTML.manifest
-
 doc man:: ${MANOBJS} ${PDFOBJS}
 
 clean::
-	rm -f Bv9ARM.aux Bv9ARM.brf Bv9ARM.glo Bv9ARM.idx
+	rm -f Bv9ARM.aux Bv9ARM.brf Bv9ARM.glo Bv9ARM.idx Bv9ARM.toc
 	rm -f Bv9ARM.log Bv9ARM.out Bv9ARM.tex Bv9ARM.tex.tmp
 
 docclean manclean maintainer-clean:: clean
-	rm -f *.html *.pdf
+	rm -f *.html ${PDFOBJS} releaseinfo.xml
 
-Bv9ARM.html: Bv9ARM-book.xml
+Bv9ARM.html: Bv9ARM-book.xml releaseinfo.xml
+	expand Bv9ARM-book.xml | \
 	${XSLTPROC} --stringparam root.filename Bv9ARM \
-		${top_srcdir}/doc/xsl/isc-docbook-chunk.xsl \
-		Bv9ARM-book.xml
+		${top_srcdir}/doc/xsl/isc-docbook-chunk.xsl -
 
-Bv9ARM.tex: Bv9ARM-book.xml
-	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl Bv9ARM-book.xml | \
+Bv9ARM.tex: Bv9ARM-book.xml releaseinfo.xml
+	expand Bv9ARM-book.xml | \
+	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl - | \
 	${XSLTPROC} ${top_srcdir}/doc/xsl/isc-docbook-latex.xsl - | \
 	@PERL@ latex-fixup.pl >$@.tmp 
 	if test -s $@.tmp; then mv $@.tmp $@; else rm -f $@.tmp; exit 1; fi
 
-Bv9ARM.dvi: Bv9ARM.tex
+Bv9ARM.dvi: Bv9ARM.tex releaseinfo.xml
 	rm -f Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log
 	${LATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
 	${LATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
 	${LATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
 
-Bv9ARM.pdf: Bv9ARM.tex
+Bv9ARM.pdf: Bv9ARM.tex releaseinfo.xml
 	rm -f Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || rm -f $@
+
+releaseinfo.xml:
+	echo >$@ '<releaseinfo>BIND Version ${VERSION}</releaseinfo>'

doc/arm/latex-fixup.pl

@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: latex-fixup.pl,v 1.2 2005/05/11 05:55:33 sra Exp $
+# $Id: latex-fixup.pl,v 1.3 2005/07/19 04:55:23 marka Exp $
 
 # Sadly, the final stages of generating a presentable PDF file always
 # seem to require some manual tweaking.  Doesn't seem to matter what
@@ -31,13 +31,17 @@
 
 while (<>) {
 
-    # At the moment, the only tweak we have is fixup for a db2latex
-    # oops.  LaTeX2e does not like having tables with duplicate names.
-    # Perhaps the dblatex project will fix this someday, but we can
-    # get by with just deleting the offending LaTeX commands for now.
+    # Fix a db2latex oops.  LaTeX2e does not like having tables with
+    # duplicate names.  Perhaps the dblatex project will fix this
+    # someday, but we can get by with just deleting the offending
+    # LaTeX commands for now.
 
     s/\\addtocounter\{table\}\{-1\}//g;
 
+    # Line break in the middle of quoting one period looks weird.
+
+    s/{\\texttt{{\.\\dbz{}}}}/\\mbox{{\\texttt{{\.\\dbz{}}}}}/;
+
     # Add any further tweaking here.
 
     # Write out whatever we have now.

doc/xsl/.cvsignore

+Makefile
 isc-docbook-chunk.xsl
 isc-docbook-html.xsl
 isc-docbook-latex.xsl