Note update of bktr(4) to 2.17 (+MFC) and fix up some problems with

a prior note about this driver.  Note addition of uscanner(4).

3 files changed, 32 insertions, 13 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index bba224d..5e21c42 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -829,7 +829,22 @@ Printer Adapters:
    Entrega USB-to-parallel printer adapter.
 
 Scanners:
-   Perfection 636U
+   Acer Acerscan 320U, 620U, 640U, C310U, 1212U
+   AGFA SnapScan Touch
+   Avision 1200U
+   Epson Perfection 610, 636U/636Photo, 1200U/1200Photo, 1600
+   Hewlett Packard Photosmart S20
+   Hewlett Packard Scanjet 3300C, 4100C, 4200C, 5200C, 5300C, 6200C, 6300C
+   KYE ColorPage Vivid-Pro
+   Microtek Phantom 336CX, C6
+   Microtek ScanMaker V6UL, V6USL, X6U
+   Mustek 600 CU, 1200 CU, 1200 UB, 1200 USB
+   NatSemi BearPaw 1200
+   Primax Colorado 600u, 1200u, USB 9600, USB 19200
+   Primax G2-200, G2-300, G2-600, G2E-300, G2E-600
+   Primax ReadyScan 636i
+   UMAX Astra 1220U, 1236U, 2000U, 2100U, 2200U
+   Visioneer OneTouch 5300, 6100, 6200, 7600, 8100, 8600
 
 Miscalleneous:
    ActiveWire I/O Board.
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index b5ffd0a..8ad11b6 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -160,8 +160,13 @@ Write combining for crashdumps has been implemented.  This feature
 is useful when write caching is disabled on both SCSI and IDE disks,
 where large memory dumps could take up to an hour to complete.
 
-The bktr(4) driver has been updated to 2.17.  This fixes bugs in devfs 
-when unloading and reloading, and syncs with some NetBSD changes.
+The bktr(4) driver has been updated to 2.15.  New tuner types have
+been added, and improvememts to the KLD module and to memory
+allocation have been made. [MERGED]
+
+The bktr(4) driver has been updated to 2.17.  This fixes bugs in devfs
+when unloading and reloading, and syncs with some NetBSD
+changes. [MERGED]
 
 Extremely large swap areas (>67 GB) no longer panic the system.
 
@@ -313,10 +318,6 @@ libreadline has been upgraded to 4.1. [MERGED]
 The ifconfig(8) command can set the link-layer address of an interface. 
 [MERGED]
 
-bktr(4) driver update to 2.1.5.  New tuner types have been added, 
-and improvememts to the KLD module and to memory allocation have been
-made. [MERGED]
-
 setproctitle(3) has been moved from libutil to libc. [MERGED]
 
 chio(1) now has the ability to specify elements by volume tag instead
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index cbb1499..65ab2b0 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -193,8 +193,13 @@ Write combining for crashdumps has been implemented.  This feature
 is useful when write caching is disabled on both SCSI and IDE disks,
 where large memory dumps could take up to an hour to complete.
 
-The bktr(4) driver has been updated to 2.17.  This fixes bugs in devfs 
-when unloading and reloading, and syncs with some NetBSD changes.
+The bktr(4) driver has been updated to 2.15.  New tuner types have
+been added, and improvememts to the KLD module and to memory
+allocation have been made. [MERGED]
+
+The bktr(4) driver has been updated to 2.17.  This fixes bugs in devfs
+when unloading and reloading, and syncs with some NetBSD
+changes. [MERGED]
 
 Extremely large swap areas (>67 GB) no longer panic the system.
 
@@ -208,6 +213,8 @@ compatibles has been added. [MERGED]
 The Inode Filesystem (IFS) has been added; more information can be
 found in /usr/src/sys/ufs/ifs/README.
 
+The uscanner(4) driver for USB scanners has been added.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -372,10 +379,6 @@ libreadline has been upgraded to 4.1. [MERGED]
 The ifconfig(8) command can set the link-layer address of an interface. 
 [MERGED]
 
-bktr(4) driver update to 2.1.5.  New tuner types have been added, 
-and improvememts to the KLD module and to memory allocation have been
-made. [MERGED]
-
 setproctitle(3) has been moved from libutil to libc. [MERGED]
 
 chio(1) now has the ability to specify elements by volume tag instead