4475. [doc] Update named-checkconf documentation. [RT #43153]

diff --git a/CHANGES b/CHANGES
index aff5b4e192266df1312e7f0124ec0e66af1560d8..c093744be3a148759e0de2cb5643cb7f9defd2ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4475.  [doc]           Update named-checkconf documentation. [RT #43153]
+
 4474.  [bug]           win32: call WSAStartup in fromtext_in_wks so that
                        getprotobyname and getservbyname work.  [RT #43197]
 

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 9e14e983f3310c8a0f6b7a07ad63fa51a08ea8c4..43694a707f53e0d47a301647278aa2ef06afdd57 100644 (file)
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -59,7 +59,7 @@ usage(void) ISC_PLATFORM_NORETURN_POST;
 
 static void
 usage(void) {
-       fprintf(stderr, "usage: %s [-h] [-j] [-p [-x]] [-v] [-z] [-t directory] "
+       fprintf(stderr, "usage: %s [-hjvz] [-p [-x]] [-t directory] "
                "[named.conf]\n", program);
        exit(1);
 }

diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 040071e58b9c0fb28e4ebe61a68f4b075d2dff89..acb60a0b2ceeaadd8f6c71ccd62d63f166443e94 100644 (file)
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -48,14 +48,12 @@
   <refsynopsisdiv>
     <cmdsynopsis sepchar=" ">
       <command>named-checkconf</command>
-      <arg choice="opt" rep="norepeat"><option>-h</option></arg>
-      <arg choice="opt" rep="norepeat"><option>-v</option></arg>
-      <arg choice="opt" rep="norepeat"><option>-j</option></arg>
+      <arg choice="opt" rep="norepeat"><option>-hjvz</option></arg>
+      <arg choice="opt" rep="norepeat"><option>-p</option>
+       <arg choice="opt" rep="norepeat"><option>-x</option>
+      </arg></arg>
       <arg choice="opt" rep="norepeat"><option>-t <replaceable class="parameter">directory</replaceable></option></arg>
       <arg choice="req" rep="norepeat">filename</arg>
-      <arg choice="opt" rep="norepeat"><option>-p</option></arg>
-      <arg choice="opt" rep="norepeat"><option>-x</option></arg>
-      <arg choice="opt" rep="norepeat"><option>-z</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -82,7 +80,6 @@
 
   <refsection><info><title>OPTIONS</title></info>
 
-
     <variablelist>
       <varlistentry>
         <term>-h</term>
@@ -94,32 +91,42 @@
       </varlistentry>
 
       <varlistentry>
-        <term>-t <replaceable class="parameter">directory</replaceable></term>
+        <term>-j</term>
         <listitem>
           <para>
-            Chroot to <filename>directory</filename> so that include
-            directives in the configuration file are processed as if
-            run by a similarly chrooted <command>named</command>.
+            When loading a zonefile read the journal if it exists.
           </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-v</term>
+        <term>-p</term>
         <listitem>
           <para>
-            Print the version of the <command>named-checkconf</command>
-            program and exit.
+           Print out the <filename>named.conf</filename> and included files
+           in canonical form if no errors were detected.
+            See also the <option>-x</option> option.
           </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-p</term>
+        <term>-t <replaceable class="parameter">directory</replaceable></term>
         <listitem>
           <para>
-           Print out the <filename>named.conf</filename> and included files
-           in canonical form if no errors were detected.
+            Chroot to <filename>directory</filename> so that include
+            directives in the configuration file are processed as if
+            run by a similarly chrooted <command>named</command>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-v</term>
+        <listitem>
+          <para>
+            Print the version of the <command>named-checkconf</command>
+            program and exit.
           </para>
         </listitem>
       </varlistentry>
@@ -149,15 +156,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>-j</term>
-        <listitem>
-          <para>
-            When loading a zonefile read the journal if it exists.
-          </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>filename</term>
         <listitem>