Sync with English version, correct context style.

Submitted by: Chinese Documentation Project.

16 files changed, 434 insertions, 278 deletions

diff --git a/zh/FAQ/FAQ.sgml b/zh/FAQ/FAQ.sgml
index d253a80a43..73c1ba253e 100644
--- a/zh/FAQ/FAQ.sgml
+++ b/zh/FAQ/FAQ.sgml
@@ -28,7 +28,7 @@
     <name>FreeBSD ¤å¥ó­pµe</name>
   </author>
 
-  <date>$Date: 1999-03-01 08:57:28 $</date>
+  <date>$Date: 1999-05-11 10:31:38 $</date>
 
   <abstract>
     ³o¥÷¤å¥ó¬O FreeBSD 2.X ªº±`¨£°Ýµª¶°¡C°£«D¦³¯S§O¥[µù¡A§_«h³o¨Ç±ø¥Ø³£¾A
@@ -43,8 +43,8 @@
     <url url="ftp://ftp.freebsd.org/pub/FreeBSD/doc/FAQ.pdf" name="PDF ª©">¡A
     ©Î¬O <url url="FAQ-html.tar.gz" name="HTML ª©">¡A©Î¬O¸g¥Ñ
     <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/docs" name="FreeBSD FTP ¯¸">
-    ©Î¬O¥¦ªº¥ô¦ó¤@­Ó <ref id="mirrors-ftp" name="mirror ¯¸»O"> ¨Ó¤U¸ü gzip'd
-    ªºª©¥»¡C±z©Î³\¤]·Q <url url="http://www.freebsd.org/search/search.html"
+    ¨Ó¤U¸ü gzip'd ªºª©¥»¡C±z©Î³\¤]·Q
+    <url url="http://www.freebsd.org/search/search.html"
     name="¦b±`¨£°Ýµª¶°¤¤·j´M¸ê®Æ">¡C
 
   </abstract>
diff --git a/zh/FAQ/acknowledgments.sgml b/zh/FAQ/acknowledgments.sgml
index a763012e18..4510811876 100644
--- a/zh/FAQ/acknowledgments.sgml
+++ b/zh/FAQ/acknowledgments.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: acknowledgments.sgml,v 1.2 1999-03-10 08:30:10 foxfair Exp $ -->
+<!-- $Id: acknowledgments.sgml,v 1.3 1999-05-11 10:31:41 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by vanilla@FreeBSD.ORG -->
 <!-- English Version: 1.1 -->
diff --git a/zh/FAQ/admin.sgml b/zh/FAQ/admin.sgml
index b0b0278ff8..a74131407b 100644
--- a/zh/FAQ/admin.sgml
+++ b/zh/FAQ/admin.sgml
@@ -1,7 +1,7 @@
-<!-- $Id: admin.sgml,v 1.9 1999-03-21 16:25:40 wosch Exp $ -->
+<!-- $Id: admin.sgml,v 1.10 1999-05-11 10:31:42 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by foxfair@FreeBSD.ORG -->
-<!-- English version: 1.20 -->
+<!-- English version: 1.22 -->
 
   <sect>
     <heading>¨t²ÎºÞ²z<label id="admin"></heading>
@@ -445,7 +445,7 @@
       <heading>§Ú¤£·|³]©w§Úªº¦Lªí¾÷¡C</heading>
 
       <p>½Ð°Ñ¾\ Handbook ¸Ì¦³Ãö¦C¦Lªº³¡¥÷¡C³oÀ³¸Ó¯à¸Ñ¨M§A¤j³¡¤Àªº°ÝÃD¡A½Ð¬Ý
-      <url url="../../handbook/printing.html" name="Handbook entry on printing.">
+      <url url="../handbook/printing.html" name="Handbook entry on printing.">
 
     <sect1>
       <heading>§Ú¨t²Î¤WªºÁä½L°t¸m¿ù¤F¡C</heading>
@@ -874,5 +874,19 @@ cd /cdrom/bin
     <item>¥Î·sªº®Ö¤ßµ{¦¡­«·s±Ò°Ê¹q¸£´N¥i¥H¤F¡C
     </enum>
 
-     
+   <sect1>
+     <heading>¥i¥H¤£¥Î¶}¾÷¡A­«·sŪ¨ú /etc/rc.conf¡B¦A¦¸±Ò°Ê /etc/rc ¶Ü¡H
+     </heading>
+
+     <p>¥ý¶i¤J³æ¤H¨Ï¥ÎªÌ¼Ò¦¡¡AµM«á¦A¦^¨ì¦h¨Ï¥ÎªÌ¼Ò¦¡¡C
+
+     ¦b¥D±±¥x°õ¦æ¡G
+<verb>
+     # shutdown now
+     (Note: without -r or -h)
+
+     # return
+     # exit
+</verb>
+
   </sect>
diff --git a/zh/FAQ/applications.sgml b/zh/FAQ/applications.sgml
index 3a4ce31a8e..4388c92546 100644
--- a/zh/FAQ/applications.sgml
+++ b/zh/FAQ/applications.sgml
@@ -1,15 +1,15 @@
-<!-- $Id: applications.sgml,v 1.4 1999-03-10 08:30:11 foxfair Exp $ -->
+<!-- $Id: applications.sgml,v 1.5 1999-05-11 10:31:43 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by vanilla@FreeBSD.ORG -->
 <!-- English Version: 1.19 -->
 
   <sect>
-    <heading>User Applications<label id="applications"></heading>
+    <heading>¤@¯ëÀ³¥Îµ{¦¡<label id="applications"></heading>
 
     <sect1>
       <heading>¶â¡C§Ú­n¦b­þ§ä¨ì§Ú­nªºµ{¦¡£°?</heading>
 
-      <p>½Ð¬Ý¬Ý <url url="../ports/" name="the ports page"> §a¡C
+      <p>½Ð¬Ý¬Ý <url url="/usr/ports/" name="ports ¥Ø¿ý"> §a¡C
       ³oÃ䦳¥÷¤w¸g port ¨ì FreeBSD ªº³nÅé¦Cªí¡C¥Ø«e¦³¶W¹L 1800 ­Ó³nÅé¤w¸g³Q
       port ¨ì FreeBSD ¤W¡A¨Ã¥B¨C¤Ñ³£¦b¼W¥[¤¤¡C©Ò¥H¦³ªÅ´N¦h¬Ý¬Ý³o¥÷¦Cªí¡A
       ¤£µM§A¤]¥i¥H­q¾\ <tt/freebsd-announce/ 
@@ -21,39 +21,34 @@
       ¨C¦¸·í FreeBSD release ®É¡A³£·|¦³¤@¥÷ ports tree ³Q©ñ¦b³o¤@­Ó
       release cd ¸Ì­±ªº <tt>ports/</tt> ¥Ø¿ý¸Ì¡C
 
-      <p>We also support the concept of a ``package'', essentially no
-      more than a gzipped binary distribution with a little extra
-      intelligence embedded in it for doing whatever custom installation
-      work is required.  A package can be installed and uninstalled
-      again easily without having to know the gory details of which
-      files it includes.
-
-      <p>Use the package installation menu in <tt>/stand/sysinstall</tt>
-      (under the post-configuration menu item) or invoke the
-      <em>pkg_add(1)</em> command on the specific package files you're
-      interested in installing.  Package files can usually be identified by
-      their <em>.tgz</em> suffix and CDROM distribution people will have
-      a <tt>packages/All</tt> directory on their CD which contains such
-      files.  They can also be downloaded over the net for various versions
-      of FreeBSD at the following locations:
+      <p>§Ú­Ì¤]¤ä´©¤@ºØ¥s ``package'' ªº·§©À¡A°ò¥»¤W´N¬O gzip À£ÁY¡B¥i¥Î
+      ¨Óµo¦æªº binary ÀɮסA¦ý¬O¸Ì­±ÂäF¤@¨Ç¬Û·í¦³¥Îªº¸ê°T¡A¥i¥Hµ¹¦UºØ¦Û
+      ­q¦w¸Ë¨Ó¨Ï¥Î¡C¨Ï¥ÎªÌ¤£¥²ª¾¹D¬Y­Ó package ¸Ì¨s³º¦³¥]¬A¨º¨ÇÀɮסA´N¥i
+      ¥H«Ü¤è«K¦a­«½Æ±N¥¦¦w¸Ë/¤Ï¦w¸Ë¡C
+
+      <p>§A¥i¥H°õ¦æ <tt>/stand/sysinstall</tt> «á¡A¦b post-configuration
+      ¿ï³æ¤U¿ï¾Ü package ³o­Ó¦w¸Ë¿ï¶µ¡F©Î¬O¹ï¬Y­Ó¦³¿³½ìªº package ÀÉ®×°õ
+      ¦æ <em>pkg_add(1)</em>¡A§â¥¦¸Ë°_¨Ó¡CPackage Àɮ׳q±`¥H <em>.tgz</em>
+      §@¬°©µ¦ùÀɦW¡A¤â¤W¦³ FreeBSD CDROM ªº¤H¥i¥H¦b <tt>packages/All</tt>
+      ³o­Ó¥Ø¿ý¤U§ä¨ì³oÃþÀɮסC¹ï¤£¦Pªº FreeBSD ª©¥»¡A¤]¥i¥H±q¤U¦C¦ì§}¥Ñºô
+      ¸ô¤W¨ú±o¡G
 
       <descrip>
-        <tag>for 2.2.8-release/2.2.8-stable</tag>
+        <tag>µ¹ 2.2.8-release/2.2.8-stable ¥Îªº</tag>
         <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/ports/i386/packages-2.2.8/"
         name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/ports/i386/packages-2.2.8/">
 
-        <tag>for 4.0-current</tag>
+        <tag>µ¹ 4.0-current ¥Îªº</tag>
         <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/ports/i386/packages-3.0/"
         name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/ports/i386/packages-3.0/">
       </descrip>
 
-      <p>or your nearest local mirror site.
+      <p>©Î¬OÂ÷§A³Ìªñªº mirror ¯¸¡C
 
-      <p>Note that all ports may not be available as packages since
-      new ones are constantly being added.  It is always a good
-      idea to check back periodically to see which packages are available
-      at the <url url="ftp://ftp.freebsd.org/pub/FreeBSD/"
-      name="ftp.freebsd.org"> master site.
+      <p>­nª`·Nªº¬O¡A¦]¬°·sªº port ¤@ª½¦b¼W¥[¤¤¡A©Ò¥H¨Ã¤£¬O©Ò¦³ port ³£
+      ¦³¬Û¹ïÀ³ªº package¡C³Ì¦n©w®ÉÀˬd
+      <url url="ftp://ftp.freebsd.org/pub/FreeBSD/" name="ftp.freebsd.org">¡A
+      ¬Ý¬Ý¦³¨º¨Ç package ¥i¥H¥Î¡C
 
     <sect1>
       <heading>§Ú¥i¥H¦b­þÃä§ä¨ì libc.so.3.0?</heading>
@@ -108,8 +103,8 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx
 
       <p>§A¥u»Ý­n±N socksys Âà¦V¨ì <htmlurl
       url="http://www.freebsd.org/cgi/man.cgi?null(4)" name="/dev/null">
-      ¥hÄF¹L open &amp; close. ¦b -current ¸Ì­±ªº ibcs2 ¬ÛÃöµ{¦¡½X±N·|³B
-      ²z³o¨ÇªF¦è¡CThis is muck cleaner than the way it was done before¡C
+      ¥hÄF¹L open &amp; close ªº°Ê§@¡C¦b -current ¸Ì­±ªº ibcs2 ¬ÛÃöµ{¦¡½X±N·|³B
+      ²z¨ä¾lªº³¡¥÷¡A³oºØ§@ªk¤ñ¥H«eªº¤è¦¡°®²b¤Ó¦h¤F¡C
       °²¦p§A·Q­n¨Ï¥Î <tt/spx/ ¤è­±ªºµ{¦¡¡A¦b§Aªº®Ö¤ß³]©wÀɸ̭±¥[¤W
       <tt/SPX&lowbar;HACK/¡C
 
diff --git a/zh/FAQ/commercial.sgml b/zh/FAQ/commercial.sgml
index 63ccfa9a7d..50124a0ad0 100644
--- a/zh/FAQ/commercial.sgml
+++ b/zh/FAQ/commercial.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: commercial.sgml,v 1.2 1999-03-10 08:30:11 foxfair Exp $ -->
+<!-- $Id: commercial.sgml,v 1.3 1999-05-11 10:31:45 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by vanilla@FreeBSD.ORG -->
 <!-- English version: 1.3 -->
@@ -6,21 +6,70 @@
   <sect>
     <heading>°Ó·~³nÅé<label id="commercial"></heading>
 
-    <p><bf/NOTE/ This section is still very sparse, though we're hoping, of
-    course, that companies will add to it! :) The FreeBSD group has no
-    financial interest in any of the companies listed here but simply
-    lists them as a public service (and feels that commercial interest
-    in FreeBSD can have very positive effects on FreeBSD's long-term
-    viability).  We encourage commercial software vendors to send their
-    entries here for inclusion.  See 
-    <url url="../commercial/commercial.html" name="the Vendors page">
-    for a longer list.
+    <p><bf/ª`·N/³o¤@¸`ªº¤º®eÁÙ¬O¬Û·í¤Ö¡A¤£¹L§Ú­Ì·íµM§Æ±æ¦U­Ó¤½¥q¯à¬°¥¦¥[
+    ÂI¤º®e :) FreeBSD ²Õ´©M¦C¦b³o¸Ìªº¥ô¦ó¤@®a¤½¥q³£¨S¦³ª÷¿ú¤Wªº§Q®`
+    Ãö«Y¡A¦C¥X¨Ó¥u¬O¹ï¤j²³ªº¤½¶}ªA°È¡]¦P®É¤]»{¬°¦b FreeBSD ¤Wªº°Ó·~¿³
+    ½ì¡A·|¹ï FreeBSD ªø¤[¥Í¾÷¦³·¥¥¿­±ªº®Ä¯q¡^¡C§Ú­Ì¹ªÀy°Ó·~³nÅ骺¼t°Ó
+    §â¥L­Ìªº²£«~¥]¬A¦b¤U­±ªº¦W³æ¤¤¡A¦b
+    <url url="../commercial/commercial.html" name="Vendors page">
+    ¥i¥H¬Ý¨ì¸ûªø¦Cªí¡C
 
     <sect1>
       <heading>§Ú¥i¥H¦b­þÃä§ä¨ìµ¹ FreeBSD ¥Îªº Motif¡H</heading>
 
+      <p>¥i¥HÁpµ¸ <ref id="apps2go" name="Apps2go"> ¨ú±o FreeBSD ELF ª©¥»ªº
+      Motif 2.1 ®M¥ó¡C<label id="apps2go">
+
+      <p>³o­Ó®M¥ó¸Ì¦³¡G
+      <itemize>
+         <item>OSF/Motif manager, xmbind, panner, wsm.
+
+         <item>Development kit with uil, mrm, xm, xmcxx, include and Imake
+         files.
+
+         <item>Static and dynamic ELF libraries¡]µ¹ FreeBSD 3.0 ¤Î¥H«áª©¥»
+         ¨Ï¥Î¡^
+
+         <item>Demonstration applets.
+      </itemize>
+
+      <p>¦]¬° <em>Apps2go</em> ¤]¦³´£¨Ñ NetBSD ©M OpenBSD ªºª©¥»¡A©Ò¥H¦b­qÁÊ
+      ®É½Ð¯S§O«ü©w¬O­n FreeBSD ª©¥»ªº Motif¡I¥L­Ì¥Ø«e¥u´£¨Ñ¥H FTP ªº¤è¦¡¨ú±o
+      ³o¥÷®M¥ó¡C
+
+      <descrip>
+        <tag/§ó¦h¸ê°T/
+        <url url="http://www.apps2go.com/" name="Apps2go WWW ­º­¶">
+
+        <tag/©Î/ <url url="mailto:sales@apps2go.com" name="Sales"> ©Î
+        <url url="mailto:support@apps2go.com" name="Support"> email «H½c¡C
+
+        <tag/©Î/ ¹q¸Ü (817) 431 8775  or +1 817 431-8775
+      </descrip>
+
+      <p>¤]¥i¥HÁpµ¸ <ref id="metrox" name="Metro Link"> ¨ú±oµ¹ FreeBSD ELF
+      ©Î a.out ª©¥»ªº Motif 2.1 ®M¥ó¡C
+
+      <p>³o¥÷®M¥ó¥]¬A¡G
+      <itemize>
+         <item>OSF/Motif manager, xmbind, panner, wsm.
+
+         <item>Development kit with uil, mrm, xm, xmcxx, include and Imake
+         files.
+
+         <item>Static and dynamic libraries¡]FreeBSD 3.0 ¤Î¤§«áª©¥»¬O¥Î
+         ELF¡FFreeBSD 2.2.8 ¤Î¤§«eªº¬O¥Î a.out¡^
+
+         <item>Demonstration applets.
+
+         <item>Preformatted man pages.
+      </itemize>
+
+      <p>¥Ñ©ó <em>Metro Link</em> ¤]¦³´£¨Ñ Linux ªºª©¥»¡A©Ò¥H­qÁʮɭn¯S§O«ü
+      ©ú¬O FreeBSD ª©¥»ªº Motif¡I¥i¥H¥Ñ¥úºÐ©Î±q FTP ¨Ó¨ú±o³o­Ó®M¥ó¡C
+
       <p>Ápµ¸ <ref id="xig" name="Xi Graphics">¡A¥L­Ì´£¨Ñ¤F¤@­Óµ¹ FreeBSD
-      ¥Îªº Motif 2.0 ®M¥ó¡C
+      ¥Îªº a.out ®æ¦¡ªº Motif 2.0 ®M¥ó¡C
 
       <p>¦b³o®M¥ó¤¤¥]¬A¤F¡G
       <itemize>
@@ -29,7 +78,7 @@
          <item>Development kit with uil, mrm, xm, xmcxx, include and Imake
          files.
 
-         <item>Static and dynamic libraries.
+         <item>Static and dynamic libraries¡]µ¹ FreeBSD 2.2.8 ©M§ó¦­ª©¥»¥Îªº¡^
 
          <item>Demonstration applets.
 
@@ -52,29 +101,50 @@
 
     <sect1>
       <heading>
-        ¨ºÃ䦳­n¿ú¡A¦ý¬O°ª®Ä²vªº X servers¡H<label id="xig">
+        ¦³¨S¦³­n¿ú¡A¦ý¬O°ª®Ä²vªº X servers¡H
       </heading>
 
-      <p>¦p§A©ÒÄ@¡A<url url="http://www.xig.com" name="Xi Graphics"> 
-      ´£¨Ñ¤F Accelerated-X µ¹ FreeBSD ¸ò¨ä¥L Intel based ªº¨t²Î¡C
+      <p>¦³¡A<url url="http://www.xig.com" name="Xi Graphics"> ©M <url
+      url="http://www.metrolink.com" name="Metro Link"> ³£¦³´£¨Ñµ¹
+      FreeBSD¡]©Î¨ä¥L Intel ¥­¥x¤W¡^¥Îªº X µøµ¡¥[³t²£«~¡C
+
+      <p>Metro Link ´£¨Ñªº°ª®Ä¯à X Server ¨Ï¥Î¤F FreeBSD ¤ºªº package ¾ã®M¤u
+      ¨ã¡A¦]¦¹³]©w¤Q¤À®e©ö¡A¤ä´©¥Ø«e¥«­±¤W¦U¤j¼tµPªºÅã¥Ü¥d¡C¥u¦³ binary ÀɮסA
+      ¥i¥H±q FTP ¯¸¬Û·í¤è«K¦aª½±µ¤U¸ü¡A§ó¤£¥Î»¡ Metro Link ³o®M²£«~ªº»ù®æ¬O
+      «D±`¦X²zªº $39¡C
+	  <label id="metrox">
+
+      <p>Metro Link ¤]¦³´£¨Ñ FreeBSD ¤Wªº ELF ©M a.out Motif¡]©¹¤W­±¬Ý¬Ý¡^¡C
+
+      <descrip>
+        <tag/§ó¦hªº¸ê°T/
+        <url url="http://www.metrolink.com/" name="Metro Link WWW ­º­¶">
+
+        <tag/©Î/ <url url="mailto:sales@metrolink.com" name="Sales"> ©Î
+        <url url="mailto:tech@metrolink.com" name="Support"> email «H½c
 
-      <p>³o­Ó°ª®Ä²vªº X Server ¦³«D±`²³æªº³]©w¤è¦¡¡A¨Ã¥B¤ä´©¤F¥Ø«e¥«­±¤W
-      ·í¬õªº¦U¤j¼tµPªºÅã¥Ü¥d¡A³Ì­«­nªº¬O¡A¥¦¥uµ¹§A Binary¡C
-      ¥¦¬O¥ÎºÏ¤ùªº¤è¦¡µo¦æ¡AFreeBSD ¸ò Linux ª©¥»³£¤@¼Ë.
+        <tag/©Î/ ¹q¸Ü (954) 938-0283  or +1 954 938-0283
+      </descrip>
 
-      <p>§A¥i¥H¦b FreeBSD ªº­ì¼t¥|¤ù¥úºÐ¤¤§ä¨ì³o­Ó°ª®Ä²v X Server ªº demo ª©¡A
-      ·íµM§A¤]¥i¥Hª½±µ¦bºô¸ô¤W§ä¨ì¡C<!-- ³o¬q§Ú¦³¥[ªF¦è -->
+      <p>Xi Graphics ©Ò´£¨Ñªº°ª®Ä¯à X Server ¦³«D±`²³æªº³]©w¤è¦¡¡A¨Ã¥B¤ä´©
+      ¤F¥Ø«e¥«­±¤W·í¬õªº¦U¤j¼tµPªºÅã¥Ü¥d¡C¥¦¥uµ¹§A Binary ÀɮסA¬O¥ÎºÏ¤ùªº¤è
+      ¦¡µo¦æ¡AFreeBSD ¸ò Linux ª©¥»³£¬Û¦P¡CXi Graphics ¦P®É¤]´£¨Ñ¤F±Mªùµ¹
+      laptop ¥Îªº°ª®Ä¯à X Server¡C
+	  <label id="xig">
 
