Module Name: src
Committed By: snj
Date: Tue Apr 14 04:33:46 UTC 2015
Modified Files:
src/usr.bin/man [netbsd-7]: man.conf.5
src/usr.sbin/makemandb [netbsd-7]: makemandb.8
Log Message:
Pull up following revision(s) (requested by christos in ticket #676):
usr.bin/man/man.conf.5: revision 1.25
usr.sbin/makemandb/makemandb.8: revision 1.8
mention that this replaces makewhatis(8)
--
there is no more makewhatis; it has been replaced by makemandb
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.6.1 src/usr.bin/man/man.conf.5
cvs rdiff -u -r1.7 -r1.7.4.1 src/usr.sbin/makemandb/makemandb.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/man/man.conf.5
diff -u src/usr.bin/man/man.conf.5:1.24 src/usr.bin/man/man.conf.5:1.24.6.1
--- src/usr.bin/man/man.conf.5:1.24 Fri Jun 28 10:13:18 2013
+++ src/usr.bin/man/man.conf.5 Tue Apr 14 04:33:46 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: man.conf.5,v 1.24 2013/06/28 10:13:18 wiz Exp $
+.\" $NetBSD: man.conf.5,v 1.24.6.1 2015/04/14 04:33:46 snj Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)man.conf.5 8.5 (Berkeley) 1/2/94
.\"
-.Dd April 28, 2012
+.Dd March 3, 2015
.Dt MAN.CONF 5
.Os
.Sh NAME
@@ -44,7 +44,7 @@ file contains the default configuration
.Xr whatis 1 ,
.Xr catman 8 ,
and
-.Xr makewhatis 8
+.Xr makemandb 8
to find manual pages and information about manual pages (e.g. the
whatis database).
.Pp
Index: src/usr.sbin/makemandb/makemandb.8
diff -u src/usr.sbin/makemandb/makemandb.8:1.7 src/usr.sbin/makemandb/makemandb.8:1.7.4.1
--- src/usr.sbin/makemandb/makemandb.8:1.7 Fri Nov 29 23:58:23 2013
+++ src/usr.sbin/makemandb/makemandb.8 Tue Apr 14 04:33:46 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: makemandb.8,v 1.7 2013/11/29 23:58:23 wiz Exp $
+.\" $NetBSD: makemandb.8,v 1.7.4.1 2015/04/14 04:33:46 snj Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 23, 2013
+.Dd March 3, 2015
.Dt MAKEMANDB 8
.Os
.Sh NAME
@@ -83,7 +83,13 @@ This prints the name of every file being
and a summary at the end of the index update.
.El
.Pp
-.Nm .
+The index generated by
+.Nm
+is also used by the
+.Xr whatis 1
+program, replacing the old
+.Dq makewhatis
+program.
.Ss DATABASE SCHEMA
The name of the FTS table is mandb and its schema is as follows:
.Bl -column -offset indent "Column Name" "Column Description"
