From edc2864f44502c5d9f45664a5d58f03c4146ca27 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 25 Dec 2011 16:53:51 +0000 Subject: Use the traditional name "whatis.db" for the mandocdb(8) databases. Requested by deraadt@, ok kristaps@. --- apropos.1 | 8 ++++---- mandocdb.8 | 12 ++++++------ mandocdb.c | 4 ++-- mandocdb.h | 6 +++--- whatis.1 | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apropos.1 b/apropos.1 index bff583df..a20ce399 100644 --- 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 .\" @@ -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 270bab92..1c277642 100644 --- 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 .\" @@ -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 2c38339b..04495315 100644 --- 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 * Copyright (c) 2011 Ingo Schwarze @@ -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 7c7e3c5b..c7d7a51a 100644 --- 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 * @@ -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 5afba2a6..931b9588 100644 --- 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 .\" @@ -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 -- cgit v1.2.3-56-ge451