svn commit: r191680 - in releng/7.2/release/doc/zh_CN.GB2312: errata hardware readme relnotes share/sgml

Xin LI delphij at FreeBSD.org
Thu Apr 30 06:17:57 UTC 2009


Author: delphij
Date: Thu Apr 30 06:17:56 2009
New Revision: 191680
URL: http://svn.freebsd.org/changeset/base/191680

Log:
  Sync with English revisions.
  
  Approved by:	re (hrs)

Modified:
  releng/7.2/release/doc/zh_CN.GB2312/errata/article.sgml
  releng/7.2/release/doc/zh_CN.GB2312/hardware/article.sgml
  releng/7.2/release/doc/zh_CN.GB2312/readme/article.sgml
  releng/7.2/release/doc/zh_CN.GB2312/relnotes/article.sgml
  releng/7.2/release/doc/zh_CN.GB2312/share/sgml/release.dsl

Modified: releng/7.2/release/doc/zh_CN.GB2312/errata/article.sgml
==============================================================================
--- releng/7.2/release/doc/zh_CN.GB2312/errata/article.sgml	Thu Apr 30 02:26:03 2009	(r191679)
+++ releng/7.2/release/doc/zh_CN.GB2312/errata/article.sgml	Thu Apr 30 06:17:56 2009	(r191680)
@@ -10,7 +10,7 @@
 
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 181796
+	Original Revision: 191495
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -19,7 +19,7 @@
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY release.bugfix "7.0-RELEASE">
+<!ENTITY release.bugfix "7.2-RELEASE">
 ]>
 
 <article>
@@ -37,14 +37,15 @@
     ·¢Ðа濱Îó</title>
 
     <corpauthor>
-    The &os; Project
+    &os; ÏîÄ¿×é
     </corpauthor>
 
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
       <year>2008</year>
-      <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
+      <year>2009</year>
+      <holder role="mailto:doc at FreeBSD.org">&os; ÎĵµÏîÄ¿×é</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -122,11 +123,9 @@
   <sect1 id="security">
     <title>°²È«¹«¸æ</title>
 
-<![ %release.type.release [
     <para>ÔÝÎÞ°²È«¹«¸æ¡£</para>
-]]>
 
-<![ %release.type.snapshot [
+<!--
     <para>ÏÂÁа²È«¹«¸æÊÊÓÃÓÚ &os; &release.bugfix;¡£
       ÈçÓûÁ˽â½øÒ»²½µÄÐÅÏ¢£¬ Çë²ÎÔÄ
       <ulink url="http://security.FreeBSD.org/"></ulink> ÌṩµÄ¾ßÌ尲ȫ¹«¸æ¡£</para>
@@ -149,82 +148,24 @@
 	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:05.openssh.asc"
 		>SA-08:05.openssh</ulink></entry>
 	    <entry>2008&nbsp;Äê&nbsp;4&nbsp;ÔÂ&nbsp;17&nbsp;ÈÕ</entry>
-	    <entry><para>OpenSSH X11-ת·¢ ÌØȨÌáÉýÎÊÌâ</para></entry>
-	  </row>
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:06.bind.asc"
-		>SA-08:06.bind</ulink></entry>
-	    <entry>2008&nbsp;Äê&nbsp;7&nbsp;ÔÂ&nbsp;13&nbsp;ÈÕ</entry>
-	    <entry><para>DNS »º´æͶ¶¾ÎÊÌâ</para></entry>
+	    <entry><para>OpenSSH X11-ת·¢ÌØȨÌáÉý</para></entry>
 	  </row>
 	</tbody>
       </tgroup>
     </informaltable>
-]]>
+-->
 
   </sect1>
 
   <sect1 id="open-issues">
     <title>δ½â¾öµÄÎÊÌâ</title>
 
-<![ %release.type.release [
-    <para>ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>[20080229] &man.tcpdump.1; ²»ÄÜÕýÈ·µØÏÔʾ 802.11 Ö¡µÄ
-      TX/RX ËÙÂÊ¡£ ´ËÎÊÌâÒѾ­ÔÚ
-      HEAD ºÍ RELENG_7 ·ÖÖ§ÖÐÐÞ¸´¡£</para>
-
-    <para>[20080229] ÔÚ Linux Ä£ÄâϵͳÖз¢ÏÖÁËÒ»¸ö¿ÉÄܵ¼ÖÂijЩʹÓÃ
-      &man.mmap.2; µÄ Linux ³ÌÐò·¢Éú·ÃÎÊÔ½½ç (segmentation fault)
-      µÄ bug¡£ ´ËÎÊÌâÒѾ­ÔÚ
-      HEAD ºÍ RELENG_7 ·ÖÖ§ÖÐÐÞ¸´¡£</para>
-
-    <para>[20080229] ʹÓà &man.re.4; Íø¿¨Çý¶¯Ê±£¬
-      ÓÐÓû§¹Û²ìµ½ÁË°üÊý¾ÝË𻵺Ͳ»Îȶ¨µÈÏÖÏó¡£ Ò»Ð©Óû§±¨¸æʹÓÃÕâÒ»Çý¶¯µÄ½Ïа汾
-      (ÔÚ HEAD ÉÏ) Äܹ»½â¾öËûÃǵÄÎÊÌ⣬ »òÖÁÉÙÓÐËù¸ÄÉÆ¡£</para>
-
-    <para>[20080229£¬ 20080817 ¸üÐÂ] ÓÐÓû§·´Ó³£¬ &os; ¶Ô·¢³ö TCP Ñ¡ÏʽËù½øÐеı䶯£¬
-      »áµ¼ÖÂÁ¬½Ó³öÏÖÎÊÌâ¡£ ÕâÒ»ÎÊÌâµÄÐÞÕýÄ¿Ç°ÒÑ»ãÈë
-      HEAD ºÍ RELENG_7 ÒÔ¼° RELENG_7_0 ·ÖÖ§¡£ ¸ü¶àÏêÇéÇë²ÎÔÄ¿±Îó֪ͨ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-08:02.tcp.asc">FreeBSD-EN-08:02.tcp</ulink>¡£</para>
-
-    <para>[20080307] &os; ÖÐµÄ SCTP ʵÏÖÄ¿Ç°ÒÀÀµÓÚ½« <literal>INET6</literal>
-      Ö§³ÖÁª±à½øÄÚºËÖС£ ÎÒÃǼƻ®ÔÚδÀ´µÄ°æ±¾Öн«ÕâÒ»ÐèÇóÈ¥µô¡£</para>
-
-    <para>[20080307] ´Ó &os;
-      6.<replaceable>X</replaceable> µ½ &os; &release.bugfix; µÄÉý¼¶£¬
-      »áÔÚ <literal>installkernel</literal> ÕâÒ»²½Ê±£¬
-      ²úÉúһЩÀ´×Ô &man.kldxref.8; µÄ¾¯¸æÐÅÏ¢¡£ ÕâЩ¾¯¸æÊÇÎÞº¦µÄ£¬
-      ¿ÉÒÔ°²È«µØºöÂÔËüÃÇ¡£<literal>installkernel</literal> step.  These warnings are
-      harmless and can be ignored.</para>
-
-    <para>[20080307] IPsec ¹¦ÄÜËùÐèÒªµÄ &man.crypto.4; Çý¶¯³ÌÐòÔÚ
-      &os;/&arch.powerpc; ƽ̨ÉÏ´æÔÚÑÏÖØÎÊÌâ
-      (±àÒëÅäÖÃÖÐʹÓà <literal>device crypto</literal> »áµ¼ÖÂÄں˲»¿ÉÓÃ)¡£</para>
-
-]]>
-
+    <para></para>
   </sect1>
 
   <sect1 id="late-news">
     <title>ÐÂÎż°ÐÞÕý</title>
 
