PERFORCE change 100614 for review

Wed Jul 5 10:43:44 UTC 2006

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

Change 100614 by jb at jb_freebsd2 on 2006/07/05 10:43:01

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#9 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#6 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/book.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/firewalls/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/converter.sgml#2 integrate
.. //depot/projects/dtrace/ports/CHANGES#2 integrate
.. //depot/projects/dtrace/ports/MOVED#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.autotools.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.database.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.php.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#1 branch
.. //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#1 branch
.. //depot/projects/dtrace/ports/Tools/scripts/addport#2 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/rmport#2 integrate
.. //depot/projects/dtrace/ports/UPDATING#2 integrate
.. //depot/projects/dtrace/src/MAINTAINERS#8 integrate
.. //depot/projects/dtrace/src/bin/cp/cp.c#3 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_scalbf.c#3 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#4 integrate
.. //depot/projects/dtrace/src/sys/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#9 integrate
.. //depot/projects/dtrace/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/dtrace/src/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc_isa.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/ispmbox.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ispfw/asm_2322.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/ispfw/ispfw.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/mii_physubr.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#11 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/ieeefp.h#3 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/libalias/libalias.3#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/Doxyfile#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Dependencies#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-cam#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-geom#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-kern#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-linux#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-vm#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/README#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/common-Doxyfile#1 branch
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/notreviewed.dox#1 branch
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/misc.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/mtree.8#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/mtree.h#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/spec.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/test/test05.sh#1 branch
.. //depot/projects/dtrace/src/usr.sbin/mtree/verify.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/command.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/config.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/devices.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/disks.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/dispatch.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/dmenu.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/globals.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/help/partition.hlp#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/help/slice.hlp#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/install.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/keymap.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/label.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/list.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/main.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/menus.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/misc.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/msg.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/rtermcap.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/sade.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/sade.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/system.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/termcap.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/usb.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/variable.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/sade/wizard.c#1 branch
.. //depot/projects/dtrace/www/fr/about.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/community/webresources.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/copyright/trademarks.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/docs/man.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/gnome/includes.navgnome.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/gnome/includes.navgnome.xsl#3 integrate
.. //depot/projects/dtrace/www/fr/gnome/index.xsl#3 integrate
.. //depot/projects/dtrace/www/fr/index.xsl#3 integrate
.. //depot/projects/dtrace/www/fr/logo.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/projects/busdma/index.sgml#3 integrate
.. //depot/projects/dtrace/www/fr/security/security.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/snapshots/index.sgml#3 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.137 2006/06/26 03:20:18 rafan Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.138 2006/07/05 02:04:30 yongari Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1347,6 +1347,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.yongari;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.andy;</para>
     </listitem>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.258 2006/06/18 20:15:52 remko Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.259 2006/07/05 06:12:55 linimon Exp $
 -->
 
 <chapter id="ports">
@@ -1126,13 +1126,21 @@
 
       <screen>&prompt.root; <userinput>pkg_version -v</userinput></screen>
 
-      <note>
-	<para>Once you updated your Ports Collection, before
-	  attempting a port upgrade, you should check the
-	  <filename>/usr/ports/UPDATING</filename> file.  This file
+      <sect3 id="ports-file-updating">
+	<title><filename>/usr/ports/UPDATING</filename></title>
+
+	<para>Once you have updated your Ports Collection, before
+	  attempting a port upgrade, you should check
+	  <filename>/usr/ports/UPDATING</filename>.  This file
 	  describes various issues and additional steps users may
-	  encounter and need to perform when updating a port.</para>
-      </note>
+	  encounter and need to perform when updating a port, including
+	  such things as file format changes, changes in locations of
+	  configuration files, or other such incompatibilities with
+	  previous versions.</para>
+
+	<para>If <filename>UPDATING</filename> contradicts something you
+	  read here, <filename>UPDATING</filename> takes precedence.</para>
+      </sect3>
 
       <sect3 id="portupgrade">
 	<title>Upgrading Ports using Portupgrade</title>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.723 2006/06/29 02:52:40 delphij Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.724 2006/07/03 05:45:53 ale Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5633,13 +5633,6 @@
 
 		<entry>Want the Apache module or the CGI version of PHP.</entry>
 	      </row>
-
-	      <row>
-		<entry><makevar>WANT_PHP_PEAR</makevar></entry>
-
-		<entry>Want the PEAR framework.</entry>
-	      </row>
-
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -5660,7 +5653,7 @@
 	  <filename>pkg-plist</filename>.</para>
 
 	<para>Include
-	  <filename>&dollar;{PORTSDIR}/devel/pear-PEAR/Makefile.common</filename>
+	  <filename>&dollar;{PORTSDIR}/devel/pear/bsd.pear.mk</filename>
 	  on the last line of the <filename>Makefile</filename>.</para>
 
 	<example id="pear-makefile">
@@ -5687,7 +5680,7 @@
 _DOCSDIR=       .
 
 .include &lt;bsd.port.pre.mk&gt;
-.include "&dollar;{PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "&dollar;{PORTSDIR}/devel/pear/bsd.pear.mk"
 .include &lt;bsd.port.post.mk&gt;</programlisting>
 
 	</example>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#9 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.389 2006/06/26 03:18:24 rafan Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.390 2006/07/05 02:00:56 yongari Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -1002,6 +1002,8 @@
 
 <!ENTITY a.yokota "Kazutaka YOKOTA <email>yokota at FreeBSD.org</email>">
 
+<!ENTITY a.yongari "Pyun YongHyeon <email>yongari at FreeBSD.org</email>">
+
 <!ENTITY a.zarzycki "Dave Zarzycki <email>zarzycki at FreeBSD.org</email>">
 
 <!ENTITY a.znerd "Ernst de Haan <email>znerd at FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ====

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.26 2006/03/20 20:39:05 blackend Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.27 2006/07/03 15:36:58 blackend Exp $
      Original revision: 1.331
 -->
 
