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

diff --git a/CHANGES b/CHANGES
index e525221549796a79a34119abcb867c315abc5a9a..d9ac82760ae0341bb723d58a4027ce048175424f 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 6d509ab2406bbce5ba790947133a977a08c6610d..172cd131cff9c7befd4f27f7526d13f91a87dd60 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.49.130.5 2009/05/29 02:18:32 marka Exp $ */
+/* $Id: named-checkzone.c,v 1.49.130.6 2009/11/10 20:01:15 each Exp $ */
 
 /*! \file */
 
@@ -73,14 +73,16 @@ static enum { progmode_check, progmode_compile } progmode;
 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 5e5fb27e59b6e042ec9ca07800b42644ec04f418..6678fc32967d488f1362e1f05936f4c911518964 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.34.130.2 2009/01/22 23:46:35 tbox Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.34.130.3 2009/11/10 20:01:15 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>