Rename whatis.{db,index} back to mandoc.{db,index}

such that makewhatis(8) called from pkg_delete(1)
does not fail trying to open old-style whatis.db files as btree(3).
Suggested by espie@ deraadt@ millert@

5 files changed, 22 insertions, 22 deletions

diff --git a/usr.bin/mandoc/apropos.1 b/usr.bin/mandoc/apropos.1
index 745d97075bb..375d0d37acf 100644
--- a/usr.bin/mandoc/apropos.1
+++ b/usr.bin/mandoc/apropos.1
@@ -1,4 +1,4 @@
-.\"	$Id: apropos.1,v 1.14 2012/01/05 22:15:17 schwarze Exp $
+.\"	$Id: apropos.1,v 1.15 2012/01/09 01:59:08 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 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: January 5 2012 $
+.Dd $Mdocdate: January 9 2012 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -266,11 +266,11 @@ standard search path.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/man.conf" -compact
-.It Pa whatis.db
+.It Pa mandoc.db
 name of the
 .Xr mandocdb 8
 keyword database
-.It Pa whatis.index
+.It Pa mandoc.index
 name of the
 .Xr mandocdb 8
 filename database
diff --git a/usr.bin/mandoc/mandocdb.8 b/usr.bin/mandoc/mandocdb.8
index 11205c61a94..0279d7945e9 100644
--- a/usr.bin/mandoc/mandocdb.8
+++ b/usr.bin/mandoc/mandocdb.8
@@ -1,4 +1,4 @@
-.\"	$Id: mandocdb.8,v 1.16 2011/12/25 20:57:58 schwarze Exp $
+.\"	$Id: mandocdb.8,v 1.17 2012/01/09 01:59:08 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 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: December 25 2011 $
+.Dd $Mdocdate: January 9 2012 $
 .Dt MANDOCDB 8
 .Os
 .Sh NAME
@@ -125,7 +125,7 @@ is printed to stderr, omitted from the index, and the parse continues
 with the next input file.
 .Ss Index Database
 The index database,
-.Pa whatis.index ,
+.Pa mandoc.index ,
 is a
 .Xr recno 3
 database with record values consisting of
@@ -161,7 +161,7 @@ Each of the above is NUL-terminated.
 If the record value is zero-length, it is unassigned.
 .Ss Keyword Database
 The keyword database,
-.Pa whatis.db ,
+.Pa mandoc.db ,
 is a
 .Xr btree 3
 database of NUL-terminated keywords (record length is non-zero string
@@ -225,12 +225,12 @@ or
 respectively, grows as a multiple of the index length and input size.
 .Sh FILES
 .Bl -tag -width Ds
-.It Pa whatis.db
+.It Pa mandoc.db
 A
 .Xr btree 3
 keyword database mapping keywords to a type and file reference in
-.Pa whatis.index .
-.It Pa whatis.index
+.Pa mandoc.index .
+.It Pa mandoc.index
 A
 .Xr recno 3
 database of indexed file-names.
diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c
index 682760f7802..cc7ee52db5f 100644
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.35 2012/01/07 15:32:24 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.36 2012/01/09 01:59:08 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -1620,7 +1620,7 @@ ofile_argbuild(int argc, char *argv[], struct of **of,
  * Recursively build up a list of files to parse.
  * We use this instead of ftw() and so on because I don't want global
  * variables hanging around.
- * This ignores the whatis.db and whatis.index files, but assumes that
+ * This ignores the mandoc.db and mandoc.index files, but assumes that
  * everything else is a manual.
  * Pass in a pointer to a NULL structure for the first invocation.
  */
diff --git a/usr.bin/mandoc/mandocdb.h b/usr.bin/mandoc/mandocdb.h
index 5277f47ba3b..af61f3ff89f 100644
--- a/usr.bin/mandoc/mandocdb.h
+++ b/usr.bin/mandoc/mandocdb.h
@@ -1,4 +1,4 @@
-/*      $Id: mandocdb.h,v 1.5 2011/12/25 16:52:55 schwarze Exp $ */
+/*      $Id: mandocdb.h,v 1.6 2012/01/09 01:59:08 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -17,8 +17,8 @@
 #ifndef MANDOCDB_H
 #define MANDOCDB_H
 
-#define	MANDOC_DB	"whatis.db"
-#define	MANDOC_IDX	"whatis.index"
+#define	MANDOC_DB	"mandoc.db"
+#define	MANDOC_IDX	"mandoc.index"
 
 #define	TYPE_An		0x0000000000000001ULL
 #define	TYPE_Ar		0x0000000000000002ULL
diff --git a/usr.bin/mandoc/whatis.1 b/usr.bin/mandoc/whatis.1
index 9b0acffa5e6..c8904243c7d 100644
--- a/usr.bin/mandoc/whatis.1
+++ b/usr.bin/mandoc/whatis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whatis.1,v 1.4 2012/01/05 22:07:42 schwarze Exp $
+.\"	$OpenBSD: whatis.1,v 1.5 2012/01/09 01:59:08 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: January 5 2012 $
+.Dd $Mdocdate: January 9 2012 $
 .Dt WHATIS 1
 .Os
 .Sh NAME
@@ -71,7 +71,7 @@ The default is
 Override the list of standard directories
 .Nm
 searches for its database named
-.Dq Pa whatis.db .
+.Dq Pa mandoc.db .
 The supplied
 .Ar path
 must be a colon
@@ -83,7 +83,7 @@ This search path may also be set using the environment variable
 Augment the list of standard directories
 .Nm
 searches for its database named
-.Dq Pa whatis.db .
+.Dq Pa mandoc.db .
 The supplied
 .Ar path
 must be a colon-separated list of directories.
@@ -126,11 +126,11 @@ standard search path.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/man.conf" -compact
-.It Pa whatis.db
+.It Pa mandoc.db
 name of the
 .Xr mandocdb 8
 keyword database
-.It Pa whatis.index
+.It Pa mandoc.index
 name of the
 .Xr mandocdb 8
 filename database