16 files changed, 17 insertions, 759 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index a2ce7fc2cc8..c4c4b317a7a 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.421 2007/07/02 01:57:54 dlg Exp $
+#	$OpenBSD: Makefile,v 1.422 2007/08/01 21:23:26 miod Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -80,7 +80,7 @@ MLINKS+=tty.4 cua.4
 MLINKS+=usb.4 uhub.4
 MLINKS+=vnd.4 svnd.4
 
-SUBDIR=	man4.alpha man4.amd64 man4.aviion man4.cats man4.hp300 man4.hppa \
+SUBDIR=	man4.alpha man4.amd64 man4.aviion man4.hp300 man4.hppa \
 	man4.i386 man4.landisk man4.luna88k man4.mac68k man4.macppc \
 	man4.mvme68k man4.mvme88k man4.sgi man4.sparc man4.sparc64 man4.vax \
 	man4.zaurus
diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index c6777ad6181..5872c53469d 100644
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isa.4,v 1.51 2007/05/31 19:19:50 jmc Exp $
+.\"	$OpenBSD: isa.4,v 1.52 2007/08/01 21:23:26 miod Exp $
 .\"	$NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 1 2007 $
 .Dt ISA 4
 .Os
 .Sh NAME
@@ -51,9 +51,6 @@
 .Cd "isa* at pceb?"
 .Cd "isa* at sio?"
 .Pp
-.Cd "# cats"
-.Cd "isa0 at pcib?"
-.Pp
 .Cd "# hp300"
 .Cd "isa* at isabr?"
 .Pp