@@ -5944,7 +5944,7 @@
 
       <para>Comme &eacute;l&eacute;ment de chaque nouvelle version, le
 	projet FreeBSD met &agrave; disposition deux images de CDROM
-	(&ldquo;images ISO&rdquo;).  Ces images peuvent inscrites
+	(&ldquo;images ISO&rdquo;).  Ces images peuvent &ecirc;tre inscrites
 	(&ldquo;grav&eacute;es&rdquo;)	sur CDs si vous disposez d'un
 	graveur de CD, et puis &ecirc;tre utilis&eacute;es pour installer
 	FreeBSD.  Si vous avez un graveur de CD, et comme la bande

==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.85 2006/05/25 22:43:53 bmah Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.86 2006/07/04 08:24:32 vanilla Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being
@@ -59,7 +59,7 @@
 <!ENTITY % not.published 	"IGNORE">
 
 <!-- Number of ports in the ports tree -->
-<!ENTITY os.numports "13,300">
+<!ENTITY os.numports "15,000">
 <!ENTITY ports.size "440&nbsp;MB">
 
 <!-- GUI-buttons -->

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/book.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $
+     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $
      Original revision: 1.27
 -->
 
@@ -41,7 +41,7 @@
 
 <book>
   <bookinfo>
-    <title>FreeBSD Documentation Project Primer for New Contributors</title>
+    <title>FreeBSD ¤å¥ópµe¤W¤â®Ñ</title>
    
     <corpauthor>FreeBSD ¤å¥óp¹º</corpauthor>
  
@@ -58,23 +58,19 @@
       <holder role="mailto:doceng at FreeBSD.org">DocEng</holder>
     </copyright>
 
-    <pubdate role="rcs">$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $</pubdate>
+    <pubdate role="rcs">$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $</pubdate>
 
-    <releaseinfo>$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $</releaseinfo>
+    <releaseinfo>$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $</releaseinfo>
 
     &bookinfo.legalnotice;
  
     <abstract>
-      <para>·PÁÂ±z°Ñ»P FreeBSD ¤å¥óp¹º¡A±zªºÂIºw°^Äm¡A³£¬Û·íÄ_¶Q¡C</para>
+      <para>·PÁÂ±z°Ñ»P FreeBSD ¤å¥óp¹º(Â²ºÙ¡GFDP, FreeBSD Documentation Project)¡A±zªºÂIºw°^Äm¡A³£¬Û·íÄ_¶Q¡C</para>
 
