various small improvements;

3 files changed, 15 insertions, 20 deletions

diff --git a/sbin/mknod/mkfifo.1 b/sbin/mknod/mkfifo.1
index e67fc91772e..d3ed55e79b4 100644
--- a/sbin/mknod/mkfifo.1
+++ b/sbin/mknod/mkfifo.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkfifo.1,v 1.6 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: mkfifo.1,v 1.7 2006/12/16 08:49:18 jmc Exp $
 .\"	$NetBSD: mkfifo.1,v 1.4 1994/12/23 07:16:54 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -46,10 +46,10 @@
 .Sh DESCRIPTION
 .Nm mkfifo
 creates the FIFOs requested, in the order specified,
-using mode
-.Li \&0666
+using mode 0666
 modified by the current
 .Xr umask 2 .
+It requires write permission in the parent directory.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -59,19 +59,14 @@ Set the file permission bits of newly created directories to
 The mode is specified as in
 .Xr chmod 1 .
 In symbolic mode strings, the
-.Dq +
+.Sq +
 and
-.Dq -
+.Sq -
 operators are interpreted relative to an assumed initial mode of
 .Dq a=rw .
 .El
 .Pp
-.Nm mkfifo
-requires write permission in the parent directory.
-.Pp
-The
-.Nm mkfifo
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std mkfifo
 .Sh SEE ALSO
 .Xr mkdir 1 ,
 .Xr rm 1 ,
@@ -79,7 +74,7 @@ utility exits 0 on success or >0 if an error occurred.
 .Xr mknod 8
 .Sh STANDARDS
 The
-.Nm mkfifo
+.Nm
 utility is expected to be
 .St -p1003.2-92
 compliant.
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 676ed899300..f27e60b4ddc 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknod.8,v 1.10 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: mknod.8,v 1.11 2006/12/16 08:49:18 jmc Exp $
 .\"	$NetBSD: mknod.8,v 1.9 1995/08/10 23:47:32 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -40,7 +40,7 @@
 .Nm mknod
 .Op Fl m Ar mode
 .Ar name
-.Op Cm c | Cm b
+.Op Cm b \*(Ba c
 .Ar major minor
 .Nm mknod
 .Op Fl m Ar mode
@@ -65,9 +65,9 @@ Set the file mode.
 may be absolute or symbolic, as described in
 .Xr chmod 1 .
 In symbolic mode strings, the
-.Ql +
+.Sq +
 and
-.Ql -
+.Sq -
 operators are interpreted relative to an assumed initial mode of
 .Dq a=rw .
 .El
@@ -82,7 +82,7 @@ for a SCSI disk or a
 .Dq pty
 for pseudo-devices.
 FIFOs may be named arbitrarily by the user.
-.It Cm b | Cm c | Cm p
+.It Cm b \*(Ba c \*(Ba p
 Type of device or FIFO.
 If the device is a block type device such as a tape or disk drive which needs
 both cooked and raw special files,
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 12af5652ad6..abc625b41e4 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mknod.c,v 1.14 2006/04/08 23:51:33 dhill Exp $	*/
+/*	$OpenBSD: mknod.c,v 1.15 2006/12/16 08:49:18 jmc Exp $	*/
 /*	$NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: mknod.c,v 1.14 2006/04/08 23:51:33 dhill Exp $";
+static char rcsid[] = "$OpenBSD: mknod.c,v 1.15 2006/12/16 08:49:18 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -185,7 +185,7 @@ usage(int ismkfifo)
 {
 
 	if (ismkfifo == 1)
-		(void)fprintf(stderr, "usage: %s [-m mode] fifoname ...\n",
+		(void)fprintf(stderr, "usage: %s [-m mode] fifo_name ...\n",
 		    __progname);
 	else {
 		(void)fprintf(stderr, "usage: %s [-m mode] name [b | c] major minor\n",