From 7c693bfdbe488ca8fa4f0831c71f5809972f6cc7 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 13 Sep 2006 00:18:27 +0000
Subject: [PATCH] 2082.   [doc]           Document 'cache-file' as a test only
 option.

---
 CHANGES                      |  2 ++
 bin/named/named.conf.docbook |  6 +++---
 doc/arm/Bv9ARM-book.xml      | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 946088cfd6..99bd8b6bf8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2082.	[doc]		Document 'cache-file' as a test only option.
+
 2081.	[port]		libbind: minor 64-bit portability fix in memcluster.c.
 			[RT #16360]
 
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 2978ce1e12..d5ab4da85e 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.23 2006/06/04 23:17:06 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.24 2006/09/13 00:15:38 marka Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -250,7 +250,7 @@ options {
 	check-integrity <replaceable>boolean</replaceable>;
 	check-mx-cname ( fail | warn | ignore );
 	check-srv-cname ( fail | warn | ignore );
-	cache-file <replaceable>quoted_string</replaceable>;
+	cache-file <replaceable>quoted_string</replaceable>; // test option
 	suppress-initial-notify <replaceable>boolean</replaceable>; // not yet implemented
 	preferred-glue <replaceable>string</replaceable>;
 	dual-stack-servers <optional> port <replaceable>integer</replaceable> </optional> {
@@ -399,7 +399,7 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 	check-integrity <replaceable>boolean</replaceable>;
 	check-mx-cname ( fail | warn | ignore );
 	check-srv-cname ( fail | warn | ignore );
-	cache-file <replaceable>quoted_string</replaceable>;
+	cache-file <replaceable>quoted_string</replaceable>; // test option
 	suppress-initial-notify <replaceable>boolean</replaceable>; // not yet implemented
 	preferred-glue <replaceable>string</replaceable>;
 	dual-stack-servers <optional> port <replaceable>integer</replaceable> </optional> {
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 1db49b156e..1abb831a18 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.307 2006/08/30 23:40:50 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.308 2006/09/13 00:15:37 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -4371,6 +4371,7 @@ category notify { null; };
     <optional> named-xfer <replaceable>path_name</replaceable>; </optional>
     <optional> tkey-domain <replaceable>domainname</replaceable>; </optional>
     <optional> tkey-dhkey <replaceable>key_name</replaceable> <replaceable>key_tag</replaceable>; </optional>
+    <optional> cache-file <replaceable>path_name</replaceable>; </optional>
     <optional> dump-file <replaceable>path_name</replaceable>; </optional>
     <optional> memstatistics-file <replaceable>path_name</replaceable>; </optional>
     <optional> pid-file <replaceable>path_name</replaceable>; </optional>
@@ -4612,6 +4613,15 @@ digits</varname>" + "<varname>tkey-domain</varname>". In most cases,
             </listitem>
           </varlistentry>
 
+          <varlistentry>
+            <term><command>cache-file</command></term>
+            <listitem>
+              <para>
+		This is for testing only.  Do not use.
+              </para>
+            </listitem>
+          </varlistentry>
+
           <varlistentry>
             <term><command>dump-file</command></term>
             <listitem>
@@ -4623,6 +4633,7 @@ digits</varname>" + "<varname>tkey-domain</varname>". In most cases,
               </para>
             </listitem>
           </varlistentry>
+
           <varlistentry>
             <term><command>memstatistics-file</command></term>
             <listitem>