diff --git a/share/man/man4/man4.cats/Makefile b/share/man/man4/man4.cats/Makefile
deleted file mode 100644
index 5b6649cb13b..00000000000
--- a/share/man/man4/man4.cats/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2004/02/07 21:00:53 miod Exp $
-
-# TODO: cpu todclock
-MAN=	autoconf.4 fcom.4 footbridge.4 intro.4 mem.4
-
-MLINKS+= mem.4 kmem.4
-MANSUBDIR=cats
-
-.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.cats/autoconf.4 b/share/man/man4/man4.cats/autoconf.4
deleted file mode 100644
index 74378703ba3..00000000000
--- a/share/man/man4/man4.cats/autoconf.4
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"	$OpenBSD: autoconf.4,v 1.4 2007/05/31 19:19:54 jmc Exp $
-.\"
-.\" Copyright (c) 1994 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt AUTOCONF 4 cats
-.Os
-.Sh NAME
-.Nm autoconf
-.Nd diagnostics from the autoconfiguration code
-.Sh DESCRIPTION
-When
-.Ox
-bootstraps it probes the innards of the machine
-on which it is running
-and locates controllers, drives, and other devices, printing out
-what it finds on the console.
-This procedure is driven by a system configuration table which is processed by
-.Xr config 8
-and compiled into each kernel.
-Devices which exist in the machine but are not configured into the
-kernel are usually not detected.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr boot_cats 8 ,
-.Xr config 8
diff --git a/share/man/man4/man4.cats/fcom.4 b/share/man/man4/man4.cats/fcom.4
deleted file mode 100644
index 6418656ee55..00000000000
--- a/share/man/man4/man4.cats/fcom.4
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"	$OpenBSD: fcom.4,v 1.3 2007/05/31 19:19:54 jmc Exp $
-.\"
-.\" Copyright (c) 2004, Miodrag Vallat.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt FCOM 4 cats
-.Os
-.Sh NAME
-.Nm fcom
-.Nd Footbridge serial communications driver
-.Sh SYNOPSIS
-.Cd "fcom0 at footbridge?"
-.Sh DESCRIPTION
-The
-.Nm
-device handles the UART found on the
-.Xr footbridge 4
-device, which provides an RS-232 serial port.
-The
-.Nm
-driver supports all of the standard
-.Xr tty 4
-ioctl calls.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr footbridge 4 ,
-.Xr intro 4 ,
-.Xr tty 4
-.Sh HISTORY
-A
-.Nm
-driver appeared in
-.Ox 3.5 .
diff --git a/share/man/man4/man4.cats/footbridge.4 b/share/man/man4/man4.cats/footbridge.4
deleted file mode 100644
index 8350a129676..00000000000
--- a/share/man/man4/man4.cats/footbridge.4
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"	$OpenBSD: footbridge.4,v 1.3 2007/05/31 19:19:54 jmc Exp $
-.\"
-.\" Copyright (c) 2004, Miodrag Vallat.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt FOOTBRIDGE 4 cats
-.Os
-.Sh NAME
-.Nm footbridge
-.Nd DC21285 PCI bridge
-.Sh SYNOPSIS
-.Cd "footbridge0 at mainbus?"
-.Cd "fcom0 at footbridge?"
-.Cd "pci0 at footbridge?"
-.Sh DESCRIPTION
-The
-.Nm
-device provides support for the
-.Xr pci 4
-bus on cats systems, and also features an uart and a clock device.
-.Sh SEE ALSO
-.Xr fcom 4 ,
-.Xr intro 4 ,
-.Xr pci 4
-.Sh HISTORY
-A
-.Nm
-driver appeared in
-.Ox 3.5 .
diff --git a/share/man/man4/man4.cats/intro.4 b/share/man/man4/man4.cats/intro.4
deleted file mode 100644
index ae5e7e9d233..00000000000
--- a/share/man/man4/man4.cats/intro.4
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$OpenBSD: intro.4,v 1.10 2007/06/21 08:49:20 jmc Exp $
-.\"
-.\" Copyright (c) 1994 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 21 2007 $
-.Dt INTRO 4 cats
-.Os
-.Sh NAME
-.Nm intro
-.Nd introduction to special files and hardware support
-.Sh DESCRIPTION
-The manual pages in section 4 describe the special files,
-related driver functions, and networking support
-available in the system.
-In this part of the manual, the
-.Sx SYNOPSIS
-section of
-each configurable device gives a sample specification
-for use in constructing a system description for the
-.Xr config 8
-program.
-The
-.Sx DIAGNOSTICS
-section lists messages which may appear on the console
-and/or in the system error log
-.Pa /var/log/messages
-due to errors in device operation;
-see
-.Xr syslogd 8
-for more information.
-.Pp
-This section contains both devices
-which may be configured into the system
-and network related information.
-The networking support is introduced in
-.Xr netintro 4 .
-.Sh DEVICE SUPPORT
-This section describes the hardware supported on the cats platform.
-Software support for these devices comes in two forms.
-A hardware device may be supported with a character or block
-.Em device driver ,
-or it may be used within the networking subsystem and have a
-.Em network interface driver .
-Block and character devices are accessed through files in the file
-system of a special type; see
-.Xr mknod 8 .
-Network interfaces are indirectly accessed through the interprocess
-communication facilities provided by the system; see
-.Xr socket 2 .
-.Pp
-A hardware device is identified to the system at configuration time
-and the appropriate device or network interface driver is then compiled
-into the system.
-When the resultant system is booted, the autoconfiguration facilities
-in the system probe for the device and, if found, enable the software
-support for it.
-If a device does not respond at autoconfiguration
-time it is not accessible at any time afterwards.
-To enable a device which did not autoconfigure,
-the system will have to be rebooted.
-.Pp
-The autoconfiguration system is described in
-.Xr autoconf 4 .
-.Sh LIST OF DEVICES
-A complete list of available devices is contained within the pages
-describing the system buses and controllers.
-For example, a PCI device would be listed in the
-.Xr pci 4
-man page.
-The following buses and controllers list these devices:
-.Pp
-.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
-.It Xr isa 4
-introduction to ISA bus support
-.It Xr pci 4
-introduction to PCI bus support
-.It Xr usb 4
-introduction to Universal Serial Bus support
-.El
-.Sh SEE ALSO
-.Xr autoconf 4 ,
-.Xr config 8
-.Sh HISTORY
-The
-cats
-.Nm intro
-first appeared in
-.Ox 3.5 .
diff --git a/share/man/man4/man4.cats/mem.4 b/share/man/man4/man4.cats/mem.4
deleted file mode 100644
index d82ca225fc1..00000000000
--- a/share/man/man4/man4.cats/mem.4
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$OpenBSD: mem.4,v 1.3 2007/05/31 19:19:54 jmc Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" 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 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: @(#)mem.4	5.3 (Berkeley) 5/2/91
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt MEM 4 cats
-.Os
-.Sh NAME
-.Nm mem ,
-.Nm kmem
-.Nd memory files
-.Sh DESCRIPTION
-The special file
-.Pa /dev/mem
-is an interface to the physical memory of the computer.
-Byte offsets in this file are interpreted as physical memory addresses.
-Reading and writing this file is equivalent to reading and writing
-memory itself.
-Only offsets within the bounds of
-.Pa /dev/mem
-are allowed.
-.Pp
-Kernel virtual memory is accessed through the interface
-.Pa /dev/kmem
-in the same manner as
-.Pa /dev/mem .
-Only kernel virtual addresses that are currently mapped to memory are allowed.
-.Pp
-On cats, physical memory is contiguous.
-The kernel virtual memory begins at address
-.Li 0xf0000000 .
-.Pp
-Writeability of these devices is controlled by the system
-.Xr securelevel 7 .
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/mem
-.It Pa /dev/kmem
-.El
-.Sh SEE ALSO
-.Xr securelevel 7
-.Sh HISTORY
-The
-.Pa /dev/mem
-and
-.Pa /dev/kmem
-files appeared in
-.At v6 .
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 140f12975cf..0f96a383aed 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.223 2007/07/02 10:13:01 jmc Exp $
+.\"	$OpenBSD: pci.4,v 1.224 2007/08/01 21:23:26 miod Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 2 2007 $
+.Dd $Mdocdate: August 1 2007 $
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -48,9 +48,6 @@
 .Cd "# amd64, i386"
 .Cd "pci* at mainbus0"
 .Pp