-      <p>Xi Graphics ¤]¦³¦b½æ FreeBSD ¥Îªº Motif ¸ò CDE (©¹¤W­±¬Ý¬Ý)¡C
+      <p>5.0 ª©¦³´£¨Ñ§K¶Oªº "compatibility demo" ª©¥»¡A§A¥i¥H¦b FreeBSD ªº­ì
+      ¼t¥|¤ù¥úºÐ¤¤§ä¨ì¡A·íµM§A¤]¥i¥Hª½±µ¦bºô¸ô¤W¨ú±o¡C<!-- ³o¬q§Ú¦³¥[ªF¦è -->
+
+      <p>Xi Graphics ¤]¦³¦b½æ FreeBSD ¥Îªº Motif ¸ò CDE¡]©¹¤W­±¬Ý¬Ý¡^¡C
 
       <descrip>
         <tag/§ó¦hªº¸ê°T/
-        <url url="http://www.xig.com/" name="Xi Graphics WWW page">
+        <url url="http://www.xig.com/" name="Xi Graphics WWW ­º­¶">
 
-        <tag/©Î/ <url url="mailto:sales@xig.com" name="Sales"> or
-        <url url="mailto:support@xig.com" name="Support"> email addresses.
+        <tag/©Î/ <url url="mailto:sales@xig.com" name="Sales"> ©Î
+        <url url="mailto:support@xig.com" name="Support"> email «H½c
 
-        <tag/©Î/ phone (800) 946 7433  or +1 303 298-7478.
+        <tag/©Î/ ¹q¸Ü (800) 946 7433  or +1 303 298-7478.
       </descrip>
 
     <sect1>
@@ -85,13 +155,13 @@
       ¤@®M¦³°Ó·~¤ä´©ªº¸ê®Æ®w¨ç¦¡®w¡C
 
       <descrip>
-        <tag/For more information/
+        <tag/§ó¦hªº¸ê°T/
         <url url="http://www.conetic.com/" name="Conetic Software Systems">
 
-        <tag/or mail/
+        <tag/©Î±H«H¨ì/
         <url url="mailto:info@conetic.com" name="Information E-mail address">,
 
-        <tag/and/
+        <tag/ÁÙ¦³/
         <url url="http://www.sleepycat.com/" name = "Sleepycat Software">.
       </descrip>
 
diff --git a/zh/FAQ/hackers.sgml b/zh/FAQ/hackers.sgml
index 99fc61bd7d..bfc23269b7 100644
--- a/zh/FAQ/hackers.sgml
+++ b/zh/FAQ/hackers.sgml
@@ -1,10 +1,10 @@
-<!-- $Id: hackers.sgml,v 1.3 1999-04-21 05:26:07 foxfair Exp $ -->
+<!-- $Id: hackers.sgml,v 1.4 1999-05-11 10:31:46 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by jtjang@gcn.net.tw -->
 <!-- English Version: 1.11 -->
 
   <sect>
