MFen: 1.227.2.14 -> 1.276

Obtained from:	The FreeBSD Simplified Chinese Project CVS

1 files changed, 47 insertions, 235 deletions

diff --git a/release/doc/zh_CN.GB2312/hardware/common/dev.sgml b/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
index 570e883..2b3147a 100644
--- a/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/common/dev.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 1.227.2.14
+	Original Revision: 1.276
 -->
 
 <!--
@@ -175,8 +175,7 @@
 
     &hwlist.nsp;
 
-    <para arch="i386">Adaptec AIC-7110 并口转 SCSI 接口 (&man.vpo.4; 驱动程序)
-    </para>
+    &hwlist.vpo;
 
     &hwlist.ida;
 
@@ -184,9 +183,9 @@
 
     &hwlist.iir;
 
-    <para arch="i386">Promise SuperTrak ATA RAID 控制器 (&man.pst.4;
-    驱动程序)
-    </para>
+    &hwlist.pst;
+
+    &hwlist.hptmv;
 
     &hwlist.ips;
 
@@ -247,7 +246,7 @@
     &hwlist.pcn;
 
     &hwlist.lnc;
-    
+
     <para arch="i386,pc98,amd64">基于 SMC 83c17x (EPIC) 的以太网 NIC (&man.tx.4; 驱动程序)
     </para>
 
@@ -319,8 +318,6 @@
 
     &hwlist.em;
 
-    &hwlist.gx;
-
     &hwlist.hme;
 
     &hwlist.gem;
@@ -334,6 +331,15 @@
 
     &hwlist.ixgb;
 
+    &hwlist.vge;
+
+  </sect2>
+
+  <sect2 id="tokenring">
+    <title>Token Ring Interfaces</title>
+
+    &hwlist.oltr;
+
   </sect2>
 
   <sect2 id="fddi">
