Regen

14 files changed, 2232 insertions, 1325 deletions

diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index 63aa3b6c3d1..0587345d252 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.6 2004/01/13 19:27:19 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.7 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 2001 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
+.\"	OpenBSD: etc.alpha/MAKEDEV.md,v 1.21 2004/02/16 19:00:57 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.Dd October 7, 2001
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 alpha
 .Os
 .Sh NAME
@@ -36,87 +35,173 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the alpha.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the alpha.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-The alpha supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The alpha supports the following devices:
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the alpha.
+Creates special files for all devices on alpha.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, klog, kmem, ksyms, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar iop#
-I2O devices.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyB?
+DEC 3000 ZS8530 ("scc") serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
 .It Ar wsmux
-Multiplexor devices for wscons.
+wscons keyboard/mouse mux devices.
 .El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar mmclock
+Memory mapped clock.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar speaker
+PC speaker.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.amd64/MAKEDEV.8 b/share/man/man8/man8.amd64/MAKEDEV.8
new file mode 100644
index 00000000000..e9120950941
--- /dev/null
+++ b/share/man/man8/man8.amd64/MAKEDEV.8
@@ -0,0 +1,241 @@
+.\" $OpenBSD: MAKEDEV.8,v 1.1 2004/02/16 19:05:06 miod Exp $
+.\"
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
+.\"
+.\"	OpenBSD: etc.amd64/MAKEDEV.md,v 1.4 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
+.Dt MAKEDEV 8 amd64
+.Os
+.Sh NAME
+.Nm MAKEDEV
+.Nd create system and device special files
+.Sh SYNOPSIS
+.Nm MAKEDEV
+.Ar name
+.Op Ar ...
+.Sh DESCRIPTION
+The shell script
+.Nm ,
+found in the
+.Pa /dev
+directory, is used to create various special files.
+See
+.Xr intro 4
+for a more complete discussion of special files.
+.Pp
+.Nm
+takes any number of device names as arguments, where the names are
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The amd64 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
+.It Ar all
+Creates special files for all devices on amd64.
+.It Ar ramdisk
+Ramdisk kernel devices.
+.It Ar std
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
+.It Ar local
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar mcd*
+Mitsumi cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.It Ar wt*	
+Archive/Wangtek QIC-cartridge tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Call units
+.Bl -tag -width tenletters -compact
+.It Ar tun*
+Network tunnel driver.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar apm
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar gpr*
+GPR400 smartcard reader.
+.It Ar iop*
+I2O controller devices.
+.It Ar joy*
+Joystick driver.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pctr*
+PC Performance Tuning Register access device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar speaker
+PC speaker.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar wdt0
+Watchdog timer.
+.It Ar xfs*
+XFS filesystem node.
+.Sh FILES
+.Bl -tag -width /dev -compact
+.It Pa /dev
+The special file directory.
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr config 8 ,
+.Xr mknod 8
diff --git a/share/man/man8/man8.cats/MAKEDEV.8 b/share/man/man8/man8.cats/MAKEDEV.8
new file mode 100644
index 00000000000..dc0cb6cca60
--- /dev/null
+++ b/share/man/man8/man8.cats/MAKEDEV.8
@@ -0,0 +1,199 @@
+.\" $OpenBSD: MAKEDEV.8,v 1.1 2004/02/16 19:05:06 miod Exp $
+.\"
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
+.\"
+.\"	OpenBSD: etc.cats/MAKEDEV.md,v 1.6 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
+.Dt MAKEDEV 8 cats
+.Os
+.Sh NAME
+.Nm MAKEDEV
+.Nd create system and device special files
+.Sh SYNOPSIS
+.Nm MAKEDEV
+.Ar name
+.Op Ar ...
+.Sh DESCRIPTION
+The shell script
+.Nm ,
+found in the
+.Pa /dev
+directory, is used to create various special files.
+See
+.Xr intro 4
+for a more complete discussion of special files.
+.Pp
+.Nm
+takes any number of device names as arguments, where the names are
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The cats supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
+.It Ar all
+Creates special files for all devices on cats.
+.It Ar ramdisk
+Ramdisk kernel devices.
+.It Ar std
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
+.It Ar local
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar ch*
+SCSI media changers.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmouse*
+wscons mice.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar xfs*
+XFS filesystem node.
+.Sh FILES
+.Bl -tag -width /dev -compact
+.It Pa /dev
+The special file directory.
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr config 8 ,
+.Xr mknod 8
diff --git a/share/man/man8/man8.hp300/MAKEDEV.8 b/share/man/man8/man8.hp300/MAKEDEV.8
index aa851618e81..e8a7c4584f6 100644
--- a/share/man/man8/man8.hp300/MAKEDEV.8
+++ b/share/man/man8/man8.hp300/MAKEDEV.8
@@ -1,58 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.15 2003/06/06 19:28:06 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.16 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 1997, Jason Downs.  All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
+.\"	OpenBSD: etc.hp300/MAKEDEV.md,v 1.17 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
-.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
-.\"
-.Dd July 27, 1997
+.Dd February 16, 2004
 .Dt MAKEDEV 8 hp300
 .Os
 .Sh NAME
