Module Name:	src
Committed By:	tron
Date:		Tue May 18 22:36:37 UTC 1999

Modified Files:
	src/usr.bin/whois: Makefile whois.1 whois.c
Log Message:
- Resolve conflicts from import.
- Fix compilation problems.
- Use "whois.internic.net" as default server for backward compatibility.
- Reformat manual page.