-.Cd "# cats"
-.Cd "pci0 at footbridge?"
-.Pp
 .Cd "# hppa"
 .Cd "pci* at dino?"
 .Cd "pci* at elroy?"
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index da92b5143a1..ee299ef4ef2 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbc.4,v 1.14 2007/05/31 19:19:51 jmc Exp $
+.\" $OpenBSD: pckbc.4,v 1.15 2007/08/01 21:23:26 miod Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,14 +25,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 1 2007 $
 .Dt PCKBC 4
 .Os
 .Sh NAME
 .Nm pckbc
 .Nd PC (ISA) keyboard controller driver
 .Sh SYNOPSIS
-.Cd "pckbc* at isa?          " Pq "alpha, amd64, cats, i386"
+.Cd "pckbc* at isa?          " Pq "alpha, amd64, i386"
 .Cd "pckbc* at ebus?         " Pq "sparc64"
 .Cd "pckbd* at pckbc?"
 .Cd "pms*   at pckbc?"
diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4
index 708378b578c..1807af9056b 100644
--- a/share/man/man4/pckbd.4
+++ b/share/man/man4/pckbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbd.4,v 1.32 2007/05/31 19:19:51 jmc Exp $
+.\" $OpenBSD: pckbd.4,v 1.33 2007/08/01 21:23:26 miod Exp $
 .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 1 2007 $
 .Dt PCKBD 4
 .Os
 .Sh NAME
@@ -185,7 +185,7 @@ with the ALT modifier are prefixed by an ESC character.
 Because PC keyboard hardware doesn't contain a beeper, requests for
 .Dq keyboard beeps
 cannot be handled directly.