-<![ %release.type.release [
-    <para>ÎÞÐÂÎÅ¡£</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>[20080229] &os; &release.bugfix; ·¢ÐÐ˵Ã÷Îĵµ
-      (·¢Ðа汾˵Ã÷¡¢ Ó²¼þ¼æÈÝ˵Ã÷µÈ) ÖÐÌᵽʹÓà &os; 7-STABLE
-      µÄÓû§Ó¦¶©ÔÄ <literal>freebsd-current</literal> ÓʼþÁÐ±í£¬
-      ÕâЩÎÄ×Ö²»Ó¦³öÏÖ¡£</para>
-
-    <para>[20080229] ÔÚ·¢Ðаæ˵Ã÷ÖÐµÄ KDE °æ±¾ºÅÊDz»ÕýÈ·µÄ£¬
-      ÕýÈ·µÄ°æ±¾ºÅÊÇ 3.5.8¡£</para>
-
-]]>
+    <para></para>
   </sect1>
-
 </article>

Modified: releng/7.2/release/doc/zh_CN.GB2312/hardware/article.sgml
==============================================================================
--- releng/7.2/release/doc/zh_CN.GB2312/hardware/article.sgml	Thu Apr 30 02:26:03 2009	(r191679)
+++ releng/7.2/release/doc/zh_CN.GB2312/hardware/article.sgml	Thu Apr 30 06:17:56 2009	(r191680)
@@ -16,7 +16,7 @@
 <articleinfo>
   <title>&os; &release.current; ¼æÈÝÓ²¼þ˵Ã÷</title>
 
-  <corpauthor>The &os; Documentation Project</corpauthor>
+  <corpauthor>&os; ÎĵµÏîÄ¿×é</corpauthor>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -30,7 +30,8 @@
     <year>2006</year>
     <year>2007</year>
     <year>2008</year>
-    <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
+    <year>2009</year>
+    <holder role="mailto:doc at FreeBSD.org">&os; ÎĵµÏîÄ¿×é</holder>
   </copyright>
 
   <legalnotice id="trademarks" role="trademarks">
@@ -49,7 +50,7 @@
   <title>½éÉÜ</title>
 
   <para>Õâ·ÝÎĵµÊÇ
-  &os; &release.current;.
+  &os; &release.current;
   µÄÓ²¼þ¼æÈÝÐÔ˵Ã÷¡£ ËüÁгöÁËÒÑÖªÄܹ»Îª &os; ËùÖ§³ÖµÄÓ²¼þ£¬
   ÒÔ¼°ËüËùÖ§³ÖµÄ¸÷ÀàÓ²¼þ (´æ´¢¿ØÖÆÆ÷¡¢ ÍøÂç½Ó¿ÚµÈµÈ)£¬
   ÒÔ¼°ÕâЩÉ豸ÀàÐÍÖÐÒÑÖª¿ÉÓõÄÓ²¼þÐͺš£</para>
@@ -72,7 +73,7 @@
     °üÀ¨°²×°ºÍ¿ª·¢»·¾³¡£</para>
 
   <para>Çë×¢ÒâÕâ¸ö¼Ü¹¹ÓÐÁ½¸öÃû×Ö£¬
-    AMD64 (AMD) ºÍ Intel EM64T (À©Õ¹ÄÚ´æ 64-λ ¼¼Êõ)¡£
+    AMD64 (AMD) ºÍ Intel EM64T (À©Õ¹ 64-λ ÄÚ´æ¼¼Êõ)¡£
     Á½Öּܹ¹µÄ 64-λ ģʽ¼¸ºõÊÇÍêÈ«Ï໥¼æÈݵģ¬
     ¶ø &os;/&arch.amd64; ¶ÔËüÃǶ¼ÄÜÌṩ֧³Ö¡£</para>
 
@@ -80,27 +81,44 @@
 
   <itemizedlist>
     <listitem>
-      <para>&amd.athlon;64 (<quote>Clawhammer</quote>).</para>
+      <para>&amd.athlon;64 (<quote>Clawhammer</quote>)¡£</para>
     </listitem>
 
     <listitem>
-      <para>&amd.opteron; (<quote>Sledgehammer</quote>).</para>
+      <para>&amd.opteron; (<quote>Sledgehammer</quote>)¡£</para>
     </listitem>
 
     <listitem>
-      <para>&intel; 64-λ &xeon; (<quote>Nocona</quote>)¡£
-	ÕâÀà´¦ÀíÆ÷²ÉÓà 90nm ÖƳ̹¤ÒÕÖÆÔ죬 ÅäºÏ &intel; E7520/E7525/E7320 оƬ×飬
-	Äܹ»ÔËÐÐÓÚ 2.80 µ½ 3.60 GHz (FSB 800MHz)¡£</para>
+      <para>³ýÁË Sossaman Ö®ÍâµÄËùÓжàºË &intel; &xeon; ´¦ÀíÆ÷¾ù°üº¬ EM64T Ö§³Ö¡£</para>
     </listitem>
 
     <listitem>
-      <para>Ö§³Ö &intel; EM64T µÄ &intel; &pentium; 4 ´¦ÀíÆ÷ (<quote>Prescott</quote>)¡£
-	ÕâÀà´¦ÀíÆ÷²ÉÓà 90nm ÖƳ̹¤ÒÕÖÆÔ죬 ²ÉÓà FC-LGA775 ·â×°£¬ ÅäºÏ &intel;
-	925X Express оƬ×飬 Äܹ»ÔËÐÐÓÚ 3.20F/3.40F/3.60F GHz¡£
-	¶ÔÓ¦µÄ S-Spec ±àºÅ°üÀ¨ SL7L9¡¢ SL7L8¡¢ SL7LA¡¢ SL7NZ¡¢ SL7PZ£¬
-	ÒÔ¼° SL7PX¡£ ÐèҪעÒâµÄÊÇ£¬ ±àºÅΪ 5xx µÄ´¦ÀíÆ÷²¢²»Ö§³Ö
-	EM64T¡£</para>
+      <para>µ¥ºË &intel; &xeon;
+        ´¦ÀíÆ÷ <quote>Nocona</quote>¡¢ <quote>Irwindale</quote>¡¢
+        <quote>Potomac</quote> ºÍ <quote>Cranford</quote> °üº¬ÁË
+        EM64T Ö§³Ö¡£</para>
     </listitem>