-      <para>This primer covers everything you will need to know in order
-        to start contributing to the FreeBSD Documentation Project, from
-        the tools and software you will be using (both mandatory and
-        recommended) to the philosophy behind the Documentation 
-        Project.</para>
+      <para>¥»¤J¤â®Ñ¤º®e¥]¬A¡G¦p¦ó¶}©lµÛ¤âÂ½Ä¶ªº¦U¶µ²Ó¸`¡A¥H¤Î·|¥Î¨ìªº¤@¨Ç¦n¥Î¤u¨ã(¥]¬A¡G¥²³Æ¤u¨ã¡B«ØÄ³¤u¨ã)
+        ¡A¥H¤Î¤å¥ópµeªº©v¦®¡C</para>
 
-      <para>¥»¤å¥óÁÙ¦b¯ó½Z¡A©|¥¼§¹½Z¡C¥¼§¹¦¨ªº³¹¸`¡A§ÚÌ·|¦b³¹¸`¦WºÙ®ÇÃä¥[µù¡y
-	<literal>*</literal> ¡z¥H§@ÃÑ§O¡C</para>
+      <para>¥»¤å¥óÁÙ¦b¯ó½Z¡A©|¥¼§¹½Z¡C¥¼§¹¦¨ªº³¹¸`¡A§ÚÌ·|¦b³¹¸`¦WºÙ®ÇÃä¥[µù¡y<literal>*</literal> ¡z¥H§@ÃÑ§O¡C</para>
     </abstract>
   </bookinfo>
 
@@ -127,52 +123,57 @@
 	  
 	  <tbody>
 	    <row>
-	      <entry>The name of commands, files, and directories. On screen
-		computer output.</entry>
-	      <entry><para>Edit your <filename>.login</filename>
-		  file.</para><para>Use <command>ls -a</command> to list all
-		  files.</para><para><screen>You have mail.</screen>
-		</para></entry>
+	      <entry>«ü¥O</entry>
+	      <entry>¨Ï¥Î <command>ls -a</command> ¨Ó¦C¥X©Ò¦³ªºÀÉ®×¡C</entry>
+	    </row>
+
+	    <row>
+	      <entry>ÀÉ¦W</entry>
+	      <entry>×§ï <filename>.login</filename> ÀÉ¡C</entry>
 	    </row>
 
 	    <row>
-	      <entry>¦b¿é¤J«ü¥O«á¡A¿Ã¹õ¤W·|¥X²{ªº¹ïÀ³¤º®e¡G</entry>
+	      <entry>¿Ã¹õ¤W·|¥X²{ªº°T®§</entry>
+	      <entry><screen>You have mail.</screen></entry>
+	    </row>
 
+	    <row>
+	      <entry>¿é¤J«ü¥O«á¡A¿Ã¹õ¤W·|¥X²{ªº¹ïÀ³¤º®e¡G</entry>
 	      <entry><screen>&prompt.user; <userinput>su</userinput>
-Password:</screen></entry>
+	      Password:</screen></entry>
 	    </row>
 
 	    <row>
-	      <entry>Á¿¨ìn°Ñ¦Òªº Manual ®É...</entry>
+	      <entry>n°Ñ¦Òªº½u¤W¤â¥U(manual)</entry>
 
-	      <entry>Use <citerefentry>
+	      <entry>¥H <citerefentry>
 		  <refentrytitle>su</refentrytitle>
 		  <manvolnum>1</manvolnum>
-		</citerefentry> to change user names.</entry>
+		</citerefentry> ¨Ó¤Á´«±b¸¹¡C</entry>
 	    </row>
 
 	    <row>
 	      <entry>¦bÁ¿¨ì±b¸¹(user)¡B¸s²Õ(group)ªº¦WºÙªº®ÉÔ...</entry>
 
-	      <entry>Only <username>root</username> can do this.</entry>
+	      <entry>¥u¦³ <username>root</username> ¤~¥i¥H°µ³o¥ó¨Æ¡C</entry>
 	    </row>
 
 	    <row>
-	      <entry>»y®ðªº±j½Õ¡C</entry>
+	      <entry>»y®ðªº±j½Õ</entry>
 
-	      <entry>You <emphasis>must</emphasis> do this.</entry>
+	      <entry>§A¡y¥²¶·¡z³o»ò°µ¤~¦æ¡C</entry>
 	    </row>
 
 	    <row>
-	      <entry>¥´«ü¥O®É¥i´À´«ªº³¡¥÷(¥i§ï¬°²Å¦X¦Û¤v¾÷¾¹¤WªºÀÉ¦W¡B³]³Æ©Î¨ä¥LÃþ¦ü³¡¥÷)¡C</entry>
+	      <entry>¥´«ü¥O®É¡A¥i´À´«ªº³¡¥÷</entry>
 
-	      <entry>To delete a file, type <command>rm <filename><replaceable>filename</replaceable></filename></command></entry>
+	      <entry>n§R°£ÀÉ®×ªº¸Ü¡A½Ð¥´ <command>rm <filename><replaceable>n§R°£ªºÀÉ¦W</replaceable></filename></command></entry>
 	    </row>
 
 	    <row>
 	      <entry>Àô¹ÒÅÜ¼Æ³]©w</entry>
 
-	      <entry><envar>$HOME</envar> is your home directory.</entry>
+	      <entry><envar>$HOME</envar> ¬O«ü±b¸¹ªº®a¥Ø¿ý©Ò¦b³B¡C</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -182,37 +183,29 @@
     <sect1 id="preface-notes">
       <title>¡yNote¡BTip¡BImportant¡BWarning¡BExample¡zªº¹B¥Î</title>
 
-      <para>¥H¤U¤å¦r¬O¡yª`·N(Note)¡z¡B¡y§Þ¥©(Tip)¡z¡B¡y«n°T®§(Important)¡z¡B¡yÄµ§i(Warning)¡z¡B¡y½d¨Ò(Example)¡zªº¹B¥Î¡C</para>
+      <para>¥H¤U¤å¦r¬O¡yª`·N¡z¡B¡y§Þ¥©¡z¡B¡y«n°T®§¡z¡B¡yÄµ§i¡z¡B¡y½d¨Ò¡zªº¹B¥Î¡C</para>
 
       <note>
-	<para>Notes are represented like this, and contain information that
-	  you should take note of, as it may affect what you do.</para>
+	<para>ªí¥Ü»Ýnª`·Nªº¨Æ¶µ¡A¨ä¤¤¥]¬A±z»Ýnª`·Nªº¨Æ±¡¡A¦]¬°³o¨Ç¨Æ±¡¥i¯à·|¼vÅT¨ì¾Þ§@µ²ªG¡C</para>
       </note>
 
       <tip>
-	<para>Tips are represented like this, and contain information that you 
-	  might find useful, or lead to an easier way to do something.</para>
+	<para>´£¨Ñ¥i¯à¹ï±z¦³¥Î©ÎÂ²¤Æ¾Þ§@¤è¦¡ªº§Þ¥©»¡©ú¡C</para>
       </tip>
 
       <important>
-	<para>Important information is represented like this.  Typically they
-	  flag extra steps you may need to carry out.</para>
+	<para>ªí¥Ün¯S§Oª`·Nªº¨Æ±¡¡C¤@¯ë¨Ó»¡¡A¥¦Ì·|¥]¬A¾Þ§@«ü¥O®É»Ýn¥[ªºÃB¥~°Ñ¼Æ¡C</para>
       </important>
 
       <warning>
-	<para>Warnings are represented like this, and contain information
-	  warning you about possible damage if you do not follow the
-	  instructions. This damage may be physical, to your hardware or to
-	  you, or it may be non-physical, such as the inadvertent deletion of
-	  important files.</para>
+	<para>ªí¥ÜÄµ§i¨Æ¶µ¡A¤ñ¦p¦pªG±z¤£ª`·N«h¥i¯à¾ÉPªº·l¥¢¡C³o¨Ç·l¥¢¥i¯à¬O¹ï±z©ÎµwÅé³y¦¨¹ê»Ú¶Ë®`¡A
+	  ¤]¥i¯à¬OµLªk¦ôpªº·l®`¡A¨Ò¦p¤@®É²¨©¿¦Ó§R°£«nÀÉ®×...¡C</para>
       </warning>
 
       <example>
 	<title>³o¬OÁ|¨Ò»¡©ú</title>
 
-	<para>Examples are represented like this, and typically contain
-	  examples you should walk through, or show you what the results of a
-	  particular action should be.</para>
+	<para>³o¬OÁ|¨Ò»¡©ú¦Ó¤w¡A³q±`¥]§tÀ³¿í´`ªº«ü¥O½d¨Ò¡A©ÎÅã¥Ü¬Y¨Ç¯S©w°Ê§@©Ò¥i¯àµo¥Íªºµ²ªG¡C</para>
       </example>
     </sect1>
 

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $
+     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $
      Original revision: 1.23
 -->
 
@@ -68,21 +68,19 @@
   </itemizedlist>
 
   <sect1 id="overview-doc">
-    <title>The FreeBSD Documentation Set</title>
+    <title>FreeBSD ¤å¥óªº²Õ¦¨³¡¤À¡G</title>
 
     <para>FDP Á`¦@t³d FreeBSD ªº 4 ºØÃþ§Oªº¤å¥ó¡G</para>
     
     <variablelist>
       <varlistentry>
