2760. [cleanup] Corrected named-compilezone usage summary. [RT #20533]

diff --git a/CHANGES b/CHANGES
index 95ff4e3e47551b42841379027628f9ed22624610..f4c4583f3e15db84a2a319619d768220649388ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2760.  [cleanup]       Corrected named-compilezone usage summary. [RT #20533]
+
 2759.  [doc]           Add information about .jbk/.jnw files to 
                        the ARM. [RT #20303]
 

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index c36152b3e92a84fc9b56b0ebe415636a5350532c..653c80dff797cc716a64a17f4fff3480040dfaf1 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.55 2009/09/29 15:06:05 fdupont Exp $ */
+/* $Id: named-checkzone.c,v 1.56 2009/11/10 20:02:01 each Exp $ */
 
 /*! \file */
 
@@ -76,14 +76,16 @@ usage(void) ISC_PLATFORM_NORETURN_POST;
 static void
 usage(void) {
        fprintf(stderr,
-               "usage: %s [-djqvD] [-c class] [-o output] "
+               "usage: %s [-djqvD] [-c class] "
                "[-f inputformat] [-F outputformat] "
                "[-t directory] [-w directory] [-k (ignore|warn|fail)] "
                "[-n (ignore|warn|fail)] [-m (ignore|warn|fail)] "
                "[-i (full|full-sibling|local|local-sibling|none)] "
                "[-M (ignore|warn|fail)] [-S (ignore|warn|fail)] "
                "[-W (ignore|warn)] "
-               "zonename filename\n", prog_name);
+               "%s zonename filename\n",
+               prog_name,
+               progmode == progmode_check ? "[-o filename]" : "{-o filename}");
        exit(1);
 }
 

diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 488c16f886146580342933930116c41b6e72c78a..0b1c999eb2d517112a736adb5d2c874738ea8a30 100644 (file)
--- 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.36 2009/01/20 23:47:56 tbox Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.37 2009/11/10 20:02:01 each Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
@@ -69,7 +69,6 @@
       <arg><option>-m <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-M <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-n <replaceable class="parameter">mode</replaceable></option></arg>
-      <arg><option>-o <replaceable class="parameter">filename</replaceable></option></arg>
       <arg><option>-s <replaceable class="parameter">style</replaceable></option></arg>
       <arg><option>-S <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg>
@@ -99,6 +98,7 @@
       <arg><option>-w <replaceable class="parameter">directory</replaceable></option></arg>
       <arg><option>-D</option></arg>
       <arg><option>-W <replaceable class="parameter">mode</replaceable></option></arg>
+      <arg choice="req"><option>-o <replaceable class="parameter">filename</replaceable></option></arg>
       <arg choice="req">zonename</arg>
       <arg choice="req">filename</arg>
     </cmdsynopsis>