Merge the relevant parts from the VERSION_1_12 branch:

- change mandocdb.db to mandoc.db
- add HISTORY to mandocdb(8)

1 files changed, 39 insertions, 7 deletions

diff --git a/mandocdb.8 b/mandocdb.8
index d90d3fa6..1bb6547b 100644
--- a/mandocdb.8
+++ b/mandocdb.8
@@ -1,4 +1,4 @@
-.\"	$Id: mandocdb.8,v 1.19 2013/07/13 19:41:16 schwarze Exp $
+.\"	$Id: mandocdb.8,v 1.20 2013/10/01 20:56:18 schwarze Exp $
 .\"
 .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,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: July 13 2013 $
+.Dd $Mdocdate: October 1 2013 $
 .Dt MANDOCDB 8
 .Os
 .Sh NAME
@@ -122,11 +122,11 @@ is printed to stderr, omitted from the index, and the parse continues
 with the next input file.
 .Sh FILES
 .Bl -tag -width Ds
-.It Pa mandocdb.db
+.It Pa mandoc.db
 A database of manpages relative to the directory of the file.
 This file is portable across architectures and systems, so long as the
 manpage hierarchy it indexes does not change.
-.It Pa mandocdb.db~
+.It Pa mandoc.db~
 A temporary database used during scanning and parsing.
 .El
 .Sh EXIT STATUS
@@ -136,10 +136,42 @@ A temporary database used during scanning and parsing.
 .Xr man 1 ,
 .Xr whatis 1 ,
 .Xr man.conf 5
-.Sh AUTHORS
+.Sh HISTORY
+A
+.Nm makewhatis
+utility first appeared in
+.Bx 2 .
+It was rewritten in
+.Xr perl 1
+for
+.Ox 2.7
+and in C for
+.Ox 5.1 .
+.Pp
 The
+.Ar dir
+argument first appeared in
+.Nx 1.0 ;
+the options
+.Fl dtu
+in
+.Ox 2.7 ;
+and the options
+.Fl aCvW
+in
+.Ox 5.1 .
+.Sh AUTHORS
+.An -nosplit
+.An Bill Joy
+wrote the original
+.Bx
+.Nm makewhatis
+in February 1979,
+.An Marc Espie
+started the Perl version in 2000,
+and the current version of
 .Nm
-utility was written by
-.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv ,
+was written by
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv
 and
 .An Ingo Schwarze Aq Mt schwarze@openbsd.org .