-        <term>Manual pages</term>
+        <term>½u¤W¤â¥U(manual)</term>
 
         <listitem>
           <para>^¤åª©ªº¨t²Î manual ¨Ã¤£¬O¥Ñ FDP ©Ò¼¶¼gªº¡A¦]¬°¥¦Ì¬OÄÝ©ó base system ªº³¡¥÷¡C
 		µM¦Ó¡AFDP ¥i¥H(¤]´¿³o»ò°µ¹L)×§ï³o¨Ç¤å¥ó¡A¨ÓÅý³o¨Ç¤å¥ó¼g±o§ó²M·¡¡A¬Æ¦Ü¬O°É¥¿¿ù»~ªº¦a¤è¡C</para>
 
-          <para>The translation teams are responsible for translating the
-	    system manual pages into different languages.  These translations
-	    are kept within the FDP.</para>
+          <para>Â½Ä¶¹Î¶¤t³d±N¨t²Îªº½u¤W¤â¥UÂ½Ä¶¬°¤£¦Pªº»y¨¥¡C ³o¨ÇÄ¶¥»³£¥Ñ FDP ºûÅ@¡C</para>
         </listitem>
       </varlistentry>
 
@@ -96,11 +94,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term>Handbook</term>
+        <term>¨Ï¥Î¤â¥U(Handbook)</term>
 
         <listitem>
-          <para>The Handbook aims to be the comprehensive on-line resource and
-	    reference for FreeBSD users.</para>
+          <para>¨Ï¥Î¤â¥U¥Dn¬Oµ¹ FreeBSD ¨Ï¥ÎªÌ´£¨Ñ¸ÔºÉªº½u¤W°Ñ¦Ò¸ê®Æ¡C</para>
         </listitem>
       </varlistentry>
  
@@ -115,20 +112,13 @@
       </varlistentry>
     </variablelist>
     
-    <para>These four groups of documentation are all available in the
-      FreeBSD CVS tree.  This means that the logs of changes to these
-      files are visible to anyone, and anyone can use a program such as
-      <application>CVSup</application> or
-      <application>CTM</application> to keep local copies of
-      this documentation.</para>
+    <para>³o¥|Ó¤å¥ó²Õ¦¨³¡¤À³£¥i³z¹L FreeBSD CVS tree ¨Ó¨ú±o¡C¤]´N¬O»¡¡A³o¨Ç¤å¥óªº×§ï°O¿ý¹ï©ó¥ô¦ó¤H³£¬O¤½¶}ªº¡A
+      ¦Ó¥BµL½×¬O½Ö³£¥i¥H¥Î¹³¬O <application>CSup</application>, <application>CVSup</application> ©Î
+      <application>CTM</application> ±N¤å¥ó¨ú¥X¨Ó(checkout)¨Ã©ñ¦b¦Û¤v¾÷¾¹¤W°µ³Æ¥÷©Î°Æ¥»°Ñ¦Òµ¥¥Î³~¡C</para>
     