@@ -64,100 +35,126 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the hp300.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the hp300.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The hp300 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+The hp300 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the hp300.
+Creates special files for all devices on hp300.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar ct#
-HP300 HP-IB cartridge tape.
-.It Ar ccd#
-.Dq Concatenated
-pseudo-disks.
-.It Ar hd#
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar hd*
 HP300 HP-IB disks.
-.It Ar mt#
-(Magnetic) 9-track reel tape.
-.It Ar sd#
-HP300 SCSI disks.
-.It Ar st#
-HP300 SCSI tape.
-.It Ar vnd#
-.Dq File
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar dca#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ct*
+HP300 HP-IB cartridge tape drives.
+.It Ar mt*
+(Magnetic) 9-track reel tape drives.
+.It Ar st*
+Exabyte tape.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar apci*
+HP400 4 port serial mux interface.
+.It Ar dca*
 HP200/300 single port serial interface.
-.It Ar dcm#
+.It Ar dcm*
 HP200/300 4 port serial mux interface.
-.It Ar apci#
-HP400 3 port/keyboard Apollo mux interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar grf#
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar grf*
 Raw interface to HP300 graphics devices.
-.It Ar ite#
+.It Ar ite*
 Terminal emulator interface to HP300 graphics devices.
-.It Ar hil
-HP300 HIL input devices.
-.It Ar ppi#
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar ppi*
 HP-IB plotters.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar tun#
-Network tunnel driver.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar hil
+HP-HIL input devices.
 .It Ar lkm
 Loadable kernel modules interface.
-.It Ar random
-In-kernel random number generator.
-.El
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar tun*
+Network tunnel driver.
+.It Ar systrace*
+System call tracing device.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
-.Bl -tag -width XXXX -compact
+.Bl -tag -width /dev -compact
 .It Pa /dev
 The special file directory.
 .El
diff --git a/share/man/man8/man8.hppa/MAKEDEV.8 b/share/man/man8/man8.hppa/MAKEDEV.8
index 626cb834eef..7fa64562549 100644
--- a/share/man/man8/man8.hppa/MAKEDEV.8
+++ b/share/man/man8/man8.hppa/MAKEDEV.8
@@ -1,35 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.4 2003/07/10 08:30:36 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.5 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\"	OpenBSD: etc.hppa/MAKEDEV.md,v 1.19 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.Dd October 4, 2002
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 hppa
 .Os
 .Sh NAME
@@ -41,111 +35,142 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the hppa.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the hppa.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The hppa supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The hppa supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the hppa.
+Creates special files for all devices on hppa.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar sd*
+SCSI disks.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar st#
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
 SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
 .El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pdc