-On alpha, cats and i386, a helper device attached to the pcppi
+On alpha and i386, a helper device attached to the pcppi
 driver allows use of the standard ISA speaker for this purpose.
 .Sh EXAMPLES
 To set a German keyboard layout without
diff --git a/share/man/man4/xf86.4 b/share/man/man4/xf86.4
index c1f04a460f6..bbff8b29246 100644
--- a/share/man/man4/xf86.4
+++ b/share/man/man4/xf86.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xf86.4,v 1.14 2007/05/31 19:19:53 jmc Exp $
+.\"	$OpenBSD: xf86.4,v 1.15 2007/08/01 21:23:27 miod Exp $
 .\"
 .\" Copyright (c) 1998 Matthieu Herrb
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 1 2007 $
 .Dt XF86 4
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Cd "option APERTURE"
 .Sh DESCRIPTION
 On
-the alpha, amd64, cats, i386, macppc, and sparc64 architectures,
+the alpha, amd64, i386, macppc, and sparc64 architectures,
 the
 .Pa /dev/xf86
 driver provides access to the memory and I/O ports of a VGA board
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 7524dfcb864..741d55c742c 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.61 2007/01/24 22:14:00 martin Exp $
+#	$OpenBSD: Makefile,v 1.62 2007/08/01 21:23:27 miod Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -15,7 +15,7 @@ MLINKS+=daily.8 weekly.8 daily.8 monthly.8
 MLINKS+=rc.8 rc.local.8 rc.8 rc.securelevel.8
 MLINKS+=rc.conf.8 rc.conf.local.8
 
-SUBDIR=	man8.alpha man8.amd64 man8.armish man8.aviion man8.cats man8.hp300 \
+SUBDIR=	man8.alpha man8.amd64 man8.armish man8.aviion man8.hp300 \
 	man8.hppa man8.hppa64 man8.i386 man8.landisk man8.luna88k man8.mac68k \
 	man8.macppc man8.mvme68k man8.mvme88k man8.sgi man8.sparc man8.sparc64 \
 	man8.vax man8.zaurus
