From dot@dotat.at Thu Sep 1 14:39:47 2016 CC: dot@dotat.at MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.0 X-Cam-Antivirus: no malware found content-type: TEXT/PLAIN; charset="utf-8" Message-ID: Received: from mx.pao1.isc.org (mx.pao1.isc.org [IPv6:2001:4f8:0:2::2b]) by bugs.isc.org (Postfix) with ESMTP id 8477A71B5A8 for ; Thu, 1 Sep 2016 14:39:47 +0000 (UTC) Received: from ppsw-40.csi.cam.ac.uk (ppsw-40.csi.cam.ac.uk [131.111.8.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.pao1.isc.org (Postfix) with ESMTPS id 5BFFE3494F4 for ; Thu, 1 Sep 2016 14:39:42 +0000 (UTC) Received: from grey.csi.cam.ac.uk ([131.111.57.57]:39294) by ppsw-40.csi.cam.ac.uk (ppsw.cam.ac.uk [131.111.8.138]:25) with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) id 1bfT9X-000woA-mF (Exim 4.86_36-e07b163) (return-path ); Thu, 01 Sep 2016 15:39:39 +0100 Delivered-To: bind9-bugs@bugs.isc.org Subject: [PATCH] Alphabetize options and sync synopsis in named-checkconf man page User-Agent: Alpine 2.11 (DEB 23 2013-08-11) Return-Path: X-Original-To: bind9-bugs@bugs.isc.org Date: Thu, 1 Sep 2016 15:39:39 +0100 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mx.pao1.isc.org To: bind9-bugs@isc.org X-Cam-Scannerinfo: http://www.cam.ac.uk/cs/email/scanner/ From: "Tony Finch" X-RT-Original-Encoding: ascii X-RT-Interface: Email Content-Length: 4066 --- 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 @@ named-checkconf - - - + + + + filename - - - @@ -82,7 +80,6 @@ OPTIONS - -h @@ -94,32 +91,42 @@ - -t directory + -j - Chroot to directory so that include - directives in the configuration file are processed as if - run by a similarly chrooted named. + When loading a zonefile read the journal if it exists. - -v + -p - Print the version of the named-checkconf - program and exit. + Print out the named.conf and included files + in canonical form if no errors were detected. + See also the option. - -p + -t directory - Print out the named.conf and included files - in canonical form if no errors were detected. + Chroot to directory so that include + directives in the configuration file are processed as if + run by a similarly chrooted named. + + + + + + -v + + + Print the version of the named-checkconf + program and exit. @@ -150,15 +157,6 @@ - -j - - - When loading a zonefile read the journal if it exists. - - - - - filename -- 2.1.4