-    <para>In addition, many people have written tutorials or other web
-      sites relating to FreeBSD.  Some of these are stored in the CVS
-      repository as well (where the author has agreed to this).  In
-      other cases the author has decided to keep his documentation
-      separate from the main FreeBSD repository.  The FDP endeavors to
-      provide links to as much of this documentation as
-      possible.</para>
+    <para>¦¹¥~¡A³\¦h¤H·|¼g¨Ç±Ð¾Ç¤å¥ó©ÎºûÅ@¦³Ãö FreeBSD ¤º®eªººô¯¸¡C(Y§@ªÌ¦P·Nªº¸Ü)¨ä¤¤¦³¨Ç¸ê®Æ·|«O¦s¦b FreeBSD ¥¿¦¡ 
+      CVS repository ¤º¡C¦Ó¨ä¥Lªº¤å¥ó¡A¥i¯à§@ªÌ¤£§Æ±æ³Q©ñ¦b FreeBSD repository ¤º¦Ó¥t¦s¥L³B¡C
+      Á`¤§¡AFDP ·|ºÉ¤O´£¨Ñ³o¨Ç¤å¥óªº³sµ²¡C</para>
   </sect1>                                                                     
   
   <sect1 id="overview-before">
@@ -138,8 +128,8 @@
     
     <itemizedlist>                                                             
       <listitem>                                                               
-	<para>¦p¦ó±q FreeBSD CVS repository §ó·s¦Û¤v¹q¸£¤Wªº FreeBSD ¤å¥ó ³¡¥÷(¥H <application>CVS</application>
-	  ©Î <application>CVSup</application> ©Î¬O
+	<para>¦p¦ó±q FreeBSD CVS repository §ó·s¦Û¤v¹q¸£¤Wªº FreeBSD ¤å¥ó³¡¥÷(¥H <application>CVS</application>
+	  ©Î <application>CSup</application> ©Î <application>CVSup</application> ©Î¬O
 	  <application>CTM</application>) ©Î¬O¥Î
 	  <application>CVSup</application> ¨Ó¤U¸ü <emphasis>checked-out</emphasis> ªº°Æ¥»</para>
       </listitem>
@@ -157,43 +147,39 @@
 
     <procedure>
       <step>
-	<para>¦w¸Ë <filename role="package">textproc/docproj</filename> ³oÓ²Õ¦X«¬ port(meta-port).</para>
+	<para>¦w¸Ë <filename role="package">textproc/docproj</filename> ³oÓ²Õ¦X«¬ port(meta-port)¡C</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/textproc/docproj</userinput>
 &prompt.root; <userinput>make JADETEX=no install</userinput></screen>
       </step>
 
       <step>
-	<para>Get a local copy of the FreeBSD <filename>doc</filename> tree.
-	  Either use CVSup in <literal>checkout</literal> mode to do this, or
-	  get a full copy of the CVS repository locally.</para>
+	<para>¤U¸ü FreeBSD <filename>doc</filename> tree ¨ì¥»¾÷¤W¡G
+	  µL½×¬O¥Î CSup ©Î CVSup ªº <literal>checkout</literal> ¼Ò¦¡¡A
+	  ©Î¬O½Æ»s§¹¾ãªº CVS repository ¨ì¥»¾÷¤W³£¥i¥H¡C</para>
 
-	<para>If you have the CVS repository locally then as a minimum you
-	  will need to checkout the <filename>doc/share</filename>, and
-	  <filename>doc/en_US.ISO8859-1/share</filename>
-	  directories.</para>
+	<para>Y·Q¦b¥»¾÷¤W¥u¶]³Ì§C«×ªº CVS repository ´N¦n¡A¨º»ò¥²¶·n 
+	  checkout ¥X <filename>doc/share</filename> ¥H¤Î <filename>doc/en_US.ISO8859-1/share</filename>
+	  ³o¨âÓ¥Ø¿ý¤~¦æ¡C</para>
 
 	<screen>&prompt.user; <userinput>cvs checkout doc/share</userinput>
 &prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/share</userinput></screen>
 
-	<para>YµwºÐªÅ¶¡°÷¤jªº¸Ü¡A¨º¥i¥H§â©Ò¦³ doc ³£ check out ¥X¨Ó¡G</para>
+	<para>YµwºÐªÅ¶¡ÁÙºâ¥i¥Hªº¸Ü¡A¨º¥i¥H§â©Ò¦³»y¨tªº doc ³£ check out ¥X¨Ó¡G</para>
 
 	<screen>&prompt.user; <userinput>cvs checkout doc</userinput></screen>
       </step>
 
       <step>
-	<para>If you are preparing a change to an existing book or article,
-	  check it out of the repository as necessary.  If you are planning on
-	  contributing a new book or article then use an existing one as a
-	  guide.</para>
+	<para>¥i¨Ì»Ýn±q repository ¤¤ checkout ¥X¨Ó§A·Q×§ï¬Y¥÷²{¦³ªº®ÑÄy©Î¤å³¹¤º®e¡C
+	  Y¥´ºâ¼¶¼g·s®Ñ©Î·s¤å³¹ªº¸Ü¡A¥i¥H°Ñ¦Ò²{¦³ªº³¡¤À§@¬°¹ê¨Ò¨Ó°µ¡C</para>
 
 	<para>Á|¨Ò¨Ó»¡¡AY·Q¼g½g·s¤å³¹¡A¤º®e¬O¦³Ãö¦b FreeBSD »P Windows 2000 ¤§¶¡«Ø¥ß VPN ³s½u¡A
 	¨º»ò¥i¥H·ÓÃþ¦ü¤U±³o¼Ëªº§@ªk¡G</para>
 
 	<procedure>
 	  <step>
-	    <para>Check out the <filename>articles</filename>
-	      directory.</para>
+	    <para>Check out <filename>articles</filename> ¥Ø¿ý¡G</para>
 
 	    <screen>&prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/articles</userinput></screen>
 	  </step>
@@ -223,19 +209,16 @@
 
 	<screen>&prompt.user; <userinput>make lint</userinput></screen>
 
-	<para>When you are ready to actually build the document, you
-  	  may specify a single format or a list of formats in the
-  	  <varname>FORMATS</varname> variable.  ¥Ø«e¤ä´©ªº®æ¦¡¦@¦³¡G
+	<para>·í½s®Ñªº¤@¤Á³£´Nºü®É¡A³o®É§A¥i¥H¥Î <varname>FORMATS</varname> 
+	  ÅÜ¼Æ¨Ó«ü©w²£¥Íªº®æ¦¡¬°þ¤@ºØ¡C  ¥Ø«e¤ä´©ªº®æ¦¡¦@¦³¡G
   	  <literal>html</literal>, <literal>html-split</literal>,
   	  <literal>txt</literal>, <literal>ps</literal>,
   	  <literal>pdf</literal>, <literal>rtf</literal> ¡C
-	 The most up to date list of supported formats is
-  	  listed at the top of the
-  	  <filename>doc/share/mk/doc.docbook.mk</filename> file.  Make
-  	  sure to use quotes around the list of formats when you build
-  	  more than one format with a single command.</para>
+	 ©Ò¤ä´©ªº®æ¦¡¦Cªí³Ì·sª©¡A¥i°Ñ¦Ò 
+  	  <filename>doc/share/mk/doc.docbook.mk</filename> ÀÉ¡C ½Ð°O±o¡G
+  	  ¦b³æ¤@«ü¥O¤¤¡AYn¦P®É²£¥Í¦hºØ®æ¦¡ªº¸Ü¡AÀ³¨Ï¥Î¤Þ¸¹(quotes)¨Ó±N³o¨Ç®æ¦¡¬A°_¨Ó¡C</para>
 
-        <para>Á|¨Ò¨Ó»¡¡AY¥un
+        <para>Á|¨Ò¨Ó»¡¡AY¥un²£¥Í 
           <literal>html</literal> ®æ¦¡´N¦n¡A¨º»ò´N¥´¡G</para>
 
 	<screen>&prompt.user; <userinput>make FORMATS=html</userinput></screen>

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml,v 1.2 2006/01/31 01:31:01 vanilla Exp $
+     $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml,v 1.4 2006/07/04 08:28:45 vanilla Exp $
      Original revision: 1.32
 -->
 
@@ -35,22 +35,20 @@
   <title>¤u¨ã</title>
   
   <para>FDP ¨Ï¥Î¤@°ï¤u¨ã¨Ó¨ó§UºÞ²z FreeBSD ¤å¥ó¡BÂà´«¤å¥ó®æ¦¡µ¥µ¥¡C
-	¦]¦¹¡AYn¶i¦æ FDP ¤u§@ªº¸Ü¡A¥i¯à¥²¶·n¾Ç·|³o¨Ç¤u¨ã¤~¦æ¡C</para>                    
+	¦]¦¹¡AYn¶i¦æ FDP ¤u§@ªº¸Ü¡A¥²¶·n¾Ç·|³o¨Ç¤u¨ã¤~¦æ¡C</para>                    
 
   <para>³o¨Ç¤u¨ã³£¥i¥H¥Î Ports ©Î Packages ¨Ó¦w¸Ë¡A¥H¸`¬Ù³\¦h¦w¸Ëªº¤u¤Ò¡C</para>                                                              
   
   <para>±z¥²¶·¦w¸Ë³o¨Ç¤u¨ã¡A¤~¯à¨Ï¥Î±µ¤U¨Ó¦U³¹¸`·|¤¶²Ð¨ìªº¨Ò¤l¡C ³o¨Ç¤u¨ãªº¥Îªk¡A·|¦b«áÄò¬ÛÃö³¹¸`½Í¨ì¡C </para>     
 
   <tip>