+PDC device.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 27c1f9eea4b..1527b311ac1 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -1,58 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.25 2004/01/13 19:27:19 jmc Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.26 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 1997, Jason Downs.  All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
+.\"	OpenBSD: etc.i386/MAKEDEV.md,v 1.21 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
-.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
-.\"
-.Dd July 27, 1997
+.Dd February 16, 2004
 .Dt MAKEDEV 8 i386
 .Os
 .Sh NAME
@@ -64,126 +35,201 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the i386.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the i386.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-The i386 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The i386 supports the following devices:
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the i386.
+Creates special files for all devices on i386.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
+.El
+.Pp
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar mcd*
+Mitsumi cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.It Ar wt*	
+Archive/Wangtek QIC-cartridge tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar ttyc*
+Cyclades serial ports.
+.El
+.Pp
+.Sy Call units
+.Bl -tag -width tenletters -compact
+.It Ar tun*
+Network tunnel driver.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
 .It Ar apm
-Power management devices.
-.It Ar audio
-Audio device.
-.It Ar bktr#
-Brooktree 848 driver.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk devices.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar fd#
-.Dq Floppy
-disk drives (3 1/2, 5 1/4).
-.It Ar joy#
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar gpr*
+GPR400 smartcard reader.
+.It Ar iop*
+I2O controller devices.
+.It Ar joy*
 Joystick driver.
 .It Ar lkm
 Loadable kernel modules interface.
-.It Ar lpa#
-Interruptless parallel port driver.
-.It Ar lpt#
-Stock parallel port device driver.
-.It Ar mcd#
-Mitsumi CD-ROM drives.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
+.It Ar music*
+MIDI devices.
+.It Ar pci
+PCI bus device.
+.It Ar pctr*
+PC Performance Tuning Register access device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar rmidi*
+Raw MIDI devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
 .It Ar speaker
-Pc speaker.
-.It Ar ss#
+PC speaker.
+.It Ar ss*
 SCSI scanners.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Standard PC COM ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel driver.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-.Dq Winchester
-disk drives (ST506, IDE, ESDI, RLL etc.).
-.It Ar wdt#
+.It Ar systrace*
+System call tracing device.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar wdt0
 Watchdog timer.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar wt#
-QIC-interfaced (i.e. not SCSI) 3M cartridge tape.
-.El
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.mac68k/MAKEDEV.8 b/share/man/man8/man8.mac68k/MAKEDEV.8
index 449fead30ec..e1b06fcedfa 100644
--- a/share/man/man8/man8.mac68k/MAKEDEV.8
+++ b/share/man/man8/man8.mac68k/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.6 2003/06/02 23:30:15 millert Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.7 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.15 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd February 21, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 mac68k
 .Os
 .Sh NAME
@@ -40,76 +35,118 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std ,
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mac68k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mac68k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-The mac68k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The mac68k supports the following devices:
 .Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the mac68k.
+Creates special files for all devices on mac68k.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar kbd
-The keyboard.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar mouse#
-Mouse ports.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
 .El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty00
+Standard serial port.
+.It Ar ttye*
+ITE bitmapped consoles.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar adb
+Apple Desktop bus event interface.
+.It Ar grf*
+Raw interface to the mac68k graphics devices.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar asc*
+ASC Audio device.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.macppc/MAKEDEV.8 b/share/man/man8/man8.macppc/MAKEDEV.8
index b9def35c904..5e801d9d654 100644
--- a/share/man/man8/man8.macppc/MAKEDEV.8
+++ b/share/man/man8/man8.macppc/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.9 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.10 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.macppc/MAKEDEV.md,v 1.16 2004/02/16 19:01:01 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd January 27, 2001
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 macppc
 .Os
 .Sh NAME
@@ -40,121 +35,165 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the macppc.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the macppc.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The macppc supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+The macppc supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the macppc.
+Creates special files for all devices on macppc.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ss#
-SCSI scanners.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
 SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar usb#
