[src/trunk]: src/usr.bin/whois Sort options.

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e7e6a96edf3e
branches:  trunk
changeset: 553173:e7e6a96edf3e
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Oct 11 09:06:03 2003 +0000

description:
Sort options.

diffstat:

 usr.bin/whois/whois.1 |  34 +++++++++++++++++-----------------
 usr.bin/whois/whois.c |   8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diffs (113 lines):

diff -r 0f6e3625a247 -r e7e6a96edf3e usr.bin/whois/whois.1
--- a/usr.bin/whois/whois.1     Sat Oct 11 08:05:57 2003 +0000
+++ b/usr.bin/whois/whois.1     Sat Oct 11 09:06:03 2003 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: whois.1,v 1.21 2003/10/09 14:21:49 jrf Exp $
+.\"     $NetBSD: whois.1,v 1.22 2003/10/11 09:06:03 wiz Exp $
 .\"    $OpenBSD: whois.1,v 1.22 2003/09/02 18:50:07 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -38,7 +38,7 @@
 .Nd Internet domain name and network number directory service
 .Sh SYNOPSIS
 .Nm whois
-.Op Fl aAdgilmQrR6
+.Op Fl 6AadgilmQRr
 .Oo
 .Fl c Ar country-code | Fl h Ar host
 .Oc
@@ -53,6 +53,17 @@
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 6
+Use the IPv6 Resource Center
+.Pq Tn 6bone
+database.
+It contains network names and addresses for the IPv6 network.
+.It Fl A
+Use the Asia/Pacific Network Information Center
+.Pq Tn APNIC
+database.
+It contains network numbers used in East Asia, Australia,
+New Zealand, and the Pacific islands.
 .It Fl a
 Use the American Registry for Internet Numbers
 .Pq Tn ARIN
@@ -67,12 +78,6 @@
 .Tn ARIN
 whois database end with
 .Qq Li -ARIN . )
-.It Fl A
-Use the Asia/Pacific Network Information Center
-.Pq Tn APNIC
-database.
-It contains network numbers used in East Asia, Australia,
-New Zealand, and the Pacific islands.
 .It Fl c Ar country-code
 This is the equivalent of using the
 .Fl h
@@ -181,11 +186,6 @@
 server (if one is listed) nor will it contact InterNic if a lookup
 fails.
 This flag has no effect when combined with any other flag.
-.It Fl r
-Use the R\(aaeseaux IP Europ\(aaeens
-.Pq Tn RIPE
-database.
-It contains network numbers and domain contact information for Europe.
 .It Fl R
 Use the Russia Network Information Center
 .Pq Tn RIPN
@@ -198,11 +198,11 @@
 option with an argument of
 .Qq Li RU
 instead.
-.It Fl 6
-Use the IPv6 Resource Center
-.Pq Tn 6bone
+.It Fl r
+Use the R\(aaeseaux IP Europ\(aaeens
+.Pq Tn RIPE
 database.
-It contains network names and addresses for the IPv6 network.
+It contains network numbers and domain contact information for Europe.
 .El
 .Pp
 The default action, unless directed otherwise with a special
diff -r 0f6e3625a247 -r e7e6a96edf3e usr.bin/whois/whois.c
--- a/usr.bin/whois/whois.c     Sat Oct 11 08:05:57 2003 +0000
+++ b/usr.bin/whois/whois.c     Sat Oct 11 09:06:03 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: whois.c,v 1.23 2003/10/09 15:32:37 christos Exp $   */
+/*      $NetBSD: whois.c,v 1.24 2003/10/11 09:06:03 wiz Exp $   */
 /*     $OpenBSD: whois.c,v 1.28 2003/09/18 22:16:15 fgsch Exp $        */
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static const char sccsid[] = "@(#)whois.c      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: whois.c,v 1.23 2003/10/09 15:32:37 christos Exp $");
+__RCSID("$NetBSD: whois.c,v 1.24 2003/10/11 09:06:03 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -100,7 +100,7 @@
 #endif
        country = host = server = NULL;
        flags = rval = 0;
-       while ((ch = getopt(argc, argv, "aAc:dgh:ilmp:qQrR6")) != -1)
+       while ((ch = getopt(argc, argv, "6Aac:dgh:ilmp:qQRr")) != -1)
                switch(ch) {
                case 'a':
                        host = ANICHOST;
@@ -309,7 +309,7 @@
 usage(void)
 {
        (void)fprintf(stderr,
-           "Usage: %s [-aAdgilmQrR6] [-c country-code | -h hostname] "
+           "Usage: %s [-6AadgilmQRr] [-c country-code | -h hostname] "
                "[-p port] name ...\n", getprogname());
        exit(1);
 }