+
+    <listitem>
+      <para>ËùÓÐ &intel; Core 2 (²»ÊÇ Core Duo) ºÍ¸üеĴ¦ÀíÆ÷</para>
+    </listitem>
+
+    <listitem>
+      <para>ËùÓÐ &intel; &pentium; D ´¦ÀíÆ÷</para>
+    </listitem>
+
+    <listitem>
+      <para>²ÉÓà <quote>Cedar Mill</quote> ºËÐÄµÄ &intel; &pentium; 4
+	ºÍ Celeron D °üº¬ÁË EM64T Ö§³Ö¡£</para>
+    </listitem>
+
+    <listitem>
+      <para>²¿·Ö²ÉÓà <quote>Prescott</quote> ºËÐÄµÄ &intel; &pentium; 4
+	ºÍ Celeron D °üº¬ÁË EM64T Ö§³Ö¡£ Çë²ÎÔÄ <ulink url="http://processorfinder.intel.com">Intel
+        Processor Spec Finder</ulink> ÒÔ»ñµÃ¹ØÓÚ Intel ´¦ÀíÆ÷¶ÔÓÚ
+        EM64T Ö§³ÖµÄÈ·Çйٷ½×ÊÁÏ¡£</para>
+    </listitem>
+
   </itemizedlist>
 
   <para>&intel; EM64T ÊÇ IA-32 (x86) µÄÒ»ÖÖÀ©Õ¹°æ±¾£¬
@@ -108,7 +126,7 @@
     һЩÀ´×Ô &intel; µÄÔçÆÚÎĵµ½« &intel; EM64T ³Æ×÷
     <quote>64-λ À©Õ¹¼¼Êõ</quote> »ò <quote>IA-32e</quote>¡£</para>
 
-  <para>ĿǰΪֹ²âÊÔ¹ýµÄ×î´óÄÚ´æÅäÖÃΪ 8GB¡£ ´ËÓ²¼þƽ̨É쵀 SMP
+  <para>ĿǰΪֹ²âÊÔ¹ýµÄ×î´óÄÚ´æÅäÖÃΪ 32GB¡£ ´ËÓ²¼þƽ̨É쵀 SMP
     Ö§³ÖÒѾ­Í걸£¬ ²¢ÇÒÏ൱Îȶ¨ÁË¡£</para>
 
   <para>ÔÚÐí¶à·½Ã棬 ÌرðÊÇÔÚÇý¶¯³ÌÐòÖ§³ÖÉÏ£¬ &os;/&arch.amd64; Óë &os;/&arch.i386;
@@ -274,13 +292,19 @@
 
   <para>ÔÚËùÓаüº¬ 1 ¸öÒÔÉÏ´¦ÀíÆ÷µÄϵͳÉÏ£¬ ¾ùÖ§³Ö SMP¡£</para>
 
-  <para>Ò»°ã¶øÑÔ£¬ &os;/&arch.sparc64; ϵͳ±ØÐëʹÓô®¿Ú¿ØÖÆ̨¡£ ¾¡¹Ü¿ÉÒÔͨ¹ýʹÓÃ
-    OpenFirmware ¿ØÖÆ̨À´Òýµ¼»ò°²×°ÏµÍ³£¬ µ«¿ØÖÆ̨É豸ÊDz»¿ÉÓõġ£</para>
+  <para>µ±Ê¹Óà <filename>GENERIC</filename> ÄÚºËʱ£¬
+    ûÓÐÅ䱸ÓÉ &man.creator.4; (&sun; Creator¡¢ &sun; Creator3D
+    ÒÔ¼° &sun; Elite3D) »ò &man.machfb.4; (&sun; PGX ºÍ &sun; PGX64
+    ÒÔ¼°°åÔØ ATI Mach64 оƬµÄ¡¢ Èç
+    &sun.blade; 100¡¢ &sun.blade; 150¡¢ &sun.ultra; 5 ºÍ &sun.ultra; 10)
+    ËùÖ§³ÖµÄÖ¡»º´æϵͳÉÏ£¬
+    &os;/&arch.sparc64; »¹ÐèҪʹÓô®¿Ú¿ØÖÆ̨¡£</para>
 
   <para>Èç¹ûÄúµÄϵͳûÓÐÔÚ´Ë´¦Áгö£¬ Ëü¿ÉÄÜÊÇ»¹Ã»ÓÐÅäºÏ &os; &release.current;
     ½øÐйý²âÊÔ¡£ ÎÒÃǽ¨ÒéÄúÔÚÕâЩ»úÆ÷ÉϽøÐвâÊÔ£¬
     ²¢ÔÚ &a.sparc; ·¢²¼ÄúµÄ²âÊÔ½á¹û£¬ °üÀ¨ÄÄЩÉ豸¹¤×÷Õý³£»ò²»Õý³£¡£</para>
 
+
     <para>&os; ÍêÈ«Ö§³ÖÏÂÁÐϵͳ£º</para>
 
       <itemizedlist>
@@ -290,6 +314,9 @@
         <listitem>
           <para>&sun.blade; 150</para>
         </listitem>
+ 	<listitem>
+	  <para>&sun.enterprise; 100</para>
+	</listitem>
         <listitem>
           <para>&sun.enterprise; 220R</para>
         </listitem>
@@ -309,10 +336,10 @@
           <para>&sun.fire; V120</para>
         </listitem>
         <listitem>
-          <para>&netra; t1 105</para> 
+          <para>&netra; t1 105</para>
         </listitem>
         <listitem>
-          <para>&netra; T1 AC200/DC200</para> 
+          <para>&netra; T1 AC200/DC200</para>
         </listitem>
         <listitem>
           <para>&netra; t 1100</para>
@@ -332,6 +359,12 @@
         <listitem>
           <para>&netra; X1</para>
         </listitem>
+ 	<listitem>
+	  <para>&sparcengine; Ultra AX1105</para>
+	</listitem>
+	<listitem>
+	  <para>&sparcengine; Ultra AXe</para>
+	</listitem>
         <listitem>
           <para>&sparcengine; Ultra AXi</para>
         </listitem>
@@ -362,10 +395,15 @@
         <listitem>
           <para>&sun.ultra; 80</para>
         </listitem>
+        <listitem>
+          <para>&sun.ultra; 450</para>
+        </listitem>
       </itemizedlist>
 
-    <para>&os; ¶ÔÏÂÁÐϵͳÌṩÁ˲¿·ÖÖ§³Ö¡£ ¾ßÌå¶øÑÔ£¬
-      ÔÚ sbus ϵͳÖеİåÔØ SCSI ¿ØÖÆÆ÷Ä¿Ç°²¢²»Ö§³Ö¡£</para>
+  <para>&os; ¶ÔÏÂÁÐϵͳÌṩÁ˲¿·ÖÖ§³Ö¡£ ¾ßÌå¶øÑÔ£¬
+    »ùÓÚ SBus µÄ¹âÏËͨµÀ¿ØÖÆÆ÷²»±»Ö§³Ö¡£ ²»¹ý£¬
+    ͸¹ý &man.esp.4 Çý¶¯ËùÖ§³ÖµÄ SCSI ¿ØÖÆÆ÷ (&sun; ESP SCSI¡¢ &sun; FAS Fast-SCSI
+    ÒÔ¼° &sun; FAS366 Fast-Wide SCSI ¿ØÖÆÆ÷) ¿ÉÒÔÕý³£Ê¹ÓÃËüÃÇ¡£</para>
 
       <itemizedlist>
         <listitem>