-    <heading>¥uµ¹¥¿¸gªº FreeBSD hacker ¬Ý<label id="hackers"></heading>
+    <heading>µ¹¦³¤ß²`¤J¬ã¨sªº FreeBSD hacker <label id="hackers"></heading>
 
     <sect1>
       <heading>SNAPs ©M RELEASEs ¬O¤°»ò¡H</heading>
@@ -481,4 +481,3 @@ SECTIONS
       ¦Ü¤Ö¦³ 256 MB¡C]</em>
 
   </sect>
-
diff --git a/zh/FAQ/hardware.sgml b/zh/FAQ/hardware.sgml
index 670f12421a..dd4e36552e 100644
--- a/zh/FAQ/hardware.sgml
+++ b/zh/FAQ/hardware.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hardware.sgml,v 1.4 1999-03-21 16:25:40 wosch Exp $ -->
+<!-- $Id: hardware.sgml,v 1.5 1999-05-11 10:31:48 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by gsl@tpts4.seed.net.tw -->
 <!-- English Version: 1.15 -->
@@ -17,7 +17,7 @@
     <sect1>
       <heading>­þ¤@¨Ç SCSI ¥d¦³³Q¤ä´©¡H</heading>
 
-      <p>¦b <htmlurl url="../../handbook/install:hw.html" name="Handbook"> ¸Ì¦³§¹¾ãªº¸ê®Æ¡C
+      <p>¦b <htmlurl url="../handbook/install:hw.html" name="Handbook"> ¸Ì¦³§¹¾ãªº¸ê®Æ¡C
 
     <sect1>
       <heading>­þ¤@¨Ç CD-ROM ³Q FreeBSD ©Ò¤ä´©¡H</heading>
@@ -73,7 +73,7 @@
     <sect1>
       <heading>¦³¨º¨Ç multi-port serial ¥d³Q FreeBSD ©Ò¤ä´©¡H</heading>
 
-      <p>§A¥i¥H°Ñ¦Ò<htmlurl url="../../handbook/install:misc.html"
+      <p>§A¥i¥H°Ñ¦Ò<htmlurl url="../handbook/install:misc.html"
       name="¨ä¥L¶gÃä³]³Æ">ªºªí¡C
 
       <p>ÁöµM¦³¨Ç¥d¬O¨SµPªº¡A¦ý¤]¥i¥H¦b FreeBSD ¤U¤u§@¡A¹³¬O¸¹ºÙ¤ä´© AST ªº¥d¡C
@@ -114,7 +114,7 @@
       </verb>
 
       <p>¦pªG§A¹ï©ó¦Û¤v½s¤@­Ó®Ö¤ß¨S¦³¸gÅç¡A½Ð°Ñ¦Ò<htmlurl
-      url="../../handbook/kernelconfig.html" name="¡u½s¤@­Ó®Ö¤ß¡v">
+      url="../handbook/kernelconfig.html" name="¡u½s¤@­Ó®Ö¤ß¡v">
 
       <p>¦pªG¦b¶}¾÷®É¦³§ä¨ì psm0 «o¤£¯à¨Ï¥Î¡A½Ð½T©w¦b /dev ¤U¦³ psm0 ³o­Ó³]³ÆÀÉ¡C
       ¦pªG¨S¦³¡A§AÀ³¸Ó¥Î root ªº¨­¥÷¿é¤J¤U­±³o¦æ¨Ó°µ¥X¡G
@@ -229,7 +229,7 @@
     <sect1>
       <heading>¨º¨Çºô¸ô¥d³Q FreeBSD ©Ò¤ä´©¡H</heading>
 
-      <p>°Ñ¦Ò<htmlurl url="../../handbook/install:nics.html" name="¤A¤Óºô¸ô¥d">
+      <p>°Ñ¦Ò<htmlurl url="../handbook/install:nics.html" name="¤A¤Óºô¸ô¥d">
       ¡A¸Ì­±¦³§¹¾ãªº²M³æ¡C
 
     <sect1>
@@ -248,7 +248,7 @@
     <sect1>
       <heading>2.X Á٤䴩¨º¨Ç³]³Æ¡H</heading>
 
-      <p>½Ð¦h¦h°Ñ¦Ò <htmlurl url="../../handbook/install:misc.html" name="Handbook">
+      <p>½Ð¦h¦h°Ñ¦Ò <htmlurl url="../handbook/install:misc.html" name="Handbook">
       ¡A¸Ì­±¦³¦C¥X¡C
 
 <!--
@@ -256,7 +256,7 @@
       <heading>§Ú­n¶R¤@»O·sªº¾÷¾¹¡A¦³¥ô¦ó«Øij¥i¥Hµ¹§Ú¶Ü¡H</heading>
 
       <p>¦pªG§A­n¦Û¦æ²Õ¸Ë¡A§A¥i¥H°Ñ¦Ò Handbook ¤¤ªº<htmlurl
-      url="../../handbook/hw.html" name="µwÅé">¡A©ÎªÌ§A¥i¥H°Ñ¦Ò<htmlurl
+      url="../handbook/hw.html" name="µwÅé">¡A©ÎªÌ§A¥i¥H°Ñ¦Ò<htmlurl
       url="../commercial/hardware.html" name="µwÅé¼t°Ó">´£¨Ñ§A¤F¸Ñ¦U®a
       ¥i¥H¨Ï¥Î FreeBSD ªº¾÷¾¹¡C
 -->
diff --git a/zh/FAQ/includes.sgml b/zh/FAQ/includes.sgml
index 011f61b8b4..7b1bd220ab 100644
--- a/zh/FAQ/includes.sgml
+++ b/zh/FAQ/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: includes.sgml,v 1.1.1.1 1999-01-30 23:20:34 vanilla Exp $ -->
+<!-- $Id: includes.sgml,v 1.2 1999-05-11 10:31:49 foxfair Exp $ -->
 
 <!-- book stores -->
 <!ENTITY isbn.amazon 'http://www.amazon.com/exec/obidos/ASIN'>
diff --git a/zh/FAQ/install.sgml b/zh/FAQ/install.sgml
index 02b880b942..b5cadbc3b3 100644
--- a/zh/FAQ/install.sgml
+++ b/zh/FAQ/install.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: install.sgml,v 1.5 1999-03-21 16:25:40 wosch Exp $ -->
+<!-- $Id: install.sgml,v 1.6 1999-05-11 10:31:51 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by foxfair@FreeBSD.ORG -->
 <!-- English Version: 1.14 -->
@@ -26,7 +26,7 @@
       </itemize>
 
       <p>¦w¸Ëµ{§Çªº§¹¾ã«ü¥O¡A¥H¤Î§ó¦h´¶¹M©Ê¦w¸Ë®É·|¸I¨ìªº°ÝÃD¥i¥H¦b
-	<url url="../../handbook/install.html" 
+	<url url="../handbook/install.html" 
 	name="Handbook entry on installing FreeBSD.">³o¸Ì§ä¨ì¡C
 
     <sect1>
@@ -54,7 +54,7 @@
  	ªíµÛ§AµLªk¥ÎºÏ¤ù¤W©T©wªºÀÉ®×¥h¨ú¥N¥¦¡C
 	§A¥²¶·§â¥¦¶Ç°e¨ì³nºÐ¤ùªº``raw''¤W¡A¨Ï¥Î§C¶¥¤Æ¤u¨ã(¹³¬O 
 	<tt>fdimage</tt> ©Î <tt>rawrite</tt>)¡A³o¨Ç¦b 
-	<url url="../../handbook/install.html" name="installation guide to
+	<url url="../handbook/install.html" name="installation guide to
 	FreeBSD">¸Ì­±¦h¦³´y­z¡C
       </itemize>
 
@@ -62,7 +62,7 @@
       <heading>¦w¸Ë FreeBSD ªº«ü¥O¦b­þ¸Ì¡H</heading>
 
       <p>§A¥i¥H¦b³o¸Ì§ä¨ì¦w¸Ë«ü¥O¡C
-      <url url="../../handbook/install.html" 
+      <url url="../handbook/install.html" 
 	name="Handbook entry on installing FreeBSD.">
 
     <sect1>
@@ -532,7 +532,7 @@ echo "1:wd(2,a)kernel" > /boot.config
      Åý¥¦Åܦ¨¤º©wªº boot string¡C
      <item>§â FreeBSD ºÏºÐ¾÷²¾¨ì primary IDE controller¡A¦]¦¹µwºÐ¾÷¬O
 	³sÄòªº¡C
-     <item><url url="../../handbook/kernelconfig.html" name="Rebuild your kernel,">
+     <item><url url="../handbook/kernelconfig.html" name="Rebuild your kernel,">
      ­×§ï¦³Ãö wd ³]©wªº¦æ¼Æ¡G
 
 <verb>
diff --git a/zh/FAQ/kernelconfig.sgml b/zh/FAQ/kernelconfig.sgml
index cc8322a288..9c1c08e83d 100644
--- a/zh/FAQ/kernelconfig.sgml
+++ b/zh/FAQ/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: kernelconfig.sgml,v 1.4 1999-03-21 16:25:41 wosch Exp $ -->
+<!-- $Id: kernelconfig.sgml,v 1.5 1999-05-11 10:31:52 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by foxfair@FreeBSD.ORG -->
 <!-- English Version: 1.2 -->
@@ -12,7 +12,7 @@
         <label id="make-kernel">
       </heading>
 
-      <p>¤£·|¡I½Ð¬d¾\ <url url="../../handbook/kernelconfig.html"
+      <p>¤£·|¡I½Ð¬d¾\ <url url="../handbook/kernelconfig.html"
       name="kernel config section of the Handbook">.
 
       <p><bf/ª`·N¡G/§Ú·|«Øij§A¦b§AÅý®Ö¤ß¯à¥¿±`¤u§@«á¡A°µ¤@­Ó
diff --git a/zh/FAQ/misc.sgml b/zh/FAQ/misc.sgml
index e119e8c9cb..c3d052aa4a 100644
--- a/zh/FAQ/misc.sgml
+++ b/zh/FAQ/misc.sgml
@@ -1,124 +1,124 @@
-<!-- $Id: misc.sgml,v 1.4 1999-03-21 16:25:41 wosch Exp $ -->
+<!-- $Id: misc.sgml,v 1.5 1999-05-11 10:31:54 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by zmx@mail.CDPA.nsysu.edu.tw -->
-<!-- English Version: 1.8 -->
+<!-- English Version: 1.16 -->
 
   <sect>
     <heading>¨ä¥¦¦U¦¡¦U¼Ëªº°ÝÃD<label id="misc"></heading>
 
     <sect1>
       <heading>
-	¬°¬Æ»ò FreeBSD ¥Îªº swap ªÅ¶¡¤ñ Linux ¦h?
+	¬°¬Æ»ò FreeBSD ¥Îªº swap ªÅ¶¡¤ñ Linux ¦h¡H
       </heading>
 
-      <p>¤£¬O³o¼Ëªº. ¦pªG§Aªº·N«ä¬O: ``¬°¬Æ»ò§Úªº swap ¬Ý°_¨Óº¡¤F?''
+      <p>¤£¬O³o¼Ëªº¡C¦pªG§Aªº·N«ä¬O¡G ``¬°¬Æ»ò§Úªº swap ¬Ý°_¨Óº¡¤F¡H''
       ¨º¬O¦]¬°§âªF¦è©ñ¦b swap ¸Ì«á®³¦^¨Óªº³t«×·|¤ñ pager ¸g¥ÑÀɮרt
-      ²Î®³¦^(¥¼­×§ï)ªº°õ¦æ½X§Ö.
+      ²Î®³¦^(¥¼­×§ï)ªº°õ¦æ½X§Ö¡C
 
 
-      <p>¨Æ¹ê¤W, °O¾ÐÅ餤 dirty pages ªº¶q¨Ã¥¼´î¤Ö; clean pages «h¦b»Ý
-      ­nªº®É­Ô²¾¨«.
+      <p>¨Æ¹ê¤W¡A°O¾ÐÅ餤 dirty pages ªº¶q¨Ã¥¼´î¤Ö¡F clean pages «h¦b»Ý
+      ­nªº®É­Ô²¾¨«¡C
 
     <sect1>
       <heading>
-        ¬°¬Æ»ò­n¥Î(¬Æ»ò¬O) a.out ©M ELF °õ¦æÀɮ榡?
+        ¬°¬Æ»ò­n¥Î(¬Æ»ò¬O) a.out ©M ELF °õ¦æÀɮ榡¡H
       </heading>
 
-      <p>­n¤F¸Ñ¬°¬Æ»ò FreeBSD ¨Ï¥Î <tt>a.out</tt> ®æ¦¡, ­º¥ý§A­nª¾¹D¤@¨Ç
-      ¥Ø«e Unix ¤¤¨Ï¥Î³Ì¼sªxªº¤TºØ®æ¦¡:
+      <p>­n¤F¸Ñ¬°¬Æ»ò FreeBSD ¨Ï¥Î <tt>a.out</tt> ®æ¦¡¡A­º¥ý§A­nª¾¹D¤@¨Ç
+      ¥Ø«e Unix ¤¤¨Ï¥Î³Ì¼sªxªº¤TºØ®æ¦¡¡G
 
       <itemize>
         <item><htmlurl url="http://www.freebsd.org/cgi/man.cgi?a.out(5)"
         name="a.out">
 
-	<p>³Ì¦­©M`¥j¨å'ªº unix ¥ØªºÀɮ榡. ¨Ï¥Î¤@ºØµu¦Óºò±KªºÀÉÀY,
+	<p>³Ì¦­©M`¥j¨å'ªº unix ¥ØªºÀɮ榡¡C¨Ï¥Î¤@ºØµu¦Óºò±KªºÀÉÀY,
 	¦ñÀH¤@­Ó³q±`¥Î¨Ó¿ë»{®æ¦¡ªºÅ]³N¼Æ¦r(°Ñ¦Ò
         <htmlurl url="http://www.freebsd.org/cgi/man.cgi?a.out(5)"
-        name="a.out(5)"> ¦³§ó¦h²Ó¸`). ¨ã¦³¤T­Ó¸`°Ï: .text, .data, ©M .bss
-	¥[¤W¤@­Ó²Å¸¹ªí©M¦r¦êªí.
+        name="a.out(5)"> ¦³§ó¦h²Ó¸`)¡C¨ã¦³¤T­Ó¸`°Ï¡G.text¡A.data¡A©M.bss
+	¥[¤W¤@­Ó²Å¸¹ªí©M¦r¦êªí¡C
 
         <item><bf>COFF</bf>
-        <p>SVR3 ¥ØªºÀɮ榡. ÀÉÀY¥]§t¤F¤@­Ó¸`°Ïªí, ©Ò¥H¥i¥H¨ã³Æ¤ñ
-	.text, .data, .bss ÁÙ¦hªº¸`°Ï.</item>
+        <p>SVR3 ¥ØªºÀɮ榡¡CÀÉÀY¥]§t¤F¤@­Ó¸`°Ïªí¡A©Ò¥H¥i¥H¨ã³Æ¤ñ
+	.text¡A.data¡A.bss ÁÙ¦hªº¸`°Ï¡C</item>
         
         <item><bf>ELF</bf>
-        <p><tt/COFF/ ªº«áÄ~ªÌ, ¨ã¦³¦h­Ó¸`°Ï¥H¤Î 32-bit ©Î 64-bit ªº
-        possible values. ¥D­nªº¯ÊÂI:<tt/ELF/ ¬O¦b¨C­Ó¨t²Î¬[ºc¥u
-        ·|¦³¤@ºØ ABI ªº°²³]¤U³]­p¥X¨Óªº. ¨Æ¹ê¤W³o­Ó°²³]¿ùªºÂ÷ÃÐ,
-	§Y¨Ï¬O°Ó·~ªº SYSV ¥@¬É, ¤]¦Ü¤Ö¦³ SVR4, Solaris, SCO ¤TºØ ABI.
-
-        <p>FreeBSD ÂǥѤ@­Ó¤u¨ã, §âµ{¦¡»Ý­n¨ººØ ABI ªº¸ê°T <em>¯O¦L</em>
-        ¦b <tt/ELF/ °õ¦æÀɤW.
-	°Ñ¦Ò man page
+        <p><tt/COFF/ ªº«áÄ~ªÌ¡A¨ã¦³¦h­Ó¸`°Ï¥H¤Î 32-bit ©Î 64-bit ªº
+        possible values¡C¥D­nªº¯ÊÂI¡G<tt/ELF/ ¬O¦b¨C­Ó¨t²Î¬[ºc¥u
+        ·|¦³¤@ºØ ABI ªº°²³]¤U³]­p¥X¨Óªº¡C¨Æ¹ê¤W³o­Ó°²³]¿ùªºÂ÷ÃСA
+	§Y¨Ï¬O°Ó·~ªº SYSV ¥@¬É¡A¤]¦Ü¤Ö¦³ SVR4¡ASolaris¡ASCO ¤TºØ ABI¡C
+
+        <p>FreeBSD ÂǥѤ@­Ó¤u¨ã¡A§âµ{¦¡»Ý­n¨ººØ ABI ªº¸ê°T <em>¯O¦L</em>
+        ¦b <tt/ELF/ °õ¦æÀɤW¡C
+        °Ñ¦Ò man page
         <htmlurl url="http://www.freebsd.org/cgi/man.cgi?brandelf"
-        name="brandelf"> ¨ú±o§ó¦h¸ê°T.
+        name="brandelf"> ¨ú±o§ó¦h¸ê°T¡C
       </itemize>
 
-      <p>FreeBSD ¨Ó¦Û "¥j¨å" °}Àç, ¶Ç²Î¤W³£¨Ï¥Î
+      <p>FreeBSD ¨Ó¦Û "¥j¨å" °}Àç¡A¶Ç²Î¤W³£¨Ï¥Î
       <htmlurl url="http://www.freebsd.org/cgi/man.cgi?a.out(5)"