-USB control devices.
-.It Ar uhid#
-USB generic HID devices.
-.It Ar ulpt#
-USB printer devices.
-.It Ar urio#
-USB Diamond Multimedia Rio 500.
-.It Ar ugen#
-USB generic devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-IDE disk drives.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
 .It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
 .El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar apm
+Power management device.
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.mvme68k/MAKEDEV.8 b/share/man/man8/man8.mvme68k/MAKEDEV.8
index 1c3d8c4bea4..4293dff9643 100644
--- a/share/man/man8/man8.mvme68k/MAKEDEV.8
+++ b/share/man/man8/man8.mvme68k/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.5 2003/09/02 21:32:15 miod Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.6 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 2001 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
+.\"	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.12 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.Dd October 7, 2001
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 mvme68k
 .Os
 .Sh NAME
@@ -36,72 +35,128 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mvme68k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mvme68k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
+.Pp
+The mvme68k supports the following devices:
 .Pp
-The mvme68k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
 .Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the mvme68k.
+Creates special files for all devices on mvme68k.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar cuaa-d
+On-board call-up devices.
+.It Ar ttya-d
+On-board serial ports.
+.It Ar tty0*
+CL-CD2400 serial ports.
+.It Ar ttyw*
+WG CL-CD2400 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
 .El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar par0
+On-board printer port.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar flash0
+On-board flash memory.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar nvram0
+On-board non-volatile memory.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar sram0
+On-board static memory.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar vmel0
+VMEbus D32 space.
+.It Ar vmes0
+VMEbus D16 space.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.mvme88k/MAKEDEV.8 b/share/man/man8/man8.mvme88k/MAKEDEV.8
index f234fb3fd8c..2459ea4f941 100644
--- a/share/man/man8/man8.mvme88k/MAKEDEV.8
+++ b/share/man/man8/man8.mvme88k/MAKEDEV.8
@@ -1,30 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.1 2003/09/02 21:33:16 miod Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.2 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Copyright (c) 2001, 2003 Miodrag Vallat.
-.\" All rights reserved.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
+.\"	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.13 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.Dd September 2, 2003
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 mvme88k
 .Os
 .Sh NAME
@@ -36,72 +35,118 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the mvme88k.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the mvme88k.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
+.Pp
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-The mvme88k supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+The mvme88k supports the following devices:
 .Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the mvme88k.
+Creates special files for all devices on mvme88k.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar sd#
-SCSI disk drives.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Onboard Serial ports.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty0*
+MVME1x7 CL-CD2400 serial ports.
+.It Ar ttya-b
+MVME188 serial ports.
+.It Ar ttyv*
+MVME332XT serial ports.
 .El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar nvram0
+On-board non-volatile memory.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar sram0
+On-board static memory.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar vmel0
+VMEbus D32 space.
+.It Ar vmes0
+VMEbus D16 space.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.pegasos/MAKEDEV.8 b/share/man/man8/man8.pegasos/MAKEDEV.8
index b8c1ed086d0..de54e72c409 100644
--- a/share/man/man8/man8.pegasos/MAKEDEV.8
+++ b/share/man/man8/man8.pegasos/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.2 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.3 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.pegasos/MAKEDEV.md,v 1.6 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd November 8, 2003
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 pegasos
 .Os
 .Sh NAME
@@ -40,118 +35,163 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the pegasos.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the pegasos.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The pegasos supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width wsmouse -compact
+The pegasos supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the pegasos.
+Creates special files for all devices on pegasos.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width wsmouse -compact
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ss#
-SCSI scanners.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
 SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar usb#
-USB control devices.
-.It Ar uhid#
-USB generic HID devices.
-.It Ar ulpt#
-USB printer devices.
-.It Ar urio#
-USB Diamond Multimedia Rio 500.
-.It Ar ugen#
-USB generic devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wd#
-IDE disk drives.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
 .It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
 .El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bktr*
