From: Mark Andrews <marka@isc.org>
Date: Mon, 15 Aug 2016 01:21:52 +0000 (+1000)
Subject: 4441.   [cleanup]       Alphabetize host's help output. [RT #43031]
X-Git-Tag: v9.12.0a0~101
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8a98ea9e942273b9f90fbacaf5333f08568a7f41;p=thirdparty%2Fbind9.git

4441.   [cleanup]       Alphabetize host's help output. [RT #43031]
---

diff --git a/CHANGES b/CHANGES
index f961844ff14..33a599032bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4441.	[cleanup]	Alphabetize host's help output. [RT #43031]
+
 4440.	[func]		Enable TCP fast open support when available on the
 			server side. [RT #42866]
 
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 0150100647f..196d546e979 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -137,14 +137,15 @@ show_usage(void) ISC_PLATFORM_NORETURN_POST;
 static void
 show_usage(void) {
 	fputs(
-"Usage: host [-aCdlriTwv] [-c class] [-N ndots] [-t type] [-W time]\n"
+"Usage: host [-aCdilrTvVw] [-c class] [-N ndots] [-t type] [-W time]\n"
 "            [-R number] [-m flag] hostname [server]\n"
 "       -a is equivalent to -v -t ANY\n"
 "       -c specifies query class for non-IN data\n"
 "       -C compares SOA records on authoritative nameservers\n"
 "       -d is equivalent to -v\n"
-"       -l lists all hosts in a domain, using AXFR\n"
 "       -i IP6.INT reverse lookups\n"
+"       -l lists all hosts in a domain, using AXFR\n"
+"       -m set memory debugging flag (trace|record|usage)\n"
 "       -N changes the number of dots allowed before root lookup is done\n"
 "       -r disables recursive processing\n"
 "       -R specifies number of retries for UDP packets\n"
@@ -152,12 +153,11 @@ show_usage(void) {
 "       -t specifies the query type\n"
 "       -T enables TCP/IP mode\n"
 "       -v enables verbose output\n"
+"       -V print version number and exit\n"
 "       -w specifies to wait forever for a reply\n"
 "       -W specifies how long to wait for a reply\n"
 "       -4 use IPv4 query transport only\n"
-"       -6 use IPv6 query transport only\n"
-"       -m set memory debugging flag (trace|record|usage)\n"
-"       -V print version number and exit\n", stderr);
+"       -6 use IPv6 query transport only\n", stderr);
 	exit(1);
 }