summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-10-19 20:05:53 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-10-19 20:05:53 +0000
commit3f0af16022e0632d781e136ef38049c6e89c4625 (patch)
tree1bcdca8928c74e6c2065f6c5452bba689c9b169c /etc
parentf18284fc5cd141baa0c4968d387deee44ea86c7f (diff)
There is no more groff in the base system, so use mandoc(1) to format
manuals on demand by man(1), even though a few manuals may still have formatting issues with mandoc, and a tiny fraction may still make mandoc error out. Also remove the .me and .ms _build rules: we don't support these formats any longer, and don't have any such manuals in base. OK deraadt@ sthen@
Diffstat (limited to 'etc')
-rw-r--r--etc/man.conf22
1 files changed, 10 insertions, 12 deletions
diff --git a/etc/man.conf b/etc/man.conf
index c0cbe449bbe..ffe8bce294a 100644
--- a/etc/man.conf
+++ b/etc/man.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: man.conf,v 1.15 2010/04/09 19:07:30 naddy Exp $
+# $OpenBSD: man.conf,v 1.16 2010/10/19 20:05:52 schwarze Exp $
# Sheer, raging paranoia...
_version BSD.2
@@ -16,17 +16,15 @@ _subdir cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 c
_suffix .0
_build .0.Z /usr/bin/zcat %s
_build .0.gz /usr/bin/gzcat %s
-_build .[1-9n] /usr/bin/nroff -Tascii -man %s
-_build .[1-9n].Z /usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
-_build .[1-9n].gz /usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
-_build .[1-9][a-z] /usr/bin/nroff -Tascii -man %s
-_build .[1-9][a-z].Z /usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
-_build .[1-9][a-z].gz /usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
-_build .tbl /usr/bin/tbl %s | /usr/bin/nroff -Tascii -man
-_build .tbl.Z /usr/bin/zcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
-_build .tbl.gz /usr/bin/gzcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
-_build .me /usr/bin/nroff -Tascii -me %s 2>/dev/null | cat -s
-_build .ms /usr/bin/nroff -Tascii -ms %s 2>/dev/null | cat -s
+_build .[1-9n] /usr/bin/mandoc %s
+_build .[1-9n].Z /usr/bin/zcat %s | /usr/bin/mandoc
+_build .[1-9n].gz /usr/bin/gzcat %s | /usr/bin/mandoc
+_build .[1-9][a-z] /usr/bin/mandoc %s
+_build .[1-9][a-z].Z /usr/bin/zcat %s | /usr/bin/mandoc
+_build .[1-9][a-z].gz /usr/bin/gzcat %s | /usr/bin/mandoc
+_build .tbl /usr/bin/mandoc %s
+_build .tbl.Z /usr/bin/zcat %s | /usr/bin/mandoc
+_build .tbl.gz /usr/bin/gzcat %s | /usr/bin/mandoc
# Sections and their directories.
# All paths ending in '/' are the equivalent of entries specifying that