+Video frame grabbers.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar iop*
+I2O controller devices.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar radio*
+FM tuner devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar tuner*
+Tuner devices.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.sparc/MAKEDEV.8 b/share/man/man8/man8.sparc/MAKEDEV.8
index c21bc925453..a33649c10a1 100644
--- a/share/man/man8/man8.sparc/MAKEDEV.8
+++ b/share/man/man8/man8.sparc/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.15 2003/07/10 08:30:36 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.16 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.sparc/MAKEDEV.md,v 1.22 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd February 21, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 sparc
 .Os
 .Sh NAME
@@ -40,123 +35,154 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the sparc.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the sparc.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The sparc supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The sparc supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the sparc.
+Creates special files for all devices on sparc.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar bpp#
-Bi-directional printer ports.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar magma#
-Magma serial/parallel interfaces.
-.It Ar openprom
-OPENPROM and EEPROM interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
-pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar spif#
-SPARC serial/parallel interfaces.
-.It Ar st#
-SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar presto*
+Prestoserve NVRAM memory.
+.It Ar sd*
+SCSI disks.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
-.It Ar xd#
-Xylogic 450/451 disks.
-.It Ar xfs#
-XFS filesystem devices.
-.It Ar xy#
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar xd*
 Xylogic 753/7053 disks.
+.It Ar xy*
+Xylogic 450/451 disks.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
+SCSI tape drives.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar cua[a-z]*
+Zilog 8530 Serial Port.
+.It Ar tty[a-z]*
+Zilog 8530 Serial Port.
 .El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
+.It Ar wsmux
+wscons keyboard/mouse mux devices.
+.El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar bpp*
+Parallel port.
+.It Ar bppmag[mno]
+Magma parallel port.
+.It Ar bpp[jkl]
+.Dq spif
+parallel port.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar openprom
+.
+.It Ar magma*
+Magma multiport cards.
+.It Ar pf*
+Packet Filter.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar spif*
+.Dq spif
+multiport cards.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.sparc64/MAKEDEV.8 b/share/man/man8/man8.sparc64/MAKEDEV.8
index 6eb984860a5..05a3e9a4549 100644
--- a/share/man/man8/man8.sparc64/MAKEDEV.8
+++ b/share/man/man8/man8.sparc64/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.8 2004/01/13 19:27:19 jmc Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.9 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.31 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd October 5, 2001
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 sparc64
 .Os
 .Sh NAME
@@ -40,117 +35,189 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create
-the common special
-files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are four special device names,
-.Ar all ,
-.Ar std ,
-.Ar local
-and
-.Ar wscons .
-If
-given,
-.Ar all
-creates device files for all devices on the sparc64.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the sparc64.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The sparc64 supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo-names
-.Bl -tag -width openprom -compact
+The sparc64 supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the sparc64.
+Creates special files for all devices on sparc64.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
-.It Ar wscons
-All wscons-related devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device-names
-.Bl -tag -width openprom -compact
-.It Ar audio
-Audio device.
-.It Ar bpf#
-Berkeley packet filters.
-.It Ar ccd#
-.Dq Concatenated
-disk drives.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI media changer drives.
-.It Ar cua#
-Serial ports.
-.It Ar fd#
-.Dq Floppy
-disk drives.
-.It Ar lkm
-Loadable kernel modules.
-.It Ar openprom
-OPENPROM and EEPROM interface.
-.It Ar pty#
-Set of 16 master and slave pseudo terminals.
-.It Ar raid#
-RAIDframe disk drives.
-.It Ar random
-In-kernel random number generator.
-.It Ar rd#
-.Dq Ramdisk
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar rd*
+.Dq rd
 pseudo-disks.
-.It Ar sd#
-SCSI disk drives.
-.It Ar ses#
-SCSI SES/SAF-TE devices.
-.It Ar st#
+.It Ar sd*
+SCSI disks.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.It Ar wd*
+.Dq winchester
+disk drives (ST506, IDE, ESDI, RLL, ...).
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar st*
 SCSI tape drives.
