summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man.conf.56
-rw-r--r--manpath.c9
2 files changed, 1 insertions, 14 deletions
diff --git a/man.conf.5 b/man.conf.5
index f288fbf1..0bf1ed35 100644
--- a/man.conf.5
+++ b/man.conf.5
@@ -101,12 +101,6 @@ manual.
.It Ic toc Ta none Ta Cm html Ta print table of contents
.It Ic width Ta integer Ta Cm ascii , utf8 Ta right margin
.El
-.It Ic _whatdb Ar path Ns Cm /whatis.db
-This directive provides the same functionality as
-.Ic manpath ,
-but using a historic and misleading syntax.
-It is kept for backward compatibility for now,
-but will eventually be removed.
.El
.Sh FILES
.Bl -tag -width /etc/examples/man.conf -compact
diff --git a/manpath.c b/manpath.c
index 1516bc32..a91a6e4e 100644
--- a/manpath.c
+++ b/manpath.c
@@ -163,7 +163,7 @@ manconf_free(struct manconf *conf)
static void
manconf_file(struct manconf *conf, const char *file)
{
- const char *const toks[] = { "manpath", "output", "_whatdb" };
+ const char *const toks[] = { "manpath", "output" };
char manpath_default[] = MANPATH_DEFAULT;
FILE *stream;
@@ -200,13 +200,6 @@ manconf_file(struct manconf *conf, const char *file)
}
switch (tok) {
- case 2: /* _whatdb */
- while (ep > cp && ep[-1] != '/')
- ep--;
- if (ep == cp)
- continue;
- *ep = '\0';
- /* FALLTHROUGH */
case 0: /* manpath */
manpath_add(&conf->manpath, cp, '\0');
*manpath_default = '\0';