Bring in corrections and improvements that were committed to the new

suite of tools now being disabled, as far as they apply to the current
tools as well.

3 files changed, 70 insertions, 14 deletions

diff --git a/libexec/makewhatis/makewhatis.8 b/libexec/makewhatis/makewhatis.8
index 3e88e25263b..74a0b968465 100644
--- a/libexec/makewhatis/makewhatis.8
+++ b/libexec/makewhatis/makewhatis.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makewhatis.8,v 1.19 2011/12/03 23:01:21 schwarze Exp $
+.\"	$OpenBSD: makewhatis.8,v 1.20 2012/01/22 13:45:22 schwarze Exp $
 .\"	$NetBSD: makewhatis.8,v 1.2.2.1 1997/11/10 19:57:45 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 3 2011 $
+.Dd $Mdocdate: January 22 2012 $
 .Dt MAKEWHATIS 8
 .Os
 .Sh NAME
@@ -130,6 +130,36 @@ man configuration information
 .Xr man 1 ,
 .Xr whatis 1 ,
 .Xr man.conf 5
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Bx 2 .
+It was rewritten in
+.Xr perl 1
+for
+.Ox 2.7 .
+.Pp
+The
+.Ar dir
+argument first appeared in
+.Nx 1.0 ;
+the options
+.Fl dptu
+in
+.Ox 2.7 ;
+and the option
+.Fl v
+in
+.Ox 4.9 .
+.Sh AUTHORS
+.An Bill Joy
+wrote the original
+.Bx
+.Nm
+in February 1979.
+.An Marc Espie
+started the Perl version in 2000.
 .Sh BUGS
 .Nm
 should parse
diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1
index 957b5be47dc..d75d3604123 100644
--- a/usr.bin/apropos/apropos.1
+++ b/usr.bin/apropos/apropos.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: apropos.1,v 1.15 2011/10/09 14:39:49 jmc Exp $
+.\"     $OpenBSD: apropos.1,v 1.16 2012/01/22 13:45:22 schwarze Exp $
 .\"     $NetBSD: apropos.1,v 1.4 1995/09/04 20:46:17 tls Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)apropos.1	8.1 (Berkeley) 6/29/93
 .\"
-.Dd $Mdocdate: October 9 2011 $
+.Dd $Mdocdate: January 22 2012 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -142,13 +142,16 @@ command first appeared in
 .Pp
 The
 .Fl M
-and
+option and the
+.Ev MANPATH
+variable first appeared in
+.Bx 4.3 ;
 .Fl m
-options first appeared in
+in
 .Bx 4.3 Reno ;
 .Fl C
 in
-.Nx 1.0 ;
+.Bx 4.4 Lite1 ;
 and
 .Fl s
 and
@@ -157,3 +160,7 @@ in
 .Ox 4.5 .
 .Sh AUTHORS
 .An Bill Joy
+wrote the original
+.Bx
+.Nm
+in February 1979.
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 8467cd5bbed..de0a4286e9e 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whatis.1,v 1.16 2011/10/09 14:39:49 jmc Exp $
+.\"	$OpenBSD: whatis.1,v 1.17 2012/01/22 13:45:22 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)whatis.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: October 9 2011 $
+.Dd $Mdocdate: January 22 2012 $
 .Dt WHATIS 1
 .Os
 .Sh NAME
@@ -42,8 +42,10 @@
 .Op Fl m Ar path
 .Ar command ...
 .Sh DESCRIPTION
+The
 .Nm
-looks up a given command and gives the header line from the manual page.
+utility looks up the given commands and shows the header lines
+from the manual pages.
 You can then use the
 .Xr man 1
 command to get more information.
@@ -54,7 +56,9 @@ will match on each individual word.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl C Ar file
-Specify an alternate configuration file in
+Specify an alternate configuration
+.Ar file
+in
 .Xr man.conf 5
 format.
 The default is
@@ -112,6 +116,12 @@ configuration file
 .Xr man.conf 5 ,
 .Xr makewhatis 8
 .Sh HISTORY
+Part of the functionality of
+.Nm
+was already provided by the former
+.Nm manwhere
+utility in
+.Bx 1 .
 The
 .Nm
 command first appeared in
@@ -119,14 +129,23 @@ command first appeared in
 .Pp
 The
 .Fl M
-option first appeared in
-.Bx 4.3 Tahoe ;
+option and the
+.Ev MANPATH
+variable first appeared in
+.Bx 4.3 ;
 .Fl m
 in
 .Bx 4.3 Reno ;
 and
 .Fl C
 in
-.Nx 1.0 .
+.Bx 4.4 Lite1 .
 .Sh AUTHORS
 .An Bill Joy
+wrote
+.Nm manwhere
+in 1977
+and the original
+.Bx
+.Nm
+in February 1979.