-    <title>Use <filename role="package">textproc/docproj</filename> if possible</title>
+    <title>«ØÄ³¦w¸Ë <filename role="package">textproc/docproj</filename></title>
 
-    <para>You can save yourself a lot of time if you install the
-      <filename role="package">textproc/docproj</filename> port.  This is a
-      <emphasis>meta-port</emphasis> which does not contain any software
-      itself.  Instead, it depends on various other ports being installed
-      correctly.  Installing this port <emphasis>should</emphasis>
-      automatically download and install all of the packages listed in this
-      chapter that you need.</para>
+    <para>¸Ë¤F 
+      <filename role="package">textproc/docproj</filename> ¥i¥H§ó¬Ù®É¬Ù¤O¡A¥¦¬OÓ
+      ²Õ¦X«¬ªº port(meta-port)¡A¥»¨¨Ã«D³nÅé¡A¥u¬O±N¤@¨Ç±`¥Î¤u¨ã²Õ¦X°_¨Ó¦Ó¤w¡C
+      ¸Ë¤F³oÓ port ¤§«á¡A¡yÀ³¸Ó¡z´N·|¦Û°Ê¤U¸ü¡B¦w¸Ë¥»³¹©Ò·|¤¶²Ð¨ìªº¤u¨ã¤F¡C
+      Yn³B²z¤¤¤åªº¸Ü¡A«ØÄ³¦A¸Ë <filename role="package">chinese/docproj</filename> ·|¤ñ¸û¦n¡C</para>
 
     <para>One of the packages that you might need is the JadeTeX macro set.
       In turn, this macro set requires &tex; to be installed.  &tex; is a large

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml,v 1.2 2006/01/31 01:31:02 vanilla Exp $
-     Original revision: 1.220
+     $FreeBSD: doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml,v 1.3 2006/07/03 15:53:46 vanilla Exp $
+     Original revision: 1.225
 -->
 
 <chapter id="cutting-edge">
@@ -37,44 +37,39 @@
     <!-- with feedback from various others -->
   </chapterinfo>
 
-  <title>The Cutting Edge</title>
+  <title>§ó·s¡B¤É¯Å FreeBSD</title>
 
   <sect1 id="cutting-edge-synopsis">
-    <title>Synopsis</title>
+    <title>·§z</title>
 
-    <para>&os; is under constant development between releases.  For
-      people who want to be on the cutting edge, there are several easy
-      mechanisms for keeping your system in sync with the latest
-      developments.  Be warned&mdash;the cutting edge is not for everyone!
-      This chapter will help you decide if you want to track the
-      development system, or stick with one of the released
-      versions.</para>
+    <para>&os; ¬OÓ«ùÄòµo®iªº§@·~¨t²Î¡C¹ï©ó³ßÅw°l¨D·sÂA¡B¨ë¿Eªº¨Ï¥ÎªÌ¦Ó¨¥¡A
+      ¦³«Ü¦h¤èªk¥i¥H¨Ï±zªº¨t²Î»´ÃP§ó·s¬°³Ì·sª©¡C
+      ª`·N¡G¨Ã«D¨CÓ¤H³£¾A¦X³o»ò°µ¡I¡@¥»³¹¥Dn¬O¨ó§U±z¨M©w¨ì©³n¸ò¶}µoª©¥»¡A©Î¬On¨Ï¥Î¸ûÃ©wªºÄÀ¥Xª©¡C
+      </para>
 
-    <para>After reading this chapter, you will know:</para>
+    <para>Åª§¹³o³¹¡A±z±N¤F¸Ñ¡J</para>
 
     <itemizedlist>
-      <listitem><para>The difference between the two development
-      branches: &os.stable; and &os.current;.</para>
+      <listitem><para>&os.stable; »P &os.current;¡@³o¨â¤À¤äªº¤£¦P¤§³B¡F</para>
       </listitem>
-      <listitem><para>How to keep your system up to date with
+      <listitem><para>¦p¦ó¥H 
+	  <application>CSup</application>,
 	  <application>CVSup</application>,