-.It Ar tty#
-Serial ports.
-.It Ar ttyC#
-Wscons console screens.
-.It Ar ttyU#
-USB serial ports.
-.It Ar tun#
-Network tunnel devices.
-.It Ar uk#
-.Dq Unknown SCSI
-devices.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar wskbd
-Keyboard devices for wscons.
-.It Ar wsmouse
-Mouse devices for wscons.
+.El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar tty[0-7][0-9a-f]
+NS16x50 serial ports.
+.It Ar cua[a-z]*
+Zilog 8530 Serial Port.
+.It Ar tty[a-z]*
+Zilog 8530 Serial Port.
+.It Ar ttyh*
+Sab82532 serial devices.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Console ports
+.Bl -tag -width tenletters -compact
+.It Ar console
+PROM console.
+.It Ar ttyC0
+Minimal wscons devices.
+.It Ar ttyC-F*
+wscons display devices.
+.It Ar wskbd*
+wscons keyboards.
 .It Ar wsmux
-Multiplexor devices for wscons.
-.It Ar xfs#
-XFS filesystem devices.
+wscons keyboard/mouse mux devices.
 .El
+.Pp
+.Sy Pointing devices
+.Bl -tag -width tenletters -compact
+.It Ar wsmouse*
+wscons mice.
+.El
+.Pp
+.Sy Printers
+.Bl -tag -width tenletters -compact
+.It Ar lpa*
+Polled printer port.
+.It Ar lpt*
+IEEE 1284 centronics printer.
+.El
+.Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar usbs
+All USB devices.
+.It Ar ttyU*
+USB serial ports.
+.It Ar ugen*
+Generic USB devices.
+.It Ar uhid*
+Generic HID devices.
+.It Ar ulpt*
+Printer devices.
+.It Ar urio*
+Diamond Multimedia Rio 500.
+.It Ar usb*
+Bus control devices used by usbd for attach/detach.
+.It Ar uscanner*
+Scanners.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar audio*
+Audio devices.
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar bpp*
+Parallel port.
+.It Ar bppmag[mno]
+Magma parallel port.
+.It Ar bpp[jkl]
+.Dq spif
+parallel port.
+.It Ar crypto
+Hardware crypto access driver.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar magma*
+Magma multiport cards.
+.It Ar pci
+PCI bus device.
+.It Ar pf*
+Packet Filter.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar spif*
+.Dq spif
+multiport cards.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar uperf
+Performance counters.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev
diff --git a/share/man/man8/man8.vax/MAKEDEV.8 b/share/man/man8/man8.vax/MAKEDEV.8
index 792d1bc2d51..d3fb048718b 100644
--- a/share/man/man8/man8.vax/MAKEDEV.8
+++ b/share/man/man8/man8.vax/MAKEDEV.8
@@ -1,34 +1,29 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.14 2003/06/02 23:30:16 millert Exp $
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $OpenBSD: MAKEDEV.8,v 1.15 2004/02/16 19:05:06 miod Exp $
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
+.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+.\" generated from:
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\"	OpenBSD: etc.vax/MAKEDEV.md,v 1.16 2004/02/16 19:01:02 miod Exp 
+.\"	OpenBSD: MAKEDEV.common,v 1.1 2004/02/16 18:58:54 miod Exp 
+.\"	OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp 
+.\"	OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp 
 .\"
-.\"	from: @(#)MAKEDEV.8	5.2 (Berkeley) 3/22/91
+.\" Copyright (c) 2004, Miodrag Vallat
+.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 .\"
-.Dd March 22, 1991
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2004
 .Dt MAKEDEV 8 vax
 .Os
 .Sh NAME
@@ -40,140 +35,150 @@
 .Op Ar ...
 .Sh DESCRIPTION
 The shell script
-.Nm MAKEDEV ,
+.Nm ,
 found in the
 .Pa /dev
