From: Ben Gras <ben@minix3.org>
Date: Sat, 26 Jun 2010 02:37:41 +0000 (+0000)
Subject: man: throw out *whatis
X-Git-Tag: v3.1.8~342
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/addsub.png?a=commitdiff_plain;h=a1a12bbc34fc19597aa0cdb9ad962b42fb28a574;p=minix.git

man: throw out *whatis
---

diff --git a/man/Makefile b/man/Makefile
index bfe5d77fa..b61e69fee 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -2,10 +2,11 @@
 
 SUBDIR=	man1 man1x man2 man3 man4 man5 man6 man7 man8 man9
 
-WHATISDBDIR?=	/usr/man
+#WHATISDBDIR?=	/usr/man
 
 makedb:
-	makewhatis ${WHATISDBDIR}
+
+#	makewhatis ${WHATISDBDIR}
 #	${TOOL_MAKEWHATIS} ${DESTDIR}${WHATISDBDIR}
 # .if ${MKUNPRIVED} != "no"
 # 	echo ".${WHATISDBDIR}/whatis.db type=file mode=0444 uname=${BINOWN} gname=${BINGRP}" \
diff --git a/man/man1/Makefile b/man/man1/Makefile
index fb6e94016..22c02cbf9 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -10,7 +10,7 @@ MAN=	acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
 	fsck.1 head.1 host.1 hostaddr.1 ifdef.1 \
 	install.1 isodir.1 isoinfo.1 isoread.1 join.1 kill.1 \
 	last.1 leave.1 loadfont.1 loadkeys.1 logger.1 login.1 \
-	look.1 lp.1 ls.1 lspci.1 M.1 mail.1 makewhatis.1 \
+	look.1 lp.1 ls.1 lspci.1 M.1 mail.1  \
 	man.1 mdb.1 mesg.1 mixer.1 mkdep.1 mkdir.1 mkfifo.1 mkfs.1 \
 	mkproto.1 modem.1 mount.1 mt.1 nice.1 nm.1 nohup.1 od.1 \
 	ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 passwd.1 \
@@ -22,7 +22,7 @@ MAN=	acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
 	synctree.1 sysenv.1 sz.1 tail.1 tee.1 telnet.1 template.1 \
 	term.1 termcap.1 tget.1 time.1 top.1 tr.1 true.1 \
 	truncate.1 tsort.1 tty.1 umount.1 uname.1 unexpand.1 uniq.1 \
-	urlget.1 uud.1 uue.1 vol.1 wc.1 whatis.1 whereis.1 which.1 \
+	urlget.1 uud.1 uue.1 vol.1 wc.1 whereis.1 which.1 \
 	who.1 whoami.1 write.1 xargs.1 yap.1 yes.1
 
 .include <bsd.man.mk>
diff --git a/man/man1/makewhatis.1 b/man/man1/makewhatis.1
deleted file mode 100644
index a56962d36..000000000
--- a/man/man1/makewhatis.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH MAKEWHATIS 1
-.SH NAME
-makewhatis \- build the whatis(5) database
-.SH SYNOPSIS
-.B makewhatis
-.I directory
-.SH DESCRIPTION
-.B Makewhatis
-makes the
-.BR whatis (5)
-database in the given manual page directory.  This database is used by
-.BR man (1)
-to map titles to manual page names and by
-.BR whatis (1)
-to give one line descriptions.  See
-.BR whatis (5)
-for a description of what a whatis database should look like and the
-restrictions that are placed on the NAME sections so that
-.B makewhatis
-can make whatis lines out of the manual pages.
-.SH "SEE ALSO"
-.BR whatis (5).
-.SH BUGS
-Removing only font and size changes from the NAME section is often not
-enough.
-.SH AUTHOR
-Kees J. Bot (kjb@cs.vu.nl)
-.\" minor correction -- ASW 2005-01-15
diff --git a/man/man1/whatis.1 b/man/man1/whatis.1
deleted file mode 100644
index 2a25238c9..000000000
--- a/man/man1/whatis.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH WHATIS 1
-.SH NAME
-whatis, apropos \- give single line descriptions for manual pages
-.SH SYNOPSIS
-.B whatis
-.RB [ \-a ]
-.I title
-.br
-.B apropos
-.I keyword
-.SH DESCRIPTION
-.B Whatis
-lists the one line description from the
-.BR whatis (5)
-database describing the title given.  It displays all the lines with
-the title from the first whatis file that has those titles.  It uses the
-same search path as
-.BR man (1).
-.PP
-.B Apropos
-searches through all whatis files for the given keywords.  It lists any
-line that has the keyword anywhere on the line.
-.SH OPTIONS
-.TP
-.B \-a
-Search all whatis files.
-.SH "SEE ALSO"
-.BR man (1),
-.BR grep (1),
-.BR whatis (5).
-.SH AUTHOR
-Kees J. Bot (kjb@cs.vu.nl)