aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2011-07-14 14:36:37 +0000
committerIngo Schwarze <schwarze@openbsd.org>2011-07-14 14:36:37 +0000
commitc921391b9e471d02ef82f0f45eaa4c354a6fdb85 (patch)
tree91b2236b7443621703a4c9718fde8a864701c640
parent64308922dfa092ac669da8955b6018bbc3cab184 (diff)
downloadmandoc-c921391b9e471d02ef82f0f45eaa4c354a6fdb85.tar.gz
mandoc-c921391b9e471d02ef82f0f45eaa4c354a6fdb85.tar.zst
mandoc-c921391b9e471d02ef82f0f45eaa4c354a6fdb85.zip
move mandocdb(1) to mandocdb(8)
"please make this change" kristaps@
-rw-r--r--Makefile39
-rw-r--r--index.sgml22
-rw-r--r--mandocdb.8 (renamed from mandocdb.1)4
-rw-r--r--mandocdb.c4
4 files changed, 35 insertions, 34 deletions
diff --git a/Makefile b/Makefile
index cc3e7a16..a2b3d449 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
.PHONY: clean install installwww
.SUFFIXES: .sgml .html .md5 .h .h.html
-.SUFFIXES: .1 .3 .7
-.SUFFIXES: .1.txt .3.txt .7.txt
-.SUFFIXES: .1.pdf .3.pdf .7.pdf
-.SUFFIXES: .1.ps .3.ps .7.ps
-.SUFFIXES: .1.html .3.html .7.html
-.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml
+.SUFFIXES: .1 .3 .7 .8
+.SUFFIXES: .1.txt .3.txt .7.txt .8.txt
+.SUFFIXES: .1.pdf .3.pdf .7.pdf .8.pdf
+.SUFFIXES: .1.ps .3.ps .7.ps .8.ps
+.SUFFIXES: .1.html .3.html .7.html .8.html
+.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml .8.xhtml
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
@@ -73,7 +73,7 @@ SRCS = Makefile \
mandoc.3 \
mandoc.c \
mandoc.h \
- mandocdb.1 \
+ mandocdb.8 \
mandocdb.c \
mandoc_char.7 \
mdoc.h \
@@ -237,12 +237,7 @@ PRECONV_LNS = preconv.ln
$(PRECONV_OBJS) $(PRECONV_LNS): config.h
-INDEX_MANS = mandocdb.1.html \
- mandocdb.1.xhtml \
- mandocdb.1.ps \
- mandocdb.1.pdf \
- mandocdb.1.txt \
- mandoc.1.html \
+INDEX_MANS = mandoc.1.html \
mandoc.1.xhtml \
mandoc.1.ps \
mandoc.1.pdf \
@@ -286,7 +281,12 @@ INDEX_MANS = mandocdb.1.html \
tbl.7.xhtml \
tbl.7.ps \
tbl.7.pdf \
- tbl.7.txt
+ tbl.7.txt \
+ mandocdb.8.html \
+ mandocdb.8.xhtml \
+ mandocdb.8.ps \
+ mandocdb.8.pdf \
+ mandocdb.8.txt
$(INDEX_MANS): mandoc
@@ -322,6 +322,7 @@ install: all
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
mkdir -p $(DESTDIR)$(MANDIR)/man7
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
$(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
@@ -399,19 +400,19 @@ config.h: config.h.pre config.h.post
.h.h.html:
highlight -I $< >$@
-.1.1.txt .3.3.txt .7.7.txt:
+.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
./mandoc -Tascii -Wall,stop $< | col -b >$@
-.1.1.html .3.3.html .7.7.html:
+.1.1.html .3.3.html .7.7.html .8.8.html:
./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
-.1.1.ps .3.3.ps .7.7.ps:
+.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
./mandoc -Tps -Wall,stop $< >$@
-.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
-.1.1.pdf .3.3.pdf .7.7.pdf:
+.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
./mandoc -Tpdf -Wall,stop $< >$@
.sgml.html:
diff --git a/index.sgml b/index.sgml
index 2308aa64..6c9b9ea6 100644
--- a/index.sgml
+++ b/index.sgml
@@ -29,7 +29,7 @@
HREF="mandoc.1.html">mandoc</A>, which interfaces with the compiler library to format output for UNIX terminals (with
support for wide-character locales), XHTML, HTML, PostScript, and PDF.
It also includes <A HREF="preconv.1.html">preconv</A>, for recoding multibyte manuals; and <A
- HREF="mandocdb.1.html">mandocdb</A>, for indexing manuals.
+ HREF="mandocdb.8.html">mandocdb</A>, for indexing manuals.
It is a <A CLASS="external" HREF="http://bsd.lv/">BSD.lv</A> project.
</P>
<P>
@@ -40,14 +40,14 @@
</H1>
<P>
<SPAN CLASS="nm">mdocml</SPAN> is in plain-old ANSI C and should build and run on any UNIX system, although <A
- HREF="mandocdb.1.html">mandocdb</A> requires <A CLASS="external"
+ HREF="mandocdb.8.html">mandocdb</A> requires <A CLASS="external"
HREF="http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html">Berkeley Database</A> (this is
installed by default on all BSD operating systems).
To compile <SPAN CLASS="nm">mdocml</SPAN>, run <CODE>make</CODE>, then <CODE>make install</CODE> to install into
<I>/usr/local</I>.
Be aware: if you have an existing <A HREF="http://www.gnu.org/software/groff/" CLASS="external">groff</A> installation,
this may overwrite its <B>preconv</B> binary.
- The <A HREF="mandocdb.1.html">mandocdb</A> utility is not yet linked to the build. You must run <CODE>make
+ The <A HREF="mandocdb.8.html">mandocdb</A> utility is not yet linked to the build. You must run <CODE>make
mandocdb</CODE> to build it (it does not install).
</P>
<P>
@@ -152,14 +152,14 @@
</TD>
</TR>
<TR>
- <TD VALIGN="top"><A HREF="mandocdb.1.html">mandocdb(1)</A></TD>
+ <TD VALIGN="top"><A HREF="mandocdb.8.html">mandocdb(8)</A></TD>
<TD VALIGN="top">
index UNIX manuals
<SMALL>
- (<A HREF="mandocdb.1.txt">text</A> |
- <A HREF="mandocdb.1.xhtml">xhtml</A> |
- <A HREF="mandocdb.1.pdf">pdf</A> |
- <A HREF="mandocdb.1.ps">postscript</A>)
+ (<A HREF="mandocdb.8.txt">text</A> |
+ <A HREF="mandocdb.8.xhtml">xhtml</A> |
+ <A HREF="mandocdb.8.pdf">pdf</A> |
+ <A HREF="mandocdb.8.ps">postscript</A>)
</SMALL>
</TD>
</TR>
@@ -314,7 +314,7 @@
12-07-2011: version 1.11.4
</P>
<P>
- Bug-fixes and clean-ups across all systems, especially in <INS><A HREF="mandocdb.1.html">mandocdb</A></INS> <DEL>makewhatis</DEL> (note: still not
+ Bug-fixes and clean-ups across all systems, especially in <INS><A HREF="mandocdb.8.html">mandocdb</A></INS> <DEL>makewhatis</DEL> (note: still not
connected to the general build and must be compiled with <INS><CODE>make mandocdb</CODE></INS> <DEL><CODE>make makewhatis</CODE></DEL>) and the <A
HREF="man.7.html">man</A> parser. This release was significantly assisted by participants in <A CLASS="external"
HREF="http://www.openbsd.org">OpenBSD</A>'s c2k11. Thanks!
@@ -341,7 +341,7 @@
<P>
Corrected some installation issues in version 1.11.1.
Further migration to <A HREF="mandoc.3.html">libmandoc</A>.
- Initial public release (this utility is very much under development) of <INS><A HREF="mandocdb.1.html">mandocdb</A></INS><DEL>makewhatis</DEL>,
+ Initial public release (this utility is very much under development) of <INS><A HREF="mandocdb.8.html">mandocdb</A></INS><DEL>makewhatis</DEL>,
initially named mandoc-db.
This utility produces keyword databases of manual content
<DEL>mandoc-cgi</DEL>,
@@ -356,7 +356,7 @@
<SMALL>
Copyright &#169; 2008&#8211;2011
<A CLASS="external" HREF="http://kristaps.bsd.lv">Kristaps Dzonsons</A>,
- $Date: 2011/07/14 10:57:02 $
+ $Date: 2011/07/14 14:36:37 $
</SMALL>
</P>
</BODY>
diff --git a/mandocdb.1 b/mandocdb.8
index 70c5e8b9..84f3abe7 100644
--- a/mandocdb.1
+++ b/mandocdb.8
@@ -1,4 +1,4 @@
-.\" $Id: mandocdb.1,v 1.1 2011/07/14 10:57:02 kristaps Exp $
+.\" $Id: mandocdb.8,v 1.1 2011/07/14 14:36:37 schwarze Exp $
.\"
.\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\"
@@ -15,7 +15,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: July 14 2011 $
-.Dt MANDOCDB 1
+.Dt MANDOCDB 8
.Os
.Sh NAME
.Nm mandocdb
diff --git a/mandocdb.c b/mandocdb.c
index 5504664c..9665f760 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.1 2011/07/14 10:57:02 kristaps Exp $ */
+/* $Id: mandocdb.c,v 1.2 2011/07/14 14:36:37 schwarze Exp $ */
/*
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -44,7 +44,7 @@
#define MANDOC_FLAGS O_CREAT|O_TRUNC|O_RDWR
#define MANDOC_SLOP 1024
-/* Bit-fields. See makewhatis.1. */
+/* Bit-fields. See mandocdb.8. */
#define TYPE_NAME 0x01
#define TYPE_FUNCTION 0x02