o Move APNIC flag from -p to -A. Since, -p is usually associated

  with specifying a port.
o Add the -p flag for specifying a port.  (PR: 28790)  This is
  useful for querying rwhois servers.  Example:
    whois -h rwhois.exodus.net -p rwhois 216.136.180.0
o Add the -c flag which allows one to get the same whois server
  that would normally be determined if no arguments were specified.
  (Concept based on work by phantom, requested by ache)  Example:
    whois -c ru TCNET-MNT-RIPN
o Deprecate -R flag in favour of -c ru.

PR:		28790
Reviewed by:	-audit, ache, phantom

1 files changed, 25 insertions, 8 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 0c1023f..41b154a 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -40,8 +40,9 @@
 .Nd "Internet domain name and network number directory service"
 .Sh SYNOPSIS
 .Nm
-.Op Fl adgimpQrR6
-.Op Fl h Ar host
+.Op Fl aAdgimQrR6
+.Op Fl c Ar country-code | Fl h Ar host
+.Op Fl p Ar port
 .Ar name ...
 .Sh DESCRIPTION
 .Nm
@@ -65,6 +66,17 @@ to the NIC handle:
 .Pp
 .Dl "$ whois -a foo3-ARIN"
 .Pp
+.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
+option with an argument of 
+.Qq Ar country-code Ns Li .whois-servers.net .
 .It Fl d
 Use the US Department of Defense
 database.
@@ -139,12 +151,12 @@ Use the Route Arbiter Database
 database.
 It contains route policy specifications for a large
 number of operators' networks.
-.It Fl p
-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 p Ar port
+Connect to the whois server on
+.Ar port .
+If this option is not specified,
+.Nm
+defaults to port 43.
 .It Fl Q
 Do a quick lookup.
 This means that
@@ -166,6 +178,11 @@ database.
 It contains network numbers and domain contact information
 for subdomains of
 .Pa .RU .
+This option is deprecated; use the
+.Fl c
+option with an argument of
+.Qq ru
+instead.
 .It Fl 6
 Use the IPv6 Resource Center
 .Pq Tn 6bone