[src/netbsd-7]: src Pull up following revision(s) (requested by christos in t...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2406ff2629be
branches:  netbsd-7
changeset: 799192:2406ff2629be
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 14 04:33:46 2015 +0000

description:
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

diffstat:

 usr.bin/man/man.conf.5         |   6 +++---
 usr.sbin/makemandb/makemandb.8 |  12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 1a87ea35c4b4 -r 2406ff2629be usr.bin/man/man.conf.5
--- a/usr.bin/man/man.conf.5    Tue Apr 14 04:26:04 2015 +0000
+++ b/usr.bin/man/man.conf.5    Tue Apr 14 04:33:46 2015 +0000
@@ -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 @@
 .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
diff -r 1a87ea35c4b4 -r 2406ff2629be usr.sbin/makemandb/makemandb.8
--- a/usr.sbin/makemandb/makemandb.8    Tue Apr 14 04:26:04 2015 +0000
+++ b/usr.sbin/makemandb/makemandb.8    Tue Apr 14 04:33:46 2015 +0000
@@ -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 <er.abhinav.upadhyay%gmail.com@localhost>
 .\" 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 @@
 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"