Some fixes from brad, ok jmc.

4 files changed, 31 insertions, 13 deletions

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 61709bfbf40..442e91bc420 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aac.4,v 1.20 2006/09/01 09:58:09 jmc Exp $
+.\"	$OpenBSD: aac.4,v 1.21 2006/12/16 22:09:38 grange Exp $
 .\"
 .\" Copyright (c) 2000 Michael Smith
 .\" Copyright (c) 2000 BSDi
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm aac
-.Nd Adaptec SCSI RAID controller
+.Nd Adaptec SATA/SCSI RAID controller
 .Sh SYNOPSIS
 .Cd "aac* at pci?"
 .Cd "scsibus* at aac?"
diff --git a/share/man/man4/gdt.4 b/share/man/man4/gdt.4
index df3b30ff427..ff8a9d7b77d 100644
--- a/share/man/man4/gdt.4
+++ b/share/man/man4/gdt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gdt.4,v 1.27 2006/09/01 09:58:09 jmc Exp $
+.\"	$OpenBSD: gdt.4,v 1.28 2006/12/16 22:09:38 grange Exp $
 .\"
 .\" Copyright (c) 2000 Niklas Hallqvist <niklas@openbsd.org>
 .\"
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm gdt
-.Nd ICP-Vortex and Intel GDT SCSI RAID controller
+.Nd ICP-Vortex and Intel GDT SATA/SCSI RAID controller
 .Sh SYNOPSIS
 .Cd "gdt* at pci?"
 .Cd "scsibus* at gdt?"
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 4ba782a416f..298a69061af 100644
--- a/share/man/man4/ips.4
+++ b/share/man/man4/ips.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ips.4,v 1.2 2006/11/28 21:33:45 jmc Exp $
+.\"	$OpenBSD: ips.4,v 1.3 2006/12/16 22:09:38 grange Exp $
 .\"
 .\" Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -19,18 +19,36 @@
 .Os
 .Sh NAME
 .Nm ips
-.Nd IBM ServeRAID controller
+.Nd IBM SATA/SCSI ServeRAID controller
 .Sh SYNOPSIS
 .Cd "ips* at pci?"
 .Cd "scsibus* at ips?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for IBM ServeRAID controllers.
+driver provides support for IBM ServeRAID controllers, including:
+.Pp
+.Bl -bullet -width Ds -offset indent -compact
+.It
+ServeRAID 3H/3L
+.It
+ServeRAID 4H/4L/4Lx/4M/4Mx
+.It
+ServeRAID 5i/5i II
+.It
+ServeRAID 6i/6M
+.It
+ServeRAID 7k/7M/7t
+.El
+.Pp
+Although the controllers are actual RAID controllers,
+the driver makes them look just like SCSI controllers.
+All RAID configuration is done through the controllers' BIOSes.
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr pci 4 ,
-.Xr scsi 4
+.Xr scsi 4 ,
+.Xr sd 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 5ee6c265240..8da4b344eb1 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.198 2006/12/12 23:54:44 pedro Exp $
+.\"	$OpenBSD: pci.4,v 1.199 2006/12/16 22:09:38 grange Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -94,8 +94,6 @@ Adaptec PCI/PCI-X AIC79xx-based Ultra320 SCSI interface
 Buslogic SCSI interface
 .It Xr iha 4
 Initio INIC-940/950 based PCI SCSI interface
-.It Xr ips 4
-IBM ServeRAID controller
 .It Xr isp 4
 Qlogic based SCSI or FibreChannel SCSI interface
 .It Xr mpi 4
@@ -117,7 +115,7 @@ PCI IDE controller driver
 .Ss RAID and cache controllers
 .Bl -tag -width 10n -offset ind -compact
 .It Xr aac 4
-Adaptec SCSI RAID controller
+Adaptec SATA/SCSI RAID controller
 .It Xr ami 4
 American Megatrends Inc. MegaRAID PATA/SATA/SCSI RAID controller
 .It Xr arc 4
@@ -129,13 +127,15 @@ Compaq Smart ARRAY 5/6 SAS/SATA/SCSI RAID controller
 .It Xr dpt 4
 DPT EATA SCSI RAID controller
 .It Xr gdt 4
-ICP-Vortex and Intel GDT SCSI RAID controller
+ICP-Vortex and Intel GDT SATA/SCSI RAID controller
 .It Xr iop 4
 Generic
 .Tn I2O
 specification
 .Tn RAID
 controllers
+.It Xr ips 4
+IBM SATA/SCSI ServeRAID controller
 .It Xr mfi 4
 LSI Logic & Dell MegaRAID SAS RAID controller
 .It Xr twe 4