@@ -376,15 +414,48 @@
         </listitem>
       </itemizedlist>
 
-    <para>ÏÂÁÐϵͳ²»±» &os; Ö§³Ö¡£ Õâ¿ÉÄÜÊÇÓÉÓÚȱÉÙ¶Ô´¦ÀíÆ÷µÄÖ§³Ö (&ultrasparc; III)¡¢
-      ÓÉÓÚϵͳÉè¼ÆÉÏ´æÔÚµÄijЩÌØÐÔʹµÃ &os; ²»Îȶ¨£¬ »òȱÉÙʹ &os;
-      ÔÚÆäÉÏÄܹ»Ê¹ÓõĻù±¾°åÔØÉ豸֧³Ö¡£</para>
+  <para>´Ó 7.2-RELEASE Æ𣬠»ùÓÚ
+    &ultrasparc; III ºÍ¸ü¸ß´¦ÀíÆ÷µÄϵͳҲÄܱ» &os; Ö§³ÖÁË£¬
+    ÒÑÖª¿ÉÓõÄϵͳ°üÀ¨£º</para>
 
       <itemizedlist>
-        <listitem>
-          <para>ËùÓÐʹÓà &ultrasparc; III ´¦ÀíÆ÷µÄ¼ÆËã»ú¡£</para>
-        </listitem>
+	<listitem>
+	  <para>&sun.blade; 1000</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.blade; 1500</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.blade; 2000</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.fire; 280R</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.fire; V210</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.fire; V440 (³ýÁË°åÔØÍø¿¨Ö®Íâ)</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.fire; V880</para>
+	</listitem>
+	<listitem>
+	  <para>&netra; 20/&netra; T4</para>
+	</listitem>
       </itemizedlist>
+
+  <para>ÏÂÁÐ &ultrasparc; IIIi ϵͳδ½øÐйý²âÊÔ£¬ µ«ÏàÐÅ &os;
+    Ö§³ÖÕâЩϵͳ£º</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>&sun.fire; V125</para>
+	</listitem>
+	<listitem>
+	  <para>&sun.fire; V240</para>
+ 	</listitem>
+       </itemizedlist>
 </sect2>
 
 </sect1>
@@ -392,7 +463,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 185258
+	Original Revision: 191519
 -->
 
 <!--
@@ -444,8 +515,9 @@
   <sect2 id="disk">
     <title>´ÅÅÌ¿ØÖÆÆ÷</title>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, &arch.sparc64;] IDE/ATA ¿ØÖÆÆ÷ (&man.ata.4; Çý¶¯³ÌÐò)</para>
-    <para>[&arch.pc98;] IDE/ATA ¿ØÖÆÆ÷ (wdc Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,ia64,pc98,sparc64">IDE/ATA ¿ØÖÆÆ÷ (&man.ata.4; Çý¶¯³ÌÐò)</para>
+
+    <para arch="pc98">IDE/ATA ¿ØÖÆÆ÷ (wdc Çý¶¯³ÌÐò)
       <itemizedlist>
         <listitem>
 	  <para>°åÔØ IDE ¿ØÖÆÆ÷</para>
@@ -485,7 +557,7 @@
 
     &hwlist.dpt;
       <note>
-	<para>[&arch.amd64;, &arch.i386;] Ö§³Ö´ÓÕâÖÖ¿ØÖÆÆ÷Æô¶¯¡£ µ« EISA
+	<para arch="amd64,i386">Ö§³Ö´ÓÕâÖÖ¿ØÖÆÆ÷Æô¶¯¡£ µ« EISA
 	¿¨Ä¿Ç°²¢²»Ö§³Ö¡£</para>
       </note>
 
@@ -510,7 +582,7 @@
     &hwlist.mlx;
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;] Äܹ»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£ ²»Ö§³Ö EISA
+	<para arch="amd64,i386">Äܹ»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£ ²»Ö§³Ö EISA
 	ÊÊÅäÆ÷¡£</para>
       </note>
 
@@ -538,7 +610,7 @@
 
     &hwlist.vpo;
 
-    <para>[&arch.i386;] wds(4) Çý¶¯³ÌÐòÖ§³Ö WD7000 SCSI ¿ØÖÆÆ÷</para>
+    <para arch="i386">wds(4) Çý¶¯³ÌÐòÖ§³Ö WD7000 SCSI ¿ØÖÆÆ÷</para>
 
     <para>ËùÓÐÖ§³ÖµÄ SCSI ¿ØÖÆÆ÷¶¼ÌṩÁËÍêÕûµÄ
     SCSI-I, SCSI-II, ºÍ SCSI-III É豸֧³Ö£¬ °üÀ¨Ó²ÅÌ£¬ ¹âÅÌ£¬
@@ -558,7 +630,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.i386;] Sony רÓÐ½Ó¿Ú (ËùÓÐÐͺÅ) (&man.scd.4;)</para>
+	  <para arch="i386">Sony רÓÐ½Ó¿Ú (ËùÓÐÐͺÅ) (&man.scd.4;)</para>
 	</listitem>
 
 	<listitem>
@@ -567,7 +639,7 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.i386;] ÒÔÏÂÉ豸²»ÔÙά»¤ÁË£º
+    <para arch="i386">ÒÔÏÂÉ豸²»ÔÙά»¤ÁË£º
       <itemizedlist>
         <listitem>
 	  <para>Mitsumi רÓÐµÄ CD-ROM ½Ó¿Ú (ËùÓÐÐͺÅ) (&man.mcd.4;)</para>
@@ -587,14 +659,14 @@
 
     &hwlist.bce;
 
-    <para>[&arch.amd64;, &arch.i386;] »ùÓÚ Broadcom BCM4401 µÄ¸ßËÙÒÔÌ«ÍøÊÊÅäÆ÷
+    <para arch="amd64,i386">»ùÓÚ Broadcom BCM4401 µÄ¸ßËÙÒÔÌ«ÍøÊÊÅäÆ÷
       (&man.bfe.4; Çý¶¯³ÌÐò)</para>
 
     &hwlist.bge;
 
     &hwlist.cdce;
 
-    <para>[&arch.amd64;, &arch.i386;] »ùÓÚ Crystal Semiconductor CS89x0 µÄ NIC
+    <para arch="amd64,i386">»ùÓÚ Crystal Semiconductor CS89x0 µÄ NIC
     (&man.cs.4; Çý¶¯³ÌÐò)
     </para>
 
@@ -672,7 +744,7 @@
 
     &hwlist.tl;
 
