Complete the whatis.1 -> apropos.1 merge,

in particular regarding HISTORY and AUTHORS.

diff --git a/apropos.1 b/apropos.1
index 14682420ff0046ce63faab7f4a157f6e0c7ef3d6..e31900bb0c46669d3399828e50456f9effaf3f93 100644 (file)
--- a/apropos.1
+++ b/apropos.1
@@ -1,4 +1,4 @@
-.\"    $Id: apropos.1,v 1.29 2014/04/24 00:28:19 schwarze Exp $
+.\"    $Id: apropos.1,v 1.30 2014/08/21 01:52:59 schwarze Exp $
 .\"
 .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 24 2014 $
+.Dd $Mdocdate: August 21 2014 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@ utilities query manual page databases generated by
 evaluating
 .Ar expression
 for each file in each database.
-By default, it displays the names, section numbers, and description lines
+By default, they display the names, section numbers, and description lines
 of all matching manuals.
 .Pp
 By default,
@@ -349,11 +349,19 @@ The following two invocations are equivalent:
 .Xr re_format 7 ,
 .Xr makewhatis 8
 .Sh HISTORY
-An
+Part of the functionality of
+.Nm whatis
+was already provided by the former
+.Nm manwhere
+utility in
+.Bx 1 .
+The
 .Nm
-utility first appeared in
+and
+.Nm whatis
+utilities first appeared in
 .Bx 2 .
-It was rewritten from scratch for
+They were rewritten from scratch for
 .Ox 5.6 .
 .Pp
 The
@@ -373,13 +381,23 @@ and
 and
 .Fl s
 in
-.Ox 4.5 .
+.Ox 4.5
+for
+.Nm
+and in
+.Ox 5.6
+for
+.Nm whatis .
 .Sh AUTHORS
 .An -nosplit
 .An Bill Joy
-wrote the original
+wrote
+.Nm manwhere
+in 1977 and the original
 .Bx
 .Nm
+and
+.Nm whatis
 in February 1979.
 The current version was written by
 .An Kristaps Dzonsons Aq Mt kristaps@bsd.lv