-directory, is used to create the common special files.
+directory, is used to create various special files.
 See
 .Xr intro 4
 for a more complete discussion of special files.
 .Pp
-.Nm MAKEDEV
+.Nm
 takes any number of device names as arguments, where the names are
-the common abbreviation for the device.
-There are three special device names,
-.Ar all ,
-.Ar std
-and
-.Ar local .
-If
-given,
-.Ar all
-creates device files for all devices on the vax.
-If units are expected for a device,
-.Nm MAKEDEV
-will supply the standard numbers.
-The
-.Ar std
-argument creates only the standard devices for the vax.
-Finally
-.Ar local
-is for devices specific to the local site, and executes the shell file
-.Pa MAKEDEV.local .
+the common abbreviation for the device or group of devices.
 .Pp
-The vax supports the following devices.
-Where a device name is followed by a hash sign ("#"), the hash sign
-must be replaced by a unit number.
+Where a device name is followed by a star
+.Sq * ,
+the star must be replaced by a unit number.
+If units are expected for a device but not provided,
+.Nm
+will supply the standard numbers in most cases.
 .Pp
-.Sy Pseudo\-names
-.Bl -tag -width indent -compact
+The vax supports the following devices:
+.Pp
+.Pp
+.Sy Special device names
+.Bl -tag -width tenletters -compact
 .It Ar all
-All known devices for the vax.
+Creates special files for all devices on vax.
+.It Ar ramdisk
+Ramdisk kernel devices.
 .It Ar std
