PERFORCE change 137969 for review

John Birrell jb at FreeBSD.org
Tue Mar 18 01:14:54 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=137969

Change 137969 by jb at jb_freebsd8 on 2008/03/18 01:14:09

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#16 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#23 integrate
.. //depot/projects/dtrace/ports/MOVED#70 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/getdate#2 delete
.. //depot/projects/dtrace/src/lib/libc/locale/wctype.c#4 integrate
.. //depot/projects/dtrace/src/sbin/atacontrol/atacontrol.8#5 integrate
.. //depot/projects/dtrace/src/sbin/atacontrol/atacontrol.c#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/ar.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/linux.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/pnp.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/scd.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/streams.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/svr4.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/atomic.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/ieee80211_radiotap.9#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/atomic.h#5 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/intr.c#7 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_ses.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/cpufreq/p4tcc.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/i386/include/atomic.h#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#8 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/atomic.h#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_conf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_intr.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_witness.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/ieee8023ad_lacp.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#16 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_l2tp.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#27 integrate
.. //depot/projects/dtrace/src/sys/netinet/libalias/alias_irc.c#7 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/atomic.h#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/gdb_machdep.h#3 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/gdb_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/atomic.h#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/ata.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/conf.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/interrupt.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/resourcevar.h#5 integrate
.. //depot/projects/dtrace/src/usr.bin/ruptime/ruptime.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/fifolog/lib/miniobj.h#2 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#10 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xsl#4 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#2 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#43 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.102 2008/03/06 11:49:00 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.105 2008/03/17 21:06:43 blackend Exp $
 -->
 
 <chapter id="printing">
@@ -1452,13 +1452,13 @@
             when <application>LPD</application> uses filters.  This knowledge
 	    could help you anticipate
             and debug problems you might encounter as you install more and
-            more filters on each of your printers.</para>
+            more filters for each of your printers.</para>
         </listitem>
               
         <listitem>
           <para><application>LPD</application> expects every printer to be 
 	    able to print plain text by
