--- src/share/man/man4/ata.4.orig	2006-12-06 19:56:35.000000000 +0100
+++ src/share/man/man4/ata.4	2006-12-06 22:03:04.000000000 +0100
@@ -98,55 +98,314 @@
 driver provides access to ATA (IDE) and SerialATA disk drives,
 ATAPI CDROM/DVD drives, ZIP/LS120 ATAPI drives and ATAPI tape drives
 connected to controllers according to the ATA/ATAPI standards.
+.Sh HARDWARE
 .Pp
-The currently supported ATA/SATA controller chips are:
+The 
+.Nm
+driver currently supports the following ATA/SATA controller chips:
 .Pp
-.Bl -tag -width "Silicon Image:" -compact
-.It Acard:
-ATP850P, ATP860A, ATP860R, ATP865A, ATP865R.
-.It ALI:
-M5229, M5281, M5287, M5289.
-.It AMD:
-AMD756, AMD766, AMD768, AMD8111.
-.It ATI:
-IXP200, IXP300, IXP400.
-.It CMD:
-CMD646, CMD646U2, CMD648, CMD649.
-.It Cypress:
-Cypress 82C693.
-.It Cyrix:
-Cyrix 5530.
-.It HighPoint:
-HPT302, HPT366, HPT368, HPT370, HPT371, HPT372, HPT372N, HPT374.
-.It Intel:
-6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8.
-.It ITE:
-IT8211F, IT8212F.
-.It JMicron:
-JMB360, JMB361, JMB363, JMB365, JMB366.
-.It Marvell
-88SX5040, 88SX5041, 88SX5080, 88SX5081, 88SX6041, 88SX6081.
-.It National:
-SC1100.
-.It nVidia:
-nForce, nForce2, nForce2 MCP, nForce3, nForce3 MCP, nForce3 Pro, nForce4.
-.It Promise:
-PDC20246, PDC20262, PDC20263, PDC20265, PDC20267, PDC20268, PDC20269, PDC20270, PDC20271, PDC20275, PDC20276, PDC20277, PDC20318, PDC20319, PDC20371, PDC20375, PDC20376, PDC20377, PDC20378, PDC20379, PDC20571, PDC20575, PDC20579, PDC20580, PDC20617, PDC20618, PDC20619, PDC20620, PDC20621, PDC20622, PDC40518, PDC40519, PDC40718, PDC40719.
-.It ServerWorks:
-HT1000, ROSB4, CSB5, CSB6.
-.It Silicon Image:
-SiI0680, SiI3112, SiI3114, SiI3512.
-.It SiS:
-SIS180, SIS181, SIS182, SIS5513, SIS530, SIS540, SIS550, SIS620, SIS630, SIS630S, SIS633, SIS635, SIS730, SIS733, SIS735, SIS745, SIS961, SIS962, SIS963, SIS964, SIS965.
-.It VIA:
-VT6410, VT6420, VT6421, VT82C586, VT82C586B, VT82C596, VT82C596B, VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233A, VT8233C, VT8235, VT8237, VT8237A, VT8251.
+.Bl -bullet -compact
+.It 
+Acard ATP850P
+.It
+Acard ATP860A
+.It
+Acard ATP860R
+.It
+Acard ATP865A
+.It
+Acard ATP865R
+.It 
+ALI M5229
+.It
+ALI M5281
+.It
+ALI M5287
+.IT
+ALI SATA RAID M5289
+.It 
+AMD AMD756
+.It
+AMD AMD766
+.It
+AMD AMD768
+.It
+AMD AMD8111
+.It
+ATI IXP200
+.It
+ATI IXP300
+.It
+ATI IXP400
+.It 
+CMD CMD646
+.It
+CMD CMD646U2
+.It
+CMD CMD648
+.It
+CMD CMD649
+.It
+Cypress 82C693
+.It 
+Cyrix 5530
+.It 
+HighPoint R100 HPT302
+.It
+HighPoint HPT366
+.It
+HighPoint Ultra66 IDE RAID controller HPT368
+.It
+HighPoint Dual Channel Ultra DMA/ATA100 RAID controller HPT370
+.It
+HighPoint R100 HPT371
+.It
+HighPoint Dual Channel Ultra DMA/ATA133 RAID controller HPT372
+.It
+HighPoint Dual Channel Ultra DMA/ATA133 RAID controller HPT372N
+.It
+HighPoint UDMA/ATA133 RAID controller HPT374
+.It
+Intel 6300ESB
+.It
+Intel 31244
+.It
+Intel PIIX
+.It
+Intel PIIX3
+.It
+Intel PIIX4
+.It
+Intel ESB2
+.It
+Intel ICH
+.It
+Intel I/O Controller Hub ICH0
+.It
+Intel I/O Controller Hub 2 ICH2
+.It
+Intel I/O Controller Hub 3 ICH3
+.It
+Intel I/O Controller Hub 4 ICH4
+.It
+Intel I/O Controller Hub 5 ICH5
+.It
+Intel I/O Controller Hub 6 ICH6
+.It
+Intel I/O Controller Hub 7 ICH7
+.It 
+Intel I/O Controller Hub 8 ICH8
+.It 
+ITE IT8211F
+.It
+ITE IT8212F
+.It 
+JMicron PCI Express to SATAII Host Controller JMB360
+.It
+JMicron PCI Express to SATAII and PATA Host Controller JMB361
+.It
+JMicron PCI Express to SATAII and PATA Host Controller JMB363
+.It
+JMicron JMB365
+.It
+JMicron PCI Express to SATAII and PATA Host Controller JMB366
+.It
+Marvell SATAII Controller 88SX5040
+.It
+Marvell SATAII Controller 88SX5041
+.It
+Marvell 88SX5080
+.It
+Marvell SATAII Host Controller 88SX5081
+.It
+Marvell 88SX6041
+.It
+Marvell MegaRAID SATA 300-8X Controller 88SX6081
+.It 
+National SC1100
+.It 
+nVidia nForce
+.It
+nVidia nForce2
+.It
+nVidia nForce2 MCP
+.It
+nVidia nForce3
+.It
+nVidia nForce3 MCP
+.It
+nVidia nForce3 Pro
+.It
+nVidia nForce4
+.It 
+Promise PDC20246
+.It
+Promise U66 controller PDC20262
+.It
+Promise FastTrak 66 PDC20263
+.It
+Promise PDC20265
+.It
+Promise PDC20267
+.It
+Promise TX2 PDC20268
+.It
+Promise Ultra133 TX2 PDC20269
+.It
+Promise FastTrak TX4 PDC20270
+.It
+Promise FastTrak TX2000 PDC20271
+.It
+Promise PDC20275
+.It
+Promise PDC20276
+.It
+Promise FastTrak TX2000 PDC20277
+.It
+Promise Serial ATA TX4 PDC20318
+.It
+Promise FastTrak S150 TX4 PDC20319
+.It 
+Promise FastTrak SATA RAID Controller PDC20371
+.It
+Promise SATA150 TX2plus PDC20375
+.It
+Promise PDC20376
+.It
+Promise PDC20377
+.It
+Promise PDC20378
+.It
+Promise PDC20379
+.It
+Promise TX2200 PDC20571
+.It
+Promise SATA300 TX4 PDC20575
+.It
+Promise PDC20579
+.It
+Promise FastTrak TX2300 PDC20580
+.It
+Promise PDC20617
+.It
+Promise PDC20618
+.It
+Promise PDC20619
+.It
+Promise PDC20620
+.It
+Promise sx4100 PDC20621
+.It
+Promise PDC20622
+.It
+Promise PDC40518
+.It
+Promise TX42000 PDC40519
+.It
+Promise TX4 SATA300 controller PDC40718
+.It
+Promise PDC40719
+.It 
+ServerWorks HT1000
+.It
+ServerWorks ROSB4
+.It
+ServerWorks CSB5
+.It
+ServerWorks CSB6
+.It
+Silicon Image SiI0680
+.It
+Silicon Image SiI3112
+.It
+Silicon Image SiI3114
+.It
+Silicon Image SiI3512
+.It 
+SiS SIS180
+.It
+SiS SIS181
+.It
+SiS SIS182
+.It
+SiS SIS5513
+.It
+SiS SIS530
+.It
+SiS SIS540
+.It
+SiS SIS550
+.It 
+SiS SIS620
+.It
+SiS SIS630
+.It
+SiS SIS630S
+.It
+SiS SIS633
+.It
+SiS SIS635
+.It
+SiS SIS730
+.It
+SiS SIS733
+.It 
+SiS SIS735
+.It
+SiS SIS745
+.It
+SiS SIS961
+.It
+SiS SIS962
+.It
+SiS SIS963
+.It
+SiS SIS964
+.It
+SiS SIS965
+.It 
+VIA VT6410
+.It
+VIA VT6420
+.It
+VIA VT6421
+.It
+VIA VT82C586
+.It
+VIA VT82C586B
+.It
+VIA VT82C596
+.It
+VIA VT82C596B
+.It
+VIA VT82C686
+.It
+VIA VT82C686A
+.It
+VIA VT82C686B
+.It
+VIA VT8231
+.It
+VIA VT8233
+.It
+VIA VT8233A
+.I
+VIA VT8233C
+.It
+VIA VT8235
+.It
+VIA VT8237
+.It
+VIA VT8237A
+.IT
+VIA VT8251.
 .El
 .Pp
 Unknown ATA chipsets are supported in PIO modes, and if the standard
 busmaster DMA registers are present and contain valid setup, DMA is
 also enabled, although the max mode is limited to UDMA33, as it is
 not known what the chipset can do and how to program it.
-.Pp
+.Sh CONFIGURATION AND TUNING
 The
 .Nm
 driver can change the transfer mode and various other parameters
@@ -202,7 +461,7 @@
 Please remember that in order to use UDMA4/ATA66 and above modes you
 .Em must
 use 80 conductor cables.
-Please assure that ribbon cables are no longer than 45cm.
+Please assure that ribbon cables are no longer than 45cm/18in.
 In case of rounded ATA cables, the length depends on the
 quality of the cables.
 SATA cables can be up to 1m long according to the specification.
@@ -216,7 +475,7 @@
 This is useful in hotswap scenarios
 where disks should always show up as the same numbered device,
 and not depend on attach order.
-.Pp
+.Sh BUGS
 Native Command Queuing (NCQ) on SATA drives is not yet supported.
 .Sh SEE ALSO
 .Xr ataraid 4 ,
