finish off fixing PR 536 completely

2 files changed, 18 insertions, 4 deletions

diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index a97d2b22a44..73980ad5894 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.1,v 1.5 1998/07/20 00:19:10 art Exp $
+.\"	$OpenBSD: man.1,v 1.6 1998/07/20 01:15:24 deraadt Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -51,6 +51,7 @@
 .Ar name Ar ...
 .Nm man
 .Fl k Ar keyword
+.Fl f Ar filename
 .Sh DESCRIPTION
 The
 .Nm man
@@ -133,8 +134,19 @@ and
 .Ar name
 combination.
 .It Fl k
-Locate commands matching
+Locate manpages matching
 .Ar keyword
+in much the same way as
+.Xr apropos 1
+works (in fact, it runs
+.Xr apropos 1
+for you).
+.It Fl f
+Locate manpages matching the
+.Ar command
+in much the same way
+.Xr whatis 1
+works.
 .El
 .Pp
 The optional
diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c
index e8be8b551cc..f463bc64bcf 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man.c,v 1.9 1998/07/01 11:23:40 espie Exp $	*/
+/*	$OpenBSD: man.c,v 1.10 1998/07/20 01:15:25 deraadt Exp $	*/
 /*	$NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)man.c	8.17 (Berkeley) 1/31/95";
 #else
-static char rcsid[] = "$OpenBSD: man.c,v 1.9 1998/07/01 11:23:40 espie Exp $";
+static char rcsid[] = "$OpenBSD: man.c,v 1.10 1998/07/20 01:15:25 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -766,5 +766,7 @@ usage()
 {
 	(void)fprintf(stderr, "usage: %s [-achw] [-C file] [-M path] [-m path] "
 	    "[-s section] [-S subsection] [section] title ...\n", __progname);
+	(void)fprintf(stderr, "usage: %s -k keyword\n", __progname);
+	(void)fprintf(stderr, "usage: %s -f command\n", __progname);
 	exit(1);
 }