-    <para>[&arch.amd64;, &arch.i386, &arch.pc98;] »ùÓÚ SMC 83c17x (EPIC) µÄÒÔÌ«Íø NIC (&man.tx.4; Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,pc98">»ùÓÚ SMC 83c17x (EPIC) µÄÒÔÌ«Íø NIC (&man.tx.4; Çý¶¯³ÌÐò)
     </para>
 
     &hwlist.txp;
@@ -694,7 +766,7 @@
   </sect2>
 
   <sect2 id="tokenring">
-    <title>Token Ring Interfaces</title>
+    <title>Token Ring ½Ó¿Ú</title>
 
     &hwlist.oltr;
 
@@ -702,33 +774,33 @@
 
   <sect2 id="fddi">
     <title>FDDI ½Ó¿Ú</title>
-    <para>[&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; Çý¶¯³ÌÐò)</para>
-    <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; Çý¶¯³ÌÐò)</para>
+    <para arch="i386,pc98">DEC DEFPA PCI (&man.fpa.4; Çý¶¯³ÌÐò)</para>
+    <para>arch="i386">DEC DEFEA EISA (&man.fpa.4; Çý¶¯³ÌÐò)</para>
   </sect2>
 
   <sect2 id="atm">
     <title>ATM ½Ó¿Ú</title>
 
