2861. [doc] dnssec-settime man pages didn't correctly document the

                        inactivation time. [RT #21039]

2860.   [bug]           named-checkconf's usage was out of date. [RT #21039]

diff --git a/CHANGES b/CHANGES
index 4633f10b61c8f30f3c8adaa9439f44a366087c12..a94336e433aeec5b1f7a37d73764f42eeb79ac77 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2861.  [doc]           dnssec-settime man pages didn't correctly document the
+                       inactivation time. [RT #21039]
+
+2860.  [bug]           named-checkconf's usage was out of date. [RT #21039]
+
 2859.  [bug]           When cancelling validation it was possible to leak
                        memory. [RT #20800]
 

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 07ed4bb2a2be6b34c509e6d6882f0ad84c0a16f7..8a20057a95449598a123e1119161d56bcc405bf0 100644 (file)
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.51 2009/12/04 21:09:32 marka Exp $ */
+/* $Id: named-checkconf.c,v 1.52 2010/03/09 03:38:18 marka Exp $ */
 
 /*! \file */
 
@@ -64,7 +64,7 @@ usage(void) ISC_PLATFORM_NORETURN_POST;
 
 static void
 usage(void) {
-       fprintf(stderr, "usage: %s [-h] [-j] [-v] [-z] [-t directory] "
+       fprintf(stderr, "usage: %s [-h] [-j] [-p] [-v] [-z] [-t directory] "
                "[named.conf]\n", program);
        exit(1);
 }

diff --git a/bin/dnssec/dnssec-settime.docbook b/bin/dnssec/dnssec-settime.docbook
index 5daa2fc0196d4be33953df8ee02d3b3dda55328f..9746b4588d9f02083592368bf3be4b1ee364eaf8 100644 (file)
--- a/bin/dnssec/dnssec-settime.docbook
+++ b/bin/dnssec/dnssec-settime.docbook
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-settime.docbook,v 1.9 2010/02/03 23:49:07 tbox Exp $ -->
+<!-- $Id: dnssec-settime.docbook,v 1.10 2010/03/09 03:35:34 marka Exp $ -->
 <refentry id="man.dnssec-settime">
   <refentryinfo>
     <date>July 15, 2009</date>
@@ -232,7 +232,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term>-p <replaceable class="parameter">C/P/A/R/U/D/all</replaceable></term>
+        <term>-p <replaceable class="parameter">C/P/A/R/I/D/all</replaceable></term>
         <listitem>
          <para>
            Print a specific metadata value or set of metadata values.
@@ -242,7 +242,7 @@
             <option>P</option> for the publication date,
             <option>A</option> for the activation date,
             <option>R</option> for the revocation date,
-            <option>U</option> for the unpublication date, or
+            <option>I</option> for the inactivation date, or
             <option>D</option> for the deletion date.
             To print all of the metadata, use <option>-p all</option>.
          </para>