-      name="a.out"> ®æ¦¡, ³o¬O¦b¦n´X¥Nªº BSD ¤¤ÃÒ©ú¥i¾aªº­p³N.
+      name="a.out"> ®æ¦¡¡A³o¬O¦b¦n´X¥Nªº BSD ¤¤ÃÒ©ú¥i¾aªº­p³N¡C
       ÁöµM¥i¥H¦b FreeBSD ¤W¥i¥H«Ø¥ß¥H¤Î°õ¦æ­ì¥Íªº <tt/ELF/ °õ¦æÀÉ(
-      ¥H¤Î®Ö¤ß), ­è¶}©l FreeBSD ¤Ï¹ïÂà´«¨ì¥H <tt/ELF/ °µ¬°¹w³]ªº
-      ®æ¦¡. ¬°¬Æ»ò? ¶â. ·í Linux ¶}©lµh­W¦aÂà´«¦Ü <tt/ELF/, ¨Ã«D¦]¬°
-      ­n°kÂ÷ <tt/a.out/ ®æ¦¡, ¦Ó¬O¦]¬°¥L­Ì¨S¦³¼u©Êªº, ¥H¸õÅDªí¬°°ò¦
-      ªº¦@¨Éµ{¦¡®w¾÷¨î. ¨º¬O¤@ºØ«D±`Ãø¥H¨Ï¥Î, µo®iªÌ¤£³ßÅwªºªF¦è. ¬J
-      µM¤w¸g¦s¦bªº <tt/ELF/ ¤u¨ã´£¨Ñ¤F¦@¨Éµ{¦¡®wªº¸Ñ¨M¤è®×, ¦Ó¥B¬Ý¨Ó
-      ¬O "«e½Ãªº¤èªk", ©Ò»Ýªº¥N»ù´N¥i±µ¨ü¦]¦ÓÂà´«. 
-
-      <p>¦b FreeBSD ªºª¬ªp¤¤, §Ú­Ìªº¦@¨Éµ{¦¡®w¾÷¨î§ó±µªñ <tt>SunOS</tt> ªº
-      «¬¦¡, ¤]´N¬O, ©ö©ó¨Ï¥Î.
-	  µM¦Ó, ±q 3.0 ¶}©l, FreeBSD ¥¿¦¡¤ä´© <tt/ELF/ ¬°¹w³]®æ¦¡. §Y¨Ï
-	  <tt/a.out/ ®æ¦¡¤´µM«D±`¦n, §Ú­Ì½sĶ¤u¨ãªº¼¶¼gªÌ, GNU ªº¦¨­û,
-	  ¤w¤¤¤î¤F¹ï, <tt/a.out/ ®æ¦¡ªº¤ä´©. ³o­¢¨Ï§Ú­ÌºûÅ@¥t¤@¥÷ª©¥»ªº
-	  compiler ©M linker, ¤]¨Ï±o§Ú­Ì¤£¯à±q³Ì·sªº GNU µo®i¦¨ªG¤¤Àò±o
-	  ¦n³B. ¦¹¥~¹ï ISO-C++ ªº»Ý¨D, ¤×¨ä¬O«ØºcªÌ©M¸ÑºcªÌ, ¤]±a°Ê¥¼¨Ó
-	  ª©¥»¤¤¹ï <tt/ELF/ ªº­ì¥Í¤ä´©.      
+      ¥H¤Î®Ö¤ß)¡A­è¶}©l FreeBSD ¤Ï¹ïÂà´«¨ì¥H <tt/ELF/ °µ¬°¹w³]ªº
+      ®æ¦¡¡C¬°¬Æ»ò¡H ¶â¡A·í Linux ¶}©lµh­W¦aÂà´«¦Ü <tt/ELF/¡A¨Ã«D¦]¬°
+      ­n°kÂ÷ <tt/a.out/ ®æ¦¡¡A¦Ó¬O¦]¬°¥L­Ì¨S¦³¼u©Êªº¡A¥H¸õÅDªí¬°°ò¦
+      ªº¦@¨Éµ{¦¡®w¾÷¨î¡C¨º¬O¤@ºØ«D±`Ãø¥H¨Ï¥Î¡Aµo®iªÌ¤£³ßÅwªºªF¦è. ¬J
+      µM¤w¸g¦s¦bªº <tt/ELF/ ¤u¨ã´£¨Ñ¤F¦@¨Éµ{¦¡®wªº¸Ñ¨M¤è®×¡A¦Ó¥B¬Ý¨Ó
+      ¬O "«e½Ãªº¤èªk"¡A©Ò»Ýªº¥N»ù´N¥i±µ¨ü¦]¦ÓÂà´«¡C
+
+      <p>¦b FreeBSD ªºª¬ªp¤¤¡A§Ú­Ìªº¦@¨Éµ{¦¡®w¾÷¨î§ó±µªñ <tt>SunOS</tt> ªº
+      «¬¦¡¡A¤]´N¬O¡A©ö©ó¨Ï¥Î¡C
+	  µM¦Ó¡A±q 3.0 ¶}©l¡AFreeBSD ¥¿¦¡¤ä´© <tt/ELF/ ¬°¹w³]®æ¦¡¡C§Y¨Ï
+	  <tt/a.out/ ®æ¦¡¤´µM«D±`¦n¡A§Ú­Ì½sĶ¤u¨ãªº¼¶¼gªÌ¡AGNU ªº¦¨­û¡A
+	  ¤w¤¤¤î¤F¹ï¡A<tt/a.out/ ®æ¦¡ªº¤ä´©¡C³o­¢¨Ï§Ú­ÌºûÅ@¥t¤@¥÷ª©¥»ªº
+	  compiler ©M linker¡A¤]¨Ï±o§Ú­Ì¤£¯à±q³Ì·sªº GNU µo®i¦¨ªG¤¤Àò±o
+	  ¦n³B. ¦¹¥~¹ï ISO-C++ ªº»Ý¨D¡A¤×¨ä¬O«ØºcªÌ©M¸ÑºcªÌ¡A¤]±a°Ê¥¼¨Ó
+	  ª©¥»¤¤¹ï <tt/ELF/ ªº­ì¥Í¤ä´©¡C
 
     <sect1>
