| CC: | dot@dotat.at |
| Subject: | [PATCH] Alphabetize options and sync synopsis in named-checkconf man page |
| Date: | Thu, 1 Sep 2016 15:39:39 +0100 |
| To: | bind9-bugs@isc.org |
| From: | "Tony Finch" <dot@dotat.at> |
---
bin/check/named-checkconf.c | 2 +-
bin/check/named-checkconf.docbook | 50 +++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 9e14e98..43694a7 100644
--- 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 040071e..acb60a0 100644
--- 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>
@@ -150,15 +157,6 @@
</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>
<para>
--
2.1.4