-    <para>[&arch.i386, &arch.pc98;] »ùÓÚ Midway µÄ ATM ½Ó¿Ú (&man.en.4;
+    <para arch="i386,pc98">»ùÓÚ Midway µÄ ATM ½Ó¿Ú (&man.en.4;
       Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. PCA-200E ATM PCI
+    <para arch="i386,pc98,sparc64">FORE Systems, Inc. PCA-200E ATM PCI
       ÊÊÅäÆ÷ (hfa ºÍ &man.fatm.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;, &arch.pc98;] »ùÓÚ IDT NICStAR 77201/211 µÄ ATM ÊÊÅäÆ÷ (&man.idt.4;
+    <para arch="i386,pc98">»ùÓÚ IDT NICStAR 77201/211 µÄ ATM ÊÊÅäÆ÷ (&man.idt.4;
     Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. HE155 ºÍ HE622
+    <para arch="i386,pc98,sparc64">FORE Systems, Inc. HE155 ºÍ HE622
       ATM ½Ó¿Ú (&man.hatm.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;, &arch.pc98;] »ùÓÚ IDT77252 µÄ ATM ¿¨ (&man.patm.4;
+    <para arch="i386,pc98">»ùÓÚ IDT77252 µÄ ATM ¿¨ (&man.patm.4;
       Çý¶¯³ÌÐò)</para>
 
   </sect2>
   <sect2 id="wlan">
     <title>ÎÞÏßÍøÂç½Ó¿Ú</title>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet 802.11b ÎÞÏßÊÊÅäÆ÷ (&man.an.4; Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,pc98">Cisco/Aironet 802.11b ÎÞÏßÊÊÅäÆ÷ (&man.an.4; Çý¶¯³ÌÐò)
     </para>
 
     &hwlist.ath;
@@ -737,31 +809,31 @@
 
     &hwlist.cnw;
 
-    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI ÍøÂçÊÊÅäÆ÷
+    <para arch="i386,amd64">Intel PRO/Wireless 2100 MiniPCI ÍøÂçÊÊÅäÆ÷
       (&man.ipw.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2200BG/2915ABG MiniPCI
+    <para arch="i386,amd64">Intel PRO/Wireless 2200BG/2915ABG MiniPCI
       ºÍ 2225BG PCI ÍøÂçÊÊÅäÆ÷ (&man.iwi.4; Çý¶¯³ÌÐò)</para>
 
     &hwlist.ral;
 
-    <para>[&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz ÎÞÏßÊÊÅäÆ÷ (&man.ray.4; Çý¶¯³ÌÐò)
+    <para arch="i386,pc98">Raytheon Raylink 2.4GHz ÎÞÏßÊÊÅäÆ÷ (&man.ray.4; Çý¶¯³ÌÐò)
     </para>
 
     &hwlist.rum;
 
     &hwlist.ural;
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] ÀÉѶ¿Æ¼¼ WaveLAN/IEEE 802.11b
+    <para arch="amd64,i386,pc98">ÀÊѶ¿Æ¼¼ WaveLAN/IEEE 802.11b
       ÎÞÏßÍøÂçÊÊÅäÆ÷£¬ ÒÔ¼°²ÉÓà Lucent Hermes¡¢ Intersil
       PRISM-II¡¢ Intersil PRISM-2.5¡¢ Intersil Prism-3 ºÍ Symbol
       Spectrum24 оƬ×éµÄÀàËƵÄÎÞÏßÍøÂçÊÊÅäÆ÷ (&man.wi.4; Çý¶¯³ÌÐò)
     </para>
 
-    <para>[&arch.i386;] NCR / AT&amp;T / ÀÉѶ¿Æ¼¼ WaveLan T1-speed
+    <para arch="i386">NCR / AT&amp;T / ÀÉѶ¿Æ¼¼ WaveLan T1-speed
     ISA/ÎÞÏß LAN ¿¨ (&man.wl.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 3945ABG MiniPCI
+    <para arch="i386,amd64">Intel PRO/Wireless 3945ABG MiniPCI
       ÍøÂçÊÊÅäÆ÷ (&man.wpi.4; Çý¶¯³ÌÐò)</para>
 
     &hwlist.zyd;
@@ -779,11 +851,11 @@
 
     &hwlist.ctau;
 
-    <para>[&arch.i386;]Granch SBNI12 µã¶ÔµãͨѶÊÊÅäÆ÷
+    <para arch="i386">Granch SBNI12 µã¶ÔµãͨѶÊÊÅäÆ÷
     (&man.sbni.4; Çý¶¯³ÌÐò)
     </para>
 
-    <para>[&arch.i386;]Granch SBNI16 SHDSL µ÷Öƽâµ÷Æ÷ (&man.sbsh.4;
+    <para arch="i386">Granch SBNI16 SHDSL µ÷Öƽâµ÷Æ÷ (&man.sbsh.4;
       Çý¶¯³ÌÐò)</para>
 
     &hwlist.cm;
@@ -792,10 +864,10 @@
 
   <sect2 id="isdn">
     <title>ISDN ½Ó¿Ú</title>
-    <para>[&arch.i386;] AcerISDN P10 ISA PnP (ʵÑéÐÔµÄ)</para>
-    <para>[&arch.i386;] Asuscom ISDNlink 128K ISA</para>
-    <para>[&arch.i386;] ASUSCOM P-IN100-ST-D (ÒÔ¼°ÆäËû»ùÓÚ Winbond W6692 µÄ¿¨)</para>
-    <para>[&arch.i386;] AVM
+    <para arch="i386">AcerISDN P10 ISA PnP (ʵÑéÐÔµÄ)</para>
+    <para arch="i386">Asuscom ISDNlink 128K ISA</para>
+    <para arch="i386">ASUSCOM P-IN100-ST-D (ÒÔ¼°ÆäËû»ùÓÚ Winbond W6692 µÄ¿¨)</para>
+    <para arch="i386">AVM
       <itemizedlist>
         <listitem>
 	  <para>A1</para>
@@ -823,7 +895,7 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para>[&arch.i386;] Creatix
+    <para arch="i386">Creatix
       <itemizedlist>
         <listitem>
 	  <para>ISDN-S0</para>
@@ -833,11 +905,11 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para>[&arch.i386;] Compaq Microcom 610 ISDN (Compaq series PSB2222I) ISA PnP</para>
-    <para>[&arch.i386;] Dr. Neuhaus Niccy Go@ ¼°¼æÈÝ</para>
-    <para>[&arch.i386;] Dynalink IS64PPH ºÍ IS64PPH+</para>
-    <para>[&arch.i386;] Eicon Diehl DIVA 2.0 ºÍ 2.02</para>
-    <para>[&arch.i386;] ELSA
+    <para arch="i386">Compaq Microcom 610 ISDN (Compaq ϵÁÐ PSB2222I) ISA PnP</para>
+    <para arch="i386">Dr. Neuhaus Niccy Go@ ¼°¼æÈÝ</para>
+    <para arch="i386">Dynalink IS64PPH ºÍ IS64PPH+</para>
+    <para arch="i386">Eicon Diehl DIVA 2.0 ºÍ 2.02</para>
+    <para arch="i386">ELSA
       <itemizedlist>
         <listitem>
 	  <para>ELSA PCC-16</para>
@@ -853,11 +925,11 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para>[&arch.i386;] ITK ix1 Micro ( &lt; V.3, ·Ç PnP °æ±¾ )</para>
-    <para>[&arch.i386;] Sedlbauer Win Speed</para>
-    <para>[&arch.i386;] Siemens I-Surf 2.0</para>
-    <para>[&arch.i386;] TELEINT ISDN SPEED No.1 (ÊÔÑéÐÔÖ§³Ö)</para>
-    <para>[&arch.i386;] Teles
+    <para arch="i386">ITK ix1 Micro ( &lt; V.3, ·Ç PnP °æ±¾ )</para>
+    <para arch="i386">Sedlbauer Win Speed</para>
+    <para arch="i386">Siemens I-Surf 2.0</para>
+    <para arch="i386">TELEINT ISDN SPEED No.1 (ÊÔÑéÐÔÖ§³Ö)</para>
+    <para arch="i386">Teles
       <itemizedlist>
         <listitem>
 	  <para>S0/8</para>
@@ -879,23 +951,23 @@
 	</listitem>
       </itemizedlist>
     </para>
-    <para>[&arch.i386;] Traverse Technologies NETjet-S PCI</para>
-    <para>[&arch.i386;] USRobotics Sportster ISDN TA intern</para>
-    <para>[&arch.i386;] »ùÓÚ Winbond W6692 µÄ PCI ¿¨</para>
+    <para arch="i386">Traverse Technologies NETjet-S PCI</para>
+    <para arch="i386">USRobotics Sportster ISDN TA intern</para>
+    <para arch="i386">»ùÓÚ Winbond W6692 µÄ PCI ¿¨</para>
   </sect2>
 
   <sect2 id="serial">
     <title>´®¿Ú</title>
 
-    <para>[&arch.amd64; &arch.i386;] <quote>PC ±ê×¼</quote> »ùÓÚ 8250¡¢ 16450£¬ ÒÔ¼°»ùÓÚ 16550 µÄ´®¿Ú (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="amd64,i386"><quote>PC ±ê×¼</quote> »ùÓÚ 8250¡¢ 16450£¬ ÒÔ¼°»ùÓÚ 16550 µÄ´®¿Ú (&man.sio.4; Çý¶¯³ÌÐò)</para>
 
     &hwlist.uart;
 
     &hwlist.scc;
 
-    <para>[&arch.amd64; &arch.i386;] ʹÓù²Ïí IRQ µÄ AST 4 ¿Ú´®¿Ú¿¨</para>
+    <para arch="amd64,i386">ʹÓù²Ïí IRQ µÄ AST 4 ¿Ú´®¿Ú¿¨</para>
 
-    <para>[&arch.i386;] ARNET ´®¿Ú¿¨ (&man.ar.4; Çý¶¯³ÌÐò)
+    <para arch="i386">ARNET ´®¿Ú¿¨ (&man.ar.4; Çý¶¯³ÌÐò)
       <itemizedlist>
         <listitem>
 	  <para>ʹÓù²Ïí IRQ µÄ ARNET 8 ¿Ú´®¿Ú¿¨</para>
@@ -905,8 +977,8 @@
 	</listitem>
       </itemizedlist>
     </para>
-    
-    <para>[&arch.i386;] Boca ¶à¿Ú´®¿Ú¿¨
+
+    <para arch="i386">Boca ¶à¿Ú´®¿Ú¿¨
       <itemizedlist>
         <listitem>
 	  <para>Boca BB1004 4-¿Ú´®¿Ú¿¨
@@ -925,86 +997,86 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.i386;] Comtrol Rocketport ¿¨ (&man.rp.4; Çý¶¯³ÌÐò)</para>
+    <para arch="i386">Comtrol Rocketport ¿¨ (&man.rp.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;] Cyclades Cyclom-Y ´®¿Ú°å (&man.cy.4; Çý¶¯³ÌÐò)</para>
+    <para arch="i386">Cyclades Cyclom-Y ´®¿Ú°å (&man.cy.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.i386;] ʹÓù²Ïí IRQ µÄ STB 4 ¿Ú´®¿Ú¿¨</para>
+    <para arch="i386">ʹÓù²Ïí IRQ µÄ STB 4 ¿Ú´®¿Ú¿¨</para>
 
-    <para>[&arch.i386;] DigiBoard ÖÇÄÜ´®¿Ú¿¨ (digi Çý¶¯³ÌÐò)
+    <para arch="i386">DigiBoard ÖÇÄÜ´®¿Ú¿¨ (digi Çý¶¯³ÌÐò)
     </para>
 
-    <para>[&arch.amd64;, &arch.i386, &arch.ia64;] »ùÓÚ PCI µÄ¶à¿Ú´®¿Ú°å (&man.puc.4;
+    <para arch="amd64,i386,ia64">»ùÓÚ PCI µÄ¶à¿Ú´®¿Ú°å (&man.puc.4;
     Çý¶¯³ÌÐò)
       <itemizedlist>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Actiontech 56K PCI</para>
+	  <para arch="amd64,i386">Actiontech 56K PCI</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64; &arch.i386;] Avlab Technology, PCI IO 2S ºÍ PCI IO 4S</para>
+	  <para arch="amd64,i386">Avlab Technology, PCI IO 2S ºÍ PCI IO 4S</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Comtrol RocketPort 550</para>
+	  <para arch="amd64,i386">Comtrol RocketPort 550</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Decision Computers PCCOM 4-¶à¿Ú´®¿Ú ºÍ Ë«¿Ú RS232/422/485</para>
+	  <para arch="amd64,i386">Decision Computers PCCOM 4-¶à¿Ú´®¿Ú ºÍ Ë«¿Ú RS232/422/485</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.ia64;] Diva Serial (GSP) ¶à¿Ú UART</para>
+	  <para arch="ia64">Diva Serial (GSP) ¶à¿Ú UART</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Dolphin Peripherals 4025/4035/4036</para>
+	  <para arch="amd64,i386">Dolphin Peripherals 4025/4035/4036</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] IC Book Labs Dreadnought 16x Lite ºÍ Pro</para>
+	  <para arch="amd64,i386">IC Book Labs Dreadnought 16x Lite ºÍ Pro</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Lava Computers 2SP-PCI/DSerial-PCI/Quattro-PCI/Octopus-550</para>
+	  <para arch="amd64,i386">Lava Computers 2SP-PCI/DSerial-PCI/Quattro-PCI/Octopus-550</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Middle Digital, Weasle ´®¿Ú</para>
+	  <para arch="amd64,i386">Middle Digital, Weasle ´®¿Ú</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64; &arch.i386;] Moxa Industio CP-114, Smartio C104H-PCI ºÍ C168H/PCI</para>
+	  <para arch="amd64,i386">Moxa Industio CP-114, Smartio C104H-PCI ºÍ C168H/PCI</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] NEC PK-UG-X001 ºÍ PK-UG-X008</para>
+	  <para arch="amd64,i386">NEC PK-UG-X001 ºÍ PK-UG-X008</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64; &arch.i386;] Netmos NM9835 PCI-2S-550</para>
+	  <para arch="amd64,i386">Netmos NM9835 PCI-2S-550</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Oxford Semiconductor OX16PCI954 PCI UART</para>
+	  <para arch="amd64,i386">Oxford Semiconductor OX16PCI954 PCI UART</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Syba Tech SD-LAB PCI-4S2P-550-ECP</para>
+	  <para arch="amd64,i386">Syba Tech SD-LAB PCI-4S2P-550-ECP</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] SIIG Cyber I/O PCI 16C550/16C650/16C850</para>
+	  <para arch="amd64,i386">SIIG Cyber I/O PCI 16C550/16C650/16C850</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] SIIG Cyber 2P1S PCI 16C550/16C650/16C850</para>
+	  <para arch="amd64,i386">SIIG Cyber 2P1S PCI 16C550/16C650/16C850</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] SIIG Cyber 2S1P PCI 16C550/16C650/16C850</para>
+	  <para arch="amd64,i386">SIIG Cyber 2S1P PCI 16C550/16C650/16C850</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] SIIG Cyber 4S PCI 16C550/16C650/16C850</para>
+	  <para arch="amd64,i386">SIIG Cyber 4S PCI 16C550/16C650/16C850</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] SIIG Cyber Serial (Single ºÍ Dual) PCI 16C550/16C650/16C850</para>
+	  <para arch="amd64,i386">SIIG Cyber Serial (Single ºÍ Dual) PCI 16C550/16C650/16C850</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64; &arch.i386;] Syba Tech Ltd. PCI-4S2P-550-ECP</para>
+	  <para arch="amd64,i386">Syba Tech Ltd. PCI-4S2P-550-ECP</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] Titan PCI-200H ºÍ PCI-800H</para>
+	  <para arch="amd64,i386">Titan PCI-200H ºÍ PCI-800H</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] US Robotics (3Com) 3CP5609 µ÷Öƽâµ÷Æ÷</para>
+	  <para arch="amd64,i386">US Robotics (3Com) 3CP5609 µ÷Öƽâµ÷Æ÷</para>
 	</listitem>
 	<listitem>