diff --git a/share/man/man8/man8.cats/MAKEDEV.8 b/share/man/man8/man8.cats/MAKEDEV.8
deleted file mode 100644
index 08a859b0848..00000000000
--- a/share/man/man8/man8.cats/MAKEDEV.8
+++ /dev/null
@@ -1,249 +0,0 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.27 2007/05/28 22:41:21 todd Exp $
-.\"
-.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-.\" generated from:
-.\"
-.\"	OpenBSD: etc.cats/MAKEDEV.md,v 1.18 2007/05/28 22:26:02 todd Exp 
-.\"	OpenBSD: MAKEDEV.common,v 1.35 2007/05/28 22:37:14 todd Exp 
-.\"	OpenBSD: MAKEDEV.man,v 1.3 2004/03/12 18:12:12 miod Exp 
-.\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 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 May 28, 2007
-.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
-.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, by invoking the shell file
-.Pa MAKEDEV.local .
-.El
-.Pp
-.Sy Disks
-.Bl -tag -width tenletters -compact
-.It Ar ccd*
-Concatenated disk devices, see
-.Xr ccd 4 .
-.It Ar cd*
-ATAPI and SCSI CD-ROM drives, see
-.Xr cd 4 .
-.It Ar ch*
-SCSI media changers, see
-.Xr ch 4 .
-.It Ar raid*
-RAIDframe disk devices, see
-.Xr raid 4 .
-.It Ar rd*
-.Dq rd
-pseudo-disks, see
-.Xr rd 4 .
-.It Ar sd*
-SCSI disks, including flopticals, see
-.Xr sd 4 .
-.It Ar vnd*
-.Dq file
-pseudo-disk devices, see
-.Xr vnd 4 .
-.It Ar wd*
-.Dq winchester
-disk drives (ST506, IDE, ESDI, RLL, ...), see
-.Xr wd 4 .
-.El
-.Pp
-.Sy Tapes
-.Bl -tag -width tenletters -compact
-.It Ar st*
-SCSI tape drives, see
-.Xr st 4 .
-.El
-.Pp
-.Sy Terminal ports
-.Bl -tag -width tenletters -compact
-.It Ar tty[0-7][0-9a-f]
-NS16x50 serial ports, see
-.Xr com 4 .
-.El
-.Pp
-.Sy Pseudo terminals
-.Bl -tag -width tenletters -compact
-.It Ar ptm
-pty master device, see
-.Xr ptm 4 .
-.It Ar pty*
-Set of 62 master pseudo terminals, see
-.Xr pty 4 .
-.It Ar tty*
-Set of 62 slave pseudo terminals, see
-.Xr tty 4 .
-.El
-.Pp
-.Sy Console ports
-.Bl -tag -width tenletters -compact
-.It Ar wscons
-Minimal wscons devices, see
-.Xr wscons 4 .
-.It Ar ttyC-J*
-wscons display devices, see
-.Xr wsdisplay 4 .
-.It Ar wskbd*
-wscons keyboards, see
-.Xr wskbd 4 .
-.It Ar wsmouse*
-wscons mice, see
-.Xr wsmouse 4 .
-.It Ar wsmux
-wscons keyboard/mouse mux devices, see
-.Xr wsmux 4 .
-.El
-.Pp
-.Sy USB devices
-.Bl -tag -width tenletters -compact
-.It Ar uall
-All USB devices, see
-.Xr usb 4 .
-.It Ar ttyU*
-USB serial ports, see
-.Xr ucom 4 .
-.It Ar ugen*
-Generic USB devices, see
-.Xr ugen 4 .
-.It Ar uhid*
-Generic HID devices, see
-.Xr uhid 4 .
-.It Ar ulpt*
-Printer devices, see
-.Xr ulpt 4 .
-.It Ar urio*
-Diamond Multimedia Rio 500, see
-.Xr urio 4 .
-.It Ar usb*
-Bus control devices used by usbd for attach/detach, see
-.Xr usb 4 .
-.It Ar uscanner*
-Scanners, see
-.Xr uscanner 4 .
-.El
-.Pp
-.Sy Special purpose devices
-.Bl -tag -width tenletters -compact
-.It Ar audio*
-Audio devices, see
-.Xr audio 4 .
-.It Ar bio
-ioctl tunnel pseudo-device, see
-.Xr bio 4 .
-.It Ar bktr*
-Video frame grabbers, see
-.Xr bktr 4 .
-.It Ar bpf*
-Berkeley Packet Filter, see
-.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
-.It Ar fd
-fd/* nodes, see
-.Xr fd 4 .
-.It Ar iop*
-I2O controller devices, see
-.Xr iop 4 .
-.It Ar lkm
-Loadable kernel modules interface, see
-.Xr lkm 4 .
-.It Ar pci*
-PCI bus devices, see
-.Xr pci 4 .
-.It Ar pf*
-Packet Filter, see
-.Xr pf 4 .
-.It Ar radio*
-FM tuner devices, see
-.Xr radio 4 .
-.It Ar *random
-In-kernel random data source, see
-.Xr random 4 .
-.It Ar tun*
-Network tunnel driver, see
-.Xr tun 4 .
-.It Ar speaker
-PC speaker, see
-.Xr spkr 4 .
-.It Ar ss*
-SCSI scanners, see
-.Xr ss 4 .
-.It Ar systrace*
-System call tracing device, see
-.Xr systrace 4 .
-.It Ar tuner*
-Tuner devices, see
-.Xr tuner 4 .
-.It Ar uk*
-Unknown SCSI devices, see
-.Xr uk 4 .
-.It Ar xfs*
-XFS filesystem node, see
-.Xr mount_xfs 8 .
-.El
-.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/Makefile b/share/man/man8/man8.cats/Makefile
deleted file mode 100644
index baaedd36a61..00000000000
--- a/share/man/man8/man8.cats/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2004/02/16 19:04:43 miod Exp $
-
-MAN=	boot_cats.8 MAKEDEV.8
-MANSUBDIR=cats
-
-.include <bsd.prog.mk>
diff --git a/share/man/man8/man8.cats/boot_cats.8 b/share/man/man8/man8.cats/boot_cats.8
deleted file mode 100644
index 9a3e02bfa51..00000000000
--- a/share/man/man8/man8.cats/boot_cats.8
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"	$OpenBSD: boot_cats.8,v 1.6 2007/05/31 19:19:59 jmc Exp $
-.\"
-.\" Copyright (c) 2004, Miodrag Vallat.
-.\" All rights reserved.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt BOOT_CATS 8 cats
-.Os
-.Sh NAME
-.Nm boot_cats
-.Nd CATS system bootstrapping procedures
-.Sh DESCRIPTION
-.Ss System startup
-When powered on, after a panic, or if the system is rebooted via
-.Xr reboot 8
-or
-.Xr shutdown 8 ,
-the Cyclone or ABLE firmware will proceed to its initialization,
-and will try to boot an operating system if autoboot is enabled.
-Cyclone firmware must be upgraded to ABLE before
-.Ox
-can be run.
-.Ss Boot process options
-The ABLE firmware will attempt to boot the commandline stored in the
-.Em boot.cmd
-environment variable, such as
-.Dq (hd0)bsd -f .
-Autoboot is enabled by setting the
-.Em boot.auto
-environment variable to
-.Sq true ,
-and will start after
-.Em boot.timeout
-seconds.
-.Pp
-The kernel can be passed arguments on the commandline.
-The expected syntax for
-.Ox
-kernel parameters is one or more option letters from the following list,
-prefixed by a dash
-.Pq - :
-.Bl -tag -width "XXX" -offset indent -compact
-.Pp
-.It Cm a
-Prompt for the root filesystem device after the devices have been configured.
-.It Cm c
-Enter the
-.Dq User Kernel Configuration
-mode upon startup
-.Pq Xr boot_config 8 .
-.It Cm d
-Enter the debugger,
-.Xr ddb 4 ,
-as soon as the kernel console has been initialized.
-.It Cm f
-Use the
-.Xr footbridge 4
-serial port
-.Pq Xr fcom 4
-as the console.
-.It Cm s
-Boot the system single-user.
-.It Cm v
-Use the
-.Xr vga 4
-graphics display as the console, if available.
-.El
-.Ss Abnormal system termination
-In case of system crashes, the kernel will usually enter the kernel
-debugger,
-.Xr ddb 4 ,
-unless it is not present in the kernel, or it is disabled via the
-.Em ddb.panic
-sysctl.
-Upon leaving ddb, or if ddb was not entered, the kernel will halt the system
-if it was still in device configuration phase, or attempt a dump to the
-configured dump device, if possible.
-The crash dump will then be recovered by
-.Xr savecore 8
-during the next multi-user boot cycle.
-It is also possible to force other behaviours from ddb.
-.Sh FILES
-.Bl -tag -width /bsd.rd -compact
-.It Pa /bsd
-default system kernel
-.It Pa /bsd.rd
-standalone installation kernel, suitable for disaster recovery
-.El
-.Sh SEE ALSO
-.Xr ddb 4 ,
-.Xr boot_config 8 ,
-.Xr halt 8 ,
-.Xr init 8 ,
-.Xr reboot 8 ,
-.Xr savecore 8 ,
-.Xr shutdown 8
-.Sh CAVEATS
-.Tn ABLE
-is not able to access or boot off
-.Ox
-FFS partitions on some disks.
-This can be helped by forcing smaller disk access, by setting the
-.Em ide.multi-limit
-nvram variable to a small integer value.
-A value of
-.Ar 1
-ought to work in all cases.