tidy up the hardware list a little; ok ajacoutot

1 files changed, 47 insertions, 120 deletions

diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index fad0fc81ebc..ab098404231 100644
--- a/share/man/man4/uscanner.4
+++ b/share/man/man4/uscanner.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uscanner.4,v 1.10 2007/11/10 17:30:26 ajacoutot Exp $
+.\" $OpenBSD: uscanner.4,v 1.11 2007/11/11 08:05:33 jmc Exp $
 .\" $NetBSD: uscanner.4,v 1.4 2000/10/13 21:05:18 augustss Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 10 2007 $
+.Dd $Mdocdate: November 11 2007 $
 .Dt USCANNER 4
 .Os
 .Sh NAME
@@ -65,124 +65,51 @@ and
 The
 .Nm
 driver works with the following scanners:
-.Ss Acer
-.Bl -tag -width Ds -offset indent -compact
-.It Acerscan 320U
-.It Acerscan 620U
-.It Acerscan 640U
-.It Acerscan C310U
-.El
-.Ss Agfa
-.Bl -tag -width Ds -offset indent -compact
-.It SnapScan 1212U
-.It SnapScan 1236U
-.It SnapScan e20
-.It SnapScan e25
-.It SnapScan e26
-.It SnapScan e40
-.It SnapScan e50
-.It SnapScan e52
-.It SnapScan Touch
-.El
-.Ss Avision
-.Bl -tag -width Ds -offset indent -compact
-.It 1200U
-.El
-.Ss Canon
-.Bl -tag -width Ds -offset indent -compact
-.It CanoScan N656U
-.It CanoScan N670U
-.It CanoScan N1220U
-.It CanoScan N1240U
-.El
-.Ss Epson
-.Bl -tag -width Ds -offset indent -compact
-.It GT-7000
-.It GT-9700F
-.It Perfection 610U
-.It Perfection 636U
-.It Perfection 640U
-.It Perfection 12xxU
-.It Perfection 12xxU Photo
-.It Perfection 16xxU
-.It Perfection 16xxU Photo
-.It Perfection 1650
-.It Perfection 2400
-.It Stylus DX38xx DX40xx DX50xx DX60xx (multifunction)
-.El
-.Ss HP
-.Bl -tag -width Ds -offset indent -compact
-.It Photosmart S20
-.It ScanJet 2200C
-.It ScanJet 3300C
-.It ScanJet 3400cse
-.It ScanJet 4100C
-.It ScanJet 4200C
-.It ScanJet 4300C
-.It ScanJet 5200C
-.It ScanJet 5300C
-.It ScanJet 6200C
-.It ScanJet 6300C
-.El
-.Ss Kye
-.Bl -tag -width Ds -offset indent -compact
-.It ColorPage Vivid-Pro
-.El
-.Ss Microtek
-.Bl -tag -width Ds -offset indent -compact
-.It ScanMaker X6USB
-.El
-.Ss Mustek
-.Bl -tag -width Ds -offset indent -compact
-.It 600
-.It 600 CU
-.It 1200
-.It 1200 CU
-.It 1200 UB
-.It 1200 Plus
-.It 1200 CU Plus
-.It BearPaw 1200F
-.El
-.Ss National
-.Bl -tag -width Ds -offset indent -compact
-.It BearPaw 1200
-.It BearPaw 2400
-.El
-.Ss Primax
-.Bl -tag -width Ds -offset indent -compact
-.It Colorado 600u
-.It Colorado 9600
-.It Colorado 19200
-.It Colorado 1200u
-.It G2-200
-.It G2-300
-.It G2-600
-.It G2E-300
-.It G2E-600
-.It ReadyScan 636i
-.It Visioneer 6200
-.El
-.Ss Umax
-.Bl -tag -width Ds -offset indent -compact
-.It Astra 1220U
-.It Astra 1236U
-.It Astra 2000U
-.It Astra 2200U
-.It Astra 3400
-.El
-.Ss Visioneer
-.Bl -tag -width Ds -offset indent -compact
-.It OneTouch 5300
-.It OneTouch 6100
-.It OneTouch 6200
-.It OneTouch 7600
-.It OneTouch 8100
-.It OneTouch 8600
-.It Scanport 3000
-.El
-.Ss Ultima
-.Bl -tag -width Ds -offset indent -compact
-.It 1200 UB Plus
+.Pp
+.Bl -bullet -compact -offset indent
+.It
+Acer: Acerscan 320U, 620U, 640U, C310U
+.It
+Agfa: SnapScan 1212U, 1236U, e20, e25, e26, e40, e50, e52, Touch
+.It
+Avision: 1200U
+.It
+Canon: CanoScan N656U, N670U, N1220U, N1240U
+.It
+Epson: GT-7000, GT-9700F
+.It
+Epson: Perfection 610U, 636U, 640U, 12xxU, 12xxU Photo, 16xxU,
+16xxU Photo, 1650, 2400
+.It
+Epson: Stylus DX38xx DX40xx DX50xx DX60xx (multifunction)
+.It
+HP: Photosmart S20
+.It
+HP: ScanJet 2200C, 3300C, 3400cse, 4100C, 4200C, 4300C, 5200C, 5300C,
+6200C, 6300C
+.It
+Kye: ColorPage Vivid-Pro
+.It
+Microtek: ScanMaker X6USB
+.It
+Mustek: 600, 600 CU, 1200, 1200 CU, 1200 UB, 1200 Plus, 1200 CU Plus,
+BearPaw 1200F
+.It
+National: BearPaw 1200, 2400
+.It
+Primax: Colorado 600u, 9600, 19200, 1200u
+.It
+Primax: G2-200, G2-300, G2-600, G2E-300, G2E-600
+.It
+Primax: ReadyScan 636i
+.It
+Primax: Visioneer 6200
+.It
+Ultima: 1200 UB Plus
+.It
+Umax: Astra 1220U, 1236U, 2000U, 2200U, 3400
+.It
+Visioneer: OneTouch 5300, 6100, 6200, 7600, 8100, 8600, 3000
 .El
 .Pp
 Many other scanners are recognized, but there is no software support