-The standard devices (console, drum, fd/*, klog, kmem, mem, null, stderr,
-stdin, stdout, tty, zero).
+Creates the
+.Sq standard
+devices (console, drum, klog, kmem, ksyms, mem, null,
+stderr, stdin, stdout, tty, zero)
+which are absolutely necessary for the system to function properly.
 .It Ar local
-Configuration specific devices.
+Creates configuration-specific devices.
 .El
 .Pp
-.Sy Device\-names
-.Bl -tag -width indent -compact
-.It Ar ad#
-UNIBUS interface to Data Translation A/D converter.
-.It Ar bpf#
-Berkeley Packet Filters.
-.It Ar ccd#
-.Dq Concatenated
-pseudo-disks.
-.It Ar cd#
-SCSI CD-ROM drives.
-.It Ar ch#
-SCSI changer.
-.It Ar ct#
-UNIBUS parallel interface to CAT typesetter.
-.It Ar dh#
-UNIBUS DH11 and emulations (e.g. Able DMAX, Emulex CS-11).
-.It Ar dhu#
-UNIBUS DHU11.
-.It Ar dmf#
-UNIBUS DMF32.
-.It Ar dmz#
-UNIBUS DMZ32.
-.It Ar dn#
-UNIBUS DN11 and emulations (e.g. Able Quadracall).
-.It Ar dz#
-UNIBUS DZ11 and DZ32.
-.It Ar hk#
-UNIBUS RK06 and RK07.
-.It Ar hp#
-MASSBUS RM??.
-.It Ar ht#
-MASSBUS TM03 & TU??.
-.It Ar ik#
-UNIBUS interface to Ikonas frame buffer.
-.It Ar lp#
-UNIBUS LP11 parallel interface.
-.It Ar md#
-.Dq Memory
-pseudo-disk devices.
-.It Ar mt#
-MSCP tape drives (TU81, TK50, etc.).
-.It Ar np#
-UNIBUS Ethernet co-processor interface, for downloading.
-.It Ar ps#
-UNIBUS interface to E&S Picture System 2.
-.It Ar pty#
-Set of master and slave pseudo terminals.
-.It Ar qv#
-QVSS (MicroVAX) display.
-.It Ar ra#
-UNIBUS UDA50 w/ RA??.
-.It Ar random
-Random number generator.
-.It Ar rb#
+.Sy Disks
+.Bl -tag -width tenletters -compact
+.It Ar ccd*
+Concatenated disk devices.
+.It Ar cd*
+SCSI cdrom drives.
+.It Ar fd*
+Floppy disk drives (3 1/2", 5 1/4").
+.It Ar hk*
+UNIBUS RK06 and RK07 disks.
+.It Ar hd*
+HP300 HP-IB disks.
+.It Ar hp*
+MASSBUSS disks.
+.It Ar ra*
+MSCP disks.
+.It Ar rb*
 730 IDC w/ RB80 and/or RB02.
-.It Ar rl#
+.It Ar rd*
+.Dq rd
+pseudo-disks.
+.It Ar rl*
 UNIBUS RL02.
-.It Ar rx#
-UNIBUS RX211 floppy disk.
-.It Ar sd#
+.It Ar rx*
+RX02 floppy disks.
+.It Ar sd*
 SCSI disks.
-.It Ar ss#
-SCSI scanner.
-.It Ar st#
+.It Ar up*
+Other UNIBUS devices.
+.It Ar vnd*
+.Dq file
+pseudo-disk devices.
+.El
+.Pp
+.Sy Tapes
+.Bl -tag -width tenletters -compact
+.It Ar ch*
+SCSI media changers.
+.It Ar ht*
+MASSBUS TM03 and TU?? devices.
+.It Ar mt*
+(Magnetic) 9-track reel tape drives.
+.It Ar st*
 SCSI tape drives.
-.It Ar tm#
-UNIBUS TM11 & TE10 emulations (e.g. Emulex TC-11).
-.It Ar ts#
+.It Ar tm*
+UNIBUS TM11 and TE10 emulations (e.g. Emulex TC-11).
+.It Ar ts*
 UNIBUS TS11.
-.It Ar ttyv0
-QVSS (MicroVAX) display reserved pty.
-.It Ar uk#
-SCSI unknown.
-.It Ar up#
-Other UNIBUS devices (e.g. on Emulex SC-21V controller).
-.It Ar ut#
+.It Ar ut*
 UNIBUS TU45 emulations (e.g. 9700).
-.It Ar uu#
-TU58 cassettes on DL11 controller.
-.It Ar va#
-UNIBUS Varian parallel interface.
-.It Ar vnd#
-.Dq File
-pseudo-disks.
-.It Ar vp#
-UNIBUS Versatec parallel interface.
 .El
+.Pp
+.Sy Terminal ports
+.Bl -tag -width tenletters -compact
+.It Ar dh*
+UNIBUS DH11 and emulations (e.g. Able dmax, Emulex CS-11).
+.It Ar dhu*
+UNIBUS DHU11.
+.It Ar dl*
+UNIBUS DL11.
+.It Ar dmf*
+UNIBUS DMF32.
+.It Ar dmz*
+UNIBUS DMZ32.
+.It Ar dz*
+UNIBUS DZ11 and DZ32.
+.It Ar vt*
+console.
+.El
+.Pp
+.Sy Pseudo terminals
+.Bl -tag -width tenletters -compact
+.It Ar ptm
+pty master device.
+.It Ar pty*
+Set of 16 master pseudo terminals.
+.It Ar tty*
+Set of 16 slave pseudo terminals.
+.El
+.Pp
+.Sy Special purpose devices
+.Bl -tag -width tenletters -compact
+.It Ar bpf*
+Berkeley Packet Filter.
+.It Ar fd
+fd/* nodes for fdescfs.
+.It Ar lkm
+Loadable kernel modules interface.
+.It Ar pf*
+Packet Filter.
+.It Ar raid*
+RAIDframe disk devices.
+.It Ar *random
+In-kernel random data source.
+.It Ar ses*
+SES/SAF-TE SCSI devices.
+.It Ar ss*
+SCSI scanners.
+.It Ar systrace*
+System call tracing device.
+.It Ar tun*
+Network tunnel driver.
+.It Ar uk*
+SCSI unknown devices.
+.It Ar xfs*
+XFS filesystem node.
 .Sh FILES
 .Bl -tag -width /dev -compact
 .It Pa /dev