-	  <para>[&arch.amd64; &arch.i386;] VScom PCI-400 ºÍ PCI-800</para>
+	  <para arch="amd64,i386">VScom PCI-400 ºÍ PCI-800</para>
 	</listitem>
       </itemizedlist>
     </para>
@@ -1013,13 +1085,13 @@
 
     &hwlist.sr;
 
-    <para>[&arch.i386;, &arch.amd64;] Ö§³Ö Specialix SI/XIO/SX ¶à¿Ú´®¿Ú¿¨, ͬʱ°üÀ¨½Ï¾ÉµÄ
+    <para arch="i386,amd64">Ö§³Ö Specialix SI/XIO/SX ¶à¿Ú´®¿Ú¿¨, ͬʱ°üÀ¨½Ï¾ÉµÄ
     SIHOST2.x ÒÔ¼° <quote>ÔöÇ¿ÐÍ</quote> (»ùÓÚ transputer£¬
     Ò²¾ÍÊÇ JET µÄ) ËÞÖ÷¿¨ (ISA¡¢ EISA ºÍ PCI ½Ó¿Ú)
     ×¢Ò⣬ ×îÐ嵀 SX+ PCI ¿¨Ä¿Ç°»¹²»Ö§³Ö¡£
     (&man.si.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.pc98;] ÄÚÖô®¿Ú (&man.sio.4; Çý¶¯³ÌÐò)
+    <para arch="pc98">ÄÚÖô®¿Ú (&man.sio.4; Çý¶¯³ÌÐò)
       <itemizedlist>
         <listitem>
 	  <para>PC-9801 °åÔØ</para>
@@ -1030,7 +1102,7 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.pc98;] NEC PC-9861K, PC-9801-101 ºÍ Midori-Denshi MDC-926Rs (&man.sio.4; Çý¶¯³ÌÐò)
+    <para arch="pc98">NEC PC-9861K, PC-9801-101 ºÍ Midori-Denshi MDC-926Rs (&man.sio.4; Çý¶¯³ÌÐò)
       <itemizedlist>
         <listitem>
 	  <para>COM2 (flags 0x01000000)</para>
