diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | apropos.1 | 14 | ||||
| -rw-r--r-- | makewhatis.8 (renamed from mandocdb.8) | 8 | ||||
| -rw-r--r-- | man.cgi.7 | 4 |
4 files changed, 22 insertions, 22 deletions
@@ -22,7 +22,7 @@ CFLAGS += -DUSE_WCHAR # If your system has manpath(1), uncomment this. This is most any # system that's not OpenBSD or NetBSD. If uncommented, manpage(1) and -# mandocdb(8) will use manpath(1) to get the MANPATH variable. +# makewhatis(8) will use manpath(1) to get the MANPATH variable. #CFLAGS += -DUSE_MANPATH # If your system does not support static binaries, comment this, @@ -52,7 +52,7 @@ INSTALL_MAN = $(INSTALL_DATA) # If you want to build without database support, for example to avoid # the dependency on SQLite3, comment the following two lines. DBLIB = -L/usr/local/lib -lsqlite3 -DBBIN = mandocdb manpage apropos +DBBIN = makewhatis manpage apropos # === END OF USER SETTINGS ============================================= @@ -111,6 +111,7 @@ SRCS = Makefile \ libroff.h \ main.c \ main.h \ + makewhatis.8 \ man.7 \ man.c \ man-cgi.css \ @@ -128,7 +129,6 @@ SRCS = Makefile \ mandoc_aux.c \ mandoc_aux.h \ mandoc_char.7 \ - mandocdb.8 \ mandocdb.c \ manpage.c \ manpath.c \ @@ -259,8 +259,8 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ tree.o $(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h -MANDOCDB_OBJS = mandocdb.o mansearch_const.o manpath.o -$(MANDOCDB_OBJS): mansearch.h mandoc.h mandoc_aux.h \ +MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o +$(MAKEWHATIS_OBJS): mansearch.h mandoc.h mandoc_aux.h \ mdoc.h man.h config.h manpath.h PRECONV_OBJS = preconv.o @@ -289,7 +289,7 @@ WWW_MANS = apropos.1.html \ mdoc.7.html \ roff.7.html \ tbl.7.html \ - mandocdb.8.html \ + makewhatis.8.html \ man.h.html \ mandoc.h.html \ manpath.h.html \ @@ -304,7 +304,7 @@ WWW_OBJS = mdocml.tar.gz \ clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) rm -f apropos $(APROPOS_OBJS) - rm -f mandocdb $(MANDOCDB_OBJS) + rm -f makewhatis $(MAKEWHATIS_OBJS) rm -f preconv $(PRECONV_OBJS) rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) @@ -353,8 +353,8 @@ libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) mandoc: $(MANDOC_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a -mandocdb: $(MANDOCDB_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB) +makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) preconv: $(PRECONV_OBJS) $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) @@ -37,7 +37,7 @@ The and .Nm whatis utilities query manual page databases generated by -.Xr mandocdb 8 , +.Xr makewhatis 8 , evaluating .Ar expression for each file in each database. @@ -47,7 +47,7 @@ of all matching manuals. By default, .Nm searches for -.Xr mandocdb 8 +.Xr makewhatis 8 databases in the default paths stipulated by .Xr man 1 and uses case-insensitive substring matching @@ -70,13 +70,13 @@ format. .It Fl M Ar path Use the colon-separated path instead of the default list of paths searched for -.Xr mandocdb 8 +.Xr makewhatis 8 databases. Invalid paths, or paths without manual databases, are ignored. .It Fl m Ar path Prepend the colon-separated paths to the list of paths searched for -.Xr mandocdb 8 +.Xr makewhatis 8 databases. Invalid paths, or paths without manual databases, are ignored. .It Fl O Ar outkey @@ -196,7 +196,7 @@ If an architecture is specified in the output, use Queries evaluate over a subset of .Xr mdoc 7 macros indexed by -.Xr mandocdb 8 . +.Xr makewhatis 8 . In addition to the macro keys listed below, the special key .Cm any may be used to match any available macro key. @@ -293,7 +293,7 @@ standard search path. .Bl -tag -width "/etc/man.conf" -compact .It Pa mandoc.db name of the -.Xr mandocdb 8 +.Xr makewhatis 8 keyword database .It Pa /etc/man.conf default @@ -347,7 +347,7 @@ The following two invocations are equivalent: .Sh SEE ALSO .Xr man 1 , .Xr re_format 7 , -.Xr mandocdb 8 +.Xr makewhatis 8 .Sh HISTORY An .Nm diff --git a/mandocdb.8 b/makewhatis.8 index 7a33722b..9b70af15 100644 --- a/mandocdb.8 +++ b/makewhatis.8 @@ -16,10 +16,10 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate$ -.Dt MANDOCDB 8 +.Dt MAKEWHATIS 8 .Os .Sh NAME -.Nm mandocdb +.Nm makewhatis .Nd index UNIX manuals .Sh SYNOPSIS .Nm @@ -174,7 +174,7 @@ The output databases are corrupt and should be removed. .Xr man.conf 5 .Sh HISTORY A -.Nm makewhatis +.Nm utility first appeared in .Bx 2 . It was rewritten in @@ -205,7 +205,7 @@ in .An Bill Joy wrote the original .Bx -.Nm makewhatis +.Nm in February 1979, .An Marc Espie started the Perl version in 2000, @@ -11,7 +11,7 @@ The .Nm script queries and displays manual pages. It interfaces with -.Xr mandocdb 8 +.Xr makewhatis 8 databases cached with .Xr catman 8 . .Pp @@ -109,7 +109,7 @@ script by Wolfram Schneider. However, the results may not be quite the same. .Sh SEE ALSO .Xr catman 8 , -.Xr mandocdb 8 +.Xr makewhatis 8 .Sh AUTHORS The .Nm |