PERFORCE change 85199 for review
soc-andrew
soc-andrew at FreeBSD.org
Wed Oct 12 21:39:32 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85199
Change 85199 by soc-andrew at soc-andrew_serv on 2005/10/13 04:38:55
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/early-adopter/Makefile#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/early-adopter/article.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#9 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 (text+ko) ====
@@ -29,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.289 2005/09/18 16:22:20 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.290 2005/10/10 18:01:18 joel Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -691,6 +691,8 @@
&hwlist.snd.maestro3;
+ &hwlist.snd.mss;
+
&hwlist.snd.neomagic;
&hwlist.snd.sbc;
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.893 2005/10/03 17:24:20 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.894 2005/10/12 12:24:37 joel Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -528,7 +528,7 @@
<para>Documentation of existing functionality has been improved by
the addition of the following manual pages:
- &man.acpi.sony.4;, &man.snd.t4dwave.4;.</para>
+ &man.acpi.sony.4;, &man.snd.mss.4;, &man.snd.t4dwave.4;.</para>
</sect2>
</sect1>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.68 2005/09/18 16:22:20 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.69 2005/10/10 18:01:18 joel Exp $
#
#
@@ -119,6 +119,7 @@
snd_ich i386,amd64
snd_maestro i386,alpha,amd64
snd_maestro3 i386,alpha,amd64
+snd_mss i386
snd_neomagic i386,amd64
snd_sbc i386,alpha,amd64
snd_solo i386,amd64
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/Makefile#2 (text+ko) ====
@@ -1,14 +1,13 @@
# The FreeBSD Simplified Chinese Project
#
-# Original Revision: 1.3
-# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.1 2004/10/15 06:43:44 delphij Exp $
+# Original Revision: 1.7
+# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.2 2005/10/12 20:30:38 delphij Exp $
RELN_ROOT?= ${.CURDIR}/..
-SUBDIR = early-adopter
+SUBDIR = relnotes
SUBDIR+= hardware
SUBDIR+= readme
-SUBDIR+= relnotes
SUBDIR+= errata
SUBDIR+= installation
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 (text+ko) ====
@@ -10,7 +10,7 @@
The FreeBSD Simplified Chinese Project
- Original Revision: 1.72
+ Original Revision: 1.73.2.1
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -19,27 +19,18 @@
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
%release;
+<!ENTITY release.bugfix "6.0-RELEASE">
]>
<article>
<articleinfo>
- <title>&os;
-<![ %release.type.current [
- &release.current;
-]]>
-<![ %release.type.snapshot [
- &release.prev;
-]]>
-<![ %release.type.release [
- &release.current;
-]]>
- ·¢Ðа濱Îó</title>
+ <title>&os; &release.bugfix; ·¢Ðа濱Îó</title>
<corpauthor>
The &os; Project
</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.2 2005/04/02 14:08:24 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.3 2005/10/12 20:30:38 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -60,51 +51,24 @@
</articleinfo>
<abstract>
- <para>Õâ·ÝÎĵµÁгöÁË &os;
-<![ %release.type.current [
- &release.current;
-]]>
-<![ %release.type.snapshot [
- &release.prev;
-]]>
-<![ %release.type.release [
- &release.current;
-]]>
- µÄ¿±ÎóÄÚÈÝ£¬ ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬
+ <para>Õâ·ÝÎĵµÁгöÁË &os; &release.bugfix; µÄ¿±ÎóÄÚÈÝ£¬
+ ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬
ÒÔ¼°ÔÚ·¢ÐаæµÄ½»¸¶¹¤³ÌºóÆÚ±¾Ó¦Ð´½ø·¢ÐаæÎĵµ£¬
¶øûÓÐÀ´µÃ¼°¼ÓÈëµÄÖØÒªÐÅÏ¢¡£ ÕâЩÐÅÏ¢¿ÉÄÜ°üÀ¨°²È«¹«¸æ£¬
ÒÔ¼°¹ØÓÚ¿ÉÄÜÓ°ÏìÈí¼þºÍÎĵµµÄ²Ù×÷»ò¿ÉÓÃÐÔµÄÐÂÎÅ¡£
ÔÚ°²×°´Ë°æ±¾µÄ &os; ֮ǰ£¬ Ó¦Ê×ÏÈÔĶÁ´ËÎĵµµÄ×îа汾¡£</para>
- <para>Õâ·Ý &os;
-<![ %release.type.current [
- &release.current;
-]]>
-<![ %release.type.snapshot [
- &release.prev;
-]]>
-<![ %release.type.release [
- &release.current;
-]]>
- µÄ¿±ÎóÎĵµ½«±»³ÖÐøµØά»¤£¬
- Ö±µ½ &os; µÄ &release.next; ·¢²¼ÎªÖ¹¡£</para>
+ <para>Õâ·Ý &os; &release.bugfix; µÄ¿±ÎóÎĵµ½«³ÖÐøµØά»¤£¬
+ Ö±µ½ &os; &release.next; ·¢²¼ÎªÖ¹¡£</para>
</abstract>
<sect1 id="intro">
<title>½éÉÜ</title>
- <para>Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os;
-<![ %release.type.current [
- &release.current;
-]]>
-<![ %release.type.snapshot [
- &release.prev;
-]]>
-<![ %release.type.release [
- &release.current;
-]]>
+ <para>Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; &release.bugfix;
µÄ <quote>×îÐÂÖØ´óÐÂÎÅ</quote>¡£ ÔÚ°²×°ÕâÒ»°æ±¾Ö®Ç°£¬
- ²Î¿¼Õâ·ÝÎĵµÒÔÁ˽âÔÚ·¢²¼Ö®ºóÒѾ·¢ÏÖ²¢ÐÞÕýÁËÄÄЩÎÊÌâ·Ç³£ÖØÒª¡£</para>
+ ͨ¹ý²Î¿¼Õâ·ÝÎĵµÀ´Á˽âÔÚ·¢²¼Ö®ºó£¬
+ ¿ÉÄÜÒѾ·¢ÏÖ²¢ÐÞÕýµÄÎÊÌâ·Ç³£ÖØÒª¡£</para>
<para>Ëæ·¢Ðа汾¶ø·¢²¼µÄÕâ·ÝÎĵµ (ÀýÈ磬 ÔÚ CDROM Éϸ½´øµÄ)
Ò»°ãÀ´ËµÒѾ¹ýʱÁË£¬ µ«ÔÚ Internet ÉϵÄÆäËû¸±±¾»á±»³ÖÐø¸üУ¬
@@ -122,54 +86,40 @@
</sect1>
+ <sect1 id="late-news">
+ <title>¸üÐÂÏûÏ¢</title>
+
+ <para>ÔÝʱûÓÐÏà¹ØÏûÏ¢¡£</para>
+ </sect1>
+
<sect1 id="security">
<title>°²È«¹«¸æ</title>
-<![ %release.type.release [
<para>ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£</para>
-]]>
-
-<![ %release.type.current [
- <para>ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£</para>
-]]>
-
-<![ %release.type.snapshot [
- <para>ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£</para>
-]]>
-
</sect1>
- <sect1 id="open-issues">
- <title>´æÔÚµÄÎÊÌâ</title>
+ <sect1 id="known-problems">
+ <title>ÒÑÖªÎÊÌâºÍ½â¾ö°ì·¨</title>
-<![ %release.type.current [
- <para>ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£</para>
-]]>
+ <para>(2005/10/3)
+ ÔÚ»úÆ÷ûÓÐÖ¡»º´æʱ£¬ Òýµ¼Ê± &os;/sparc64 GENERIC
+ Äں˿ÉÄÜ»áÊä³öÏÂÁÐÏûÏ¢£º</para>
-<![ %release.type.release [
- <para>ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£</para>
-]]>
+ <screen>Aug 26 19:31:27 hostname getty[429]: open /dev/ttyv1: No such file or directory</screen>
-<![ %release.type.snapshot [
- <para>ÔÝʱ»¹Ã»ÓÐеÄÒÑÖªÎÊÌâ¡£</para>
-]]>
+ <para>ÕâÊÇÓÉÓÚ¼ÆËã»úûÓпÉÒÔ±» &man.syscons.4; ʶ±ðµÄͼÐÎÓ²¼þÉ豸£¬ Òò´Ë
+ <filename>/dev/ttyv*</filename> É豸½ÚµãÒ²¾Í²»»á×Ô¶¯´´½¨¡£
+ ÕâÊÇÒ»¸öÎÞº¦µÄ´íÎóÌáʾ£¬ Äú¿ÉÒÔͨ¹ý½ûÓÃ
+ <filename>/etc/ttys</filename> ÖеÄ
+ <filename>/dev/ttyv*</filename> ÏîÀ´ÆÁ±ÎËü¡£</para>
- </sect1>
+ <para>(2005/10/3)
+ ÔÚÄڴ泬¹ý 4GB µÄÔËÐÐ &os;/sparc64 µÄ¼ÆËã»úÉÏ£¬ ÎÞ·¨¼ÓÔغÍʹÓÃÄÚºËÄ£¿é¡£
+ ĿǰûÓа취ÈƹýÕâ¸öÎÊÌ⣬ ÄúÖ»Äܽ«ÕâЩģ¿é¾²Ì¬Áª±àµ½¶¨ÖƵÄÄں˲ÅÐС£</para>
- <sect1 id="late-news">
- <title>ÖØ´óÐÂÎÅ</title>
-
-<![ %release.type.current [
- <para>ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£</para>
-]]>
-
-<![ %release.type.release [
- <para>ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£</para>
-]]>
-
-<![ %release.type.snapshot [
- <para>ÔÝʱ»¹Ã»ÓÐÐÂÎÅ¡£</para>
-]]>
+ <para>(2005/10/3)
+ &man.kgdb.1; ¹¤¾ßÎÞ·¨ÔÚ &os;/sparc64 ÓÃÓÚµ÷ÊÔ°üº¬ trap µÄ panic¡£
+ Èƹý´ËÎÊÌâµÄÁÙʱ·½·¨ÊÇʹÓà <filename>devel/gdb53</filename>¡£</para>
</sect1>
</article>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.3.4.1
- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $
+ Original Revision: 1.5.2.1
+ $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml,v 1.2 2005/10/12 20:30:38 delphij Exp $
-->
<sect1 id="proc">
<title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 (text+ko) ====
@@ -1,14 +1,14 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.6
- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.2 2005/03/27 17:20:30 delphij Exp $
+ Original Revision: 1.7
+ $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.3 2005/10/12 20:30:39 delphij Exp $
-->
<articleinfo>
<title>&os;/&arch; &release.current; ¼æÈÝÓ²¼þ˵Ã÷</title>
- <corpauthor>The FreeBSD Documentation Project</corpauthor>
+ <corpauthor>The &os; Documentation Project</corpauthor>
<copyright>
<year>2000</year>
@@ -17,6 +17,6 @@
<year>2003</year>
<year>2004</year>
<year>2005</year>
- <holder role="mailto:doc at FreeBSD.org">The FreeBSD Documentation Project</holder>
+ <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
</articleinfo>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.277
+ Original Revision: 1.282.2.3
-->
<!--
@@ -35,7 +35,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.4 2005/08/28 08:20:41 simon Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.5 2005/10/12 20:30:39 delphij Exp $</pubdate>
</sect1info>
<title>Ö§³ÖµÄÓ²¼þ</title>
@@ -58,7 +58,7 @@
<title>´ÅÅÌ¿ØÖÆÆ÷</title>
<para arch="i386,alpha,sparc64,ia64,pc98,amd64">IDE/ATA ¿ØÖÆÆ÷ (&man.ata.4; Çý¶¯³ÌÐò)</para>
- <para arch="pc98">IDE/ATA ¿ØÖÆÆ÷ (wdc driver)
+ <para arch="pc98">IDE/ATA ¿ØÖÆÆ÷ (wdc Çý¶¯³ÌÐò)
<itemizedlist>
<listitem>
<para>°åÔØ IDE ¿ØÖÆÆ÷</para>
@@ -66,7 +66,11 @@
</itemizedlist>
</para>
- &hwlist.aic;
+ &hwlist.aac;
+
+ &hwlist.adv;
+
+ &hwlist.adw;
&hwlist.aha;
@@ -76,74 +80,41 @@
&hwlist.ahd;
- &hwlist.aac;
+ &hwlist.aic;
+
+ &hwlist.amd;
+
+ &hwlist.amr;
+ <note>
+ <para arch="i386,amd64">Äܹ»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£ ²»Ö§³Ö EISA
+ ÊÊÅäÆ÷¡£</para>
- &hwlist.ct;
+ <para arch="alpha">ÓÉÓÚ SRM µÄÏÞÖÆ£¬ ²»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£</para>
+ </note>
- <para arch="pc98">NEC PC-9801-55, 92 ÒÔ¼°¼æÈÝµÄ C-Bus SCSI ½Ó¿Ú (bs Çý¶¯)
- <itemizedlist>
- <listitem>
- <para>NEC PC-9801-55, 92 ¼°Æä¼æÈÝ</para>
- <para>ICM IF-2660</para>
- <para>Midori-Denshi MDC-554NA</para>
- <para>Logitec LHA-N151</para>
- <note>
- <para>DMA ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x00000"¡£</para>
- </note>
- </listitem>
- <listitem>
- <para>I-O DATA SC-98II</para>
- <note>
- <para>DMA ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x10000"¡£</para>
- </note>
- </listitem>
- <listitem>
- <para>TEXA HA-55BS2 ºÍ¸üÐÂ</para>
- <para>Midori-Denshi MDC-926Rs</para>
- <note>
- <para>Bus-master ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x20000"¡£</para>
- </note>
- </listitem>
- <listitem>
- <para>ELECOM Bus-master SCSI ½Ó¿Ú</para>
- <note>
- <para>Bus-master ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x30000"¡£</para>
- </note>
- </listitem>
- <listitem>
- <para>ËùÓÐ SMIT ´«ÊäÀàÐ굀 SCSI ½Ó¿Ú</para>
- <note>
- <para>SMIT ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x40000"¡£</para>
- </note>
- </listitem>
- <listitem>
- <para>Logitec LHA-20x ϵÁÐ</para>
- <para>ICM IF-2766, IF-2766ET, IF-2767 ºÍ IF-2769</para>
- <note>
- <para>Bus-master ´«ÊäģʽÐèÒªÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨ "flags 0x50000"¡£</para>
- </note>
- </listitem>
- </itemizedlist>
- </para>
- &hwlist.adv;
+ &hwlist.arcmsr;
- &hwlist.adw;
+ &hwlist.asr;
&hwlist.bt;
+ &hwlist.ciss;
+
+ &hwlist.ct;
+
&hwlist.dpt;
- &hwlist.asr;
+ &hwlist.esp;
+
+ &hwlist.hptmv;
+
+ &hwlist.ida;
- &hwlist.amr;
- <note>
- <para arch="i386,amd64">Äܹ»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£ ²»Ö§³Ö EISA
- ÊÊÅäÆ÷¡£</para>
+ &hwlist.iir;
- <para arch="alpha">ÓÉÓÚ SRM µÄÏÞÖÆ£¬ ²»Ö§³Ö´ÓÕâЩ¿ØÖÆÆ÷Æô¶¯¡£</para>
- </note>
+ &hwlist.ips;
- &hwlist.arcmsr;
+ &hwlist.isp;
&hwlist.mlx;
@@ -159,41 +130,27 @@
&hwlist.mly;
- &hwlist.twe;
-
- &hwlist.twa;
+ &hwlist.mpt;
&hwlist.ncr;
- &hwlist.sym;
-
&hwlist.ncv;
- &hwlist.stg;
-
- &hwlist.isp;
-
- &hwlist.amd;
-
&hwlist.nsp;
- &hwlist.vpo;
+ &hwlist.pst;
- &hwlist.ida;
+ &hwlist.stg;
- &hwlist.ciss;
+ &hwlist.sym;
- &hwlist.iir;
+ &hwlist.trm;
- &hwlist.pst;
+ &hwlist.twa;
- &hwlist.hptmv;
+ &hwlist.twe;
- &hwlist.ips;
-
- &hwlist.mpt;
-
- &hwlist.trm;
+ &hwlist.vpo;
<para arch="i386">wds(4) Çý¶¯³ÌÐòÖ§³Ö WD7000 SCSI ¿ØÖÆÆ÷</para>
@@ -215,11 +172,6 @@
</listitem>
<listitem arch="i386">
- <para>Matsushita CR-562, CR-563, ¼°¼æÈÝ
- (&man.matcd.4; Çý¶¯³ÌÐò)</para>
- </listitem>
-
- <listitem arch="i386">
<para>Sony רÓÐ½Ó¿Ú (ËùÓÐÐͺÅ) (&man.scd.4;)</para>
</listitem>
@@ -241,97 +193,101 @@
<sect2 id="ethernet">
<title>ÒÔÌ«Íø½Ó¿Ú</title>
- &hwlist.sf;
+ &hwlist.aue;
+
+ &hwlist.axe;
- &hwlist.ti;
+ <para arch="i386,amd64">»ùÓÚ Broadcom BCM4401 µÄ¸ßËÙÒÔÌ«ÍøÊÊÅäÆ÷
+ (&man.bfe.4; Çý¶¯³ÌÐò)</para>
- &hwlist.pcn;
+ &hwlist.bge;
- &hwlist.lnc;
+ &hwlist.cue;
- <para arch="i386,pc98,amd64">»ùÓÚ SMC 83c17x (EPIC) µÄÒÔÌ«Íø NIC (&man.tx.4; Çý¶¯³ÌÐò)
+ <para arch="i386,amd64">»ùÓÚ Crystal Semiconductor CS89x0 µÄ NIC
+ (&man.cs.4; Çý¶¯³ÌÐò)
</para>
+ &hwlist.dc;
+
+ &hwlist.de;
+
&hwlist.ed;
- &hwlist.rl;
+ &hwlist.el;
- &hwlist.wb;
+ &hwlist.em;
- &hwlist.vr;
+ &hwlist.ep;
- &hwlist.sis;
+ &hwlist.ex;
- &hwlist.nge;
+ &hwlist.fe;
- &hwlist.ste;
+ &hwlist.fxp;
- &hwlist.sk;
+ &hwlist.gem;
- &hwlist.tl;
+ &hwlist.hme;
- &hwlist.dc;
+ &hwlist.ie;
- &hwlist.aue;
-
- &hwlist.cue;
+ &hwlist.ixgb;
&hwlist.kue;
- &hwlist.axe;
+ &hwlist.lge;
- &hwlist.rue;
+ &hwlist.lnc;
- &hwlist.udav;
+ &hwlist.my;
- &hwlist.de;
+ &hwlist.nge;
- &hwlist.fe;
+ &hwlist.nve;
- &hwlist.fxp;
+ &hwlist.pcn;
- &hwlist.ex;
+ &hwlist.re;
- &hwlist.ie;
+ &hwlist.rl;
- &hwlist.ep;
+ &hwlist.rue;
- &hwlist.xl;
+ &hwlist.sf;
- &hwlist.vx;
+ &hwlist.sis;
- <para arch="i386,amd64">»ùÓÚ Crystal Semiconductor CS89x0 µÄ NIC
- (&man.cs.4; Çý¶¯³ÌÐò)
- </para>
+ &hwlist.sk;
&hwlist.sn;
- &hwlist.xe;
+ &hwlist.snc;
- &hwlist.snc;
+ &hwlist.ste;
- &hwlist.lge;
+ &hwlist.ti;
- &hwlist.txp;
+ &hwlist.tl;
- &hwlist.bge;
+ <para arch="i386,pc98,amd64">»ùÓÚ SMC 83c17x (EPIC) µÄÒÔÌ«Íø NIC (&man.tx.4; Çý¶¯³ÌÐò)
+ </para>
- &hwlist.em;
+ &hwlist.txp;
- &hwlist.hme;
+ &hwlist.udav;
- &hwlist.gem;
+ &hwlist.vge;
- &hwlist.my;
+ &hwlist.vr;
- <para arch="i386,amd64">»ùÓÚ Broadcom BCM4401 µÄ¸ßËÙÒÔÌ«ÍøÊÊÅäÆ÷
- (&man.bfe.4; Çý¶¯³ÌÐò)</para>
+ &hwlist.vx;
- &hwlist.re;
+ &hwlist.wb;
- &hwlist.ixgb;
+ &hwlist.xe;
- &hwlist.vge;
+ &hwlist.xl;
</sect2>
@@ -695,53 +651,54 @@
</note>
</sect2>
- <sect2 id="audio">
- <title>Audio Devices</title>
+ <sect2 id="sound">
+ <title>ÉùÒôÉ豸</title>
+
+ &hwlist.sound;
&hwlist.snd.ad1816;
- &hwlist.snd.cs4281;
- &hwlist.snd.solo;
+
+ &hwlist.snd.als4000;
- &hwlist.snd.sbc;
+ &hwlist.snd.audiocs;
&hwlist.snd.cmi;
+ &hwlist.snd.cs4281;
+
&hwlist.snd.csa;
+ &hwlist.snd.ds1;
+
+ &hwlist.snd.emu10k1;
+
&hwlist.snd.es137x;
&hwlist.snd.ess;
- &hwlist.snd.maestro;
+ &hwlist.snd.fm801;
- &hwlist.snd.maestro3;
+ &hwlist.snd.gusc;
- <para arch="i386,amd64">ForteMedia fm801</para>
+ &hwlist.snd.ich;
- &hwlist.snd.gusc;
+ &hwlist.snd.maestro;
- <para arch="i386,amd64">Intel 443MX, 810, 815, ºÍ 815E ¼¯³ÉÉùÒôÉ豸
- (&man.pcm.4; Çý¶¯³ÌÐò)</para>
+ &hwlist.snd.maestro3;
- <para arch="i386,alpha,amd64">MSS/WSS ¼æÈÝµÄ DSP (&man.pcm.4; Çý¶¯³ÌÐò)</para>
-
&hwlist.snd.neomagic;
- <para arch="i386,amd64">OPTi 931/82C931 (&man.pcm.4; Çý¶¯³ÌÐò)</para>
+ &hwlist.snd.sbc;
- &hwlist.snd.vibes;
+ &hwlist.snd.solo;
- &hwlist.snd.emu10k1;
+ &hwlist.snd.t4dwave;
- <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; driver)</para>
+ &hwlist.snd.via8233;
&hwlist.snd.via82c686;
- &hwlist.snd.ds1;
-
- &hwlist.snd.ich;
-
- &hwlist.snd.audiocs;
+ &hwlist.snd.vibes;
<para arch="pc98">NEC PC-9801-73, 86 ¼°¼æÈÝ (nss Çý¶¯³ÌÐò)
<itemizedlist>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.6
- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml,v 1.1 2004/10/15 06:43:45 delphij Exp $
+ Original Revision: 1.7
+ $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $
-->
<sect1 id="intro">
@@ -18,7 +18,7 @@
</note>
<para arch="ia64">¹ØÓÚ &os;/&arch; µÄ¸ü¶àÐÅÏ¢¿ÉÒÔÔÚ
- <ulink url="http://www.FreeBSD.org/platforms/ia64/index.html">&os;/&arch;
+ <ulink url="&url.base;/platforms/ia64/index.html">&os;/&arch;
Project</ulink> ÉÏÕÒµ½¡£</para>
</sect1>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.5
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
+ Original Revision: 1.6
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $
-->
<articleinfo>
@@ -18,6 +18,7 @@
<year>2002</year>
<year>2003</year>
<year>2004</year>
- <holder role="mailto:doc at FreeBSD.org">The FreeBSD Documentation Project</holder>
+ <year>2005</year>
+ <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
</articleinfo>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.17
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.2 2005/04/09 06:20:08 delphij Exp $
+ Original Revision: 1.19
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.3 2005/10/12 20:30:39 delphij Exp $
This file contains the comments of the old TROUBLE.TXT file.
-->
@@ -66,7 +66,8 @@
»òÕß°²×°Ê±ÐÐΪÒì³££¬ »òÕßÈíÇýûÓмì²âµ½¡£</para>
</question>
<answer>
- <para>&os; 5.0 ÒÔ¼°¸ü¸ß°æ±¾´óÁ¿µØʹÓÃÁË i386 ƽ̨ÉϵÄϵͳ ACPI
+ <para>&os; 5.0 ÒÔ¼°¸ü¸ß°æ±¾´óÁ¿µØʹÓÃÁË i386¡¢ amd64
+ ÒÔ¼° ia64 ƽ̨ÉϵÄϵͳ ACPI
·þÎñÒÔ°ïÖú¼ì²âϵͳÔÚÆô¶¯¹ý³ÌÖмì²âµ½µÄÉ豸¡£
²»ÐÒµÄÊÇ£¬ ACPI Çý¶¯³ÌÐòÒÔ¼°Ö÷°å¼°Æä BIOS ÈÔÈ»´æÔÚһЩ bug¡£
ACPI ¿ÉÒÔͨ¹ýÔÚÆô¶¯¼ÓÔصĵÚÈý½×¶Îͨ¹ýÉèÖÃ
@@ -96,7 +97,7 @@
</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386,pc98,alpha,sparc64">
<question>
<para>ÏÈÇ°°æ±¾µÄ &os; Äܹ»Ê¶±ðÎҵľÉʽ ISA É豸£¬
¶øа汾²»ÄÜÁË¡£ ·¢ÉúÁËʲôÎÊÌ⣿</para>
@@ -202,7 +203,7 @@
</blockquote>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>&man.mcd.4; Çý¶¯×ÜÊÇÈÏΪËü·¢ÏÖÁËÒ»¸öÉ豸£¬ ¶øÕâµ¼ÖÂÎÒµÄ
Intel EtherExpress Íø¿¨ÎÞ·¨Õý³£¹¤×÷¡£</para>
@@ -237,7 +238,7 @@
Äú¾Í²»Ó¦Ê¹Óà IRQ 2 »ò 9¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>ÎÒ´ÓÈíÅÌÒýµ¼°²×°ÎÒµÄ IBM ThinkPad (tm)Ï¥ÉÏÐ͵çÄÔ£¬
¼üÅ̵ÄÊäÈëÒ»ÍÅÔã¡£</para>
@@ -249,7 +250,7 @@
hint <quote>hint.atkbd.0.flags="4"</quote> Ó¦¸ÃÄÜÈÃÆäÕý³£¹¤×÷¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386,pc98,alpha,sparc64">
<question>
<para>ÎÒµÄϵͳÕÒ²»µ½ÎÒµÄ Intel EtherExpress 16 ¿¨¡£</para>
</question>
@@ -259,7 +260,7 @@
³ÌÐò½øÐÐÉèÖ㬠ÈÃʹӳÉäºóµÄÄÚ´æ´óСΪ 32K </para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>ÔÚ EISA HP Netserver ÉÏ°²×°Ê±£¬ÎÒµÄ
AIC-7xxx SCSI ¿ØÖÆÆ÷¼ì²â²»µ½¡£</para>
@@ -270,7 +271,7 @@
ÐèÒªÔÚ¼ÓÔØÆ÷µÚÈý½×¶ÎÉèÖà hint <quote>hw.eisa_slots="12"</quote>¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>ÎÒÓÐһ̨ Panasonic AL-N1 »ò Rios Chandler Pentium
»úÆ÷£¬ ÎÒ·¢ÏÖÿµ±½øÈ밲װʱϵͳ¶¼»á¹Ò»ú¡£</para>
@@ -290,7 +291,7 @@
<para>&os; ²»Ö§³ÖÕâÖÖ¿ØÖÆÆ÷¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>ÔÚһ̨ Compaq Aero ±Ê¼Ç±¾ÉÏ£¬ µ±³¢ÊÔ´ÓÈíÅÌ°²×°Ê±£¬ Ìáʾ <quote>No
floppy devices found! Please check ...</quote>¡£</para>
@@ -302,7 +303,7 @@
ÕâÑùÇý¶¯³ÌÐò½«ÈÏΪµÚÒ»¸öÈíÇý´æÔÚ£¬ ¶ø²»È¥²éѯ CMOS¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>ÔÚ°²×°Ò»Ì¨ Dell Poweredge XE ʱ£¬ ÎÞ·¨Ê¶±ð Dell
×ÔÓÐµÄ RAID ¿ØÖÆÆ÷ DSA (Dell SCSI Array)¡£</para>
@@ -329,7 +330,7 @@
ΨһµÄ½â¾ö°ì·¨ÊÇ°²×°Ò»¸ö²»Í¬Æ·ÅƵÄÍø¿¨¡£</para>
</answer>
</qandaentry>
- <qandaentry>
+ <qandaentry arch="i386">
<question>
<para>µ±ÎÒÔÚÅäÖÃÍøÂç·þÎñÆڼ䰲װÁËÒ»¸ö
IBM Netfinity 3500£¬ ϵͳֹͣÁËÏìÓ¦¡£</para>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.12
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
+ Original Revision: 1.13
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $
This section contains the contents of the old UPGRADE.TXT
file.
@@ -187,7 +187,7 @@
<para>ÄÇЩ¶ÔÔÊÐí¸ü¸´ÔÓ¡¢¹îÒìµÄÉý¼¶·½·¨¸ÐÐËȤµÄÈËÓ¦¸Ã¿´¿´
&os; ʹÓÃÊÖ²áµÄ <ulink
- url="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/cutting-edge.html">
+ url="&url.books.handbook;/cutting-edge.html">
×îÇ°ÑØ</ulink> Ò»Õ¡£Õâ¸ö¹ý³Ì°üÀ¨ÁË´ÓÔ´´úÂëÖؽ¨Õû¸ö &os;¡£
ÕâÒÀÀµÓÚ¿É¿¿µÄÍøÂçÁ¬½Ó¡¢¶îÍâµÄ´ÅÅÌ¿Õ¼äºÍʱ¼ä£¬
µ«ÊÇÓÐÍøÂçÒÔ¼°ÆäËü¸ü¸´ÔÓ°²×°µÄÓÅÊÆ¡£
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 (text+ko) ====
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.31.2.2
+ Original Revision: 1.37
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
@@ -18,7 +18,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.1 2004/10/15 06:43:47 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -26,6 +26,7 @@
<year>2002</year>
<year>2003</year>
<year>2004</year>
+ <year>2005</year>
<holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
@@ -106,6 +107,25 @@
]]>
+<![ %release.type.current; [
+
+ <para>Õâ¸ö &release.type; Ö÷ÒªÕë¶Ô×·Çó×îй¦ÄÜ£¬
+ ÒÔ¼°Ï£Íû²ÎÓëÕýÔÚ½øÐÐµÄ &os; ¿ª·¢»î¶¯µÄÓû§¡£ ¾¡¹Ü &os;
+ µÄ¿ª·¢ÍŶӻᾡ×î´óŬÁ¦È·±£Ã¿Ò»¸ö &release.type;
+ ¶¼Äܹ»ÈçÐû´«µÄÄÇÑù¹¤×÷£¬ µ« &release.branch; ÈÔÈ»ÊÇÒ»¸ö¿ª·¢ÖеķÖÖ§¡£</para>
+
+ <para>ʹÓÃÕâ¸ö &release.type; µÄ»ù±¾ÒªÇóÊÇ¶Ô &os; ¼¼ÊõµÄÊìÁ·ÐÔ£¬
+ ÒÔ¼°¶ÔÕýÔÚ½øÐÐµÄ &os; &release.branch; ¿ª·¢¹ý³ÌµÄÀí½â (ÕâЩ£¬
+ ¶¼»áÔÚ &a.current; ÖнøÐÐÌÖÂÛ)¡£</para>
+
+ <para>¶ÔÓÚÄÇЩϣÍûÓà &os; À´´¦ÀíÈÕ³£ÒµÎñ£¬
+ ¶ø²»Êdz¢ÊÔ×îР&os; ¼¼ÊõµÄÓû§À´Ëµ£¬ ÕýʽµÄ·¢Ðа汾
+ (ÀýÈç &release.prev.stable;) ͨ³£¸üΪºÏÊÊ¡£
+ ·¢Ðа汾¾¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²ì£¬
+ ÒÔÈ·±£Æä¸ß¿É¿¿ÐÔ¡£</para>
+
+]]>
+
<![ %release.type.snapshot; [
<para>&release.type; Ö÷ҪĿ±êÊÇÓÐðÏÕ¾«ÉñµÄ£¬
@@ -278,16 +298,9 @@
</listitem>
<listitem>
- <para><filename>EARLY.TXT</filename>: Ϊ´Ó
- &os; 4.<replaceable>X</replaceable> ǨÒƵ½
- &os; 5.<replaceable>X</replaceable>
- ϵÁз¢ÐаæµÄÐÂÓû§×¼±¸µÄÖ¸ÄÏ¡£</para>
- </listitem>
-
- <listitem>
- <para><filename>RELNOTES.TXT</filename>£º·¢ÐÐ˵Ã÷£¬
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list