3 files changed, 21 insertions, 6 deletions

diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index 0e986bbb27ee..c109d3c04391 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,6 +1,9 @@
-# $Id: Makefile,v 1.9 1995/07/25 00:33:07 bde Exp $
+# $Id: Makefile,v 1.1 1996/03/09 17:31:08 wosch Exp wosch $
 
 SHPROG=	apropos
 
+MLINKS=	apropos.1 whatis.1
+LINKS=	${BINDIR}/apropos ${BINDIR}/whatis
+
 .include "../../Makefile.inc"
 .include "../Makefile.shprog"
diff --git a/gnu/usr.bin/man/apropos/apropos.man b/gnu/usr.bin/man/apropos/apropos.man
index 3bb3e17d617e..62b7d7a9d044 100644
--- a/gnu/usr.bin/man/apropos/apropos.man
+++ b/gnu/usr.bin/man/apropos/apropos.man
@@ -1,4 +1,4 @@
-.\" Man page for apropos
+.\" Man page for apropos an whatis
 .\"
 .\" Copyright (c) 1990, 1991, John W. Eaton.
 .\"
@@ -15,13 +15,19 @@
 .TH apropos 1 "Jan 15, 1991"
 .LO 1
 .SH NAME
-apropos \- search the whatis database for strings
+apropos, whatis \- search the whatis database
 .SH SYNOPSIS
 .BI apropos
 keyword ...
+
+.BI whatis
+keyword ...
 .SH DESCRIPTION
-apropos searches a set of database files containing short descriptions
+.B apropos 
+searches a set of database files containing short descriptions
 of system commands for keywords and displays the result on the
 standard output.
+.B whatis
+display only complete word matches.
 .SH "SEE ALSO"
-whatis(1), man(1).
+man(1), makewhatis(1).
diff --git a/gnu/usr.bin/man/apropos/apropos.sh b/gnu/usr.bin/man/apropos/apropos.sh
index ed2f3f8e15d0..cb26c204e5a6 100644
--- a/gnu/usr.bin/man/apropos/apropos.sh
+++ b/gnu/usr.bin/man/apropos/apropos.sh
@@ -21,6 +21,7 @@
 
 PATH=/bin:/usr/bin:$PATH
 db=whatis	# name of whatis data base
+grepopt=''
 
 # argument test
 case $# in 0)  
@@ -29,6 +30,11 @@ case $# in 0)
 	;; 
 esac
 
+case "$0" in
+	*whatis) grepopt='-w';;	# run as whatis(1)
+	*)	 grepopt='';;	# otherwise run as apropos(1)
+esac
+
 # test manpath
 manpath=`%bindir%/manpath -q | tr : '\040'`
 case X"$manpath" in X) 
@@ -62,7 +68,7 @@ esac
 
 for manpage
 do
-	if grep -hi "$manpage" $mandir; then :
+	if grep -hi $grepopt "$manpage" $mandir; then :
 	else
         	echo "$manpage: nothing appropriate"
 	fi