-	  <application>CVS</application>, or
-	  <application>CTM</application>.</para>
+	  <application>CVS</application> ©Î
+	  <application>CTM</application> ¨Ó§ó·s§Aªº¨t²Î</para>
       </listitem>
-      <listitem><para>How to rebuild and reinstall the entire base
-      system with <command>make buildworld</command> (etc).</para>
+      <listitem><para>¦p¦ó¥H <command>make buildworld</command> µ¥«ü¥O¨Ó«·s½sÄ¶¡B¦w¸Ë¾ãÓ 
+      base system¡C</para>
       </listitem>
 
     </itemizedlist>
 
-    <para>Before reading this chapter, you should:</para>
+    <para>¦b¶}©l¾\Åª³o³¹¤§«e¡A±z»Ýn¡J</para>
 
     <itemizedlist>
-      <listitem><para>Properly set up your network connection (<xref
-      linkend="advanced-networking">).</para>
+      <listitem><para>¥ý³]¦n§Aªººô¸ô(<xref linkend="advanced-networking">)¡C</para>
       </listitem>
-      <listitem><para>Know how to install additional third-party
-        software (<xref linkend="ports">).</para></listitem>
+      <listitem><para>ª¾¹D¦p¦ó³z¹L port/package ¦w¸Ë³nÅé(<xref linkend="ports">)¡C</para></listitem>
     </itemizedlist>
   </sect1>
   