@@ -627,17 +633,9 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386">SDL Communication 串口板
-      <itemizedlist>
-        <listitem>
-	  <para>SDL Communications Riscom/8 串口板 (rc 驱动程序)</para>
-	</listitem>
-        <listitem>
-	  <para>SDL Communications RISCom/N2 和 N2pci 高速同步串口板
-	  (&man.sr.4; 驱动程序)</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.rc;
+
+    &hwlist.sr;
 
     <para arch="i386,amd64">Specialix SI/XIO/SX 多口串口卡, 同时包括较旧的
     SIHOST2.x 和新式的 <quote>增强型</quote> (基于 transputer 的，
@@ -700,131 +698,50 @@
   <sect2 id="audio">
     <title>Audio Devices</title>
 
-    <para arch="i386,amd64">Advance (&man.sbc.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>Asound 100 和 110</para>
-	</listitem>
-        <listitem>
-	  <para>Logic ALS120 和 ALS4000</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.ad1816;
+    &hwlist.snd.cs4281;
+    &hwlist.snd.solo;
 
-    <para arch="i386,amd64">CMedia 音效芯片
-      <itemizedlist>
-        <listitem>
-	  <para>CMI8338/CMI8738</para>
-        </listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.sbc;
 
-    <para arch="i386,amd64">Crystal Semiconductor (&man.csa.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>CS461x/462x 声音加速器</para>
-	</listitem>
-	<listitem>
-	  <para>CS428x 声音控制器</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.cmi;
 
-    <para arch="i386,amd64">ENSONIQ (&man.pcm.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>AudioPCI ES1370/1371</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.csa;
+
+    &hwlist.snd.es137x;
 
     &hwlist.snd.ess;
 
-    <para arch="i386,alpha,amd64">ESS
-      <itemizedlist>
-        <listitem>
-	  <para>ES1868, ES1869, ES1879 和 ES1888 (&man.sbc.4; 驱动程序)</para>
-	</listitem>
-        <listitem>
-	  <para>Maestro-1, Maestro-2, 和 Maestro-2E</para>
-	</listitem>
-        <listitem>
-	  <para>Maestro-3/Allegro</para>
-	  <note>
-	    <para>由于授权的限制， Maestro-3/Allegro 不能编译进
-	    &os; 内核。 要使用这个驱动， 将下面的行添加到
-	    <filename>/boot/loader.conf</filename>：</para>
+    &hwlist.snd.maestro;
 
-            <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
-	  </note>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.maestro3;
 
     <para arch="i386,amd64">ForteMedia fm801</para>
 
-    <para arch="i386,amd64">Gravis (&man.gusc.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>UltraSound MAX</para>
-	</listitem>
-        <listitem>
-	  <para>UltraSound PnP</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.gusc;
 
     <para arch="i386,amd64">Intel 443MX, 810, 815, 和 815E 集成声音设备
     (&man.pcm.4; 驱动程序)</para>
 
     <para arch="i386,alpha,amd64">MSS/WSS 兼容的 DSP (&man.pcm.4; 驱动程序)</para>
 
-    <para arch="i386,amd64">NeoMagic 256AV/ZX (&man.pcm.4; 驱动程序)</para>
+    &hwlist.snd.neomagic;
 
     <para arch="i386,amd64">OPTi 931/82C931 (&man.pcm.4; 驱动程序)</para>
 
-    <para arch="i386,amd64">S3 Sonicvibes</para>
+    &hwlist.snd.vibes;
 
-    <para arch="i386,alpha,amd64">Creative Technologies SoundBlaster 系列 (&man.sbc.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>SoundBlaster</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster Pro</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-32</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-64</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-64 GOLD</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster ViBRA-16</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.emu10k1;
 
-    <para arch="i386,amd64">Creative Technologies Sound Blaster Live! 系列
-    (emu10k1 驱动程序)</para>
+    <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; driver)</para>
 
-    <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; 驱动程序)</para>
+    &hwlist.snd.via82c686;
 
-    <para arch="i386,amd64">VIA Technologies VT82C686A</para>
+    &hwlist.snd.ds1;
 
-    <para arch="i386,amd64">Yamaha
-      <itemizedlist>
-        <listitem>
-	  <para>DS1</para>
-	</listitem>
-        <listitem>
-	  <para>DS1e</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.ich;
+
+    &hwlist.snd.audiocs;
 
     <para arch="pc98">NEC PC-9801-73, 86 及兼容 (nss 驱动程序)
       <itemizedlist>
@@ -855,9 +772,9 @@
 
   <sect2 id="camera">
     <title>照相机和视频捕捉设备</title>
-    <para arch="i386,pc98">基于 Brooktree Bt848/849/878/879 帧抓取器 (&man.bktr.4;
-    驱动程序)
-    </para>      
+
+    &hwlist.bktr;
+
     <para arch="i386">Connectix QuickCam</para>
   </sect2>
 
@@ -931,106 +848,7 @@
 
     &hwlist.uscanner;
 
-    <para arch="i386,pc98,alpha,amd64">存储器 (&man.umass.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>ADTEC Stick Drive AD-UST32M, 64M, 128M, 256M</para>
-	</listitem>
-        <listitem>
-	  <para>Denno 火线/USB2 Removable
-            2.5-inch HDD Case MIFU-25CB20</para>
-	</listitem>
-        <listitem>
-	  <para>FujiFilm Zip USB Drive ZDR100 USB A</para>
-	</listitem>
-        <listitem>
-	  <para>GREEN HOUSE USB Flash Memory <quote>PicoDrive</quote>
-            GH-UFD32M, 64M, 128M</para>
-	</listitem>
-        <listitem>
-	  <para>IBM 32MB USB Memory Key (P/N 22P5296)</para>
-	</listitem>
-        <listitem>
-	  <para>IBM ThinkPad USB 便携式 CD-ROM 驱动器 (P/N 33L5151)</para>
-	</listitem>
-        <listitem>
-	  <para>I-O DATA USB x6 CD-RW Drive CDRW-i64/USB (仅限 CDROM)</para>
-	</listitem>
-        <listitem>
-	  <para>I-O DATA USB CD/CD-R/CD-RW/DVD-R/DVD-RW/DVD-RAM/DVD-ROM Drive DVR-iUH2
-            (仅限 CDROM, DVD-RAM)</para>
-	</listitem>
-        <listitem arch="i386,pc98">
-	  <para>Iomega USB Zip 100Mb (目前只是初步的支持)</para>
-	</listitem>
-        <listitem>
-	  <para>Iomega Zip750 USB2.0 驱动器</para>
-	</listitem>
-        <listitem>
-	  <para>Keian USB1.1/2.0 3.5-英寸 HDD Case KU350A</para>
-	</listitem>
-        <listitem>
-	  <para>Kurouto Shikou USB 2.5-英寸 HDD Case GAWAP2.5PS-USB2.0</para>
-	</listitem>
-        <listitem>
-	  <para>Logitec USB1.1/2.0 HDD Unit SHD-E60U2</para>
-	</listitem>
-        <listitem>
-	  <para>Logitec Mobile USB Memory LMC-256UD</para>
-	</listitem>
-        <listitem>
-	  <para>Logitec USB 倍速软驱 LFD-31U2</para>
-	</listitem>
-        <listitem>
-	  <para>Logitec USB/IEEE1394 DVD-RAM/R/RW Unit LDR-N21FU2 (仅 CDROM)</para>
-	</listitem>
-        <listitem>
-	  <para>Matshita CF-VFDU03 软驱</para>
-	</listitem>
-        <listitem>
-	  <para>MELCO USB2.0 MO Drive MO-CH640U2</para>
-	</listitem>
-        <listitem>
-	  <para>I-O DATA USB/IEEE1394 便携式 HD Drive HDP-i30P/CI, HDP-i40P/CI</para>
-	</listitem>
-        <listitem>
-	  <para>MELCO USB Flash Disk <quote>PetitDrive</quote>,
-            RUF-32M, -64M, -128M, -256M</para>
-	</listitem>
-        <listitem>
-	  <para>MELCO USB2.0 Flash Disk <quote>PetitDrive2</quote>,
-            RUF-256M/U2, -512M/U2</para>
-	</listitem>
-        <listitem>
-	  <para>MELCO USB Flash Disk <quote>ClipDrive</quote>,
-            RUF-C32M, -C64M, -C128M, -C256M, -C512M</para>
-	</listitem>
-        <listitem>
-	  <para>Microtech USB-SCSI-HD 50 USB to SCSI cable</para>
-	</listitem>
-        <listitem>
-	  <para>NOVAC USB2.0 2.5/3.5-inch HDD Case NV-HD351U</para>
-	</listitem>
-        <listitem>
-	  <para>Panasonic 软驱</para>
-	</listitem>
-        <listitem>
-	  <para>Panasonic USB2.0 便携式 CD-RW Drive KXL-RW40AN (仅限于 CDROM)</para>
-	</listitem>
-        <listitem>
-	  <para>RATOC Systems USB2.0 Removable HDD Case U2-MDK1, U2-MDK1B</para>
-	</listitem>
-        <listitem>
-	  <para>Sony 便携式 CD-R/RW Drive CRX10U (仅限于 CDROM)</para>
-	</listitem>
-        <listitem>
-	  <para>TEAC 便携式 USB CD-ROM Unit CD-110PU/210PU</para>
-	</listitem>
-        <listitem>
-	  <para>Y-E Data 软驱 (720/1.44/2.88Mb)</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.umass;
 
     <para arch="i386,pc98,amd64">声音设备 (&man.uaudio.4; 驱动程序)
     </para>
@@ -1052,13 +870,7 @@
   <sect2 id="bluetooth">
     <title>蓝牙设备</title>
 
-    <para arch="i386,pc98,amd64">PCCARD 主控制器 (&man.ng.bt3c.4; 驱动程序)
-      <itemizedlist>
-        <listitem>
-	  <para>3Com/HP 3CRWB6096-A PCCARD 适配器</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.ng.bt3c;
 
     &hwlist.ng.ubt;
 
@@ -1094,9 +906,9 @@
       (&man.vga.4; 驱动程序)
 
       <note>
-	<para>特定网卡与 <application>XFree86</application> 的兼容信息，
+	<para>关于特定显卡与 <application>Xorg</application> 的兼容信息，
 	  可以在 <ulink
-	  url="http://www.xfree86.org/"></ulink> 找到。</para>
+	  url="http://www.x.org/"></ulink> 找到。</para>
       </note>
 
       </para>
@@ -1137,8 +949,8 @@
 
       <note>
 	<para>&man.moused.8; 提供了如何在 &os; 中使用定点设备的进一步信息。
-	  关于如何在 <application>XFree86</application> 中使用鼠标的信息可以在
-	  <ulink url="http://www.xfree86.org/"></ulink> 找到。</para>
+	  关于如何在 <application>Xorg</application> 中使用这类设备的信息， 可以在
+	  <ulink url="http://www.x.org/"></ulink> 找到。</para>
       </note>
     </para>