-            default.  This presents a problem for &postscript; (or other
+            default.  This presents a problem for &postscript; printers (or other
             language-based printers) which cannot directly print plain text.
             Section <link
               linkend="printing-advanced-if-conversion">Accommodating
@@ -1487,8 +1487,8 @@
             section, you should be able to set up your printers such that
             users can type <command>lpr -t</command> to print troff data, or
             <command>lpr -d</command> to print &tex; DVI data, or <command>lpr
-              -v</command> to print raster image data, and so forth.  I
-            recommend reading this section.</para>
+              -v</command> to print raster image data, and so forth.  The
+            reading of this section is recommended.</para>
         </listitem>
               
         <listitem>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#9 (text+ko) ====

@@ -1,9 +1,9 @@
 #
-# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.15 2007/10/23 02:08:21 loader Exp $
+# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.16 2008/03/17 20:24:22 loader Exp $
 #
 # Build the FreeBSD Handbook (Simplified Chinese).
 #
-# Original revision: 1.108
+# Original revision: 1.109
 
 # ------------------------------------------------------------------------
 #
@@ -160,6 +160,18 @@
 IMAGES_EN+= virtualization/virtualpc-freebsd11.png
 IMAGES_EN+= virtualization/virtualpc-freebsd12.png
 IMAGES_EN+= virtualization/virtualpc-freebsd13.png
+IMAGES_EN+= virtualization/vmware-freebsd01.png
+IMAGES_EN+= virtualization/vmware-freebsd02.png
+IMAGES_EN+= virtualization/vmware-freebsd03.png
+IMAGES_EN+= virtualization/vmware-freebsd04.png
+IMAGES_EN+= virtualization/vmware-freebsd05.png
+IMAGES_EN+= virtualization/vmware-freebsd06.png
+IMAGES_EN+= virtualization/vmware-freebsd07.png
+IMAGES_EN+= virtualization/vmware-freebsd08.png
+IMAGES_EN+= virtualization/vmware-freebsd09.png
+IMAGES_EN+= virtualization/vmware-freebsd10.png
+IMAGES_EN+= virtualization/vmware-freebsd11.png
+IMAGES_EN+= virtualization/vmware-freebsd12.png
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#16 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original revision: 1.404
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.18 2008/01/16 08:22:58 loader Exp $
+     Original revision: 1.406
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.19 2008/03/17 20:24:22 loader Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -4661,7 +4661,12 @@
 
       <itemizedlist>
 	<listitem>
-	  <para>´ÓÄúµÄÉÏÒ»¼¶ÌṩÉÌÄÇÀï»ñµÃ IPv6 ÍøÂç¡£ÓëÄúµÄ»¥ÁªÍøÌṩÉÌÌÖÂÛÒÔÇóÖ¸µ¼¡£</para>
+	  <para>×ÉѯÄãµÄ»¥ÁªÍø·þÎñÌṩÉÌÊÇ·ñÌṩ IPv6¡£</para>
+	</listitem>
+
+	<listitem>
+	  <para><ulink url="http://www.sixxs.net">SixXS</ulink>
+	    ÏòÈ«Çò·¶Î§ÌṩͨµÀ¡£</para>
 	</listitem>
 
 	<listitem>
@@ -4997,7 +5002,58 @@
 
     <para>ÕâÑù¾Í¿ÉÒÔʹÓà <acronym>CARP</acronym> ¹¦ÄÜÁË£¬
       һЩ¾ßÌåµÄ²ÎÊý£¬ ¿ÉÒÔͨ¹ýһϵÁÐ <command>sysctl</command>
-      <acronym>OID</acronym> À´µ÷Õû¡£ É豸¿ÉÒÔͨ¹ý <command>ifconfig</command> ÃüÁîÀ´¼ÓÔØ£º</para>
+      <acronym>OID</acronym> À´µ÷Õû¡£</para>
+
+    <informaltable frame="none" pgwide="1">
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>OID</entry>
+	    <entry>ÃèÊö</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry><varname>net.inet.carp.allow</varname></entry>
+	    <entry>½ÓÊܽøÀ´µÄ <acronym>CARP</acronym> °ü¡£
+	      ĬÈÏÆôÓá£</entry>
+          </row>
+
+          <row>
+            <entry><varname>net.inet.carp.preempt</varname></entry>
+	    <entry>µ±Ö÷»úÖÐÓÐÒ»¸ö <acronym>CARP</acronym> ÍøÂç½Ó¿ÚʧȥÏìӦʱ£¬
+	      Õâ¸öÑ¡ÏֹͣÕą̂Ö÷»úÉÏËùÓÐµÄ <acronym>CARP</acronym>
+	      ½Ó¿Ú¡£ ĬÈϽûÓá£</entry>
+          </row>
+
+          <row>
+            <entry><varname>net.inet.carp.log</varname></entry>
+	    <entry>µ±ÖµÎª <literal>0</literal> ±íʾ½ûÖ¹¼Ç¼ËùÓÐÈÕÖ¾¡£
+	      ֵΪ <literal>1</literal> ±íʾ¼Ç¼Ëð»µµÄ <acronym>CARP</acronym>
+	      °ü¡£ÈκδóÓÚ <literal>1</literal> ±íʾ¼Ç¼ <acronym>CARP</acronym>
+	      ÍøÂç½Ó¿ÚµÄ״̬±ä»¯¡£Ä¬ÈÏֵΪ <literal>1</literal>¡£</entry>
+          </row>
+
+          <row>
+            <entry><varname>net.inet.carp.arpbalance</varname></entry>
+	    <entry>ʹÓà <acronym>ARP</acronym> ¾ùºâ±¾µØÍøÂçÁ÷Á¿¡£
+	      ĬÈϽûÓá£</entry>
+          </row>
+
+          <row>
+            <entry><varname>net.inet.carp.suppress_preempt</varname></entry>
+	    <entry>´ËÖ»¶Á <acronym>OID</acronym> ÏÔʾÒÖÖÆÇÀÕ¼µÄ״̬¡£
+	      Èç¹ûÒ»¸ö½Ó¿ÚÉϵÄÁ¬½ÓʧȥÏìÓ¦, ÔòÇÀÕ¼»á±»ÒÖÖÆ¡£
+	      µ±Õâ¸ö±äÁ¿µÄֵΪ <literal>0</literal> ʱ£¬±íʾÇÀռδ±»ÒÖÖÆ¡£
+	      ÈκÎÎÊÌⶼ»áʹ <acronym>OID</acronym> µÝÔö¡£</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <para><acronym>CARP</acronym> É豸¿ÉÒÔͨ¹ý <command>ifconfig</command>
+      ÃüÁîÀ´´´½¨¡£</para>
 
     <screen>&prompt.root; <userinput>ifconfig carp0 create</userinput></screen>
 
@@ -5030,7 +5086,7 @@
       <programlisting>hostname="hosta.example.org"
 ifconfig_fxp0="inet 192.168.1.3 netmask 255.255.255.0"
 cloned_interfaces="carp0"
-ifconfig_carp0="vhid 1 pass testpast 192.168.1.50/24"</programlisting>
+ifconfig_carp0="vhid 1 pass testpass 192.168.1.50/24"</programlisting>
 
       <para>ÔÚ <hostid>hostb.example.org</hostid> ÉÏ£¬
 	¶ÔÓ¦µÄ <filename>rc.conf</filename> ÅäÖÃÔòÊÇ£º</para>
@@ -5067,8 +5123,8 @@
         <para>ĬÈ쵀 &os; ÄÚºË <emphasis>¿ÉÄÜ</emphasis> ÆôÓÃÁËÖ÷»ú¼äÇÀÕ¼¡£
 	  Èç¹ûÊÇÕâÑùµÄ»°£¬
 	  <hostid>provider.example.org</hostid> ¿ÉÄÜÔÚÕýʽµÄÄÚÈÝ·þÎñÆ÷»Ö¸´Ê±²»ÊÍ·Å
-	  <acronym>IP</acronym> µØÖ·¡£ ´Ëʱ£¬ ¹ÜÀíÔ±¿ÉÒÔ
-	  <quote>ÌáÐÑ</quote> һϽӿڡ£ ¾ßÌå×ö·¨ÊÇÔÚ
+	  <acronym>IP</acronym> µØÖ·¡£ ´Ëʱ£¬ ¹ÜÀíÔ±±ØÐëÊÖ¹¤Ç¿ÖÆ IP
+	  »Øµ½Ô­À´ÄÚÈÝ·þÎñÆ÷¡£ ¾ßÌå×ö·¨ÊÇÔÚ
 	  <hostid>provider.example.org</hostid> ÉÏʹÓÃÏÂÃæµÄÃüÁ</para>
 
 	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#14 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.228
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.18 2007/12/31 15:10:15 loader Exp $
+     Original Revision: 1.229
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.19 2008/03/17 20:24:22 loader Exp $
 -->
 
 <chapter id="config-tuning">
@@ -678,14 +678,22 @@
     <para>ºÜ¶àϵͳ·þÎñÒÀÀµÆäËû·þÎñÌṩµÄÏàÓ¦¹¦ÄÜ¡£ÀýÈ磬NIS ºÍÆäËû»ùÓÚ
       RPC µÄ·þÎñÆô¶¯¿ÉÄÜÔÚ <command>rpcbind</command> ·þÎñÆô¶¯Ö®Ç°Ê§°Ü¡£
       Òª½â¾öÕâ¸öÎÊÌ⣬ÒÀÀµ¹ØϵÐÅÏ¢ºÍÆäËûÍ·ÐÅÏ¢µ±×÷×¢Êͱ»°üº¬ÔÚÿ¸öÆô¶¯½Å±¾ÎļþµÄÇ°Ãæ¡£
-      ³ÌÐòÔÚϵͳ³õʼ»¯Ê±·ÖÎöÕâЩעÊÍÒÔ¾ö¶¨µ÷ÓÃÆäËûϵͳ·þÎñÀ´Âú×ãÒÀÀµ¹Øϵ¡£
-      ÏÂÃæµÄ×Ö¾ä¿ÉÄÜ»á°üº¬ÔÚÿ¸öÆô¶¯½Å±¾ÎļþµÄÇ°Ã棺</para>
+      ³ÌÐòÔÚϵͳ³õʼ»¯Ê±·ÖÎöÕâЩעÊÍÒÔ¾ö¶¨µ÷ÓÃÆäËûϵͳ·þÎñÀ´Âú×ãÒÀÀµ¹Øϵ¡£</para>
+
+    <para>ÏÂÃæµÄ×Ö¾ä±ØÐë±»°üº¬ÔÚËùÓеÄÆô¶¯½Å±¾ÎļþÀ
+      £¨ËûÃǶ¼ÊÇ &man.rc.subr.8; ÓÃÀ´ <quote>enable</quote>
+      Æô¶¯½Å±¾±ØÐèµÄ£©:</para>
 
     <itemizedlist>
       <listitem>
 	<para><literal>PROVIDE</literal>: Ö¸¶¨´ËÎļþËùÌṩµÄ·þÎñµÄÃû×Ö¡£</para>
       </listitem>
+    </itemizedlist>
+
+    <para>ÒÔϵÄ×Ö¾ä¿ÉÒÔ±»°üº¬ÔÚÆô¶¯ÎļþµÄ¶¥²¿¡£ÑϸñÀ´ËµËûÃDz»ÊDZØÐèµÄ£¬
+      µ«×÷Ϊ¶ÔÓÚ &man.rcorder.8; ÓÐÒ»¶¨µÄÌáʾ×÷Óãº</para>
 
+    <itemizedlist>
       <listitem>
 	<para><literal>REQUIRE</literal>: Áгö´Ë·þÎñÆô¶¯Ö®Ç°ËùÐèÒªµÄÆäËû·þÎñ¡£
 	  ´Ë½Å±¾ÌṩµÄ·þÎñ»áÔÚÖ¸¶¨µÄÄÇЩ·þÎñ <emphasis>Ö®ºó</emphasis>
@@ -699,8 +707,10 @@
       </listitem>
     </itemizedlist>
 
-    <para>ͨ¹ýÕâÖÖ·½·¨£¬ÏµÍ³¹ÜÀíÔ±¿ÉÒÔÈÝÒ׵ĿØÖÆϵͳ¶ø²»ÓÃÏñÆäËûһЩ
-      &unix; ²Ù×÷ϵͳһÑùÒªÓà <quote>runlevels</quote> À´¿ØÖÆ¡£</para>
+    <para>ͨ¹ýÔÚÆô¶¯½Å±¾ÖÐ×ÐϸÉ趨ÕâЩ¹Ø¼ü×Ö£¬
+      ϵͳ¹ÜÀíÔ±¿ÉÒÔºÜÓÐÌõÀíµÄ¿ØÖƽű¾µÄÆô¶¯Ë³Ðò£¬
+      ½ø¶ø±ÜÃâʹÓÃÏñÆäËû &unix; ²Ù×÷ϵͳÄÇÑù»ìÂÒµÄ
+      <quote>runlevels</quote>¡£</para>
 
     <para>¸ü¶à¹ØÓÚ <filename>rc.d</filename> ϵͳµÄÐÅÏ¢£¬ ¿ÉÒÔÔÚ
       &man.rc.8; ºÍ &man.rc.subr.8; Áª»úÊÖ²áÖÐÕÒµ½¡£

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#13 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
 
-     Original Revision: 1.273
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml,v 1.16 2008/02/09 13:33:15 loader Exp $
+     Original Revision: 1.274
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml,v 1.17 2008/03/17 20:24:23 loader Exp $
 -->
 
 <chapter id="ports">
@@ -450,6 +450,10 @@
 
         <row><entry>*</entry><entry>Èí¼þ°üÓкܶà°æ±¾¡£</entry></row>
 
+	<row><entry>!</entry><entry>ÒÑ°²×°µÄÈí¼þ°üÔÚË÷ÒýÖдæÓмǼ£¬
+	    µ«ÊÇÓÉÓÚijЩԭÒò <command>pkg_version</command>
+	    ÎÞ·¨±È½ÏÒÑ°²×°µÄÈí¼þ°üÓëË÷ÒýÖÐÏà¶ÔÓ¦µÄ°æ±¾ºÅ¡£</entry></row>
+
 	</tbody>
 	</tgroup>
     </informaltable>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#8 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.101
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.8 2008/03/03 13:08:46 loader Exp $
+     Original Revision: 1.102
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.9 2008/03/17 20:24:23 loader Exp $
 -->
 
 <chapter id="printing">
@@ -2999,8 +2999,8 @@
             
         <para>È»ºóÎÒÃǾͿÉÒÔÔÚ¶àÖÖ¹ýÂËÆ÷ÀïʹÓÃÕâ¸ö½Å±¾ÁË¡£ ¼ÓÈëÎÒÃÇÓÐһ̨
           Diablo 750-N ÐÐʽ´òÓ¡»úÁªÔÚÍøÂçÉÏ¡£ ´òÓ¡»úÔÚ 5100 ¶Ë¿ÚÉϽÓÊÕÒª´òÓ¡µÄÊý¾Ý¡£
-          ´òÓ¡»úµÄÖ÷»úÃûÊÇ
-          scrivener¡£ ÕâÀïÊÇΪÕâ¸ö´òÓ¡»úдµÄÎı¾¹ýÂËÆ÷£º</para>
+          ´òÓ¡»úµÄÖ÷»úÃûÊÇ <hostid>scrivener</hostid>¡£
+	  ÕâÀïÊÇΪÕâ¸ö´òÓ¡»úдµÄÎı¾¹ýÂËÆ÷£º</para>
           
         <programlisting>#!/bin/sh
 #

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml#4 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.13
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml,v 1.5 2007/11/20 14:10:30 loader Exp $
+     Original Revision: 1.16
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml,v 1.6 2008/03/17 20:24:23 loader Exp $
 -->
 
 <chapter id="virtualization">
@@ -686,12 +686,178 @@
     </sect2>
 
     <sect2 id="virtualization-guest-vmware">
-      <title>ÔËÐÐÓÚ &windows;/&mac;/&linux; µÄ VMware</title>
+      <title>ÔËÐÐÓÚ MacOS µÄ VMware</title>
+
+      <para>&mac °æ±¾µÄ <application>VMWare Fusion</application>
+	ÊÇÒ»¸öÉÌÒµÈí¼þ£¬ÔËÐÐÔÚ»ùÓÚ &intel µÄ &apple; &mac ¼ÆËã»úµÄ
+	&macos; 10.4.9 »ò¸ü°æ±¾µÄ²Ù×÷ϵͳÉÏ¡£FreeBSD
+	ÊÇÒ»¸öÍêÈ«±»Ö§³ÖµÄ¿Í»§²Ù×÷ϵͳ¡£ ÔÚ &macos; X ÉÏ°²×°ÁË
+	<application>VMWare Fusion</application> Ö®ºó£¬
+	Óû§¾Í¿ÉÒÔ×ÅÊÖÅäÖÃÒ»¸öÐéÄâ»úÆ÷²¢°²×°¿Í»§²Ù×÷ϵͳ¡£</para>
+
+	<sect3 id="virtualization-guest-vmware-install">
+	  <title>ÔÚ VMWare/&macos; X ÉÏ°²×° FreeBSD</title>
+
+	  <para>µÚÒ»²½ÊÇÔËÐÐ VMWare Fusion£¬ ÐéÄâ»úÆ÷¿â½«±»×°ÔØ¡£
+	    µ¥»÷ "New" ´´½¨ VM£º</para>
+
+	  <mediaobject>
+            <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd01">
+            </imageobject>
+          </mediaobject>
+
+	  <para>New Virtual Machine Assistant ½«±»ÔËÐÐÀ´°ïÖúÄã´´½¨ VM£¬
+	    µ¥»÷ Continue ¼ÌÐø£º</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd02">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>ÔÚ <guimenuitem>Operatiing System</guimenuitem> ÏîÑ¡Ôñ
+	    <guimenuitem>Other</guimenuitem>£¬<guimenuitem>Version</guimenuitem>
+	    Ïî¿ÉÑ¡ <guimenuitem>FreeBSD</guimenuitem> »ò
+	    <guimenuitem>FreeBSD 64-bit</guimenuitem>¡£</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd03">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>Ñ¡Ò»¸öÄãÏëÒªµÄ VM ¾µÏñÃû×ֺʹ洢µÄĿ¼λÖá£</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd04">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>Ñ¡Ôñ VM ÐéÄâÓ²Å̵ĴóС£º</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd05">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>Ñ¡Ôñ°²×° VM µÄ·½Ê½£¬ ´ÓÒ»¸ö ISO ¾µÏñ»òÒ»ÕÅ CD °²×°£º</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd06">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>Ò»µ©Äãµã»÷ÁË Finish£¬ VM ¾Í»áÆô¶¯ÁË£º</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd07">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>ÒÔÄãͨ³£µÄ·½Ê½°²×° &os; »òÕß²ÎÕÕ <xref linkend="install">
+	      ÖеIJ½Ö裺</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd08">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>°²×°Íê³ÉÖ®ºó£¬Äã¾Í¿ÉÒÔÐÞ¸ÄһЩ VM µÄÉ趨£¬±ÈÈçÄÚ´æ´óС£º</para>
+
+          <note>
+	    <para>ÔÚ VM ÔËÐеÄʱºò£¬VM ϵͳӲ¼þµÄÉèÖÃÊÇÎÞ·¨Ð޸ĵġ£</para>
+          </note>
+
+	  <mediaobject>
+            <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd09">
+            </imageobject>
+          </mediaobject>
+
+	  <para>ÅäÖà VM µÄ CPU ÊýÁ¿£º</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd10">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>CD-ROMÉ豸µÄ״̬¡£Í¨³£µ±Äã²»ÔÚÐèÒª CDROM/ISO µÄʱºò¿ÉÒÔÇжÏËûÃǸú
+	    VM µÄÁ¬½Ó¡£</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd11">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>×îºóÒ»ÏîÐèÒªÐ޸ĵÄÊÇ VM ÓëÍøÂçÁ¬½ÓµÄ·½Ê½¡£
+	    Èç¹ûÄãÏ£Íû³ýÁËËÞÖ÷ÒÔÍâµÄ»úÆ÷Ò²ÄÜÁ¬½Óµ½ VM£¬
+	    ÇëÑ¡Ôñ <guimenuitem>Connect directly to the physical network
+	    (Bridged)</guimenuitem>¡£Ñ¡Ôñ <guimenuitem>Share the
+	    host's internet connection (NAT)</guimenuitem> µÄ»°£¬
+	    VM ¿ÉÒÔÁ¬½ÓÉÏÍøÂ磬µ«ÊDz»ÄÜ´ÓÍâÃæ·ÃÎÊ¡£</para>
+
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="virtualization/vmware-freebsd12">
+	    </imageobject>
+	  </mediaobject>
+
+	  <para>ÔÚÄãÐÞ¸ÄÍêÉ趨֮ºó£¬¾Í¿ÉÒÔ´Óа²×°µÄ FreeBSD
+	    ÐéÄâ»úÆ÷Æô¶¯ÁË¡£</para>
+
+	<sect3 id="virtualization-guest-vmware-configure">
+	  <title>ÅäÖÃÔËÐÐÓÚ &macos; X/VMWare É쵀 FreeBSD</title>
+
+	  <para>ÔÚ &macos; X É쵀 <application>VMWare</application>
+	    ÉÏ°²×°Íê FreeBSD Ö®ºó£¬ÓÐЩÅäÖõIJ½Öè¿ÉÓÃÀ´ÓÅ»¯ÐéÄâϵͳ¡£</para>
+
+          <procedure>
+	    <step>
+	      <title>ÉèÖà boot loader ±äÁ¿</title>
+
+	      <para>×îÖØÒªµÄ²½ÖèÊǽµµÍ <option>kern.hz</option>
+		À´¼õÉÙ <application>VMWare</application> ÉÏ FreeBSD
+		µÄ CPU ʹÓÃÂÊ¡£ÕâÐèÒªÔÚ <filename>/boot/loader.conf</filename>
+		Àï¼ÓÈëÒÔÏÂÕâÐÐÉ趨£º</para>
+
+	  	<programlisting>kern.hz=100</programlisting>
+
+	      <para>Èç¹ûûÓÐÕâÏîÉ趨£¬<application>VMWare</application>
+		É쵀 FreeBSD ¿Í»§ OS ¿ÕÏÐʱ½«Õ¼Óà &imac; ÉÏÒ»¸ö CPU 
+		´óÔ¼ 15% µÄ×ÊÔ´¡£ÔÚÐ޸ĴËÏîÉ趨֮ºó½öΪ 5%¡£</para>
+	    </step>
+
+	    <step>
+	      <title>´´½¨Ò»¸öеÄÄÚºËÅäÖÃÎļþ</title>
+
+	      <para>Äã¿ÉÒÔÈ¥µôËùÓÐµÄ FireWire, USB É豸µÄÇý¶¯³ÌÐò¡£
+		<application>VMWare</application> ÌṩÁËÒ»¸ö
+		&man.em.4; Ö§³ÖµÄÐéÄâÍøÂçÊÊÅäÆ÷£¬ËùÒÔ³ýÁË &man.em.4;
+		Ö®ÍâµÄÍø¿¨Çý¶¯¶¼¿ÉÒÔ±»ÌÞ³ý¡£</para>
+	    </step>
+
+	    <step>
+	      <title>ÉèÖÃÍøÂç</title>
 
-      <para>±¾½ÚÉÐδ¿ªÊ¼×«Ð´¡£</para>
+	      <para>×î»ù±¾µÄÍøÂçÉ趨°üÀ¨¼òµ¥µÄʹÓà DHCP 
+		°ÑÄãµÄÐéÄâ»úÆ÷Á¬½Óµ½ËÞÖ÷ &mac; ÏàͬµÄ±¾µØÍøÂçÉÏ¡£
+		ÔÚ <filename>/etc/rc.conf</filename> ÖмÓÈ룺
+		<literal>ifconfig_em0="DHCP"</literal>¡£
+		¸ü¶àÓйØÍøÂçµÄÉèÖÿÉÒÔ²ÎÔÄ
+		<xref linkend="advanced-networking">¡£</para>
+	    </step>
+          </procedure>
 
+      </sect3>
     </sect2>
-
   </sect1>
 
   <sect1 id="virtualization-host">

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#23 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.895
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.32 2008/01/12 14:04:57 loader Exp $
+     Original Revision: 1.905
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.33 2008/03/17 20:35:53 loader Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -2192,14 +2192,17 @@
 		<entry>0.7.1d</entry>
 		<entry>0.7.1.d</entry>
 	      </row>
+
 	      <row>
 		<entry>10Alpha3</entry>
 		<entry>10.a3</entry>
 	      </row>
+
 	      <row>
 		<entry>3Beta7-pre2</entry>
 		<entry>3.b7.p2</entry>
 	      </row>
+
 	      <row>
 		<entry>8:f_17</entry>
 		<entry>8f.17</entry>
@@ -5586,35 +5589,42 @@
 	      <entry><makevar>USE_JAVA</makevar></entry>
 	      <entry>Ö»Óж¨ÒåËü²ÅÄÜʹÆäËü±äÁ¿ÉúЧ¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_VERSION</makevar></entry>
 	      <entry>Óÿոñ·Ö¿ªµÄÊÊºÏ port ʹÓÃµÄ Java °æ±¾¡£
 		¿ÉÑ¡µÄ <literal>"+"</literal> ¿ÉÒÔÓÃÓÚÖ¸¶¨Ä³¸ö·¶Î§µÄ°æ±¾ (¿ÉÒÔÓãº
 		<literal>1.1[+] 1.2[+] 1.3[+] 1.4[+]</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_OS</makevar></entry>
 	      <entry>Óÿոñ·Ö¿ªµÄÊÊÓ¦ port µÄ JDK port ²Ù×÷ϵͳÀàÐÍ (¿ÉÒÔÓ㺠<literal>native
 		linux</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_VENDOR</makevar></entry>
 	      <entry>Óÿոñ·Ö¿ªµÄÊÊÓ¦ port µÄ JDK port ¹©Ó¦ÉÌ
 		(¿ÉÒÔÓ㺠<literal>freebsd bsdjava sun ibm
 		blackdown</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_BUILD</makevar></entry>
 	      <entry>ÉèÖÃÕâ¸ö±äÁ¿±íʾËùÑ¡µÄ JDK port Ó¦±»ÁÐÈë port µÄ¹¹½¨ÒÀÀµ¹Øϵ¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_RUN</makevar></entry>
 	      <entry>ÉèÖÃÕâ¸ö±äÁ¿±íʾËùÑ¡µÄ JDK port Ó¦±»ÁÐÈë port µÄÔËÐл·¾³ÒÀÀµ¹Øϵ¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_EXTRACT</makevar></entry>
 	      <entry>ÉèÖÃÕâ¸ö±äÁ¿±íʾËùÑ¡µÄ JDK port Ó¦±»ÁÐÈë port µÄ½âѹËõÖ§³ÖÒÀÀµ¹Øϵ¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>USE_JIKES</makevar></entry>
 	      <entry>port ÊÇ·ñӦʹÓÃ
@@ -5653,105 +5663,126 @@
 	      <entry>JDK port µÄÃû×Ö (ÀýÈç
 		<literal>'java/jdk14'</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VERSION</makevar></entry>
 	      <entry>JDK port µÄÍêÕû°æ±¾ (ÀýÈç
 		<literal>'1.4.2'</literal>)¡£ Èç¹ûÄúÖ»ÐèÒª°æ±¾ºÅµÄÇ°Á½Î»£¬ Ôò¿ÉÓÃ
 		<makevar>${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}</makevar>¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_OS</makevar></entry>
 	      <entry>ËùÓà JDK port µÄ²Ù×÷ϵͳ (ÀýÈç
 		<literal>'linux'</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VENDOR</makevar></entry>
 	      <entry>ËùÓà JDK port µÄ¹©Ó¦ÉÌ (ÀýÈç
 		<literal>'sun'</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_OS_DESCRIPTION</makevar></entry>
 	      <entry>ËùÓà JDK port ²Ù×÷ϵͳµÄÃèÊö
 		(ÀýÈç <literal>'Linux'</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VENDOR_DESCRIPTION</makevar></entry>
 	      <entry>ËùÓà JDK port ¹©Ó¦É̵ÄÃèÊö (ÀýÈç
 		<literal>'FreeBSD Foundation'</literal>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_HOME</makevar></entry>
 	      <entry>JDK µÄ°²×°Ä¿Â¼ (ÀýÈç
 		<filename>'/usr/local/jdk1.3.1'</filename>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAC</makevar></entry>
 	      <entry>ËùÓà Java ±àÒëÆ÷µÄÍêÕû·¾¶ (ÀýÈç
 		<filename>'/usr/local/jdk1.1.8/bin/javac'</filename> »ò
 		<filename>'/usr/local/bin/jikes'</filename>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAR</makevar></entry>
 	      <entry>ËùÓà <command>jar</command> ¹¤¾ßµÄÍêÕû·¾¶ (ÀýÈç
 		<filename>'/usr/local/jdk1.2.2/bin/jar'</filename> »ò
 		<filename>'/usr/local/bin/fastjar'</filename>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>APPLETVIEWER</makevar></entry>
 	      <entry>ËùÓà <command>appletviewer</command> ¹¤¾ßµÄÍêÕû·¾¶ (ÀýÈç
 		<filename>'/usr/local/linux-jdk1.2.2/bin/appletviewer'</filename>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA</makevar></entry>
 	      <entry>ËùÓà <command>java</command> Ö´ÐÐÎļþµÄÍêÕû·¾¶¡£
 		ÄúӦʹÓÃËüÀ´Ö´ÐÐ Java ³ÌÐò (ÀýÈç
 		<filename>'/usr/local/jdk1.3.1/bin/java'</filename>)¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVADOC</makevar></entry>
 	      <entry>ËùÓà <command>javadoc</command> ¹¤¾ßµÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAH</makevar></entry>
 	      <entry>ËùÓà <command>javah</command> ³ÌÐòµÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAP</makevar></entry>
 	      <entry>ËùÓà <command>javap</command> ³ÌÐòµÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_KEYTOOL</makevar></entry>
 	      <entry>ËùÓà <command>keytool</command> ¹¤¾ßµÄÍêÕû·¾¶¡£
 		Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_N2A</makevar></entry>
 	      <entry>ËùÓà <command>native2ascii</command> ¹¤¾ßµÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_POLICYTOOL</makevar></entry>
 	      <entry>ËùÓà <command>policytool</command> ³ÌÐòµÄÍêÕû·¾¶¡£
 		Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_SERIALVER</makevar></entry>
 	      <entry>ËùÓà <command>serialver</command> ³ÌÐòµÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMIC</makevar></entry>
 	      <entry>ËùÓà RMI ×®/¼Ü Éú³ÉÆ÷£¬
 		<command>rmic</command> µÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMIREGISTRY</makevar></entry>
 	      <entry>ËùÓà RMI ×¢²á±í³ÌÐò£¬
 		<command>rmiregistry</command> µÄÍêÕû·¾¶¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMID</makevar></entry>
 	      <entry>ËùÓà RMI ·þÎñ³ÌÐò <command>rmid</command> µÄÍêÕû·¾¶¡£
 		Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_CLASSES</makevar></entry>
 	      <entry>ËùÓà JDK ÀàÎļþĿ¼µÄÍêÕû·¾¶¡£
@@ -5760,6 +5791,7 @@
 		JDK ÔòʹÓÃ
 		<filename>${JAVA_HOME}/lib/classes.zip</filename>¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>HAVE_JIKES</makevar></entry>
 	      <entry>Ëæ <command>jikes</command> ÊÇ·ñ½«±»Ó¦ÓÃÓÚ port
@@ -5792,11 +5824,13 @@
 		ĬÈÏÖµ£º <filename>${PREFIX}/share/java</filename>.
 	      </entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAJARDIR</makevar></entry>
 	      <entry>ÓÃÒÔ°²×° JAR ÎļþµÄĿ¼¡£ ĬÈÏÖµ£º
 		<filename>${JAVASHAREDIR}/classes</filename>¡£</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVALIBDIR</makevar></entry>
 	      <entry>ÆäËü port °²×°µÄ JAR ÎļþËùÔÚµÄĿ¼¡£ ĬÈÏÖµ£º
@@ -6637,6 +6671,7 @@
 		<entry><filename
 		    role="package">x11-toolkits/wxgtk26</filename></entry>
 	      </row>
+
 	      <row>
 		<entry><literal>2.8</literal></entry>
 
@@ -7039,12 +7074,14 @@
 		<entry>µ½ <application>wxWidgets</application>
 		  <command>wx-config</command> ½Å±¾µÄ·¾¶ (Ãû×Ö»áËæ°æ±¾²»Í¬¶ø²»Í¬)</entry>
 	      </row>
+
 	      <row>
 		<entry><makevar>WXRC_CMD</makevar></entry>
 
 		<entry>µ½ <application>wxWidgets</application>
 		  <command>wxrc</command> ³ÌÐòµÄ·¾¶ (Ãû×Ö»áËæ°æ±¾²»Í¬¶ø²»Í¬)</entry>
 	      </row>
+
 	      <row>
 		<entry><makevar>WX_VERSION</makevar></entry>
 
@@ -7600,18 +7637,21 @@
 
 		<entry><application>Lua</application> Ä£¿é°üµÄºó׺Ãû</entry>
 	      </row>
+
 	      <row>
 		<entry><makevar>LUA_CMD</makevar></entry>
 
 		<entry>µ½ <application>Lua</application>
 		  ½âÊÍÆ÷µÄ·¾¶</entry>
 	      </row>
+
 	      <row>
 		<entry><makevar>LUAC_CMD</makevar></entry>
 
 		<entry>µ½ <application>Lua</application>
 		  ±àÒëÆ÷µÄ·¾¶</entry>
 	      </row>
+
 	      <row>
 		<entry><makevar>TOLUA_CMD</makevar></entry>
 
@@ -10002,99 +10042,121 @@
 		    <entry>´´½¨ RELENG_5_0 ·ÖÖ§Ö®ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500100</entry>
 		  </row>
+
 		  <row>
 		    <entry>&lt;sys/dkstat.h&gt; ±ä³ÉÁËÒ»¸ö¿ÕÎļþ£¬ ²»Ó¦ÔÙ±»ÒýÓÃ</entry>
 		    <entry>500101</entry>
 		  </row>
+
 		  <row>
 		    <entry>ÐÞ¸Ä d_mmap_t ½Ó¿ÚÖ®ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500102</entry>
 		  </row>
+
 		  <row>
 		    <entry>taskqueue_swi ÒÔÎÞÈ«¾ÖËøµÄ·½Ê½ÔËÐÐÖ®ºóµÄ 5.0-CURRENT£¬
 		      ͬʱ»¹¼ÓÈëÁËʹÓÃÈ«¾ÖËøµÄ taskqueue_swi_giant</entry>
 		    <entry>500103</entry>
 		  </row>
+
 		  <row>
 		    <entry>È¥µôÁË cdevsw_add() ºÍ cdevsw_remove()
 		      ³öÏÖ MAJOR_AUTO ·ÖÅä»úÖÆ</entry>
 		    <entry>500104</entry>
 		  </row>
+
 		  <row>
 		    <entry>²ÉÓÃÐ嵀 cdevsw ³õʼ»¯·½·¨Ö®ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500105</entry>
 		  </row>
+
 		  <row>
 		    <entry>devstat_add_entry() ±»
 		      devstat_new_entry() È¡´ú</entry>
 		    <entry>500106</entry>
 		  </row>
+
 		  <row>
 		    <entry>ÐÞ¸Ä devstat ½Ó¿Ú£» Çë²Î¼û sys/sys/param.h 1.149</entry>
 		    <entry>500107</entry>
 		  </row>
+
 		  <row>
 		    <entry>¸Ä±äÁË Token-Ring ½Ó¿Ú</entry>
 		    <entry>500108</entry>
 		  </row>
+
 		  <row>
 		    <entry>¼ÓÈë vm_paddr_t</entry>
 		    <entry>500109</entry>
 		  </row>
+
 		  <row>
 		    <entry>½« &man.realpath.3; ¸ÄΪḬ̈߳²È«Ö®ºóµÄ
 		      5.0-CURRENT</entry>
 		    <entry>500110</entry>
 		  </row>
+
 		  <row>
 		    <entry>&man.usbhid.3; Óë NetBSD ͬ²½Ö®ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500111</entry>
 		  </row>
+
 		  <row>
 		    <entry>¼ÓÈëÐ嵀 NSS ʵÏÖ£¬ ÒÔ¼° POSIX.1 getpw*_r, getgr*_r
 		      º¯ÊýÖ®ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500112</entry>
 		  </row>
+
 		  <row>
 		    <entry>ɾȥ¾Éʽ rc ϵͳ֮ºóµÄ 5.0-CURRENT</entry>
 		    <entry>500113</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-RELEASE.</entry>
 		    <entry>501000</entry>
 		  </row>
+
 		  <row>
 		    <entry>´´½¨ RELENG_5_1 ·ÖÖ§Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501100</entry>
 		  </row>
+
 		  <row>
 		    <entry>¸ÄÕý sigtimedwait(2) ºÍ sigwaitinfo(2)
 		      ÓïÒåÖ®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501101</entry>
 		  </row>
+
 		  <row>
 		    <entry>ÔÚ &man.bus.dma.tag.create.9; ÖмÓÈëÁË lockfunc
 		      ºÍ lockfuncarg ×Ö¶ÎÖ®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501102</entry>
 		  </row>
+
 		  <row>
 		    <entry>¼¯³ÉÁË GCC 3.3.1-pre 20030711 Ö®ºóµÄ
 		      5.1-CURRENT</entry>
 		    <entry>501103</entry>
 		  </row>
+
 		  <row>
 		    <entry>twe ÖÐ 3ware API ±ä»¯Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501104</entry>
 		  </row>
+
 		  <row>
 		    <entry>ÔÊÐí¶¯Ì¬Á¬½Ó /bin ºÍ /sbin£¬
 		      ÒÔ¼°½«Ä³Ð©¿âÒƶ¯µ½ /lib Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501105</entry>
 		  </row>
+
 		  <row>
 		    <entry>Ôö¼ÓÄں˼¶ Coda 6.x Ö§³ÖÖ®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501106</entry>
 		  </row>
+
 		  <row>
 		    <entry>½« 16550 UART ³£Á¿´Ó
 		      <filename>&lt;dev/sio/sioreg.h&gt;</filename> Ųµ½
@@ -10102,146 +10164,179 @@
 		      5.1-CURRENT¡£ ´ËÍ⣬ rtld Ò²´Ó´ËÎÞÌõ¼þÖ§³Ö libmap ¹¦ÄÜ</entry>
 		    <entry>501107</entry>
 		  </row>
+
 		  <row>
 		    <entry>¸üРPFIL_HOOKS API Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501108</entry>
 		  </row>
+
 		  <row>
 		    <entry>Ôö¼Ó kiconv(3) Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501109</entry>
 		  </row>
+
 		  <row>
 		    <entry>ĬÈ쵀 cdevsw open ºÍ close ²Ù×÷±ä»¯Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501110</entry>
 		  </row>
+
 		  <row>
 		    <entry>cdevsw µÄ²¼¾Ö±ä»¯Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501111</entry>
 		  </row>
+
 		  <row>
 		    <entry>Ôö¼Ó kobj ¶à¼Ì³ÐÖ®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501112</entry>
 		  </row>
+
 		  <row>
 		    <entry>ÐÞ¸Ä struct ifnet ÖÐµÄ if_xname Ö®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501113</entry>
 		  </row>
+
 		  <row>
 		    <entry>½« /bin ºÍ /sbin ¸ÄΪ¶¯Ì¬Á¬½ÓÖ®ºóµÄ 5.1-CURRENT</entry>
 		    <entry>501114</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-RELEASE</entry>
 		    <entry>502000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2.1-RELEASE</entry>
 		    <entry>502010</entry>
 		  </row>
+
 		  <row>
 		    <entry>´´½¨ RELENG_5_2 ·ÖÖ§Ö®ºóµÄ 5.2-CURRENT</entry>
 		    <entry>502100</entry>
 		  </row>
+
 		  <row>
 		    <entry>libc ÖмÓÈëÁË __cxa_atexit/__cxa_finalize

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list