Use the traditional name "whatis.db" for the mandocdb(8) databases.

Requested by deraadt@, ok kristaps@.

diff --git a/apropos.1 b/apropos.1
index bff583dfd2438701ae997dba40bf412af6f51471..a20ce399a2633a00dfc5e90cd677bb012a56832f 100644 (file)
--- a/apropos.1
+++ b/apropos.1
@@ -1,4 +1,4 @@
-.\"    $Id: apropos.1,v 1.14 2011/12/24 22:37:16 kristaps Exp $
+.\"    $Id: apropos.1,v 1.15 2011/12/25 16:53:51 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 24 2011 $
+.Dd $Mdocdate: December 25 2011 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -258,11 +258,11 @@ If none of these conditions are met, it overrides the default list.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/man.conf" -compact
-.It Pa mandoc.db
+.It Pa whatis.db
 name of the
 .Xr mandocdb 8
 keyword database
-.It Pa mandoc.index
+.It Pa whatis.index
 name of the
 .Xr mandocdb 8
 filename database

diff --git a/mandocdb.8 b/mandocdb.8
index 270bab92fa0c02f7932103d7ea0407264b9406ec..1c2776421eb5c0ba101720d718ef3d502186adcc 100644 (file)
--- a/mandocdb.8
+++ b/mandocdb.8
@@ -1,4 +1,4 @@
-.\"    $Id: mandocdb.8,v 1.15 2011/12/25 13:08:12 schwarze Exp $
+.\"    $Id: mandocdb.8,v 1.16 2011/12/25 16:53:51 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -119,7 +119,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 mandoc.index ,
+.Pa whatis.index ,
 is a
 .Xr recno 3
 database with record values consisting of
@@ -155,7 +155,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 mandoc.db ,
+.Pa whatis.db ,
 is a
 .Xr btree 3
 database of NUL-terminated keywords (record length is non-zero string
@@ -221,12 +221,12 @@ or
 respectively, grows as a multiple of the index length and input size.
 .Sh FILES
 .Bl -tag -width Ds
-.It Pa mandoc.db
+.It Pa whatis.db
 A
 .Xr btree 3
 keyword database mapping keywords to a type and file reference in
-.Pa mandoc.index .
-.It Pa mandoc.index
+.Pa whatis.index .
+.It Pa whatis.index
 A
 .Xr recno 3
 database of indexed file-names.

diff --git a/mandocdb.c b/mandocdb.c
index 2c38339b583849b86e82a3f0d4628a54cca88195..04495315e2c4da7b67c31824f36e6698a5af86b5 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.39 2011/12/25 14:58:39 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.40 2011/12/25 16:53:51 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -1538,7 +1538,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 mandoc.db and mandoc.index files, but assumes that
+ * This ignores the whatis.db and whatis.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/mandocdb.h b/mandocdb.h
index 7c7e3c5b4a233c7138440d09f450358831e3fcfc..c7d7a51a9ba2a320ec6a0f46fd04e9a169cd5e3c 100644 (file)
--- a/mandocdb.h
+++ b/mandocdb.h
@@ -1,4 +1,4 @@
-/*      $Id: mandocdb.h,v 1.4 2011/12/25 14:58:39 schwarze Exp $ */
+/*      $Id: mandocdb.h,v 1.5 2011/12/25 16:53:51 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -17,8 +17,8 @@
 #ifndef MANDOCDB_H
 #define MANDOCDB_H
 
-#define        MANDOC_DB       "mandoc.db"
-#define        MANDOC_IDX      "mandoc.index"
+#define        MANDOC_DB       "whatis.db"
+#define        MANDOC_IDX      "whatis.index"
 
 #define        TYPE_An         0x0000000000000001ULL
 #define        TYPE_Ar         0x0000000000000002ULL

diff --git a/whatis.1 b/whatis.1
index 5afba2a69cf11ecc3baf0a00019cb6c55ac88256..931b958849830de77cc3ea039427c47091f5f10e 100644 (file)
--- a/whatis.1
+++ b/whatis.1
@@ -1,4 +1,4 @@
-.\"    $Id: whatis.1,v 1.5 2011/12/24 22:37:16 kristaps Exp $
+.\"    $Id: whatis.1,v 1.6 2011/12/25 16:53:51 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 24 2011 $
+.Dd $Mdocdate: December 25 2011 $
 .Dt WHATIS 1
 .Os
 .Sh NAME
@@ -130,11 +130,11 @@ If none of these conditions are met, it overrides the default list.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/man.conf" -compact
-.It Pa mandoc.db
+.It Pa whatis.db
 name of the
 .Xr mandocdb 8
 keyword database
-.It Pa mandoc.index
+.It Pa whatis.index
 name of the
 .Xr mandocdb 8
 filename database