summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-08-21 01:52:59 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-08-21 01:52:59 +0000
commitad497d8b54be47ed17bd27d7036b3d16702f049f (patch)
treea868a98e1c496ea20c74704537ded2b0c9c88f28
parent33a151c3da146842261142380b53d0aea0bbc37c (diff)
downloadmandoc-ad497d8b54be47ed17bd27d7036b3d16702f049f.tar.gz
Complete the whatis.1 -> apropos.1 merge,
in particular regarding HISTORY and AUTHORS.
-rw-r--r--apropos.130
1 files changed, 24 insertions, 6 deletions
diff --git a/apropos.1 b/apropos.1
index 83394c1d..5d5d1ce7 100644
--- a/apropos.1
+++ b/apropos.1
@@ -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