- Remove note about device listings going away.

- Add a note about possibility for duplicate listing of devices.
- Auto generate device listings for the following drivers: ncr, sym,
  umodem, and uscanner

MFC after:	3 days

3 files changed, 30 insertions, 54 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 8c79081..da051fd 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -46,12 +46,10 @@
   etc. can be found in the manual pages.</para>
 
   <note>
-    <para>Lists of specific, supported devices are gradually being
-      removed from this document in order to reduce the amount of
-      duplicated (and potentially out-of-date) information contained
-      within.  When this process is complete, the manual page for each
-      driver should be consulted for the authoritative list of devices
-      supported that particular driver.</para>
+    <para>The device lists in this document are being generated
+      automatically from &os; manual pages.  This means that some
+      devices, which are supported by multiple drivers, may appear
+      multiple times.</para>
   </note>
 
   <sect2 id="disk">
@@ -220,12 +218,9 @@
 
     &hwlist.twa;
 
-    <para arch="i386,pc98,alpha,sparc64,amd64">LSI/Symbios (formerly NCR)
-    53C8<replaceable>XX</replaceable> and 53C10<replaceable>XX</replaceable> PCI
-    SCSI controllers, either embedded on motherboard or on add-on
-    boards (&man.ncr.4; and &man.sym.4; drivers)
-    </para>      
-        
+    &hwlist.ncr;
+
+    &hwlist.sym;
 
     &hwlist.ncv;
 
@@ -1341,19 +1336,9 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para arch="i386,pc98,amd64">Modems (&man.umodem.4; driver)
-      <itemizedlist>
-        <listitem>
-	  <para>3Com 5605</para>
-	</listitem>
-        <listitem>
-	  <para>Metricom Ricochet GS USB wireless modem</para>
-	</listitem>
-        <listitem>
-	  <para>Yamaha Broadband Wireless Router RTW65b</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+
+    &hwlist.umodem;
+
     <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver)
     </para>
     <para arch="i386,pc98,alpha,amd64">Printers and parallel printer conversion cables (&man.ulpt.4; driver)
@@ -1388,8 +1373,9 @@
       &man.ubser.4;,
       &man.uftdi.4;, and &man.uplcom.4; drivers)
     </para>
-    <para arch="i386,pc98,amd64">Scanners (through <application>SANE</application>) (&man.uscanner.4; driver)
-    </para>
+
+    &hwlist.uscanner;
+
     <para arch="i386,pc98,alpha,amd64">Storage (&man.umass.4; driver)
       <itemizedlist>
         <listitem>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index 8c79081..da051fd 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -46,12 +46,10 @@
   etc. can be found in the manual pages.</para>
 
   <note>
-    <para>Lists of specific, supported devices are gradually being
-      removed from this document in order to reduce the amount of
-      duplicated (and potentially out-of-date) information contained
-      within.  When this process is complete, the manual page for each
-      driver should be consulted for the authoritative list of devices
-      supported that particular driver.</para>
+    <para>The device lists in this document are being generated
+      automatically from &os; manual pages.  This means that some
+      devices, which are supported by multiple drivers, may appear
+      multiple times.</para>
   </note>
 
   <sect2 id="disk">
@@ -220,12 +218,9 @@
 
     &hwlist.twa;
 
-    <para arch="i386,pc98,alpha,sparc64,amd64">LSI/Symbios (formerly NCR)
-    53C8<replaceable>XX</replaceable> and 53C10<replaceable>XX</replaceable> PCI
-    SCSI controllers, either embedded on motherboard or on add-on
-    boards (&man.ncr.4; and &man.sym.4; drivers)
-    </para>      
-        
+    &hwlist.ncr;
+
+    &hwlist.sym;
 
     &hwlist.ncv;
 
@@ -1341,19 +1336,9 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para arch="i386,pc98,amd64">Modems (&man.umodem.4; driver)
-      <itemizedlist>
-        <listitem>
-	  <para>3Com 5605</para>
-	</listitem>
-        <listitem>
-	  <para>Metricom Ricochet GS USB wireless modem</para>
-	</listitem>
-        <listitem>
-	  <para>Yamaha Broadband Wireless Router RTW65b</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+
+    &hwlist.umodem;
+
     <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver)
     </para>
     <para arch="i386,pc98,alpha,amd64">Printers and parallel printer conversion cables (&man.ulpt.4; driver)
@@ -1388,8 +1373,9 @@
       &man.ubser.4;,
       &man.uftdi.4;, and &man.uplcom.4; drivers)
     </para>
-    <para arch="i386,pc98,amd64">Scanners (through <application>SANE</application>) (&man.uscanner.4; driver)
-    </para>
+
+    &hwlist.uscanner;
+
     <para arch="i386,pc98,alpha,amd64">Storage (&man.umass.4; driver)
       <itemizedlist>
         <listitem>
diff --git a/release/doc/share/misc/dev.archlist.txt b/release/doc/share/misc/dev.archlist.txt
index dd5ad4d..f5e6fb4 100644
--- a/release/doc/share/misc/dev.archlist.txt
+++ b/release/doc/share/misc/dev.archlist.txt
@@ -66,16 +66,20 @@ mlx	i386,alpha,amd64
 mly	i386,amd64
 mpt	i386,alpha,pc98,sparc64,ia64,amd64
 my	i386,pc98
+ncr	i386,pc98,alpha,sparc64,amd64
 ncv	i386,pc98
 nsp	i386,pc98
 ohci	i386,pc98,alpha,ia64,amd64
 rl	i386,pc98,alpha,sparc64,amd64
 stg	i386,pc98
+sym	i386,pc98,alpha,sparc64,amd64
 trm	i386,amd64
 twa	i386
 twe	i386
 txp	i386,pc98,alpha,amd64
 udav	i386,pc98,amd64
+umodem	i386,pc98,amd64
+uscanner	i386,pc98,amd64
 vr	i386,pc98,alpha,amd64
 xe	i386,amd64
 xl	i386,pc98,alpha,sparc64,amd64