From 6043e41fcf5dc91aa8a981c966512d73bdec31c1 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 19 Jun 2007 06:58:04 +0000
Subject: [PATCH] documentation updates from Jeremy

---
 bin/check/named-checkconf.docbook |  5 ++++-
 bin/check/named-checkzone.docbook |  5 ++++-
 bin/named/named.conf.docbook      |  5 ++++-
 bin/named/named.docbook           | 10 +++++++++-
 bin/rndc/rndc.docbook             | 11 +++++------
 doc/arm/Bv9ARM-book.xml           | 19 ++++++++++++++++---
 6 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 665348e4a5..53592392da 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.18 2007/06/18 23:47:17 tbox Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.19 2007/06/19 06:58:03 marka Exp $ -->
 <refentry id="man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>
@@ -151,6 +151,9 @@
     <para><citerefentry>
         <refentrytitle>named</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>named-checkzone</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citetitle>BIND 9 Administrator Reference Manual</citetitle>.
     </para>
   </refsect1>
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index e0fc8ae1f6..c5321e2d54 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.33 2007/06/18 23:47:17 tbox Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.34 2007/06/19 06:58:03 marka Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
@@ -434,6 +434,9 @@
     <para><citerefentry>
         <refentrytitle>named</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>named-checkconf</refentrytitle><manvolnum>8</manvolnum>  
+      </citerefentry>,
       <citetitle>RFC 1035</citetitle>,
       <citetitle>BIND 9 Administrator Reference Manual</citetitle>.
     </para>
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 4b804700fd..1b245d73b5 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.30 2007/06/18 23:47:18 tbox Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.31 2007/06/19 06:58:03 marka Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -593,6 +593,9 @@ zone <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
     <para><citerefentry>
         <refentrytitle>named</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>named-checkconf</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>rndc</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 8b4fee0653..a60d149668 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.18 2007/06/18 23:47:18 tbox Exp $ -->
+<!-- $Id: named.docbook,v 1.19 2007/06/19 06:58:03 marka Exp $ -->
 <refentry id="man.named">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -369,6 +369,14 @@
     <para><citetitle>RFC 1033</citetitle>,
       <citetitle>RFC 1034</citetitle>,
       <citetitle>RFC 1035</citetitle>,
+      <citerefentry>
+        <refentrytitle>named-checkconf</refentrytitle>
+	<manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>named-checkzone</refentrytitle>
+	<manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>rndc</refentrytitle>
 	<manvolnum>8</manvolnum>
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index d6afc8dfbc..cb75d18e05 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc.docbook,v 1.19 2007/06/18 23:47:26 tbox Exp $ -->
+<!-- $Id: rndc.docbook,v 1.20 2007/06/19 06:58:03 marka Exp $ -->
 <refentry id="man.rndc">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -139,13 +139,12 @@
         <term>-s <replaceable class="parameter">server</replaceable></term>
         <listitem>
           <para><replaceable class="parameter">server</replaceable> is
-            	       the name or address of the server which matches a
+            the name or address of the server which matches a
             server statement in the configuration file for
-            <command>rndc</command>.  If no server is supplied on
-            the
+            <command>rndc</command>.  If no server is supplied on the
             command line, the host named by the default-server clause
-            in the option statement of the configuration file will be
-            used.
+            in the options statement of the <command>rndc</command>
+	    configuration file will be used.
           </para>
         </listitem>
       </varlistentry>
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 110a57944a..5050cd25dd 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.329 2007/06/18 23:47:33 tbox Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.330 2007/06/19 06:58:04 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -741,8 +741,8 @@ zone "eng.example.com" {
 
       <para>
         A primitive form of load balancing can be achieved in
-        the <acronym>DNS</acronym> by using multiple A records for
-        one name.
+        the <acronym>DNS</acronym> by using multiple records
+	(such as multiple A records) for one name.
       </para>
 
       <para>
@@ -4425,6 +4425,7 @@ category notify { null; };
     <optional> dump-file <replaceable>path_name</replaceable>; </optional>
     <optional> memstatistics-file <replaceable>path_name</replaceable>; </optional>
     <optional> pid-file <replaceable>path_name</replaceable>; </optional>
+    <optional> recursing-file <replaceable>path_name</replaceable>; </optional>
     <optional> statistics-file <replaceable>path_name</replaceable>; </optional>
     <optional> zone-statistics <replaceable>yes_or_no</replaceable>; </optional>
     <optional> auth-nxdomain <replaceable>yes_or_no</replaceable>; </optional>
@@ -4739,6 +4740,18 @@ category notify { null; };
             </listitem>
           </varlistentry>
 
+          <varlistentry>
+            <term><command>recursing-file</command></term>
+            <listitem>
+              <para>
+                The pathname of the file the server dumps
+                the queries that are currently recursing when instructed
+                to do so with <command>rndc recursing</command>.
+                If not specified, the default is <filename>named.recursing</filename>.
+              </para>
+            </listitem>
+          </varlistentry>
+
           <varlistentry>
             <term><command>statistics-file</command></term>
             <listitem>