sort options and sync usage();

from wiz@netbsd

2 files changed, 20 insertions, 20 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index b6bc17511fb..769a86ecf13 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.22 2003/09/02 18:50:07 jmc Exp $
+.\"	$OpenBSD: whois.1,v 1.23 2003/10/12 13:26:09 jmc Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc 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 @@ Network Information Centers
 .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 @@ nor by
 .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 @@ will not attempt to lookup the name in the authoratative whois
 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 @@ This option is deprecated; use the
 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 --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 2e12789bd13..fbd4143545b 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: whois.c,v 1.29 2003/10/04 03:18:38 deraadt Exp $	*/
+/*	$OpenBSD: whois.c,v 1.30 2003/10/12 13:26:09 jmc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: whois.c,v 1.29 2003/10/04 03:18:38 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: whois.c,v 1.30 2003/10/12 13:26:09 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -307,7 +307,7 @@ usage(void)
 	extern char *__progname;
 
 	(void)fprintf(stderr,
-	    "usage: %s [-aAdgilmQrR6] [-c country-code | -h hostname] "
+	    "usage: %s [-6AadgilmQRr] [-c country-code | -h hostname] "
 		"[-p port] name ...\n", __progname);
 	exit(1);
 }