-      <heading>¦n§a, ¦ý¬°¬Æ»ò·|¦³³o»ò¦hºØ¤£¦Pªº®æ¦¡?</heading>
-
-      <p>¦b¶Â·tªº¹L¥h, ¥u¦³Â²³æªºµwÅé. ²³æªºµwÅé¤ä´©¤p«¬¡B²³æªº¨t²Î.
-      a.out ¦b²³æªº¨t²Î¤W³Ó¥ô´r§Ö (PDP-11). ·í unix ²¾´Ó¨ì¨ä¥L¥­¥x®É, 
-      a.out «O¯d¤F¤U¨Ó, ¦]¬°¹ï¦­´Áªº Motorola 68K, VAX ¤§Ãþªº¬[ºc¤w¸g
-      °÷¥Î¤F.
-
-      <p>µM«á¦³¨ÇµwÅé¤uµ{®vı±oÅý³nÅé¦h°µÂI¨Æ, ¨º CPU ªº¹q´¹Åé´N¯à¤Ö
-      ¤@ÂI¦Ó¶]ªº§ó§Ö. ­n¦b³oºØ·s¦¡µwÅé¤W¤u§@(²{¦bºÙ¬°RISC), <tt/a.out/ ´N
-      ¤£¾A¦X¤F, ©Ò¥H»Ý¦hªº®æ¦¡´Nµo®i¥X¨Ó¥H´£¨Ñ¤ñ¨ü­­¡B²³æªº<tt/a.out/ §ó
-      ¦nªº®Ä¯à. ¹³¬O <tt/COFF/, <tt/ECOFF/, ¥H¤Î¤@¨Ç¤£¦³¦Wªº®æ¦¡, ¨C¤@ºØ
-      ³£¦³­­¨îª½¨ì <tt/ELF/.
-
-      <p>¦¹¥~, ·íµ{¦¡¶V¨Ó¶V¤j¨àºÏºÐ(¥H¤Î¥D°O¾ÐÅé)¬Û¹ï¨Ó»¡¸û¤p®É,  ¦@¨É
-      µ{¦¡®wªº·§©À´Nµo®i¥X¨Ó¤F. µêÀÀ°O¾ÐÅé¨t²Î¤]Åܱo¶V¨Ó¶Vºë¥©. ·í¨C¤@
-      ºØ¶i¨B³£¦b <tt/a.out/ ¤W§¹¦¨®É, ¥¦ªº¥i¥Î©Ê¤]¶V¨Ó¶V§C. ¥t¥~, ¤H­Ì
-      ÁÙ¦³¦b°õ¦æ®É´Á¥i¥H°ÊºA¸ü¤J, ©Î¬O¥á±ó°õ¦æ¹Lªºªì©l¤Æµ{¦¡¥H¸`¬Ù°O¾Ð
-      Åé. µ{¦¡»y¨¥¤]Åܱo§óºë¥©¦Ó¥B¤H­Ì·Q­n¦b¦b main ¤§«e°õ¦æ§Oªºµ{¦¡½X
-      . ³\¦hÁcÂøªº§Þ¥©¥Î¦b <tt/a.out/ ¤W¥H¸Ñ¨M³o¨Ç°ÝÃD. <tt/a.out/ ­n
-      ¸Ñ¨M³o¨Ç°ÝÃD»Ý­n¶V¨Ó¶V¦hÃB¥~ªº­t¾á©M½ÆÂø«×. ·í <tt/ELF/ »´©öªº¸Ñ
-      ¨M³o¨Ç°ÝÃD, ±q°ò¥»¤W¥i¥H¤u§@ªº¨t²ÎÂà´««o«Üµh­W. ©Ò¥H<tt/ELF/ ­n
-      µ¥¨ìºûÅ@ <tt/a.out/ ¤ñÂà´«¨ì <tt/ELF/ ÁÙµh­W.
-
-      <p>µM¦Ó, ÀHµÛ®É¶¡¹L¥h, FreeBSD ªº build tools §Î¦¨¤F¥­¦æªº¨â¤ä
-      (¤×¨ä¬O²ÕĶ¾¹©M loader). FreeBSD ³o¤ä¥[¶i¤F¦@¨Éµ{¦¡®w¥H¤Î­×¥¿
-      ¤F¤@¨Ç¿ù»~. GNU ­ì¨Ó¼¶¼g³o¨Çµ{¦¡ªº¤H«h­«¼g¤F³o¨Çµ{¦¡, ¨Ã¥[¤J¤F
-      ¹ï©ó¸ó¥­¥x½sĶ, ¤£¦P®æ¦¡¼Ò²Õ¤§ÃþªºªF¦è§ó²³æªº¤ä´©. ³\¦h¤H·Q­n
-      °µ¥X¥H FreeBSD ¬°¥Øªº¥­¥xªº¸ó¥­¥x½sĶ¾¹, ¤£©¯ªº¬O FreeBSD ªº as
-      ©M ld ¤£¯à°µ³o¶µ¤u§@. ·sªº GNU ¤u¨ã(binutils) ¥[¤J¤F¸ó¥­¥x½sĶ¡B
-      <tt/ELF/¡B¦@¨Éµ{¦¡®w¡BC++ ÂX¥R, µ¥µ¥. ¦¹¥~, ³\¦h¼t°Ó¥H <tt/ELF/ ®æ
-      ¦¡µo¦æ²£«~, ¦Ó¯à°÷¦b FreeBSD ¤W¶]ªº¸Ü·íµM«Ü¦n.  ¦Ó¥B¦pªG¯à¶] <tt/ELF/
-      ®æ¦¡ªº°õ¦æÀÉ, ¬°¬Æ»òÁÙ­n²z <tt/a.out/ ? ¨e¬O¤@¤Ç¤S²Ö¤S¦Ñªº°¨, ¹L
-      ¥h«D±`¦³¥Î, ¦ý¬O®É«áÅý¨e°h¥ð¤F.
-
-      <p><tt/ELF/ ¤ñ a.out §óÀ³¦³ªí¹F¤O(expressive?)¦Ó¥B¨ã¦³§ó¦hªº
-      ÂX¥R©Ê. <tt/ELF/ ¤u¨ãºûÅ@ªº¤ñ¸û¦n, ¦Ó¥B´£¨Ñ¸ó¥­¥x½sĶªº¤ä´©,
-      ³o¹ï³\¦h¤H¨Ó»¡¬O«Ü­«­nªº. <tt/ELF/ ¥i¯à¤ñ a.out ºC¤@ÂI, ¦ý®t²§
-      «D±`Ãø´ú¶q¥X¨Ó. ³o¨âªÌ¤§¶¡ÁÙ¦³³\¦h²Ó¸`¤Wªº¤£¦P, ¨Ò¦p¤À­¶ªº¹ïÀ³
-      ¤è¦¡, ªì©l¤Æµ{¦¡½Xªº§@ªkµ¥µ¥. ³o¨Ç¨Ã¤£¬O«Ü­«­n, ¦ý´N¬O¤£¦P. ¦b
-      ¥H«á GENERIC ®Ö¤ß¤£·|¤ä´D <tt/a.out/ , ·í¤£¦b¦³°õ¦æ¶Ç²Î <tt/a.out/
-      µ{¦¡ªº»Ý­n®É, ·|±q®Ö¤ß²¾°£.
+      <heading>¦n§a¡A¦ý¬°¬Æ»ò·|¦³³o»ò¦hºØ¤£¦Pªº®æ¦¡¡H</heading>
+
+      <p>¦b¶Â·tªº¹L¥h¡A¥u¦³Â²³æªºµwÅé. ²³æªºµwÅé¤ä´©¤p«¬¡B²³æªº¨t²Î.
+      a.out ¦b²³æªº¨t²Î¤W³Ó¥ô´r§Ö (PDP-11). ·í unix ²¾´Ó¨ì¨ä¥L¥­¥x®É¡A
+      a.out «O¯d¤F¤U¨Ó¡A¦]¬°¹ï¦­´Áªº Motorola 68K¡AVAX ¤§Ãþªº¬[ºc¤w¸g
+      °÷¥Î¤F¡C
+
+      <p>µM«á¦³¨ÇµwÅé¤uµ{®vı±oÅý³nÅé¦h°µÂI¨Æ¡A¨º CPU ªº¹q´¹Åé´N¯à¤Ö
+      ¤@ÂI¦Ó¶]ªº§ó§Ö. ­n¦b³oºØ·s¦¡µwÅé¤W¤u§@(²{¦bºÙ¬°RISC)¡A<tt/a.out/ ´N
+      ¤£¾A¦X¤F¡A©Ò¥H»Ý¦hªº®æ¦¡´Nµo®i¥X¨Ó¥H´£¨Ñ¤ñ¨ü­­¡B²³æªº<tt/a.out/ §ó
+      ¦nªº®Ä¯à. ¹³¬O <tt/COFF/¡A<tt/ECOFF/¡A¥H¤Î¤@¨Ç¤£¦³¦Wªº®æ¦¡¡A¨C¤@ºØ
+      ³£¦³­­¨îª½¨ì <tt/ELF/¡C
+
+      <p>¦¹¥~¡A·íµ{¦¡¶V¨Ó¶V¤j¨àºÏºÐ(¥H¤Î¥D°O¾ÐÅé)¬Û¹ï¨Ó»¡¸û¤p®É¡A¦@¨É
+      µ{¦¡®wªº·§©À´Nµo®i¥X¨Ó¤F¡AµêÀÀ°O¾ÐÅé¨t²Î¤]Åܱo¶V¨Ó¶Vºë¥©¡C·í¨C¤@
+      ºØ¶i¨B³£¦b <tt/a.out/ ¤W§¹¦¨®É¡A¥¦ªº¥i¥Î©Ê¤]¶V¨Ó¶V§C¡C¥t¥~¡A¤H­Ì
+      ÁÙ­n¦b°õ¦æ®É´Á¥i¥H°ÊºA¸ü¤J¡A©Î¬O¥á±ó°õ¦æ¹Lªºªì©l¤Æµ{¦¡¥H¸`¬Ù°O¾Ð
+      Åé¡Cµ{¦¡»y¨¥¤]Åܱo§óºë¥©¦Ó¥B¤H­Ì·Q­n¦b¦b main ¤§«e°õ¦æ§Oªºµ{¦¡½X
+      ¡C³\¦hÁcÂøªº§Þ¥©¥Î¦b <tt/a.out/ ¤W¥H¸Ñ¨M³o¨Ç°ÝÃD¡C<tt/a.out/ ­n
+      ¸Ñ¨M³o¨Ç°ÝÃD»Ý­n¶V¨Ó¶V¦hÃB¥~ªº­t¾á©M½ÆÂø«×¡C<tt/ELF/ ¥i¥H»´©öªº¸Ñ
+      ¨M³o¨Ç°ÝÃD¡A¦ý¬O±q°ò¥»¤W¥i¥H¤u§@ªº¨t²ÎÂà´«¦¨ <tt/ELF/ «o«Ü´Æ¤â¡C
+      ©Ò¥H­nµ¥¨ìºûÅ@ <tt/a.out/ ¤ñÂà´«¨ì <tt/ELF/ ´Æ¤â¡C
+
+      <p>µM¦Ó¡AÀHµÛ®É¶¡¹L¥h¡A FreeBSD ªº build tools §Î¦¨¤F¥­¦æªº¨â¤ä
+      (¤×¨ä¬O²ÕĶ¾¹©M loader)¡CFreeBSD ³o¤ä¥[¶i¤F¦@¨Éµ{¦¡®w¥H¤Î­×¥¿¤F
+      ¤@¨Ç¿ù»~¡C­ì¨Ó¼¶¼g³o¨Çµ{¦¡ªº GNU ¦¨­û«h­«¼g¤F³o¨Çµ{¦¡¡A¥H§ó²³æ
+      ªº¤è¦¡¤ä´©¸ó¥­¥x½sĶ¡B¦hºØ®æ¦¡µ¥µ¥¡C³\¦h¤H·Q­n°µ¥X¥H FreeBSD ¬°
+      ¥Øªº¥­¥xªº¸ó¥­¥x½sĶ¾¹¡A¤£©¯ªº¬O FreeBSD ªº as ©M ld ¤£¯à°µ³o¶µ
+      ¤u§@¡C·sªº GNU ¤u¨ã(binutils)¥[¤J¤F¸ó¥­¥x½sĶ¡B<tt/ELF/¡B¦@¨Éµ{
+      ¦¡®w¡B C++ ÂX¥R¡Aµ¥µ¥¡C¦¹¥~¡A³\¦h¼t°Ó¥H <tt/ELF/ ®æ¦¡µo¦æ²£«~¡A
+      ¦Ó¯à°÷¦b FreeBSD ¤W¶]ªº¸Ü·íµM«Ü¦n¡C¦Ó¥B¦pªG¯à¶] <tt/ELF/ ®æ¦¡ªº
+      °õ¦æÀÉ¡A¬°¬Æ»òÁÙ­n²z <tt/a.out/ ¡H¨e¬O¤@¤Ç¤S²Ö¤S¦Ñªº°¨¡A¹L¥h«D±`
+      ¦³¥Î¡A¦ý¬O®É­ÔÅý¨e°h¥ð¤F¡C
+
+      <p><tt/ELF/ ¤ñ a.out §óÀ³¦³ªí¹F¤O(expressive¡H)¦Ó¥B¨ã¦³§ó¦hªº
+      ÂX¥R©Ê. <tt/ELF/ ¤u¨ãºûÅ@ªº¤ñ¸û¦n¡A¦Ó¥B´£¨Ñ¸ó¥­¥x½sĶªº¤ä´©,
+      ³o¹ï³\¦h¤H¨Ó»¡¬O«Ü­«­nªº¡C<tt/ELF/ ¥i¯à¤ñ a.out ºC¤@ÂI¡A¦ý®t²§
+      «D±`Ãø´ú¶q¥X¨Ó¡C³o¨âªÌ¤§¶¡ÁÙ¦³³\¦h²Ó¸`¤Wªº¤£¦P¡A¨Ò¦p¤À­¶ªº¹ïÀ³
+      ¤è¦¡¡Aªì©l¤Æµ{¦¡½Xªº§@ªkµ¥µ¥¡C³o¨Ç¨Ã¤£¬O«Ü­«­n¡A¦ý´N¬O¤£¦P¡C¦b
+      ¥H«á GENERIC ®Ö¤ß¤£·|¤ä´© <tt/a.out/ ¡A·í¤£¦A¦³°õ¦æ¶Ç²Î <tt/a.out/
+      µ{¦¡ªº»Ý­n®É¡A·|±q®Ö¤ß²¾°£¡C
 
     <sect1>
-      <heading>¬°¬Æ»ò chmod ¤£·|§ïÅܲŸ¹³sµ²(symlink)ªº¦s¨úÅv­­?</heading>
+      <heading>¬°¬Æ»ò chmod ¤£·|§ïÅܲŸ¹³sµ²(symlink)ªº¦s¨úÅv­­¡H</heading>
 
       <p>§A¥²¶·§â ``<tt/-H/'' ©Î¬O ``<tt/-L/'' »P ``<tt/-R/'' ¿ï¶µ¤@°_¨Ï¥Î.
       °Ñ¦Ò<htmlurl url="http://www.freebsd.org/cgi/man.cgi?chmod"
@@ -126,117 +126,199 @@
       ¤Î<htmlurl url="http://www.freebsd.org/cgi/man.cgi?symlink" 
       name="symlink"> man pages ¥H¨ú±o§ó¦h¸ê°T.
 
-      <p><bf/ĵ§i/ ``<tt/-R/'' ¿ï¶µ·|Åý <tt/chmod/ °µ<bf/»¼°j/. «ü©w¥Ø¿ý
-      ©Î¬O³sµ²¨ì¥Ø¿ýªº symlink ®É­n¤p¤ß. ¦pªG§A­n§ïÅܤ@­Ó²Å¸¹³sµ²°Ñ¦Ò¨ì
-      ªº¥Ø¿ýªº¦s¨úÅv­­, ¨Ï¥Î <htmlurl 
+      <p><bf/ĵ§i/ ``<tt/-R/'' ¿ï¶µ·|Åý <tt/chmod/ °µ<bf/»¼°j/¡C¥Î¦b¥Ø¿ý
+      ©Î¬O³sµ²¨ì¥Ø¿ýªº²Å¸¹³sµ²®É­n¤p¤ß¡C¦pªG§A­n§ïÅܤ@­Ó²Å¸¹³sµ²°Ñ¦Ò¨ì
+      ªº¥Ø¿ýªº¦s¨úÅv­­¡A¨Ï¥Î <htmlurl 
       url="http://www.freebsd.org/cgi/man.cgi?chmod" name="chmod"> ¥B¤£­n
-      ¥[¥ô¦ó¿ï¶µ, ¨Ã¥B¦b symlink ªºµ²§À¥[¤W±×½u(``<tt>/</tt>''). Á|¨Ò¨Ó»¡
-      , ¦pªG ``<tt/foo/'' ³sµ²¨ì ``<tt/bar/'', ¦Ó§A­n§ó§ï ``<tt/foo/'' ªº
-      Åv­­ (¨Æ¹ê¤W¬O ``<tt/bar/''), ¨º´N¥Î:
+      ¥[¥ô¦ó¿ï¶µ¡A¨Ã¥B¦b symlink ªºµ²§À¥[¤W±×½u(``<tt>/</tt>'')¡CÁ|¨Ò¨Ó»¡
+      ¡A¦pªG ``<tt/foo/'' ³sµ²¨ì ``<tt/bar/''¡A¦Ó§A­n§ó§ï ``<tt/foo/'' ªº
+      Åv­­ (¨Æ¹ê¤W¬O ``<tt/bar/'')¡A¨º´N¥Î¡G
 
 
       <verb>
         chmod 555 foo/
       </verb>
 
-      <p>¨Ì·Óµ²§Àªº±×½u, <htmlurl 
-      url="http://www.freebsd.org/cgi/man.cgi?chmod" name="chmod"> ·|
-      ¸g¹L³sµ² ``<tt/foo/'', ¦Ó§ïÅÜ ``<tt/bar/'' ¥Ø¿ýªºÅv­­.
+      <p>µ²§Àªº±×½u¡A·|Åý <htmlurl url="http://www.freebsd.org/cgi/man.cgi?chmod" name="chmod"> 
+      §ïÅÜ ``<tt/foo/'' «ü¦Vªº ``<tt/bar/'' ¥Ø¿ýªºÅv­­¡C
 
     <sect1>
       <heading>
-        ¬°¬Æ»ò±b¸¹ <bf/¤´µM/ ­­¨î¬°¤K­Ó¦r¤¸?
+        ¬°¬Æ»ò±b¸¹ <bf/¤´µM/ ­­¨î¬°¤K­Ó¦r¤¸¡H
       </heading>
 
-      <p>§A·|»{¬°­×§ï <bf/UT_NAMESIZE/ µM«á­««Ø¨t²Î¬O«Ü²³æªº¨Æ±¡, ¦Ó¥B
-      ¨C¥ó¨Æ³£¥i¥H¹B°µ¦a«Ü¦n. ¤£¨¯ªº¬O¦³³\¦hªºµ{¦¡©M¤u¨ã(¥]§t¨t²Î¤u¨ã)
-      §â¼Æ¦r¼g¦º¦bµ{¦¡¸Ì(¨Ã«DÁ`¬O 8 ©Î 9, ¦³®É¬O¥j©Çªº¦p 15 ©M 20).
-      ³o¤£¥u·|§â§Aªº°O¿ýÀɧËÃa(¨Ó¦Û©óÅܰʪø«×©M©T©wªø«×°O¿ýªº®t²§), ¤]
-      ·|¯}Ãa Sun ªº NIS «È¤áºÝªº¹B°µ, ©M¨ä¥¦ UNIX ¨t²Îªº¤¬¬Û¼vÅT¤]¥i¯à
-      ¦³¼ç¦bªº°ÝÃD.
+      <p>§A·|»{¬°­×§ï <bf/UT_NAMESIZE/ µM«á­««Ø¨t²Î¬O«Ü²³æªº¨Æ±¡¡A¦Ó¥B
+      ¨C¥ó¨Æ³£¥i¥H¹B§@¦a«Ü¦n¡C¤£¨¯ªº¬O¦³³\¦hªºµ{¦¡©M¤u¨ã(¥]§t¨t²Î¤u¨ã)
+      §â¼Æ¦r¼g¦º¦bµ{¦¡¸Ì(¨Ã«DÁ`¬O 8 ©Î 9¡A¦³®É¬O¥j©Çªº 15¡B20µ¥µ¥)¡C
+      ³o¤£¥u·|§â§Aªº°O¿ýÀɧËÃa(¨Ó¦Û©óÅܰʪø«×©M©T©wªø«×°O¿ýªº®t²§)¡A¤]
+      ·|¯}Ãa Sun ªº NIS «È¤áºÝªº¹B°µ¡A©M¨ä¥¦ UNIX ¨t²Îªº¥æ¤¬§@¥Î¤]¥i¯à
+      ¦³¼ç¦bªº°ÝÃD¡C
 
-      <p>¦b FreeBSD 3.0 ¥H¤Î¤§«áªºª©¥», ±b¸¹ªº³Ì¤jªø«×¼W¥[¨ì16­Ó¦r¤¸,
-      ¦Ó¨º¨Ç¼g¦ºªø«×ªºµ{¦¡¤]§ä¥X¨Ó­×¥¿. ¼vÅT¨ì¨t²Î¦p¦¹¦h³¡¥÷¥¿¬Oª½¨ì
-      3.0 ¤~°µ­×§ïªº­ì¦].</p>
+      <p>¦b FreeBSD 3.0 ¥H¤Î¤§«áªºª©¥»¡A±b¸¹ªº³Ì¤jªø«×¼W¥[¨ì16­Ó¦r¤¸,
+      ¦Ó¨º¨Ç¼g¦ºªø«×ªºµ{¦¡¤]§ä¥X¨Ó­×¥¿. ¥¿¦]¬°¼vÅT¨t²Îªº³¡¥÷«Ü¨ì¡Aª½¨ì
+      3.0 ¤~°µ­×§ï¡C</p>
 
-      <p>¦pªG§A¦³¦Û«H¦b¥X°ÝÃDªº®É«á¯à¦Û¦æ¸Ñ¨M, §A¥i¥H¥Î¤U­±ªº¤èªkÅý¸û¦­ªº
-      ª©¥»¤ä´©¸ûªøªº±b¸¹. ­×§ï /usr/include/utmp.h ¤¤ªº UT_NAMESIZE. §A¤]
+      <p>¦pªG§A¦³¦Û«H¦b¥X°ÝÃDªº®É«á¯à¦Û¦æ¸Ñ¨M¡A§A¥i¥H¥Î¤U­±ªº¤èªkÅý¸û¦­ªº
+      ª©¥»¤ä´©¸ûªøªº±b¸¹¡C­×§ï /usr/include/utmp.h ¤¤ªº UT_NAMESIZE¡C§A¤]
       ¥²¶·§â /usr/include/sys/param.h ¤¤ªº MAXLOGNAME §ï¦¨¸ò UT_NAMESIZE
-      ¬Û²Å. ³Ì«á, ¦pªG§A¬O±q­ì©lµ{¦¡«Ø¥ß¨t²Î, §O§Ñ¤F /usr/include ¨C¦¸³£
-      ·|§ó·s! ­×§ï /usr/src/.. ¤¤¾A·íªºÀÉ®×. </p>
+      ¬Û²Å. ³Ì«á¡A¦pªG§A¬O±q­ì©lµ{¦¡«Ø¥ß¨t²Î¡A§O§Ñ¤F /usr/include ¨C¦¸³£
+      ·|§ó·s¡I­×§ï /usr/src/.. ¤¤¾A·íªºÀɮסC</p>
 
     <sect1>
-      <heading>§Ú¯à¦b FreeBSD ¤U¶] DOS µ{¦¡¶Ü?</heading>
+      <heading>§Ú¯à¦b FreeBSD ¤U¶] DOS µ{¦¡¶Ü¡H</heading>
 
-      <p>¬Oªº, ±q 3.0 ª©¶}©l¥i¥H¨Ï¥Î¤w¸g¾ã¦X¨Ã¥[±jªº BSDI <tt/rundos/
-      DOS ¼ÒÀÀ¾¹. ¦pªG§A³Ì³o­ÓªF¦è¦³¿³½ì, °e«Ê«H¨ì
+      <p>¬Oªº¡A±q 3.0 ª©¶}©l¥i¥H¨Ï¥Î¤w¸g¾ã¦X¨Ã¥[±jªº BSDI <tt/rundos/
+      DOS ¼ÒÀÀ¾¹¡C¦pªG§A³Ì³o­ÓªF¦è¦³¿³½ì¡A°e«Ê«H¨ì
       <url url="mailto:freebsd-emulation@freebsd.org"
       name="The FreeBSD emulation discussion list">
 
-      <p>¹ï 3.0 ¤§«eªº¨t²Î, ¦b port ¤¤¦³¤@­Ó·¥¨Îªº¤u¨ãµ{¦¡
+      <p>¹ï 3.0 ¤§«eªº¨t²Î¡A¦b port ¤¤¦³¤@­Ó·¥¨Îªº¤u¨ãµ{¦¡
       <htmlurl url="http://www.freebsd.org/cgi/ports.cgi?^pcemu" name="pcemu">
-      ¥i¥H¼ÒÀÀ 8088 ©M¨¬°÷ªº BIOS ªA°È¥H°õ¦æ DOS ¤å¦r¼Ò¦¡µ{¦¡. ¥¦¶·­n X Window
-      System (¥Ñ XFree86 ´£¨Ñ).
+      ¥i¥H¼ÒÀÀ 8088 ©M¨¬°÷ªº BIOS ªA°È¥H°õ¦æ DOS ¤å¦r¼Ò¦¡µ{¦¡¡C¥¦¶·­n X Window
+      System(¥Ñ XFree86 ´£¨Ñ)¡C
 
     <sect1>
       <heading>
-        ¬Æ»ò¬O ``<tt/sup/'', ¦p¦ó¨Ï¥Î?
+        ¬Æ»ò¬O ``<tt/sup/''¡A¦p¦ó¨Ï¥Î¡H
       </heading>
 
       <p><htmlurl url="http://www.freebsd.org/cgi/ports.cgi?^sup" name="SUP">
-      ·N«ä¬O Software Update Protocol, ¥Ñ CMU µo®i¥Hºû«ùµo®iªº¦P¨B.
-      §Ú­Ì§Q¥Î¥L¨Ó«O«ù»·ºÝªº¯¸¥x©M­ì©l¯¸¥x¦P¨B.
+      ·N«ä¬O Software Update Protocol¡A¥Ñ CMU µo®i¥Hºû«ùµo®iªº¦P¨B¡A
+      §Ú­Ì§Q¥Î¥L¨Ó«O«ù»·ºÝªº¯¸¥x©M­ì©l¯¸¥x¦P¨B¡C
 
-      <p>SUP ¹ïÀW¼eªº¨Ï¥Î¤£¤Íµ½, ¦Ó¥B¤w©ñ±ó¤F. ¥Ø«e«Øijºû«ù­ì©l½X§ó·sªº¤èªk¬O
-      <url url="../../handbook/cvsup.html" name="Handbook entry on CVSup">
+      <p>SUP ¹ïÀW¼eªº¨Ï¥Î¤£¤Íµ½¡A¦Ó¥B¤w¸g¤£¨Ï¥Î¤F¡C¥Ø«e«Øijºû«ù­ì©l½X§ó·sªº¤èªk¬O
+      <url url="../handbook/cvsup.html" name="Handbook entry on CVSup">
 
 
     <sect1>
-      <heading>How cool is FreeBSD?</heading>
-
-      <p>°Ý: ¦³¤H°µ¹L FreeBSD °õ¦æ®Éªº·Å«×´ú¸Õ¶Ü? §Úª¾¹D Linux ¤ñ DOS ²D,
-      ¦ý¨SÅ¥¤H´£¹L FreeBSD. ¦ü¥G«Ü¼ö.
-
-      <p>A. No, but we have done numerous taste tests on blindfolded
-      volunteers who have also had 250 micrograms of LSD-25
-      administered beforehand.  35% of the volunteers said that FreeBSD
-      tasted sort of orange, whereas Linux tasted like purple haze.
-      Neither group mentioned any particular variances in temperature
-      that I can remember.  We eventually had to throw the results of
-      this survey out entirely anyway when we found that too many
-      volunteers were wandering out of the room during the tests, thus
-      skewing the results.  I think most of the volunteers are at Apple
-      now, working on their new ``scratch and sniff'' GUI.  It's a
-      funny old business we're in!
-
-      <p>¤£¶}ª±¯º¤F, FreeBSD ©M Linux ³£¨Ï¥Î ``<tt/HLT/'' (halt) «ü¥O
-      ¥H¦b¨t²Î¶¢¸m®É­°§C¹q¤Oªº¨Ï¥Î¤]´î¤Ö¤F¼öªº²£¥Í. ¦pªG¦³³]©w APM
-      (automatic power management), FreeBSD ¤]¥i¥HÅý CPU ¶i¤J§C¹q¤O
-      ¼Ò¦¡.
+      <heading>How cool is FreeBSD¡H</heading>
+
+      <p>°Ý¡G¦³¤H°µ¹L FreeBSD °õ¦æ®Éªº·Å«×´ú¸Õ¶Ü¡H§Úª¾¹D Linux ¤ñ DOS ²D¡A
+      ¦ý¨SÅ¥¤H´£¹L FreeBSD¡A¦ü¥G«Ü¼ö¡C
+
+      <p>µª¡G¨S¦³¡A¦ý¬O¦b¨ýı¤W¦³°µ¹LµL¼Æ¦¸´ú¸Õ¡C§Ú­Ìé¤W¦ÛÄ@¨ü¸ÕªÌªº
+      ²´·ú¡A¨Æ¥ý¦Aµ¹¥L­ÌªA¥Î 250 ²@§Jªº LSD-25 °g¤ÛÃÄ¡C35% ªº¨ü¸ÕªÌ»¡
+      FreeBSD ¹Á°_¨Ó¹³¾ï¤l¡A¦Ó Linux «h¬Oµµ¦âªººd¾ðªG¹ê¡C¾Ú§Ú©Òª¾¡A¨S
+      ¦³¤@²Õ´£¨ì·Å«×¤W¯S§Oªº®t²§¡C«á¨Óµo²{¡A¦³¤Ó¦h¨ü¸ÕªÌ¦b´ú¸Õ®É¹Ú¹C¨«
+      ¥X©Ð¶¡¼vÅT¨ì¼Æ¾Ú¡A³Ì«á¥u±o©ñ±ó¾ã­Ó½Õ¬d¡C§Ú·Q¤j³¡¥÷ªº¨ü¸ÕªÌ²{¦b¦b
+      Apple ¤u§@¡AÄ~ Drag and Drop ¤§«á¡A¬ã¨s¥þ·sªº Scratch and Sniff
+      ¹Ï§Î¬É­±¡CIt's a funny old business we're in¡I
+
+      <p>¤£¶}ª±¯º¤F¡AFreeBSD ©M Linux ³£¨Ï¥Î ``<tt/HLT/'' (halt) «ü¥O
+      ¥H¦b¨t²Î¶¢¸m®É­°§C¹q¤Oªº¨Ï¥Î¤]´î¤Ö¤F¼öªº²£¥Í¡C¦pªG¦³³]©w APM
+      (automatic power management)¡AFreeBSD ¤]¥i¥HÅý CPU ¶i¤J§C¹q¤O
+      ¼Ò¦¡¡C
 
     <sect1>
-      <heading>½Ö¦b§Úªº°O¾ÐÅé´¡¼Ñ¤¤¨F¨F§@ÅT??</heading>
+      <heading>½Ö¦b§Úªº°O¾ÐÅé´¡¼Ñ¤¤¨F¨F§@ÅT¡H¡H</heading>
 
-      <p>°Ý: FreeBSD ½sĶ®Ö¤ß®É¦³°µ¬Æ»ò "©_¯S" ªº¨ÆÅý°O¾ÐÅé¨F¨F§@ÅT¶Ü?
-      ·í½sĶ®É(ÁÙ¦³¶}¾÷®É½T»{³nºÐ«áªºµu¼È®É¶¡), ¤]ºØ¦ü¥G¨Ó¦Û°O¾ÐÅé´¡¼Ñ
-      ªº©_©ÇÁn­µ.
+      <p>°Ý¡GFreeBSD ½sĶ®Ö¤ß®É¦³°µ¬Æ»ò "©_¯S" ªº¨ÆÅý°O¾ÐÅé¨F¨F§@ÅT¶Ü¡H
+      ·í½sĶ®É(ÁÙ¦³¶}¾÷®É½T»{³nºÐ«áªºµu¼È®É¶¡)¡A¤]ºØ¦ü¥G¨Ó¦Û°O¾ÐÅé´¡¼Ñ
+      ªº©_©ÇÁn­µ¡C
 
-      <p>µª; ¬Oªº! ¦b BSD ªº¤å¥ó¤¤§A·|±`±`¬Ý¨ì ``­I«áÆF'', ¤j³¡¥÷ªº¤H
+      <p>µª¡G¬Oªº¡I¦b BSD ªº¤å¥ó¤¤§A·|±`±`¬Ý¨ì ``­I«áÆF''¡A¤j³¡¥÷ªº¤H
       ³£¤£ª¾¹D¨º¬O¤@ºØ¹ê»Ú¦s¦bªººë¯«Åé --- ´x±±µÛ§Aªº¹q¸£. §AÅ¥¨ìªºÁn­µ
-      ¬O³o¨Ç­I«áÆF¥H°ª­µ¤f­ï¦b·¾³q«ç¼Ë°µ³\¦hªº¨t²ÎºÞ²z¤u§@.
+      ¬O³o¨Ç­I«áÆF¥H°ª­µ¤f­ï¦b·¾³q«ç¼Ë°µ³\¦hªº¨t²ÎºÞ²z¤u§@¡C
+
+      <p>¦pªG³o¨ÇÁn­µ«Ü§xÂZ§A¡A¨Ó¦Û DOS ªº ``<tt>fdisk /mbr</tt>'' ´N
+      ¯àÂ\²æ¡A¦ý¦pªG¦³¬Û¤Ïªº®ÄªG¤]¤£­nÅå³Y¡C¨Æ¹ê¤W¡A¦pªG¦b»ö¦¡¤¤Å¥¨ì
+      Bill Gates ®£©ÆªºÁn­µ±q¤º«Øªº³â¥z¶Ç¨Ó¡A°¨¤W°k¦Ó¥B¤£­n¦^ÀY¡I
+      ±q BSD ­I«áÆF¤£¥­¿Åªº¼vÅT¤¤¸Ñ©ñ¡ADOS ©M Windows ­I«áÆF³q±`³£¯à
+      ­«·s±±¨î¾ã¥x¾÷¾¹¨Ã¹ï§AªºÆF»î¶A©G¡C¦pªG¦³¿ï¾Ü¡A§Ú·Q§Ú¹çÄ@²ßºD©_
+      ©ÇªºÁn­µ¡C
+
+    <sect1>
+      <heading>MFC ¬O¬Æ»ò·N«ä¡H</heading>
+
+      <p>MFC ¬O 'Merged From -CURRENT' ªºÁY¼g¡C¨Ï¥Î¦b CVS °O¿ý¤¤¥H
+      ªí¥Ü±q CURRENT ¤¤¾ã¦X¶i STABLE ¤À¤äªº§ïÅÜ¡C
+
+    <sect1>
+      <heading>'BSD' ¬O¤°»ò·N«ä¡H</heading>
+
+      <p>¦b¥u¦³·|­ûª¾¹Dªº¯µ±K»y¨¥¤¤¡A¥¦¥Î¨Óªí¥Ü¬YºØªF¦è¡C§Ú­ÌµLªk§@¤å¦r¤Wª½
+      ±µªºÂ½Ä¶¡A¥u¯à»¡¥¦ªº·N«ä¤j·§¦b '¤@¯Å¤èµ{¦¡Áɨ®'¡B'¥øÃZ¬O¦n¦Yªº¤pÂI¤ß'¡B
+      ©M '§Ú­Ì¤ñ Linux ¨Ó±o¦³«ÕÀq·P' ³o¤TªÌ¤§¶¡¡C:-)
 
-      <p>¦pªG³o¨ÇÁn­µ«Ü§xÂZ§A, ¨Ó¦Û DOS ªº ``<tt>fdisk /mbr</tt>'' ´N
-      ¯àÂ\²æ, ¦ý¦pªG¦³¬Û¤Ïªº®ÄªG¤]¤£­nÅå³Y.  ¨Æ¹ê¤W, ¦pªG¦b»ö¦¡¤¤Å¥¨ì
-      Bill Gates ®£©ÆªºÁn­µ±q¤º«Øªº³â¥z¶Ç¨Ó, °¨¤W°k¦Ó¥B¤£­n¦^ÀY!
-      ±q BSD ­I«áÆF¤£¥­¿Åªº¼vÅT¤¤¸Ñ©ñ, DOS ©M Windows ­I«áÆF³q±`³£¯à
-      ­«·s±±¨î¾ã¥x¾÷¾¹¨Ã¹ï§AªºÆF»î¶A©G. ¦pªG¦³¿ï¾Ü, §Ú·Q§Ú¹çÄ@²ßºD©_
-      ©ÇªºÁn­µ. 
+      <p>¥¿¸gÂI¡ABSD ¬O 'Berkeley Software Distribution' ªºÁY¼g¡A¥Ñ·í®Éªº
+      Berkeley CSRG(Computer Systems Research Group)¿ï¨Ó·í§@¥L­Ì©Òµo¦æ Unix
+      ª©¥»ªº¦WºÙ¡C
 
     <sect1>
-      <heading>MFC ¬O¬Æ»ò·N«ä?</heading>
+      <heading>­n´X­Ó FreeBSD hacker ¤~¯à´«±¼¤@­Ó¹q¿Oªw¡H</heading>
+
+      <p>¤@¤d¤@¦Ê¤C¤Q¤G­Ó¡G
+
+      <p>¤G¤Q¤T­Ó¦b -current ¤W©ê«è¬Ý¤£¨ì¥ú¤F¡F
+
+      <p>¥|­Ó«ÅºÙ³o¬O³]©w¤Wªº°ÝÃD¡A©Ò¥H¹³³o¼Ëªº email À³¸Ó©ñ¦b -questions¡F
+
+      <p>¤T­Ó submit PR¡A¨ä¤¤¤@­Ó°e¿ù¨ì doc ¤U¡A¨Ã¥B¤º®e¥u¦³¡¨³o¸Ì¦n·t¡¨¡F
+
+      <p>¤@­Ó commit ©|¥¼´ú¸Õªº¹q¿Oªw¡A³y¦¨¤£¯à buildworld¡A¤­¤ÀÄÁ«á¥L§â­ì¨Ó
+      ªº¿Oªw´«¦^¨Ó¡F
+
+      <p>¤K­Óº´°_ flame war¡A³d©Ç°e¥X PR ªº¤H¨S¦³¥]¬A patch¡F
+
+      <p>¤­­Ó®I«è buildworld Äê±¼¤F¡F
+
+      <p>¤T¤Q¤@­Ó»¡ buildworld ¥i¥H¥Î¡A¤£¯à¥Îªº¤H¤@©w¬O cvsup ªº®É¾÷¤£¹ï¡F
+
+      <p>¤@­Ó§â´«¦¨·s¿Oªwªº patch ¥á¨ì -hackers ¤W¡F
+
+      <p>¤@­Ó»¡¥L¤T¦~«e´N°µ¥X¤F patch¡A¦ý°e¨ì -current «á«o³Q©¿²¤±¼¡A©Ò¥H¥L
+      ¹ï¾ã­Ó PR ¨t²Î¦³«Ü¤£¦nªº¦L¶H¡C¦¹¥~¡A¥L¤]»{¬°®³¥Xªº·s¿OªwµLªk¤Ï¥ú¡F
+
+      <p>¤T¤Q¤C­Ó©H­ý»¡¹q¿Oªw¤£ÄÝ©ó°ò¥»¨t²Îªº¤@³¡¥÷¡A©Ò¥H committer ¤£¯à¤£¥ý
+      ¿Ô¸ß¾ã­Ó Community ªº·N¨£´N³o¼Ë°µ¤U¥h¡CÁÙ¦³¡A-CORE ¨ì©³©M³o¥ó¨Æ¦³¤°»ò
+      Ãö«Y¡H¡I
+
+      <p>¨â¦Ê¤H©ê«è´«¿Oªw¤§«á¡A¸}½ñ¨®´×ªºÃC¦âÅܱo¦n©_©Ç¡F
+
+      <p>¤T­Ó«ü¥X¡A¥Î¨Ó´«¿Oªwªº patch ¤£²Å¦X style(9) ªº³W©w¡F
+
+      <p>¤Q¤C­Ó®I«è®³¥X¨Óªº·s¿Oªw¬°¤°»ò¬O¥Î GPL¡F
+
+      <p>¤­¦Ê¤K¤Q¤»¤H³´¤J¤@³õ flame war¡A¦b GPL¡BBSD¡BMIT¡BNPL ¦U­Ó license
+      ©M FSF ¬Y¦ì¤£¨ã¦W³Ð¿ì¤H¤h­Ó¤H½Ã¥Í¤§¶¡¡A¤ñ¸û©¼¦¹ªºÀu¶Õ¡F
+
+      <p>¤C­Ó±N³o¤@¦ê°Q½×ªº¤£¦P³¡¥÷¤À§O²¾¨ì -chat ©M -advocacy¡F
+
+      <p>´Nºâ´£¥Xªº·s¿Oªw¤ñªº·t¡AÁÙ¬O¦³¤@­Ó§â¥¦ commit ¶i¨Ó¡F
+
+      <p>¨â­Ó´«¦^­ì¥ýªº¿Oªw¡A¨Ã¥B¯d¤U·¥¬°¼««ãªº commit °T®§¡C¥L­Ì»{¬°»P¨äÅý
+      FreeBSD ¥Î·t¿Oªw¡AÁÙ¤£¦p°®¯Ü«Ý¦b¶Â·t¤¤ºâ¤F¡F
+
+      <p>¥|¤Q¤»¤H¹ï¨ú®ø¤£¥Î·t¿Oªw³o¥ó¨Æ¤jÁn¯e©I¡A­n¨D -core ¥ß¨è´£¥X¼á²M¡F
+
+      <p>¤Q¤@­Ó­n¨D´«¦¨¤p¤@ÂIªº¹q¿Oªw¡A¥H«K¥¼¨Ó FreeBSD ¦pªG²¾´Ó¨ì¹q¤lÂû¤W«á
+      ·|§ó¬°¤è«K¡F
+
+      <p>¤C¤Q¤T¤H©ê«è -hackers ©M -chat ¤Wªº SNR¡AÂÇ unsubscribe ¨Óªí¥Ü§Üij¡F
+
+      <p>¤Q¤T­Ó°e¥X "unsubscribe"¡B¡¨§Ú­n¦p¦ó unsubscribe¡¨©Î¡¨«ô°U§â§Ú±q
+      list ¦W³æ¤¤§R±¼¡¨¡A«Hªº³Ì«á­±«h¬O¤@¯ë¥Ñ majordomo ¥[¤W¥hªº footer¡F
+
+      <p>·í¨C­Ó¤H¦£©ó©¼¦¹¥s½|®É¡A¦³­Ó³Ã¥ë¶X¨S¤Hª`·N¡A§â¥i¥H¥Îªº¿Oªw°½°½´«¤W
+      ¥h¡F
+
+      <p>¤T¤Q¤@­Ó«ü¥X¦pªG¥Î TenDRA ½sĶ·sªº¿Oªw¡A·|¤ñªº¨Ó±o«G 0.364%¡]ÁöµM
+      ¿Oªw·|³Q½sĶ¦¨¥¿¤»­±Åé¡^¡A©Ò¥H FreeBSD ¤º©wªº½sĶ¾¹À³¸Ó¬O TenDRA¡A¦Ó¤£
+      ¬O EGCS¡F
+
+      <p>¦³­Ó¤H»¡·s¿Oªw¯Ê¥F¬ü·P¡F
+
+      <p>¤E­Ó¤H¡]¥]¬A­ì¥ý°e PR ªº¤H¡^°Ý¡¨¤°»ò¬O MFC¡H¡¨¡F
+
+      <p>¤­¤Q¤C­Ó©ê«è¦Û±q´«¤F¿Oªw«á¡A¨â­Ó¬P´Á³£¨S¦³¥ú¥X²{¡C
+
+      <p><em><url url="mailto:nik@freebsd.org" name="Nik Clayton">
+      ¸Éª`¡G</em>
+
+      <p><em/­è¬Ý¨ì®É¡A§Ú§Ö¯ºÂ½¤F¡C/
 
-      <p>MFC ¬O 'Merged From -CURRENT' ªºÁY¼g. ¨Ï¥Î¦b CVS °O¿ý¤¤¥H
-      ªí¥Ü±q CURRENT ¤¤¾ã¦X¶i STABLE ¤À¤äªº§ïÅÜ.
+      <p><em/µM«á·Q¨ì¡A¡¨µ¥¤@¤U¡A¤£¬OÀ³¸ÓÁÙ¦³¤@­Ó­n±N³o¨Ç°O¦b list ¤W¶Ü¡H¡¨/
 
-  </sect>
+      <p><em/±µµÛ²×©ó¤F¸Ñ§Úªº¨Ï©R :-)/
 
+  </sect>
\ No newline at end of file
diff --git a/zh/FAQ/network.sgml b/zh/FAQ/network.sgml
index 3c551d4368..761494de83 100644
--- a/zh/FAQ/network.sgml
+++ b/zh/FAQ/network.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: network.sgml,v 1.4 1999-04-21 05:26:08 foxfair Exp $ -->
+<!-- $Id: network.sgml,v 1.5 1999-05-11 10:31:56 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by wing@cc.nsysu.edu.tw, jtjang@gcn.net.tw -->
 <!-- English Version: 1.20 -->
@@ -1108,4 +1108,4 @@ ftp stream tcp nowait nobody /usr/local/bin/socket socket ftp.foo.com ftp
        url="../handbook/kernelconfig:nodes.html"
        name="handbook ¤¤¦³Ãö device node ªº»¡©ú">¡C
 
-    </sect>
+    </sect>
\ No newline at end of file
diff --git a/zh/FAQ/preface.sgml b/zh/FAQ/preface.sgml
index 3c4acfa22d..59b82c4139 100644
--- a/zh/FAQ/preface.sgml
+++ b/zh/FAQ/preface.sgml
@@ -1,7 +1,7 @@
-<!-- $Id: preface.sgml,v 1.5 1999-03-21 16:25:41 wosch Exp $ -->
+<!-- $Id: preface.sgml,v 1.6 1999-05-11 10:31:57 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by ijliao@dragon2.net -->
-<!-- English Version: 1.28 -->
+<!-- English Version: 1.35 -->
 
   <sect>
     <heading>«e¨¥<label id="preface"></heading>
@@ -36,7 +36,7 @@
       Ãö¥L­Ìªº¸ê®Æ¡C
 
       <p>¦pªG·Q¬ÝÃö©ó FreeBSD §ó²`¤Jªº¸ê®Æ¡A½Ð¬Ý
-      <url url="../../handbook/handbook.html" name="FreeBSD ¨Ï¥Î¤â¥U">¡C
+      <url url="../handbook/index.html" name="FreeBSD ¨Ï¥Î¤â¥U">¡C
 
     <sect1>
       <heading>µo®i FreeBSD ªº¥Øªº¬O¤°»ò¡H</heading>
@@ -76,29 +76,22 @@
     <sect1>
       <heading>³Ì·sª©ªº FreeBSD ¬O¨º¤@ª©¡H</heading>
 
-      <p><url url="ftp://ftp.freebsd.org/pub/FreeBSD/releases/2.2.8-RELEASE"
-      name="2.2.8"> ¬O¥Ø«e³Ì·sªº <em> stable </em> ª©¡F¥¦©ó 1998 ¦~
-      12 ¤ëµo¦æ¡C¥¦¦P®É¤]¬O¥Ø«e³Ì·sªº <em>release</em> ª©¡C
+      <p><url url="ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/3.1-RELEASE"
+      name="3.1"> ¬O¥Ø«e³Ì·sªº <em> stable </em> ª©¡F¥¦©ó 1999 ¦~
+      2 ¤ëµo¦æ¡C¥¦¦P®É¤]¬O¥Ø«e³Ì·sªº <em/release/ ª©¡C
 
-      <p>²³æªº»¡¡A<bf>-stable</bf> ªº¥D­n¶D¨D¹ï¶H¬O¹ï©óí©w©Ê¤Î§CÅܲ§©Ê¦³
-      ¸û±j»Ý¨Dªº¾÷ºc¡A¨Ò¦p ISP¡A¦Ó«D³ß·R¤@¨Ç¯S§O·s¥\¯àªº¾÷ºc¡C¦b¦¹¦P®É¡A³o
-      ¨Çª©¥»¬O§¹¥þ¤@¼Ëªº¡A¦ý¬O¦b <bf>-current</bf> ³o­Ó¤À¤äªº§¹¦¨«×¨¬¥H°µ¤@
-      ­Ó¥¿±` release ¤§«e¡A³oºØ±¡ªp¤£·|ºû«ù¤Ó¤[¡C
-
-      <p>¦ý¬O³o¨Ã¤£¥Nªí»¡ 3.0-STABLE release ´N¤£¾A¦X¥Î¦b°Ó·~ªA°È¤W¡A¨Æ¹ê
-      ¤W¡A«Ü¦h»Ý­n 3.0 ·s¥\¯à (§ó·sªº½sĶ¾¹§Þ³N¡A§ó¦³®Ä²vªººô¸ôµ{¦¡½Xµ¥) ªº
-      ¨Ï¥ÎªÌ³£±o¨ì¤F«D±`º¡·Nªºµ²ªG¡C¦b 1999 ¦~ 2 ¤ë 3.1-RELEASE ¥X¨Ó¤§«e¡A
-      §Ú­Ì¤£¯à``¾á«O''3.0 ¥i¥H¾á±o°_­«­nªº¤u§@¡C
+      <p>²³æªº»¡¡A<em/-stable/ ªº¥D­n¶D¨D¹ï¶H¬O¹ï©óí©w©Ê¤Î§CÅܲ§©Êªº»Ý¨D
+      »·³Ó¹L¹ï³Ì·s <em/-current/ snapshot ¤¤¯S§O·s¥\¯àªº»Ý¨D¡A¨Ò¦p ISP¡C
 
     <sect1>
       <heading>¤°»ò¬O FreeBSD-current¡H<label id="current"></heading>
 
-      <p><url url="../../handbook/current.html" name="FreeBSD-current">«üªº¬O¥¿
+      <p><url url="../handbook/cutting-edge.html#CURRENT" name="FreeBSD-current"> «üªº¬O¥¿
       ¦bµo®i¤¤ªºª©¥»¡A¥¦²×±N¦b¾A·íªº®É¾÷¦¨¬° 4.0-RELEASE¡C¥¦¹ê¦b¬O¥u¾A¦Xµ¹
       ¨t²Îµo®iªÌ¥H¤Î¦³¼Ý¤Oªº·~¾l·R¦nªÌ¨Ï¥Î¡C¦pªG·Q­n±o¨ì¦³Ãö¦p¦ó¨Ï¥Î
       -current ªº²`¤J¸ê°T¡A½Ð°Ñ¦Ò
-      <url url="../../handbook/handbook.html" name="¨Ï¥Î¤â¥U"> ªº
-      <url url="../../handbook/current.html" name="¬ÛÃö³¡¥÷">¡C
+      <url url="../handbook/index.html" name="¨Ï¥Î¤â¥U"> ªº
+      <url url="../handbook/cutting-edge.html#CURRENT" name="¬ÛÃö³¡¥÷">¡C
 
       <p>¦pªG±z¹ï§@·~¨t²Î¥»¨­¨Ã¤£¬O«Ü¼ô±x¡A©Î¬O±z¨S¿ìªk¤À¿ë±z¹J¨ìªº°ÝÃD¬O¯u
       ªºµo¥Í¤F°ÝÃD¥ç©Î¬O¼È®É©Êªº¤pª¬ªp¡A¨º»ò±z´N¤£À³¸Ó¨Ï¥Î FreeBSD-current¡C
@@ -136,10 +129,10 @@
       <heading>¤°»ò¬O FreeBSD-stable¡H</heading>
 
       <p>¦^·¹¨ì FreeBSD 2.0.5 ­èµoªíªº®É­Ô¡A§Ú­Ì¨M©w§â FreeBSD ªº release
-      ¤À¦¨¨â¤ä¡C¤@¤ä¥s°µ<url url="../../handbook/stable.html" name="-stable">¡A
+      ¤À¦¨¨â¤ä¡C¤@¤ä¥s°µ<url url="../handbook/stable.html" name="-stable">¡A
       §Ú­Ì¥u¹ï¥¦°µ¿ù»~­×¥¿¤Î¤p´T«×ªº­×§ï (³o¬Oµ¹ ISP ©M°Ó·~¤½¥qµ¥¹ï¹êÅ礤¥\
       ¯à¤£·P¿³½ìªº³æ¦ì©Ò¨Ï¥Îªº)¡C¥t¥~¤@¤ä¥s°µ
-      <url url="../../handbook/current.html" name="-current">¡A±q 2.0 ª©µo¦æ¥H
+      <url url="../handbook/cutting-edge.html#CURRENT" name="-current">¡A±q 2.0 ª©µo¦æ¥H
       «á´N¤£¶¡Â_¦a´ÂµÛ 4.0-RELEASE (¥H¤Î¥H«áªºª©¥») «e¶iµÛ¡C¤U­±´N¬Oª©¥»ºt
       ¶iªº¥Ü·N¹Ï¡G
 
@@ -206,8 +199,9 @@
 
       <p>¦pªG¬O¤@¨Ç¦³Ãö FreeBSD ­pµeªºÃöÁä©Ê¨M©w¡A¹³¬O¾ã­Ó­pµeªº¨«¦V©Î¬O¨M
       ©w½Ö¥i¥H§ï source tree ¸Ìªºµ{¦¡½X³oÃþªº¨Æ¡A¬O¥Ñ¤@­Ó¬ù 15 ­Ó¤H©Ò²Õ¦¨ªº
-      <url url="../../handbook/staff:core.html" name="core team"> ¨Ó¨M©w¡C¦Ó¦³
-      ¥t¤@¸s¬ù 100 ­Ó¤H¦³Åv§Q¥i¥Hª½±µ­×§ï FreeBSD ªº source tree¡C
+      <url url="../handbook/staff.html#STAFF-CORE" name="core team"> ¨Ó¨M©w¡C¦Ó¦³
+      ¥t¤@¸s¬ù 150 ­Ó <url url="../handbook/staff-committers.html"
+      name="commiters"> ¦³Åv§Q¥i¥Hª½±µ­×§ï FreeBSD ªº source tree¡C
 
       <p>µL½×¦p¦ó¡A¤j¦h¼Æªº§ïÅܳ£·|¨Æ«e¦b
       <ref id="mailing" name="mailing lists"> ¥ý°Q½×¹L¡A¦Ó¥B¨C­Ó¤H³£¥i¥H°Ñ»P
@@ -285,13 +279,13 @@
         §Ú¦b¨º¸Ì¥i¥H§ä¨ì¦³Ãö FreeBSD mailing lists ªº¸ê°T¡H<label id="mailing">
       </heading>
 
-      <p>±z¥i¥H¦b <url url="../../handbook/eresources:mail.html"
+      <p>±z¥i¥H¦b <url url="../handbook/eresources.html#ERESOURCES-MAIL"
       name="¨Ï¥Î¤â¥U - mailing-lists"> ¤¤§ä¨ì§¹¾ãªº¸ê°T¡C
 
     <sect1>
       <heading>¦³¤°»ò°Q½× FreeBSD ªº·s»D°Q½×¸s²Õ¶Ü¡H</heading>
 
-      <p>±z¥i¥H¦b <url url="../../handbook/eresources:news.html"
+      <p>±z¥i¥H¦b <url url="../handbook/eresources-news.html"
       name="¨Ï¥Î¤â¥U - ·s»D°Q½×¸s²Õ"> ¤¤§ä¨ì§¹¾ãªº¸ê°T¡C
 
     <sect1>
@@ -339,7 +333,7 @@
            name="&lt;freebsd-questions@FreeBSD.ORG&gt;"> ¡C
 
       <p>±z¤]¥i¥H±q
-      <url url="../../handbook/handbook.html" name="FreeBSD ¨Ï¥Î¤â¥U">
+      <url url="../handbook/index.html" name="FreeBSD ¨Ï¥Î¤â¥U">
       ¨ú±o FreeBSD``¨Ï¥Î¤â¥U''¡C½Ðª`·N¡A³o¥÷¤å¥ó¤´³B©ó»s§@¶¥¬q¡A¦³«Ü¦h³¡¥÷³£
       ÁÙ¨S¦³§¹¦¨¡C
 
@@ -546,7 +540,7 @@ prefix=/usr/local/www/data/www.freebsd.org delete old use-rel-suffix
       </itemize>
 
       <p>FreeBSD ¨Ï¥Î¤â¥U¤]¦³¤@¤À«Ü§¹¾ãªº
-      <url url="../../handbook/bibliography.html" name="°Ñ¦Ò®ÑÄy¦Cªí">¡A¦pªG±z
+      <url url="../handbook/bibliography.html" name="°Ñ¦Ò®ÑÄy¦Cªí">¡A¦pªG±z
       ¥¿·Q¶R®Ñªº¸Ü¡A³o³¡¥÷­È±o¤@¬Ý¡C
 
   </sect>
diff --git a/zh/FAQ/serial.sgml b/zh/FAQ/serial.sgml
index 7a025ed3f5..abaed3c75e 100644
--- a/zh/FAQ/serial.sgml
+++ b/zh/FAQ/serial.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: serial.sgml,v 1.3 1999-03-01 08:57:28 foxfair Exp $ -->
+<!-- $Id: serial.sgml,v 1.4 1999-05-11 10:31:58 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by ijliao@dragon2.net -->
 <!-- English Version: 1.4 -->
diff --git a/zh/FAQ/troubleshoot.sgml b/zh/FAQ/troubleshoot.sgml
index d1ca8d3c25..9ea0cba562 100644
--- a/zh/FAQ/troubleshoot.sgml
+++ b/zh/FAQ/troubleshoot.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: troubleshoot.sgml,v 1.3 1999-03-21 16:25:41 wosch Exp $ -->
+<!-- $Id: troubleshoot.sgml,v 1.4 1999-05-11 10:32:00 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by corona@tale.net -->
 <!-- English Version: 1.9 -->
@@ -126,7 +126,7 @@
 
       <p>¦]¦¹¡A²{¦b§A¯à°µªº³Ì¦n¨Æ±¡´N¬O¦b kernel ùس]©w <tt/EISA_SLOTS/ 
       ³o­Ó¿ï¶µ¬° 12 ¡AµM«á·í§@¨S¦³³o­Ó°ÝÃD :)¡C
-      ½Ð¨Ì·Ó <url url="../../handbook/kernelconfig.html"
+      ½Ð¨Ì·Ó <url url="../handbook/kernelconfig.html"
       name="Handbook ¤¤¦³Ãö kernel ªº³]©w"> ùØ©Ò»¡ªº¤èªk¨Ó
       ³]©w»P½sĶ±zªº kernel
 
diff --git a/zh/FAQ/x.sgml b/zh/FAQ/x.sgml
index 76388d0af5..3e180983b8 100644
--- a/zh/FAQ/x.sgml
+++ b/zh/FAQ/x.sgml
@@ -1,7 +1,7 @@
-<!-- $Id: x.sgml,v 1.4 1999-03-01 08:57:28 foxfair Exp $ -->
+<!-- $Id: x.sgml,v 1.5 1999-05-11 10:32:01 foxfair Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Translate into Chinese by ijliao@dragon2.net -->
-<!-- English Version: 1.6 -->
+<!-- English Version: 1.8 -->
 
   <sect>
     <heading>X Window System ¤Î Virtual Consoles<label id="x"></heading>
@@ -14,10 +14,10 @@
       <p>µM«á¬Ý¬Ý <htmlurl url=
       "http://www.freebsd.org/cgi/man.cgi?manpath=xfree86&amp;query=xf86config"
       name="xf86config ªº man page"> ¡A³o­Óµ{¦¡¥i¥HÀ°±z³]©w XFree86(tm) ¨Ï¥¦
-      ¯à°÷¨Ï¥Î±zªºÅã¥Ü¥d/·Æ¹« µ¥¶gÃä¡C
+      ¯à°÷¨Ï¥Î±zªºÅã¥Ü¥d/·Æ¹«µ¥¶gÃä¡C
 
-      <p>±z©Î³\¤]·Q¸Õ¸Õ¬Ý Xaccel server ¡A¥¦¥i¥H¥H«D±`¦X²zªº»ù®æ¨ú±o¡C¸Ô±¡½Ð¬Ý
-      <ref id="xig" name="Xi Graphics"> ³o¤@¬q¡C
+      <p>±z©Î³\¤]·Q¸Õ¸Õ¬Ý Xaccel server¡C¸Ô±¡½Ð¬Ý <ref id="metrox"
+      name="Metro Link"> ©Î¬O <ref id="xig" name="Xi Graphics"> ³o¤@¬q¡C
 
     <sect1>
       <heading>¬°¤°»ò§Ú¤£¯à¦b X ¸Ì¨Ï¥Î·Æ¹«¡H<label id="x-and-moused"></heading>
@@ -181,12 +181,14 @@
       ºØ¤èªk³£¬O¦Xªkªº¡A¦pªG±z¸Õ¬Y¤@ºØ¤èªkµL®Äªº¸Ü¡A±z¥i¥H¸Õ¸Õ¥t¥~¤@ºØ¡C³o¨â
       ºØ¤èªkªºµ²ªG¬O¤@¼Ëªº¡GX ·|Åã¥Ü¤@­Ó¹Ï§Î¤Æªº login: ´£¥Ü¡C
 
-      <p>¥Î ttys ªº¤èªkªºÀuÂI¦b©ó»¡©ú¤F X ¦b±Ò°Ê¥H¤Î¦b logout «á­«·s±Ò°Ê®É¡A
-      ¨ì©³ X ¥Îªº¬O¨º­Ó vty ¡C¦Ó rc.local ªº¤èªk«h¬O¦b·í±Ò°Ê X ¥X¤F°ÝÃD®É¡A±z
-      ¥i¥H§â xdm ±þ±¼¨Ó¸Ñ¨M¡C
+      <p>¥Î ttys ªº¤èªkªºÀuÂI¡A¦b©ó«ü©ú¤F X ¦b±Ò°Ê®É¨ì©³¬O¥Î¨º­Ó vty¡A¨Ã¥B±N
+      logout ®É­«·s±Ò°Ê X server ªº³d¥ô¥áµ¹ init¡C rc.local ªº¤èªk«h¬O¦b·í±Ò
+      °Ê X ¥X¤F°ÝÃD®É¡A¥i¥H«Ü»´ÃP¦a§â xdm ±þ±¼¨Ó¸Ñ¨M°ÝÃD¡C
 
-      <p>¦pªG¬O¥Î rc.local ªº¤èªkªº¸Ü¡A¦b°õ¦æ <tt/xdm/ ®É±z¤£¯à¥[¥ô¦ó°Ñ¼Æ (
-      ¤]´N¬O¶]¦¨ daemon) ¡C
+      <p>¦pªG¬O¥Î rc.local ªº¤èªk¡A¦b°õ¦æ <tt/xdm/ ®É±z¤£¯à¥[¥ô¦ó°Ñ¼Æ¡]¤]´N
+      ¬O¶]¦¨ daemon¡^¡C¥²¶·¦b getty °õ¦æ«á¤~¯à±Ò°Ê xdm¡A§_«h getty ©M xdm ·|
+      ¤¬¬Û½Ä¬ð¦ÓÂê¦í console¡C³Ì¦nªº¤è¦¡¬O¦b script ¤¤¥[­Ó sleep¡AÅý¥¦¼È°±
+      10 ¬íÄÁ¥ª¥k¡A±µµÛ¤~°õ¦æ xdm¡C
 
       <p>«e¤@ª©ªº FAQ »¡±z¥²¶·§â±z·QÅý X ¨Ï¥Îªº <tt/vt/ ¥[¨ì
       <tt>/usr/X11R6/lib/X11/xdm/Xservers</tt> Àɸ̥h¡C³o¬O¤£¥²­nªº¡GX ·|¦Û
@@ -332,4 +334,4 @@ diff -u psm.c.orig psm.c
    <tt/ xmodmap -e "pointer = 3 2 1"/ ªº«ü¥O¡C
    </p>
   </sect1>
-  </sect>
\ No newline at end of file
+  </sect>