1 files changed, 13 insertions, 14 deletions
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 1cb6e67f1e1..53ef081a01b 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.conf.5,v 1.12 2007/05/31 19:20:13 jmc Exp $
+.\"	$OpenBSD: man.conf.5,v 1.13 2010/10/28 21:18:03 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)man.conf.5	8.5 (Berkeley) 1/2/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt MAN.CONF 5
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@ search for manual pages or their database files as specified by the
 .Nm man.conf
 file.
 Manual pages are normally expected to be preformatted (see
-.Xr nroff 1 )
+.Xr mandoc 1 )
 and named with a trailing
 .Sq .0 .
 .Pp
@@ -172,10 +172,10 @@ Given the following
 file:
 .Bd -literal -offset indent
 _version	BSD.2
-_subdir		cat[123]
+_subdir		cat1 cat3 cat2
 _suffix		.0
-_build		.[1-9]	nroff -man %s
-_build		.tbl	tbl %s | nroff -man
+_build		.[1-9]	/usr/bin/mandoc %s
+_build		.tbl	/usr/bin/mandoc %s
 _default	/usr/share/man/
 sect3		/usr/share/man/{old/,}cat3
 .Ed
@@ -188,20 +188,21 @@ and
 .Dq mktemp.tbl
 in the directories
 .Pa /usr/share/man/cat1 ,
-.Pa /usr/share/man/cat2 ,
+.Pa /usr/share/man/cat3 ,
 and
-.Pa /usr/share/man/cat3 .
+.Pa /usr/share/man/cat2 ,
+in that order.
 If on a machine of type
 .Dq vax ,
 the subdirectory
 .Dq vax
-in each directory would be searched as well, before the directory was
-searched.
+in each directory would be searched as well,
+before the rest of the directory was searched.
 .Pp
 If
 .Dq mktemp.tbl
 was found first, the command
-.Dq Li tbl mktemp.tbl \&| nroff -man
+.Dq /usr/bin/mandoc mktemp.tbl
 would be run to build a man page for display to the user.
 .Pp
 The command
@@ -210,9 +211,7 @@ would search the directories
 .Pa /usr/share/man/old/cat3
 and
 .Pa /usr/share/man/cat3 ,
-in that order, for the
-.Xr mktemp 1
-manual page.
+in that order, for the mktemp manual page.
 If a subdirectory with the same name as the current machine type
 existed in any of them, it would be searched as well, before each
 of them were searched.