@@ -83,10 +78,9 @@
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
-    <para>There are two development branches to FreeBSD: &os.current; and
-      &os.stable;.  This section will explain a bit about each and describe
-      how to keep your system up-to-date with each respective tree.
-      &os.current; will be discussed first, then &os.stable;.</para>
+    <para>FreeBSD ¦³¨âÓµo®i¤À¤ä¡G&os.current; ¤Î
+      &os.stable;¡C¥»¸`±N·|³°Äò¤¶²Ð¡A¨Ã¤¶²Ð¥¦Ì¤À§O¤S¬O¦p¦ó§ó·s¡C
+      º¥ý¡A¥ý¤¶²Ð &os.current;¡A±µµÛ¦A¤¶²Ð &os.stable;¡C</para>
 
     <sect2 id="current">
       <title>Staying Current with &os;</title>
@@ -99,11 +93,10 @@
 	twice before installing it.  </para>
 
       <sect3>
-	<title>What Is &os.current;?</title>
+	<title>¤°»ò¬O &os.current;¡H</title>
 	<indexterm><primary>snapshot</primary></indexterm>
 
-	<para>&os.current; is the latest working sources for &os;.
-	  This includes work in progress, experimental changes, and
+	<para>&os.current; ¬O &os; ªº³Ì·sª©¡C¥¦¥]§t¡G work in progress, experimental changes, and
 	  transitional mechanisms that might or might not be present
 	  in the next official release of the software.  While many
 	  &os; developers compile the &os.current; source code daily,
@@ -383,11 +376,11 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>If you are installing a new system and want it to be as
-	      stable as possible, you can simply grab the latest dated
-	      branch snapshot from <ulink
-	      url="ftp://snapshots.jp.FreeBSD.org/pub/FreeBSD/snapshots/"></ulink>
-	      and install it like any other release.  Or you can
+	    <para>If you are going to install a new system and want it
+	      to run monthly snapshot built from &os.stable;, please
+	      check the <ulink url="&url.base;/snapshots/">
+		Snapshots</ulink> web page for more information.
+	      Alternatively, it is possible to
 	      install the most recent &os.stable; release from the
 	      <link linkend="mirrors">mirror sites</link> and follow
 	      the instructions below to upgrade your system to the
@@ -467,7 +460,7 @@
   </sect1>
 
   <sect1 id="synching">
-    <title>Synchronizing Your Source</title>
+    <title>§ó·s§Aªº Source</title>
     
     <para>There are various ways of using an Internet (or email)
       connection to stay up-to-date with any given area of the &os;
@@ -552,9 +545,9 @@
       tree to rebuild the system.</para>
 
     <warning>
-      <title>Take a Backup</title>
+      <title>Make a Backup</title>
 
-      <para>It cannot be stressed enough how important it is to take a
+      <para>It cannot be stressed enough how important it is to make a
 	backup of your system <emphasis>before</emphasis> you do this.
 	While rebuilding the world is (as long as you follow these
 	instructions) an easy task to do, there will inevitably be times
@@ -673,7 +666,7 @@
 
       <para>Examine the files
 	<filename>/usr/share/examples/etc/make.conf</filename>
-	(called <filename>/etc/defaults/make.conf</filename> in &os;&nbsp;4.X) and
+	and
 	<filename>/etc/make.conf</filename>.  The first contains some
 	default defines &ndash; most of which are commented out.  To
 	make use of them when you rebuild your system from source, add
@@ -684,10 +677,9 @@
 
       <para>A typical user will probably want to copy the
 	<makevar>CFLAGS</makevar> and
-	<makevar>NO_PROFILE</makevar> (or <makevar>NOPROFILE</makevar> on
-	&os;&nbsp;5.X and older) lines found in
+	<makevar>NO_PROFILE</makevar> lines found in
 	<filename>/usr/share/examples/etc/make.conf</filename>
-	(or in <filename>/etc/defaults/make.conf</filename> on &os;&nbsp;4.X) to
+	to
 	<filename>/etc/make.conf</filename> and uncomment them.</para>
 
       <para>Examine the other definitions (<makevar>COPTFLAGS</makevar>, 
@@ -714,21 +706,13 @@
 	In some cases <command>make buildworld</command> will check to see if
 	these users or groups exist.</para>
 
-      <para>A recent example of this is when the
+      <para>An example of this is when the
 	<username>smmsp</username> user was added.  Users had the
 	installation process fail for them when
 	&man.mtree.8; was trying to create
 	<filename>/var/spool/clientmqueue</filename>.</para>
 
-      <para>The solution is to examine
-	<filename>/usr/src/etc/group</filename> and compare its list of
-	groups with your own.  If there are any groups in the new file that
-	are not in your file then copy them over.  Similarly, you should
-	rename any groups in <filename>/etc/group</filename> which have
-	the same GID but a different name to those in
-	<filename>/usr/src/etc/group</filename>.</para>
-
-      <para>Since 4.6-RELEASE you can run &man.mergemaster.8; in
+      <para>The solution is to run &man.mergemaster.8; in
 	pre-buildworld mode by providing the <option>-p</option> option.
 	This will compare only those files that are essential for the success
 	of <maketarget>buildworld</maketarget> or
@@ -781,7 +765,7 @@
 	mode.</para>
 
       <para>Alternatively, reboot the system, and at the boot prompt,
-        enter the <option>-s</option> flag.  The system will then boot
+        select the <quote>single user</quote> option.  The system will then boot
 	single user.  At the shell prompt you should then run:</para>
 
       <screen>&prompt.root; <userinput>fsck -p</userinput>
@@ -830,8 +814,8 @@
 &prompt.root; <userinput>rm -rf *</userinput></screen>
     </sect2>
 
-    <sect2>
-      <title>Recompile the Source</title>
+    <sect2 id="cutting-edge-compilebase">
+      <title>Recompile the Base System</title>
 
       <sect3>
 	<title>Saving the Output</title>
@@ -922,22 +906,16 @@
 
 	<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
 
-	<para>Beginning with version 2.2.5 of &os; (actually, it was
-	  first created on the &os.current; branch, and then retrofitted to
-	  &os.stable; midway between 2.2.2 and 2.2.5) the
-	  <maketarget>world</maketarget> target has been split in
-	  two: <maketarget>buildworld</maketarget> and
-	  <maketarget>installworld</maketarget>.  Beginning with version
-	  5.3 of &os; the <maketarget>world</maketarget> target will be changed
-	  so it will not work at all by default because it is actually
-	  dangerous for most users.</para>
+	<para>Where <replaceable>target</replaceable> will be one of
+	  many build options.  The first target should always be
+	  <makevar>buildworld</makevar>.</para>
 
 	<para>As the names imply, <maketarget>buildworld</maketarget>
 	  builds a complete new tree under <filename>/usr/obj</filename>,
-	  and <maketarget>installworld</maketarget> installs this tree on
+	  and <maketarget>installworld</maketarget>, another target, installs this tree on
 	  the current machine.</para>
 
-	<para>This is very useful for 2 reasons.  First, it allows you
+	<para>Having separate options is very useful for two reasons.  First, it allows you
 	  to do the build safe in the knowledge that no components of
 	  your running system will be affected.  The build is
 	  <quote>self hosted</quote>.  Because of this, you can safely
@@ -963,7 +941,7 @@
 
 	<screen>&prompt.root; <userinput>make buildworld</userinput></screen>
  
-        <para>It is now possible to specify a <option>-j</option> option to
+        <para>It is possible to specify a <option>-j</option> option to
           <command>make</command> which will cause it to spawn several
           simultaneous processes.  This is most useful on multi-CPU machines.
           However, since much of the compiling process is IO bound rather
@@ -980,11 +958,6 @@
 	<para>If you have a multi-CPU machine and you are using an SMP
 	  configured kernel try values between 6 and 10 and see how they speed
 	  things up.</para>
-
-	<para>Be aware that this is still somewhat experimental, and commits
-	  to the source tree may occasionally break this feature.  If the
-	  world fails to compile using this parameter try again without it
-	  before you report any problems.</para>
       </sect3>
       
       <sect3>
@@ -994,8 +967,8 @@
 	  <secondary>timings</secondary>
 	</indexterm>
 
-        <para>Many factors influence the build time, but currently a 500&nbsp;MHz
-          &pentium;&nbsp;III with 128&nbsp;MB of RAM takes about 2&nbsp;hours to build
+        <para>Many factors influence the build time, but fairly recent
+          machines may only take a one or two hours to build
           the &os.stable; tree, with no tricks or shortcuts used during the
           process.  A &os.current; tree will take somewhat longer.</para>
       </sect3>
@@ -1024,7 +997,7 @@
 	can then build a new kernel based on your normal kernel	configuration
 	file.</para>
 
-      <para>On modern versions of FreeBSD it is important to <link
+      <para>On &os; it is important to <link
         linkend="make-buildworld">build world</link> before building a
         new kernel.</para>
 
@@ -1057,7 +1030,7 @@
 	<xref linkend="makeworld-singleuser">.</para>
     </sect2>
 
-    <sect2>
+    <sect2 id="make-installworld">
       <title>Install the New System Binaries</title>
 
       <para>If you were building a version of &os; recent enough to have
@@ -1169,7 +1142,7 @@
 
       <para>After &man.mergemaster.8; is done with the system files you will be
         prompted for other options.  &man.mergemaster.8; may ask if you want to rebuild
-        the password file and/or run &man.MAKEDEV.8; if you run a FreeBSD version prior to 5.0, and will finish up with an option to
+        the password file and will finish up with an option to
         remove left-over temporary files.</para>
       </sect3>
 
@@ -1187,7 +1160,7 @@
 	not in <filename>/usr/src/etc</filename>.</para>
 
       <para>If you are using &man.mergemaster.8; (as recommended),
-        you can skip forward to the <link linkend="update-dev">next
+        you can skip forward to the <link linkend="cutting-edge-rebooting">next
 	section</link>.</para>
 
       <para>The simplest way to do this by hand is to install the
@@ -1334,103 +1307,8 @@
       </tip>
       </sect3>

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