@@ -1041,32 +1113,32 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.pc98;] NEC PC-9801-120 (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">NEC PC-9801-120 (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
         <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x11000000"¡£</para>
       </note>
 
-    <para>[&arch.pc98;] Microcore MC-16550, MC-16550II, MC-RS98 (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">Microcore MC-16550, MC-16550II, MC-RS98 (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
         <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x14000?01"¡£</para>
       </note>
 
-    <para>[&arch.pc98;] Media Intelligent RSB-2000, RSB-3000 and AIWA B98-02 (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">Media Intelligent RSB-2000, RSB-3000 ºÍ AIWA B98-02 (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
-        <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x15000?01"¡£</para>
+        <para>"flags 0x15000?01" is necessary in kernel configuration.</para>
       </note>
 
-    <para>[&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">Media Intelligent RSB-384 (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
         <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x16000001"¡£</para>
       </note>
 
-    <para>[&arch.pc98;] I-O DATA RSA-98III (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">I-O DATA RSA-98III (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
         <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x18000?01"¡£</para>
       </note>
 
-    <para>[&arch.pc98;] Hayes ESP98 (&man.sio.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">Hayes ESP98 (&man.sio.4; Çý¶¯³ÌÐò)</para>
       <note>
         <para>ÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "options COM_ESP" ºÍ "flags 0x19000000"¡£</para>
       </note>
@@ -1133,7 +1205,7 @@
 
     &hwlist.snd.vibes;
 
-    <para>[&arch.pc98;] NEC PC-9801-73, 86 ¼°¼æÈÝ (nss Çý¶¯³ÌÐò)
+    <para arch="pc98">NEC PC-9801-73, 86 ¼°¼æÈÝ (nss Çý¶¯³ÌÐò)
       <itemizedlist>
         <listitem>
           <para>NEC A-MATE ÄÚÖÃÉùÒô</para>
@@ -1144,14 +1216,14 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.pc98;] NEC X-MATE, CanBe, ValueStar ÄÚÖà (mss Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">NEC X-MATE, CanBe, ValueStar ÄÚÖà (mss Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.pc98;] Creative Technologies SoundBlaster(98) (&man.sb.4;
+    <para arch="pc98">Creative Technologies SoundBlaster(98) (&man.sb.4;
     Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.pc98;] I-O DATA CD-BOX (&man.sb.4; Çý¶¯³ÌÐò)</para>
+    <para arch="pc98">I-O DATA CD-BOX (&man.sb.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.pc98;] MPU-401 ¼°¼æÈÝ½Ó¿Ú (mpu Çý¶¯)
+    <para arch="pc98">MPU-401 ¼°¼æÈÝ½Ó¿Ú (mpu Çý¶¯)
       <itemizedlist>
         <listitem>
           <para>Q-Vision WaveStar</para>
@@ -1165,24 +1237,24 @@
 
     &hwlist.bktr;
 
-    <para>[&arch.i386;] Connectix QuickCam</para>
+    <para arch="i386">Connectix QuickCam</para>
   </sect2>
 
   <sect2 id="usb">
     <title>USB É豸</title>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] &os; Äܹ»Ö§³ÖһϵÁÐ USB ÍâÉ裻
+    <para arch="amd64,i386,ia64,pc98">&os; Äܹ»Ö§³ÖһϵÁÐ USB ÍâÉ裻
     ÒÑÖªÄܹ»ÕýȷʹÓõÄÉ豸ÔÚÕâ½ÚÁгö¡£ ÓÉÓÚ USB É豸ÌìÉúµÄͨÓÃÐÔ£¬
     ³ýÁËÉÙÁ¿±È½ÏÓиöÐÔµÄÉ豸֮Í⣬ ͬһÀàÐ͵ÄÉ豸¼¸ºõ¶¼Äܱ»Ö§³Ö£¬
     ¼´Ê¹ÔÚÕâÀïûÓÐÃ÷È·µØÁгö¡£</para>
 
     <note>
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB ÒÔÌ«ÍøÊÊÅäÆ÷¿ÉÒÔÔÚ <link
+      <para arch="amd64,i386,ia64,pc98">USB ÒÔÌ«ÍøÊÊÅäÆ÷¿ÉÒÔÔÚ <link
       linkend="ethernet">ÒÔÌ«Íø½Ó¿Ú</link> Ò»½ÚÕÒµ½¡£</para>
     </note>
 
     <note>
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB À¶ÑÀÊÊÅäÆ÷¿ÉÒÔÔÚ <link
+      <para arch="amd64,i386,ia64,pc98">USB À¶ÑÀÊÊÅäÆ÷¿ÉÒÔÔÚ <link
       linkend="bluetooth">À¶ÑÀ</link> Ò»½ÚÕÒµ½¡£</para>
     </note>
 
@@ -1190,14 +1262,14 @@
 
     &hwlist.uhci;
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ²ÉÓà EHCI ½Ó¿ÚµÄ USB 2.0
+    <para arch="amd64,i386,ia64,pc98">²ÉÓà EHCI ½Ó¿ÚµÄ USB 2.0
       ¿ØÖÆÆ÷ (&man.ehci.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ¼¯ÏßÆ÷
+    <para arch="amd64,i386,ia64,pc98">¼¯ÏßÆ÷
     </para>
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ¼üÅÌ (&man.ukbd.4; Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,ia64,pc98">¼üÅÌ (&man.ukbd.4; Çý¶¯³ÌÐò)
     </para>
-    <para>[&arch.amd64;, &arch.i386, &arch.pc98;] ÆäËû
+    <para arch="amd64,i386,pc98">ÆäËû
       <itemizedlist>
         <listitem>
 	  <para>Assist Computer Systems PC Camera C-M1</para>
@@ -1221,7 +1293,7 @@
 
     &hwlist.umodem;
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] Êó±êÆ÷ (&man.ums.4; Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,ia64,pc98">Êó±êÆ÷ (&man.ums.4; Çý¶¯³ÌÐò)
     </para>
 
     &hwlist.ulpt;
@@ -1240,7 +1312,7 @@
 
     &hwlist.umass;
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] ÉùÒôÉ豸 (&man.uaudio.4; Çý¶¯³ÌÐò)
+    <para arch="amd64,i386,pc98">ÉùÒôÉ豸 (&man.uaudio.4; Çý¶¯³ÌÐò)
     </para>
 
     &hwlist.uvisor;
@@ -1252,7 +1324,7 @@
 
     &hwlist.fwohci;
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.sparc64;] ´®ÐÐ×ÜÏßЭÒé 2 (SBP-2)
+    <para arch="amd64,i386,sparc64">´®ÐÐ×ÜÏßЭÒé 2 (SBP-2)
       ´æ´¢É豸 (&man.sbp.4; Çý¶¯³ÌÐò)</para>
 
   </sect2>
@@ -1279,7 +1351,7 @@
   <sect2 id="misc">
     <title>ÆäËû</title>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] FAX-Modem/PCCARD
+    <para arch="amd64,i386,pc98">FAX-Modem/PCCARD
       <itemizedlist>
         <listitem>
 	  <para>MELCO IGM-PCM56K/IGM-PCM56KH</para>
@@ -1290,9 +1362,9 @@
       </itemizedlist>
     </para>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] ÈíÇý (&man.fdc.4; Çý¶¯³ÌÐò)</para>
+    <para arch="amd64,i386,pc98">ÈíÇý (&man.fdc.4; Çý¶¯³ÌÐò)</para>
 
-    <para>[&arch.amd64; &arch.i386;] VGA-¼æÈÝ ÏÔʾ¿¨
+    <para arch="amd64,i386">VGA-¼æÈÝ ÏÔʾ¿¨
       (&man.vga.4; Çý¶¯³ÌÐò)
 
       <note>
@@ -1303,37 +1375,37 @@
 
       </para>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ¼üÅÌ°üÀ¨£º
+    <para arch="amd64,i386,ia64,pc98">¼üÅÌ°üÀ¨£º
       <itemizedlist>
         <listitem>
-	  <para>[&arch.i386;] AT-·ç¸ñµÄ ¼üÅÌ (&man.atkbd.4; Çý¶¯³ÌÐò)</para>
+	  <para arch="i386">AT-·ç¸ñµÄ ¼üÅÌ (&man.atkbd.4; Çý¶¯³ÌÐò)</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64;, &arch.i386;] PS/2 ¼üÅÌ (&man.atkbd.4; Çý¶¯³ÌÐò)</para>
+	  <para arch="amd64,i386">PS/2 ¼üÅÌ (&man.atkbd.4; Çý¶¯³ÌÐò)</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.pc98;] ±ê×¼¼üÅÌ</para>
+	  <para arch="pc98">±ê×¼¼üÅÌ</para>
 	</listitem>
         <listitem>
-	  <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB ¼üÅÌ (&man.ukbd.4; Çý¶¯³ÌÐò)</para>
+	  <para arch="amd64,i386,ia64,pc98">USB ¼üÅÌ (&man.ukbd.4; Çý¶¯³ÌÐò)</para>
 	</listitem>
       </itemizedlist>
     </para>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ¶¨µãÉ豸°üÀ¨£º
+    <para arch="amd64,i386,ia64,pc98">¶¨µãÉ豸°üÀ¨£º
       <itemizedlist>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-all mailing list