From owner-doc-jp-work@jp.FreeBSD.org Fri Jan 28 18:20:21 2005
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id j0S9KLk15358;
	Fri, 28 Jan 2005 18:20:21 +0900 (JST)
	(envelope-from owner-doc-jp-work@jp.FreeBSD.org)
Received: from mail.smalltown.ne.jp (jr.smalltown.ne.jp [202.222.20.60])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id j0S9KJ815352
	for <doc-jp-work@jp.freebsd.org>; Fri, 28 Jan 2005 18:20:19 +0900 (JST)
	(envelope-from usata@smalltown.ne.jp)
Received: by mail.smalltown.ne.jp (Postfix, from userid 6001)
	id 781F2631F6A; Fri, 28 Jan 2005 18:20:19 +0900 (JST)
X-IMAP-Sender: usata
X-Sieve: cmu-sieve 2.0
Received: from is2.ecc.u-tokyo.ac.jp (is2.ecc.u-tokyo.ac.jp [133.11.171.236])
	by mh.sodan.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id C5D616156B
	for <usata@sodan.ecc.u-tokyo.ac.jp>; Mon,  1 Jul 2002 20:09:41 +0900 (JST)
Received: from is2.ecc.u-tokyo.ac.jp (localhost.localdomain [127.0.0.1])
	by is2.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id 9F38D17B534
	for <usata@sodan.ecc.u-tokyo.ac.jp>; Mon,  1 Jul 2002 20:09:41 +0900 (JST)
Received: from m.ecc.u-tokyo.ac.jp (mail.ecc.u-tokyo.ac.jp [133.11.171.196])
	by is2.ecc.u-tokyo.ac.jp (8.11.6/8.11.3) with ESMTP id g61B9fe32508;
	Mon, 1 Jul 2002 20:09:41 +0900
Received: from is2.ecc.u-tokyo.ac.jp by m.ecc.u-tokyo.ac.jp
 (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
 with ESMTP id <0GYK00D11HO4AI@m.ecc.u-tokyo.ac.jp>; Mon,
 1 Jul 2002 20:09:40 +0900 (JST)
Received: from is2.ecc.u-tokyo.ac.jp (localhost.localdomain [127.0.0.1])
 by is2.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id 7297117B534 for
 <c10344@mail.ecc.u-tokyo.ac.jp>; Mon, 01 Jul 2002 20:09:40 +0900 (JST)
Received: from lorica.ucc.usyd.edu.au (lorica.ucc.usyd.edu.au [129.78.64.15])
 by is2.ecc.u-tokyo.ac.jp (8.11.6/8.11.3) with ESMTP id g61B9ce32492 for
 <c10344@mail.ecc.u-tokyo.ac.jp>; Mon, 01 Jul 2002 20:09:39 +0900
Received: from extro.ucc.usyd.edu.au
 (mkom6251@extro.ucc.usyd.edu.au [129.78.64.1]) by lorica.ucc.usyd.edu.au
 (8.9.3/8.9.3) with ESMTP id VAA11355; Mon, 01 Jul 2002 21:09:36 +1000 (EST)
Received: (from mkom6251@localhost) by extro.ucc.usyd.edu.au (8.10.2+Sun/8.9.3)
 id g61B9Yh23795; Mon, 01 Jul 2002 21:09:34 +1000 (EST)
From: KOMACHI Mamoru <c10344@mail.ecc.u-tokyo.ac.jp>
To: doc-jp-work@jp.FreeBSD.org
Message-id: <20020701210934.A23351@extro.usyd.edu.au>
Organization: University of Sydney
MIME-version: 1.0
Content-type: multipart/mixed; boundary="X1bOJ3K7DJ5YkBrT"
Content-disposition: inline
Content-transfer-encoding: 7bit
User-Agent: Mutt/1.2.5.1i-jp0
Reply-To: doc-jp-work@jp.FreeBSD.org
Precedence: list
Date: Mon, 01 Jul 2002 21:09:34 +1000
X-Sequence: doc-jp-work 1062
Subject: [doc-jp-work 1062] books/handbook/cutting-edge/chapter.sgml (1.82 -> 1.127)
 =?ISO-2022-JP?B?GyRCOjpGSTRqJCQbKEI=?=
Sender: owner-doc-jp-work@jp.FreeBSD.org
X-Originator: c10344@mail.ecc.u-tokyo.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+041223




--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

$B>.D.$G$9!%(B

	books/handbook/cutting-edge/chapter.sgml (1.82 -> 1.127)

$B$rLu$7=*$($^$7$?!%::FI$r$*4j$$$7$^$9!%(B

$B<!$O(B

	books/handbook/kernelconfig/chapter.sgml (1.42 -> 1.77)
	books/handbook/config/chapter.sgml (1.4 -> 1.52)

$B$N=g$K<h$j$+$+$m$&$+$H;W$C$F$$$^$9!%$=$N8e$O$A$g$C$HBgJ*$G$9$,(B

	books/handbook/linuxemu/chapter.sgml (1.35 -> 1.73)

$B$r(B2$BF|$+(B3$BF|$/$i$$$+$1$F$d$k$D$b$j$G$9!%(B

$B$G$O!%(B

-- 
KOMACHI Mamoru <c10344@mail.ecc.u-tokyo.ac.jp>
http://www.sodan.ecc.u-tokyo.ac.jp/~usata/

--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: attachment; filename="handbook_cutting-edge_chapter.sgml.diff"
Content-Transfer-Encoding: 7bit

--- books/handbook/cutting-edge/chapter.sgml.ORIG	Sun Jun 30 17:14:31 2002
+++ books/handbook/cutting-edge/chapter.sgml	Mon Jul  1 19:30:34 2002
@@ -2,17 +2,43 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.82
+     Original revision: 1.127
      $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.31 2002/06/01 03:42:47 kuriyama Exp $
 -->
 
 <chapter id="cutting-edge">
-  <title>$B3+H/$N:GA0@~(B</title>
-
-  <para><emphasis>$B2~D{(B: &a.jim;, 2000 $BG/(B 3 $B7n(B.</emphasis></para>
+  <chapterinfo>
+    <authorgroup>
+      <author>
+	<firstname>Jim</firstname>
+	<surname>Mock</surname>
+	<contrib>$B:F9=@.(B, $B:FJT@.$*$h$S2~D{(B</contrib>
+      </author>
+      <!-- Mar 2000 -->
+    </authorgroup>
+    <authorgroup>
+      <author>
+	<firstname>Jordan</firstname>
+	<surname>Hubbard</surname>
+	<contrib>$B86:n(B</contrib>
+      </author>
+      <author>
+	<firstname>Poul-Henning</firstname>
+	<surname>Kamp</surname>
+      </author>
+      <author>
+	<firstname>John</firstname>
+	<surname>Polstra</surname>
+      </author>
+      <author>
+	<firstname>Nik</firstname>
+	<surname>Clayton</surname>
+      </author>
+    </authorgroup>
+    <!-- with feedback from various others -->
+  </chapterinfo>
 
-  <para><emphasis>$B86:n(B: &a.jkh;, &a.phk;, &a.jdp;, &a.nik;,
-      $B$*$h$S$?$/$5$s$N%U%#!<%I%P%C%/(B.</emphasis></para>
+  <title>$B3+H/$N:GA0@~(B</title>
 
   <sect1>
     <title>$B$3$N>O$G$O(B</title>
@@ -27,6 +53,32 @@
       $B$b$7$b$"$J$?$,(B, $B3+H/ESCf$N%7%9%F%`$rDI$$$+$1$h$&$+(B,
       $B$=$l$H$b%j%j!<%9%P!<%8%g%s$N$I$l$+$r;H$$B3$1$h$&$+$HLB$C$F$$$k$N$J$i(B,
       $B$-$C$H$3$N>O$,;29M$K$J$k$G$7$g$&(B.</para>
+
+    <para>$B$3$N>O$rFI$s$GJ,$+$k$N$O(B:</para>
+
+    <itemizedlist>
+      <listitem><para>2$B$D$N3+H/%V%i%s%A(B, &os.stable; $B$H(B &os.current; $B$N0c$$(B</para>
+      </listitem>
+      <listitem><para><application>CVSup</application>,
+	  <application>CVS</application>, $B$b$7$/$O(B
+	  <application>CTM</application>
+	  $B$r;H$C$?%7%9%F%`99?7J}K!(B</para>
+      </listitem>
+      <listitem><para><command>make world</command>
+      $B$r;H$C$F%Y!<%9%7%9%F%`A4BN$r:F9=C[$7%$%s%9%H!<%k$9$kJ}K!(B</para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>$B$3$N>O$rFI$`A0$K(B, $B0J2<$N=`Hw$r$7$^$7$g$&(B.</para>
+
+    <itemizedlist>
+      <listitem><para>$B%M%C%H%o!<%/@\B3$NE,@Z$J@_Dj(B (<xref
+      linkend="advanced-networking">)</para>
+      </listitem>
+      <listitem><para>$B%5!<%I%Q!<%F%#@=$N%=%U%H%&%'%"$N%$%s%9%H!<%kJ}K!$N=,F@(B
+        (<xref linkend="ports">)</para></listitem>
+    </itemizedlist>
   </sect1>
 
   <sect1 id="current-stable">
@@ -49,15 +101,15 @@
       <para>$B$3$l$rFI$`A0$K(B,
         $B?4$K$H$a$F$*$$$FM_$7$$$3$H$,$"$j$^$9(B.
 	&os.current; $B$H$O(B &os; $B$N3+H/$N(B<quote>$B:GA0@~(B</quote>$B$@$H$$$&$3$H$G$9(B.
+	&os.current; $B$N%f!<%6$O9b$$5;=QNO$r;}$D$3$H$,MW5a$5$l(B,
+	$B<+J,$N%7%9%F%`$,Jz$($k:$Fq$JLdBj$r<+NO$G2r7h$G$-$J$1$l$P$J$j$^$;$s(B.
         $B$b$7(B &os; $B$r;H$$;O$a$?$P$+$j$J$i(B,
         $B$3$l$r1?MQ$9$k$3$H$K$D$$$F==J,8!F$$r=E$M$?J}$,NI$$$G$7$g$&(B.</para>
 
       <sect3>
 	<title>&os.current; $B$C$F$J$K(B?</title>
 
-        <para>&os.current; $B$H$OJ8;zDL$j(B,
-          $BF|!9JQ99$5$l$F$$$k(B
-          &os; $B$N%=!<%9$N%9%J%C%W%7%g%C%H0J30$N2?$b$N$G$b$"$j$^$;$s(B.  
+        <para>&os.current; $B$O(B &os; $B$N:G?7$N%=!<%9$G$9(B.
           $BCf$K$O8=:_3+H/ES>e$N%=%U%H%&%'%"(B,
           $B<B83E*$JJQ99(B, $B$"$k$$$O2aEOE*$J5!G=$J$I$,4^$^$l$F$$$^$9(B.
           $B$^$?(B, $B$3$NCf$KF~$C$F$$$k5!G=$,$9$Y$F(B,
@@ -65,19 +117,17 @@
           &os.current; $B$r%=!<%9$+$i$[$\KhF|%3%s%Q%$%k$7$F$$$k?M$O(B
           $B$?$/$5$s$$$^$9$,(B,
           $B;~4|$K$h$C$F$O%3%s%Q%$%k$5$($G$-$J$$>uBV$K$J$C$F$$$k$3$H$b$"$j$^$9(B.
-          $B0lHLE*$K(B, $B$3$l$i$NLdBj$O2DG=$J8B$j?WB.$K2r7h$5$l$^$9$,(B,
+          $B$3$l$i$NLdBj$O2DG=$J8B$j?WB.$K2r7h$5$l$^$9$,(B,
           &os.current; $B$N%=!<%9$,IT9,$r$b$?$i$9$+(B,
-          $B$=$l$H$bHs>o$KAG@2$i$7$$5!G=$r$b$?$i$9$+$H$$$&$N$OJ8;zDL$j(B,
-          $B$"$kM?$($i$l$?(B 24
-          $B;~4V$N4V$N(B,
-          $B$I$NItJ,$G$"$J$?$,%=!<%9$r<j$KF~$l$?$+$K$h$k>l9g$b$"$k$N$G$9(B.</para>
+          $B$=$l$H$bHs>o$KAG@2$i$7$$5!G=$r$b$?$i$9$+$H$$$&$N$O(B,
+	  $B$^$5$K%=!<%9%3!<%I$r<j$KF~$l$?;~4V<!Bh$N>l9g$b$"$k$N$G$9(B.</para>
       </sect3>
 
       <sect3>
 	<title>$BC/$,(B &os.current; $B$rI,MW$H$7$F$k$N(B?</title>
 
         <para>&os.current; $B$O(B,
-          $B<g$K<!$N;0$D$N=EMW$J%0%k!<%W$rBP>]$H$7$F$$$^$9(B.</para>
+          $B<!$N;0$D$N=EMW$J%0%k!<%W$rBP>]$H$7$F$$$^$9(B.</para>
 
         <orderedlist>
           <listitem>
@@ -90,18 +140,17 @@
 	<listitem>
             <para>$B3hH/$K%F%9%H$7$F$$$k(B &os; $B%0%k!<%W$N%a%s%P(B.
               $BH`$i$O(B, &os.current;
-              $B$,(B<quote>$B7rA4$G$"$k(B</quote>$B$3$H$r2DG=$J8B$j3NG'$9$k$?$a$K(B,
-              $B<o!9$NLdBj$H@o$&;~4V$r@K$7$^$J$$?M!9$G$9(B.
+              $B$,7rA4$G$"$k$3$H$r2DG=$J8B$jJ]>Z$9$k$?$a$K(B,
+              $B<o!9$NLdBj$r2r7h$9$k;~4V$r@K$7$^$J$$?M!9$G$9(B.
               $BH`$i$O$^$?(B, $BMM!9$JJQ99$K4X$9$kDs0F$d(B
               &os; $B$NBg$^$+$JJ}8~IU$1$r9T$J$$$?$$$H;W$C$F$$$k(B
-              $B?M!9$G$b$"$j$^$9(B.</para>
+              $B?M!9$G$b$"$j(B, $B$=$l$r<BAu$9$k$?$a$N%Q%C%A$rDs<($7$^$9(B.</para>
 	</listitem>
 
 	<listitem>
             <para>$BC1$K(B, $BMM!9$J;v$KL\$r8~$1(B, $B;29M$N$?$a$K(B
               ($B$?$H$($PF0$+$9$?$a$G$O$J$/(B<emphasis>$BFI$`$?$a(B</emphasis>$B$K(B)
-              $B:G?7$N%=!<%9$r;H$$$?$$$H;W$C$F$$$k(B &os;
-              ($B$^$?$OB>$N(B) $B%0%k!<%W$N$^$o$j$K$$$k%a%s%P(B.
+              $B:G?7$N%=!<%9$r;H$$$?$$$H;W$C$F$$$k?M!9(B.
               $B$3$l$i$N?M!9$O$^$?(B,
               $B;~!9%3%a%s%H$d%3!<%I$r4s9F$7$F$/$l$^$9(B.</para>
           </listitem>
@@ -116,30 +165,35 @@
           <listitem>
             <para>$B$J$K$+?7$7$/%+%C%3%$%$%b%N$,$"$k$HJ9$-(B,
               $B<+J,$N<~0O$G$O0lHV$K$=$l$r;}$A$?$$$,$?$a$K(B,
-              $B%j%j!<%9A0$N%3!<%I$NCGJR$rDI$$$+$1$k$3$H(B.</para>
+              $B%j%j!<%9A0$N%3!<%I$NCGJR$rDI$$$+$1$k$3$H(B.
+	      $B?7$7$$5!G=$rF@$k$?$a$K0lHV>h$j$K$J$k$H$$$&$3$H$O(B,
+	      $B?7$7$$%P%0$K:G=i$K$V$AEv$?$k$H$$$&$3$H$G$9(B.</para>
           </listitem>
 
           <listitem>
-            <para>$B%P%0$r=$@5$9$k$?$a$NAGAa$$J}K!(B.</para>
+            <para>$B%P%0$r=$@5$9$k$?$a$NAGAa$$J}K!(B.
+	      $B$$$+$J$k%P!<%8%g%s$N(B &os.current; $B$G$"$l(B,
+	      $B85$+$i$"$k%P%0$r=$@5$9$k$N$HF1$8$/(B,
+	      $B?7$7$$%P%0$r;:$_=P$9$*$=$l$,$"$j$^$9(B.</para>
           </listitem>
 
           <listitem>
-            <para>$B$o$?$7$?$A$,(B<quote>$B8x<0$K%5%]!<%H$9$k(B</quote>$B$3$H(B.
+            <para><quote>$B8x<0$K%5%]!<%H$9$k(B</quote>$B$3$H(B.
               $B$o$?$7$?$A$O(B 3 $B$D$N(B<quote>$B8x<0$J(B</quote>
               &os.current; $B$N%0%k!<%W$N0l$D$K(B,
               $B<B:]$KB0$9$k?M!9$r=u$1$k$N$K%Y%9%H$r?T$/$7$^$9$,(B,
               $B5;=QE*$J%5%]!<%H$r9T$J$&$K$O(B, $BC1$K!V;~4V$,B-$j$J$$!W$N$G$9(B.
               $B$3$l$O$o$?$7$?$A$,30$N?M$r=u$1$k$N9%$^$J$$(B,
-              $B%1%A$G0UCO0-$$?M4V$@$H$$$&$3$H$G$O$J$/(B
-              ($B$b$7$=$&$J$i(B &os; $B$J$s$+$d$C$F$$$^$;$s(B),
-              $BJ8;zDL$j$o$?$7$?$A$O0lF|$K(B 400 $B$b$N%a%C%;!<%8$KEz$((B,
+              $B%1%A$G0UCO0-$$?M4V$@$H$$$&$3$H$G$O$"$j$^$;$s(B
+              ($B$b$7$=$&$J$i(B &os; $B$J$s$+$d$C$F$$$^$;$s(B).
+              $B$o$?$7$?$A$O0lF|$K2?I4DL$b$N%a%C%;!<%8$KEz$((B,
               <emphasis>$B$+$D(B</emphasis> &os;
               $B$N:n6H$r$9$k$3$H$J$I=PMh$J$$(B!
-              $B$H$$$&$3$H$J$N$G$9(B.
+              $B$H$$$&$@$1$N$3$H$J$N$G$9(B.
               $B$b$7(B, &os; $B$N2~NI:n6H$rB3$1$k$+(B,
-              $B$=$l$H$b$?$/$5$s$N<ALd$KEz$($k$+(B,
+              $B$=$l$H$b<B83E*$J%3!<%I$K4X$9$k$?$/$5$s$N<ALd$KEz$($k$+(B,
               $B$H$$$&Fs<TBr0l$,M?$($i$l$?$H$7$?$i(B,
-              $B3+H/<T$H%f!<%6$N$[$H$s$I$OA0<T$r;Y;}$9$k$G$7$g$&(B.</para>
+              $B3+H/<T$OA0<T$rA*Br$9$k$G$7$g$&(B.</para>
           </listitem>
         </orderedlist>
       </sect3>
@@ -209,15 +263,16 @@
                 <para><link linkend="cvsup">cvsup</link> $B$r(B
                   <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile">$B$3$N(B supfile</ulink>
 		$B$rMQ$$$F;HMQ$9$k(B.
-                  $B$3$l$O(B 2 $BHVL\$K?dA&$5$l$kJ}K!$G$9(B.
+                  $B$3$l$,$b$C$H$b?d>)$5$l$kJ}K!$G$9(B.
                   $B$J$<$J$i(B, <command>cvsup</command> $B$K$h$C$F0lEYA4BN$rF~<j$7(B,
                   $B8e$OJQ99$5$l$?$H$3$m$@$1$rF~<j$9$k$3$H$,$G$-$k$+$i$G$9(B.
                   $B$?$/$5$s$N?M$,<+F0E*$K%=!<%9$r:G?7$N$b$N$KJ]$D$?$a$K(B
                   <command>cvsup</command> $B$r(B <command>cron</command> $B$+$i5/F0$7$F$$$^$9(B.
-                  $B$3$l$r9T$J$&$?$a$NHs>o$K4JC1$JJ}K!$O(B, $BC1$K(B</para>
-
-		<blockquote><screen>&prompt.root; <userinput>pkg_add -f ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></screen></blockquote>
-                <para>$B$H%?%$%W$9$k$3$H$G$9(B.</para>
+		  $B>e$K5s$2$?%5%s%W%k(B supfile $B$O%+%9%?%^%$%:$7$F4D6-$K9g$o$;$F(B
+		  <link linkend="cvsup">cvsup</link> $B$r@_Dj$9$kI,MW$,$"$j$^$9(B.
+		  $B$=$N@_Dj$r9T$J$$$?$$$N$G$"$l$P(B, $BC1$K(B</para>
+ 		<screen>&prompt.root; <userinput>pkg_add -f ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/All/cvsupit-3.1.tgz</userinput></screen>
+		<para>$B$H%?%$%W$7$F$/$@$5$$(B.</para>
               </listitem>
 
               <indexterm>
@@ -231,8 +286,7 @@
                   <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/">
                     ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/</ulink>
                   $B$G(B<quote>$B8x3+(B</quote>$B$5$l$F$$$^$9(B.
-                  $B$o$?$7$?$A$O$^$?(B, $BA4BN$r(B compress/tar $B$7$FF~<j$G$-$k(B
-                  <command>wu-ftpd</command> $B$r;H$C$F$$$^$9(B.
+                  $BA4BN$r(B compress/tar $B$7$FF~<j$G$-$k(B FTP $B%_%i!<$b$"$j$^$9(B.
                   $B$?$H$($P(B,</para>
 
                 <screen>usr.bin/lex</screen>
@@ -332,7 +386,17 @@
 	<para>$B%;%-%e%j%F%#>e$N=$@5$O(B &os.stable; $B%V%i%s%A$KBP$7$F9T$J$o$l$^$9$,(B,
           $B$=$N$?$a$K(B &os.stable; $B$rDI$&(B<emphasis>$BI,MW(B</emphasis>$B$O$"$j$^$;$s(B.
           $B$9$Y$F$N(B FreeBSD $B%;%-%e%j%F%#4+9p$K$O(B
-          $B1F6A$N$"$k%j%j!<%9$GLdBjE@$r=$@5$9$kJ}K!$,@bL@$5$l$F$*$j(B,
+          $B1F6A$N$"$k%j%j!<%9$GLdBjE@$r=$@5$9$kJ}K!$,@bL@$5$l$F$*$j(B
+	  <footnote><para>$B$3$l$O@53N$G$O$"$j$^$;$s(B.
+	    $B<B:]$o$?$7$?$A$O2?G/$b$N4V8E$$%j%j!<%9$N(B FreeBSD
+	    $B$r%5%]!<%H$7$F$O$$$k$N$G$9$,(B,
+	    $B1J1s$K%5%]!<%H$7B3$1$k$3$H$O$G$-$^$;$s(B.
+	    $B8=;~E@$G$N8E$$%j%j!<%9$N(B FreeBSD $B$N%;%-%e%j%F%#%]%j%7!<$NA4@bL@$rCN$k$K$O(B,
+  	    <ulink
+  	    url="../../../../security/index.html">http://www.FreeBSD.org/security/</ulink>
+	    $B$r;2>H$7$F$/$@$5$$(B</para>
+	  </footnote>
+	  ,
           $B%;%-%e%j%F%#>e$NM}M3$N$_$+$i3+H/MQ%V%i%s%AA4BN$rDI$$$+$1$k$3$H$O(B,
           $BF1;~$KK>$^$7$/$J$$JQ99E@$^$G<h$j9~$s$G$7$^$&2DG=@-$,$"$k$+$i$G$9(B.</para>
 
@@ -411,19 +475,6 @@
 
             <orderedlist>
 	      <indexterm>
-          <primary><command>CTM</command></primary>
-        </indexterm>
-	      <indexterm>
-	        <primary>-STABLE</primary>
-		<secondary>CTM $B$r;H$C$?F14|(B</secondary>
-	      </indexterm>
-              <listitem>
-                <para><application><link linkend="ctm">CTM</link></application>
-                  $B5!G=$r;HMQ$9$k(B. $BE>Aw%l!<%H$,0BDj$7$F$$$k(B TCP/IP
-                  $B@\B3$G$J$$>l9g$O(B, $B$3$NJ}K!$,E,$7$F$$$^$9(B.</para>
-              </listitem>
-
-	      <indexterm>
 	        <primary>-STABLE</primary>
 		<secondary>CVSup $B$r;H$C$?F14|(B</secondary>
 	      </indexterm>
@@ -431,9 +482,8 @@
                 <para><link linkend="cvsup">cvsup</link> $B$r(B
                   <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile">$B$3$N(B supfile</ulink>
                   $B$rMQ$$$F;HMQ$9$k(B.
-                  $B0lEY%3%l%/%7%g%sA4BN$rF~<j$7$F$7$^$($P(B,
-                  $BA02s$+$i$NJQ99ItJ,$@$1$G$9$`$N$G(B, 2
-                  $BHVL\$K?d>)$5$l$kJ}K!$G$9(B.
+                  $B0lEY%3%l%/%7%g%sA4BN$rF~<j$7$F$7$^$($PA02s$+$i$NJQ99ItJ,$@$1$G$9$`$N$G(B, 
+		  $B$b$C$H$b?d>)$5$l$kJ}K!$G$9(B.
                   $BB?$/$N?M$,(B <command>cron</command> $B$+$i(B <command>cvsup</command> $B$r<B9T$7(B,
                   $B<+F0E*$K%=!<%9%3!<%I$r:G?7$N>uBV$KJ]$C$F$$$^$9(B.
                   $B$3$l$r4JC1$K07$&$K$O<!$N$h$&$K%?%$%W$7$F$/$@$5$$(B.</para>
@@ -451,9 +501,9 @@
                   $B>o$K<!$N$H$3$m$G(B<quote>$B8x3+(B</quote>$B$5$l$F$$$^$9(B:
                   <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/</ulink></para>
 
-                <para>$B;d$?$A$O$^$?(B, tar/compress
-                  $B$G%D%j!<A4BN$rF~<j$G$-$k(B <command>wu-ftpd</command>
-                  $B$r;HMQ$7$F$$$^$9(B. $BNc$($P(B :</para>
+                <para>compress/tar $B$G%D%j!<A4BN$rF~<j$G$-$k(B
+		  FTP $B%_%i!<$b$"$j$^$9(B.
+		  $BNc$($P(B :</para>
 
                 <screen>usr.bin/lex</screen>
 
@@ -465,8 +515,18 @@
                 <para>$B$H$9$k$3$H$K$h$j(B, $B%G%#%l%/%H%jA4BN$r(B tar
                   $B%U%!%$%k$H$7$FF~<j$9$k$3$H$,$G$-$^$9(B.</para>
               </listitem>
-            </orderedlist>
-          </listitem>
+	      <indexterm>
+	        <primary>-STABLE</primary>
+		<secondary>CTM $B$r;H$C$FF14|$9$k(B</secondary>
+	      </indexterm>
+	      <listitem>
+		<para><application><link
+		  linkend="ctm">CTM</link></application> $B5!G=$r;H$$$^$9(B.
+		  $B%$%s%?!<%M%C%H$KB.$/0B$/@\B3$G$-$J$$$N$G$"$l$P(B,
+		  $B$3$NJ}K!$r8!F$$7$F$_$^$7$g$&(B.</para>
+	      </listitem>
+	   </orderedlist>
+	 </listitem>
 
           <listitem>
             <para>$B4pK\E*$K$O(B,
@@ -583,11 +643,6 @@
       <quote>$B%Y!<%9%G%k%?(B</quote>$B$+$i(B) $B0l$+$i$d$jD>$7(B, CTM $B$+(B anoncvs
       $B$r;H$C$F0-$$ItJ,$r>C5n$7(B, $B:FF14|$5$;$k$3$H$K$h$C$F(B
       $B$9$Y$F$r:F9=C[$7$J$1$l$P$J$j$^$;$s(B.</para>
-
-    <para><application>Anonymous CVS</application>,
-      <application>CTM</application>, <application>CVSup</application>
-      $B$K$D$$$F$N(B $B>\$7$$>pJs$K$D$$$F$O(B,
-      $B0J2<$N@a$r;2>H$7$F$/$@$5$$(B.</para>
   </sect1>
 
   <sect1 id="makeworld">
@@ -645,11 +700,9 @@
         $BEj9F$5$l$^$9(B.
       </para>
 
-      <para>&os.stable; $B$d(B &os.current; $B%V%i%s%A$r;n$7$?$j(B, $B$=$l$i$K(B
-        $BDI?o$7$F$$$/$H$-$K(B
-        <email>FreeBSD-stable@FreeBSD.ORG</email> $B$d(B
-	<email>FreeBSD-current@FreeBSD.ORG</email>
-        $B$rFI$^$J$$$H$$$&$N$O(B, $B<+$i:RFq$r>7$/$3$H$K$J$k$G$7$g$&(B.
+      <para>&os.stable; $B$d(B &os.current; $B%V%i%s%A$KDI?o$9$k$?$a$K;n$=$&$H$9$k$N$K(B,
+        &a.stable; $B$d(B &a.current;
+        $B$r2a5n$KAL$C$FFI$^$J$$$H$$$&$N$O(B, $B<+$i:RFq$r>7$/$3$H$K$J$k$G$7$g$&(B.
       </para>
 
       <para><emphasis>$BLuCm(B:</emphasis>
@@ -706,7 +759,7 @@
     </sect2>
 
   <sect2>
-      <title><filename>/etc/group</filename> $B$N99?7(B</title>
+      <title><filename>/etc</filename> $B$K$"$k%U%!%$%k$N99?7(B</title>
 
       <para>
         <filename>/etc</filename> $B%G%#%l%/%H%j$K$O(B,
@@ -726,17 +779,18 @@
         <quote>make world</quote> $B$N%$%s%9%H!<%k$NCJ3,$G$O(B,
         $BFCDj$N%f!<%6L>(B, $B$"$k$$$O%0%k!<%W$,B8:_$7$F$$$k$3$H$r(B
         $BMW5a$9$k>lLL$,$"$j$^$9(B. $B%7%9%F%`$N%"%C%W%0%l!<%I$r9T$J$&:]$K$O(B,
-        $B$=$l$i$N%0%k!<%W$,:o=|(B, $B$"$k$$$OJQ99$5$l$FB8:_$7$F$$$J$$2DG=@-$,(B
+        $B$=$l$i$N%f!<%6L>$d%0%k!<%W$,:o=|(B, $B$"$k$$$OJQ99$5$l$FB8:_$7$F$$$J$$2DG=@-$,(B
         $B9M$($i$l$^$9$,(B, $B$=$&$$$C$?>l9g(B, $B%7%9%F%`$N%"%C%W%0%l!<%I$r(B
         $B9T$J$C$F$$$k4V$K(B, $BLdBj$,H/@8$9$k860x$K$J$j$^$9(B.
       </para>
 
-      <para>$B$3$N<o$NNc$G$b$C$H$b5-21$K?7$7$$$N$O(B,
-        <quote/ppp/ $B%0%k!<%W(B($B8e$K(B <quote/network/ $B$KJQ99$5$l$^$7$?(B)$B$,(B
+      <para>$B$3$NNc$G5-21$K?7$7$$$N$O(B,
+        <username>smmsp</username> $B%f!<%6$,DI2C$5$l$?;~$G$9(B.
         $BDI2C$5$l$?;~$G$9(B. 
-        <filename>ppp</filename> $B%5%V%7%9%F%`$,%$%s%9%H!<%k$5$l$k;~(B,
-        $B$=$N%5%V%7%9%F%`$,MxMQ$9$k(B <quote/ppp/ $B%0%k!<%W$,B8:_$7$J$+$C$?$?$a$K(B,
-        $B$=$l$i$N%$%s%9%H!<%k$K<:GT$7$F$7$^$C$?$N$G$9(B.
+        <command>mtree</command> $B$,(B
+	<filename>/var/spool/clientmqueue</filename>
+	$B$r:n@.$7$h$&$H$9$k;~(B,
+	$B$=$N%f!<%6L>$,B8:_$7$J$$$?$a$K%$%s%9%H!<%k$K<:GT$7$F$7$^$C$?$N$G$9(B.
       </para>
 
       <para>$B2r7hJ}K!$O(B, <filename>/usr/src/etc/group</filename> $B$rD4$Y(B,
@@ -750,6 +804,18 @@
         $B3:Ev$9$k$9$Y$F$N%0%k!<%WL>$rJQ99$7$F$*$+$J$1$l$P$J$j$^$;$s(B.
       </para>
 
+      <para>4.6-RELEASE $B$+$i$O(B, buildworld $B$NA0$K(B <option>-p</option>
+	$B$r$D$1$?(B &man.mergemaster.8; $B$r<B9T$7$F$b$h$$$G$9(B.
+	$B$3$l$r<B9T$9$k$H(B, <maketarget>buildworld</maketarget> $B$d(B
+	<maketarget>installworld</maketarget>
+	$B$,@.8y$9$k$?$a$KI,MW$J%U%!%$%k$@$1$rHf3S$7$^$9(B.
+	$B8E$$%P!<%8%g%s$N(B <command>mergemaster</command>
+	$B$r;H$C$F$$$F(B, <option>-p</option> $B$,%5%]!<%H$5$l$F$$$J$$>l9g(B,
+	$B:G=i$K<B9T$9$k$H$-%=!<%9%D%j!<$K$"$k?7$7$$%P!<%8%g%s$N$b$N$r;H$C$F$/$@$5$$(B.</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
+&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
+
       <tip>
 	<para>$B$b$7(B, $B$"$J$?$,$b$C$H?@7P<A$J?M$J$i(B, $B$"$J$?$,L>A0$rJQ99$7$?$j(B,
           $B:o=|$7$F$7$^$C$?%0%k!<%W$,=jM-$7$F$$$k%U%!%$%k$r(B,
@@ -806,6 +872,19 @@
       </para>
     </sect2>
 
+
+        <note>
+          <para>CMOS $B%/%m%C%/$,CO0h;~4V$K@_Dj$5$l$F$$$F(B
+	    GMT $B$G$O$J$$>l9g(B, 
+	    $B<!$N%3%^%s%I$r<B9T$9$kI,MW$,$"$k$+$b$7$l$^$;$s(B.</para>
+<screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
+
+          <para>$B$3$&$9$l$P(B,
+	    $B3N$+$KCO0h;~9o@_Dj$,@5$7$/@_Dj$5$l$^$9(B&mdash;$B$3$l$rBU$k$H(B,
+	    $B$"$H$"$HLdBj$K$J$k$+$b$7$l$^$;$s(B.</para>
+        </note>
+
+
     <sect2>
       <title><filename>/usr/obj</filename> $B$N:o=|(B</title>
 
@@ -861,7 +940,7 @@
           <username>root</username> $B$N%[!<%`%G%#%l%/%H%j$,E,$7$F$$$^$9(B.</para>
       </sect3>
 	
-      <sect3>
+      <sect3 id="make-buildworld">
 	<title>$B%Y!<%9%7%9%F%`$N9=C[$H%$%s%9%H!<%k(B</title>
 
 	<para>$B$^$:(B, $B%+%l%s%H%G%#%l%/%H%j$r(B <filename>/usr/src</filename> $B$K(B
@@ -987,7 +1066,7 @@
 	<screen>&prompt.root; <userinput>make buildworld</userinput></screen>
 
         <para>$B$r<B9T$7$F$/$@$5$$(B.  $B$3$3$G(B <command>make</command> $B$K(B
-          -j $B%*%W%7%g%s$r$D$1$k$H(B, $BF1;~$K$$$/$D$+$N%W%m%;%9$r@8@.$5$;$k$3$H$,(B
+          <option>-j</option> $B%*%W%7%g%s$r$D$1$k$H(B, $BF1;~$K$$$/$D$+$N%W%m%;%9$r@8@.$5$;$k$3$H$,(B
           $B$G$-$^$9(B.  $B$3$N5!G=$O%^%k%A(B CPU $B%^%7%s$GFC$K8z2L$rH/4x$7$^$9(B.
           $B9=C[2aDx$NBgItJ,$G$O(B CPU $B@-G=$N8B3&$h$j(B
           I/O $B@-G=$N8B3&$NJ}$,LdBj$H$J$k$?$a(B, $B%7%s%0%k(B CPU
@@ -1022,10 +1101,10 @@
 	</indexterm>
 
         <para>$B9=C[;~4V$r7h$a$kMWAG$O$5$^$6$^$"$j$^$9$,(B,
-          $B8=;~E@$G$O(B Pentium 3 $B$N(B 500MHz, 128MB $B$N(B RAM $B$H$$$&9=@.$G(B
+          $B8=;~E@$G$O(B Pentium III $B$N(B 500 MHz, 128 MB $B$N(B RAM $B$H$$$&9=@.$G(B
           $B%H%j%C%/$d6aF;$r;H$o$:$KIaDL$K9=C[$7$?>l9g(B,
-          &os.current; $B$N9=C[$KLs(B 3 $B;~4VH>$+$+$j$^$9(B.
-          &os.stable; $B$N9=C[$O(B, $B$b$&>/$7Aa$/=*$o$j$^$9(B.</para>
+	  &os.stable; $B$N9=C[$KLs(B 2 $B;~4V$+$+$j$^$9(B.
+          &os.current; $B$N9=C[$O(B, $B$b$&>/$7;~4V$,$+$+$j$^$9(B.</para>
       </sect3>
     </sect2>
 
@@ -1057,15 +1136,18 @@
 
       <para>$B$b$7(B &os; 4.0 $B0J9_$N%7%9%F%`$K%"%C%W%0%l!<%I$9$k>l9g(B,
         (<xref linkend="kernelconfig"> $B$K5-:\$5$l$F$$$k(B)
-        $BI8=`E*$J%+!<%M%k9=C[<j=g$O;H$($^$;$s(B.
-        $BBe$o$j$K(B, $B0J2<$N%3%^%s%I$r<B9T$9$kI,MW$,$"$j$^$9(B.</para>
+        $B8E$$%+!<%M%k9=C[<j=g$O;H$($^$;$s(B.
+        $BBe$o$j$K(B,
+	<maketarget>buildworld</maketarget> $B$r;H$C$F%7%9%F%`$r9=C[$7$?(B
+	<link linkend="make-buildworld"><emphasis>$B$"$H(B</emphasis>$B$K(B,
+	$B0J2<$N%3%^%s%I$r<B9T$9$kI,MW$,$"$j$^$9(B.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildkernel</userinput>
 &prompt.root; <userinput>make installkernel</userinput></screen>
 
       <para>&os; $B$N(B 4.0 $B0JA0$K%"%C%W%0%l!<%I$9$k>l9g$O(B,
-        $BI8=`E*$J%+!<%M%k9=C[<j=g$K=>$&I,MW$,$"$j$^$9(B.
+        $B8E$$%+!<%M%k9=C[<j=g$K=>$&I,MW$,$"$j$^$9(B.
         $B$?$@$7(B, $B0J2<$N%3%^%s%I$r;H$C$F?7$7$$%P!<%8%g%s$N(B
         &man.config.8; $B$rMxMQ$9$k$3$H$,?d>)$5$l$F$$$^$9(B.</para>
       
@@ -1094,7 +1176,8 @@
 
       <para>$B$=$l$K$O(B, $B0J2<$N%3%^%s%I$r<B9T$7$F$/$@$5$$(B.</para>
 
-      <screen>&prompt.root; <userinput>make installworld</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make installworld</userinput></screen>
 
       <note>
 	<para><command>make buildworld</command> $B$G%3%^%s%I%i%$%s$+$i(B
@@ -1129,18 +1212,88 @@
         $B?75,$KF3F~$5$l$?$j(B, $BJQ99$5$l$?@_Dj%U%!%$%k$K$h$k(B
         $B%U%!%$%k$N99?7$O9T$J$o$l$^$;$s(B.</para>
 
-      <indexterm><primary><command>mergemaster</command></primary></indexterm>
       <para>
 	$B$3$l$i$N%U%!%$%k$r99?7$9$k$b$C$H$b4JC1$JJ}K!$O(B, &man.mergemaster.8;
 	$B$r;H$&$3$H$G$9(B.  $B$3$l$O<+J,$G$d$k$3$H$b2DG=$J$N$G(B, $B$=$&$7$F$b(B
 	$B$+$^$$$^$;$s(B.
-	&man.mergemaster.8; $B$O4JC1$K;H$($k$N$G(B, $B$3$A$i$r;H$&$3$H$r(B
-	$B$*4+$a$7$^$9(B. $B$=$N>l9g$K$O(B <link linkend="update-dev">
-	  $B<!$N%;%/%7%g%s(B</link> $B$K?J$s$G$/$@$5$$(B.
-	$B$^$::G=i$K%^%K%e%"%k%Z!<%8$rFI$s$G(B, <filename>/etc</filename>
+	$B$$$:$l$NJ}K!$K=>$&$K$;$h(B, 
+	$BI,$:(B <filename>/etc</filename>
 	$B$N%P%C%/%"%C%W$r<h$C$FITB,$N;vBV$KHw$($F$/$@$5$$(B.
       </para>
 
+      <sect3>
+	<title><command>mergemaster</command></title>
+        <indexterm><primary><command>mergemaster</command></primary></indexterm>
+
+      <para>&man.mergemaster.8; $B%f!<%F%#%j%F%#$O(B Bourne $B%7%'%k%9%/%j%W%H$G(B,
+        <filename>/etc</filename> $B$K$"$k@_Dj%U%!%$%k$H%=!<%9%D%j!<$N(B
+	<filename>/usr/src/etc</filename> $B$K$"$k@_Dj%U%!%$%k$N0c$$$r3NG'$9$k$N$r<jEA$C$F$/$l$^$9(B.
+        $B$3$l$r;H$&$N$,(B, $B%=!<%9%D%j!<$K$"$k@_Dj%U%!%$%k$K%7%9%F%`$N@_Dj%U%!%$%k$r(B
+	$B99?7$9$k$?$a$K?d>)$5$l$kJ}K!$G$9(B.</para>
+
+      <para><command>mergemaster</command> $B$O(B
+        3.3-RELEASE $B$H(B 3.4-RELEASE $B$N4V$K(B FreeBSD
+	$B$N%Y!<%9%7%9%F%`$KE}9g$5$l$^$7$?(B.
+	$B$D$^$j(B, 3.3 $B0\9T$N(B -STABLE $B$H(B -CURRENT $B$N%7%9%F%`$K$OA4$F(B
+	$B$3$l$,$"$k$H$$$&$3$H$G$9(B.</para>
+
+      <para>$B;O$a$k$K$O(B, $B%W%m%s%W%H$+$iC1$K(B
+        <command>mergemaster</command> $B$HF~NO$7$F(B,
+	$B3+;O$9$k$N$r8+$F$/$@$5$$(B.
+	$B$9$k$H(B <command>mergemaster</command> $B$O0l;~E*$J%k!<%H4D6-$r9=C[$7(B,
+	<filename>/</filename> $B$+$i;O$a$F$5$^$6$^$J%7%9%F%`@_Dj%U%!%$%k$rCV$$$F$$$-$^$9(B.
+	$B<!$K$3$l$i$N%U%!%$%k$O8=:_%7%9%F%`$K%$%s%9%H!<%k$5$l$F$$$k%U%!%$%k$HHf3S$5$l$^$9(B.
+	$B$3$N;~E@$G(B, $B0[$J$k%U%!%$%k$O(B &man.diff.1; $B7A<0$G<($5$l(B,
+	<option>+</option> $B$N%5%$%s$ODI2C$5$l$?9T$+JQ99$5$l$?9T$rI=$7(B,
+	<option>-</option> $B$O40A4$K:o=|$5$l$?9T$+?7$7$$9T$GCV$-49$($i$l$?9T$rI=$7$^$9(B.
+        &man.diff.1; $B$N=q<0$H%U%!%$%k$N0c$$$NI=<(J}K!$K$D$$$F$N$h$/>\$7$$>pJs$O(B,
+	&man.diff.1; $B$r;2>H$7$F$/$@$5$$(B.</para>
+
+      <para>$B$=$7$F(B, &man.mergemaster.8; $B$,?)$$0c$$$,5/$-$F$$$k%U%!%$%k$r$=$l$>$l<($9$N$G(B,
+        $B$3$3$G?7$7$$%U%!%$%k(B($B0l;~%U%!%$%k$H$7$F;2>H$5$l$F$$$^$9(B)$B$r:o=|$9$k$+(B,
+	$B0l;~%U%!%$%k$r$=$N$^$^%$%s%9%H!<%k$9$k$+(B,
+	$B0l;~%U%!%$%k$H8=:_%$%s%9%H!<%k$5$l$F$$$k%U%!%$%k$rE}9g$9$k$+(B,
+	$B$b$7$/$O(B &man.diff.1; $B$N7k2L$r$b$&0lEY8+$k$+A*Br$7$^$9(B.</para>
+
+      <para>$B0l;~%U%!%$%k$N:o=|$rA*$V$H(B, &man.mergemaster.8; 
+        $B$O8=:_$N%U%!%$%k$rJQ99$7$J$$$G?7$7$$%P!<%8%g%s$r:o=|$7$F$[$7$$$N$@$HJ,$+$j$^$9(B.
+        $B$3$NA*Br$O(B, $B8=:_$N%U%!%$%k$rJQ99$9$kM}M3$,J,$+$i$J$$$N$G$J$1$l$P(B,
+	$B$*4+$a$G$-$^$;$s(B.
+	mergemaster $B$N%W%m%s%W%H$G(B <option>?</option> $B$H%?%$%W$9$l$P(B,
+	$B$$$D$G$b%X%k%W$,8+$i$l$^$9(B.
+	$B%U%!%$%k$N%9%-%C%W$rA*$V$H(B, $BB>$NA4$F$N%U%!%$%k$r=*$($?$"$H(B,
+	$B$b$&0lEY$=$N%U%!%$%k$,Ds<($5$l$^$9(B.</para>
+
+      <para>$B0l;~%U%!%$%k$r$=$N$^$^%$%s%9%H!<%k$9$k$3$H$rA*$V$H(B,
+        $B8=:_$N%U%!%$%k$r?7$7$$%U%!%$%k$GCV$-49$($^$9(B.
+	$B$[$H$s$I$N<j$r2C$($F$$$J$$%U%!%$%k$O(B,
+	$B$3$l$,0lHV$h$$A*Br$G$9(B.</para>
+
+      <para>$B%U%!%$%k$NE}9g$rA*$s$@>l9g(B,
+        $B%F%-%9%H%(%G%#%?$HN>J}$N%U%!%$%k$NCf?H$,Ds<($5$l$^$9(B.
+	$B2hLL>e$KJB$VN>J}$N%U%!%$%k$r8+$F?7$7$$%U%!%$%k$r:n@.$9$k$?$a$KN>J}$+$iI,MW$JItJ,$rA*Br$7(B,
+	2$B$D$N%U%!%$%k$rE}9g$9$k$3$H$,$G$-$^$9(B.
+	$BJB$s$G$$$k%U%!%$%k$rHf3S$9$k$H$-(B,
+        <option>l</option> $B%-!<$G:8B&$NCf?H$rA*Br$7(B,
+        <option>r</option> $B%-!<$G1&B&$NCf?H$rA*Br$7$^$9(B.
+        $B:G=*=PNO$ON>J}$NItJ,ItJ,$+$i$J$k%U%!%$%k$K$J$k$N$G(B,
+	$B$3$N%U%!%$%k$r%$%s%9%H!<%k$9$k$3$H$,$G$-$^$9(B.
+	$B$3$N%*%W%7%e%s$O47=,E*$K%f!<%6$,JQ99$7$?@_Dj$r4^$`%U%!%$%k$K;H$o$l$^$9(B.</para>
+
+      <para>diff $B$N7k2L$r$b$&0lEY8+$k(B, $B$rA*Br$9$k$H(B,
+        $B$A$g$&$I@h$[$I(B &man.mergemaster.8; $B$,A*Br;h$rI=<($7$?$N$HF1$8$h$&$K(B,
+	$B%U%!%$%k$NAj0[E@$r8+$k$3$H$,$G$-$^$9(B.</para>
+
+      <para>&man.mergemaster.8; $B$,%7%9%F%`%U%!%$%k$NHf3S$r=*$($?$"$H(B,
+        $BB>$N%*%W%7%g%s$K$D$$$F$b%W%m%s%W%H$,I=<($5$l$^$9(B.
+	&man.mergemaster.8; $B%Q%9%o!<%I%U%!%$%k$r:F9=C[$7$?$$$+$I$&$+(B,
+	<filename>MAKEDEV</filename> $B$r<B9T$9$k$+$I$&$+$r?V$+$l$k$3$H$,$"$j(B,
+	$B;D$C$?0l;~%U%!%$%k$r:o=|$9$k$+$I$&$+$NA*Br;h$rI=<($9$k$N$,:G8e$G$9(B.</para>
+      </sect3>
+
+      <sect3>
+	<title>$B<jF0$G$N99?7(B</title>
+
       <para>
 	$B<jF0$G99?7$9$k$3$H$rA*$s$@>l9g(B,
         $BC1$K%U%!%$%k$r(B
@@ -1156,6 +1309,9 @@
 	<filename>/usr/src/etc</filename> $B$K$J$$$b$N$b$"$j$^$9(B.  
       </para>
 
+      <para>&man.mergemaster.8; $B$r;H$C$F$$$k$N$G$"$l$P(B($B$*4+$a$G$9(B),
+	<link linkend="update-dev">$B<!$N%;%/%7%g%s(B</link>$B$^$GHt$P$7$F$b$+$^$$$^$;$s(B.</para>
+
       <para>
 	$B<jF0$G9T$&:]$N(B
         $B0lHV4JC1$JJ}K!$O(B, $B%U%!%$%k$r?7$7$$%G%#%l%/%H%j$K%$%s%9%H!<%k$7$F$+$i(B, 
@@ -1218,7 +1374,7 @@
       <para>
         <filename>/var/tmp/root</filename> $B0J2<$K(B
         $B%$%s%9%H!<%k$5$l$F$$$k%U%!%$%k$NCf$K$O(B, 
-        <quote/./ $B$+$i;O$^$C$F$$$k$b$N$,$"$j$^$9(B. 
+        <quote>.</quote> $B$+$i;O$^$C$F$$$k$b$N$,$"$j$^$9(B. 
         $B$3$l$r=q$$$F$$$k;~E@$G(B, $B$=$l$K3:Ev$9$k%U%!%$%k$O(B
 	<filename>/var/tmp/root/</filename> $B$H(B 
 	<filename>/var/tmp/root/root/</filename> $B$NCf$K$"$k(B
@@ -1343,6 +1499,7 @@
 	  
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
       </tip>
+      </sect3>
     </sect2>
 
     <sect2 id="update-dev">
@@ -1498,7 +1655,7 @@
 	  <answer>
             <para>
               $B$=$l$OJQ99$N@-<A$K$h$k$N$G(B, $B$J$s$H$b8@$($^$;$s(B.
-	      $BNc$($P(B, CVSup $B$r<B9T$7$?$H$-(B, $B:G8e$K<B9T$7$?$H$-$+$iHf$Y$F(B
+	      $BNc$($P(B, <application>CVSup</application> $B$r<B9T$7$?$H$-(B, $B:G8e$K<B9T$7$?$H$-$+$iHf$Y$F(B
 	      $B<!$K$"$2$k$h$&$J%U%!%$%k$,99?7$5$l$F$$$?$H$7$^$9(B.</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>
@@ -1568,7 +1725,7 @@
 	    <para><filename>/usr/obj</filename> $B$K$O(B, 
               $B%3%s%Q%$%k$NCJ3,$G@8@.$5$l$?(B
               $B$9$Y$F$N%*%V%8%'%/%H%U%!%$%k$,4^$^$l$F$$$^$9(B.
-              $BDL>o(B <quote/make world/ $B$N:G=i$NCJ3,$G$O(B, 
+              $BDL>o(B <quote>make world</quote> $B$N:G=i$NCJ3,$G$O(B, 
               $B$3$N%G%#%l%/%H%j$r:o=|$7$F?7$7$/$D$/$jD>$9$h$&$K$J$C$F$$$^$9(B.  
               $B$=$N>l9g$K$O(B, $B9=C[=*N;8e$N(B <filename>/usr/obj</filename>
               $B$rJ]B8$7$F$*$$$F$b(B, $B$"$^$j0UL#$O$"$j$^$;$s(B.  
@@ -1577,7 +1734,7 @@
 
 	    <para>
               $B$7$+$7(B, $B$b$7$"$J$?$,2?$r9T$J$*$&$H$7$F$$$k$N$+M}2r$7$F$$$k$J$i(B, 
-	      $B$3$NCJ3,$r>JN,$7$F(B <quote/make world/ $B$r9T$J$&$3$H$,$G$-$^$9(B.  
+	      $B$3$NCJ3,$r>JN,$7$F(B <quote>make world</quote> $B$r9T$J$&$3$H$,$G$-$^$9(B.  
 	      $B$3$&$9$k$H(B, $B$[$H$s$I$N%=!<%9$O:F%3%s%Q%$%k$5$l$J$$$?$a(B, 
               $B9=C[$O$+$J$j9bB.2=$5$l$^$9(B.  
 	      $B$3$l$ON"$r$+$($;$P(B, $B%G%j%1!<%H$J0MB84X78$NLdBj$K$h$C$F(B, 
@@ -1585,11 +1742,6 @@
               &os; $B%a!<%j%s%0%j%9%H$G$O$7$P$7$P(B, $B9=C[$N<:GT$,(B, 
               $B$3$NCJ3,$N>JN,$K$h$k$b$N$@$H$$$&$3$H$rM}2r$;$:$K(B
               $BITK~$N@<$r$"$2$k?M$,$$$^$9(B.</para>
-
-	    <para>$B$b$7(B, $B$3$N$h$&$J4m81$r>5CN$7$?>e$G%7%9%F%`$N:F9=C[$r9T$J$&>l9g$K$O(B, 
-	      $B<!$N$h$&$KJQ?t(B <makevar>NOCLEAN</makevar> $B$rDj5A$7$F9=C[$7$^$9(B.</para>
-
-	    <screen>&prompt.root; <userinput>make -DNOCLEAN world</userinput></screen>
 	  </answer>
 	</qandaentry>
 
@@ -1643,24 +1795,6 @@
 	  </answer>
 	</qandaentry>
 
-	<indexterm><primary>NFS</primary></indexterm>
-	<qandaentry>
-	  <question>
-	    <para>$B$"$k%^%7%s$r(B <emphasis/$B%^%9%?(B/ $B$H$7$F(B, 
-              $BB>$NB?$/$N%^%7%s$r(B (NFS$B$G(B) $B%"%C%W%0%l!<%I$G$-$^$9$+(B?</para>
-	  </question>
-
-          <answer>
-	    <para>$B$3$N:n6H$r9T$J$&$N$O4JC1$G(B,
-              $B$?$/$5$s$N%^%7%s$r%"%C%W%0%l!<%I$9$k>l9g$K;~4V$r@aLs$9$k$3$H$,$G$-$^$9(B.
-              $B$3$l$K$O(B, $BCf?4$H$J$k%^%7%s$G(B <maketarget>buildworld</maketarget> $B$r<B9T$7(B,
-              $B=*N;8e$K%j%b!<%H%^%7%s$G(B
-              <filename>/usr/src</filename> $B$H(B <filename>/usr/obj</filename>
-              $B$r(B NFS $B%^%&%s%H$7$F$+$i(B, $B$=$3$G(B
-              <maketarget>installworld</maketarget> $B$7$^$9(B.</para>
-	  </answer>
-	</qandaentry>
-
 	<qandaentry>
 	  <question>
 	    <para>$B$I$N$h$&$K$9$l$P(B make world $B$r9bB.2=$G$-$^$9$+(B?</para>
@@ -1696,18 +1830,18 @@
 	      <listitem>
 		<para>$B$^$?(B, <filename>/etc/make.conf</filename> $B$NCf$N(B
 		  <makevar>CFLAGS</makevar> $B$r(B, 
-                  <quote>-O -pipe</quote> $B$N$h$&$K;XDj$7$^$7$g$&(B.
-                  <quote>-O2</quote> $B$N:GE,2=$O$5$i$KB?$/$N;~4V$rI,MW$H$7(B, 
-		  $B$7$+$b(B <quote>-O</quote> $B$H(B <quote>-O2</quote> $B$N(B
+                  <option>-O -pipe</option> $B$N$h$&$K;XDj$7$^$7$g$&(B.
+                  <option>-O2</option> $B$N:GE,2=$O$5$i$KB?$/$N;~4V$rI,MW$H$7(B, 
+		  $B$7$+$b(B <option>-O</option> $B$H(B <option>-O2</option> $B$N(B
 		  $B:GE,2=$K$O(B, $B$[$H$s$I:9$O$"$j$^$;$s(B.
-                  <quote>-pipe</quote> $B$r;XDj$9$k$3$H$G(B, 
+                  <option>-pipe</option> $B$r;XDj$9$k$3$H$G(B, 
                   $B%3%s%Q%$%i$O%F%s%]%i%j%U%!%$%k$NBe$o$j$K%Q%$%W$rMxMQ$7$^$9(B.  
                   $B$=$N7k2L(B, ($B%a%b%j$NMxMQ$OA}$($^$9$,(B)$B%G%#%9%/%"%/%;%9$,8:$j$^$9(B.  
                 </para>
 	      </listitem>
 	      
 	      <listitem>
-		<para>make $B$K(B <option>-j&lt;n&gt;</option> $B%*%W%7%g%s$r;XDj$7$F(B,
+		<para>&man.make.1; $B$K(B <option>-j&lt;n&gt;</option> $B%*%W%7%g%s$r;XDj$7$F(B,
                   $BJ#?t$N%W%m%;%9$rJBNs$K<B9T$5$;$F$/$@$5$$(B.  
                   $B$3$l$O%W%m%;%C%5$,C10l$+J#?t$+$K$h$i$:(B, 
                   $B$I$A$i$bF1MM$K287C$rF@$k$3$H$,$G$-$^$9(B.</para>
@@ -1773,7 +1907,146 @@
 	    </itemizedlist>
 	  </answer>
 	</qandaentry>
+
+        <qandaentry>
+          <question>
+            <para>$B$J$K$+0-$$$3$H$,$"$C$?$i$I$&$9$l$P$$$$$G$9$+(B?</para>
+          </question>
+
+          <answer>
+            <para>$B<+J,$N4D6-$KA0$N%S%k%I$NM>7W$J%4%_$,;D$C$F$$$J$$$3$H$r$O$C$-$j$H3NG'$7$F$/$@$5$$(B.
+	      $B$H$F$b4JC1$G$9(B.</para>
+
+            <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/usr</userinput>
+&prompt.root; <userinput>rm -rf /usr/obj/usr</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make cleandir</userinput>
+&prompt.root; <userinput>make cleandir</userinput></screen>
+
+            <para>$B$($((B, <command>make cleandir</command>
+	      $B$OK\Ev$K(B2$B2s<B9T$9$k$N$G$9(B.</para>
+
+            <para>$B$=$7$F(B, $BA4%W%m%;%9$r:G=i$+$i(B,
+              <command>make buildworld</command> $B$+$i$b$&0lEY;O$a$F$/$@$5$$(B.</para>
+
+            <para>$B$^$@LdBj$,$"$l$P(B, $B%(%i!<$H(B <command>uname -a</command>
+	      $B$N=PNO$r(B &a.questions; $B$KAw$C$F$/$@$5$$(B.
+              $B<+J,$N@_Dj$K$D$$$FB>$N<ALd$,Mh$F$bEz$($i$l$k$h$&MQ0U$7$F$/$@$5$$(B!</para>
+          </answer>
+        </qandaentry>
       </qandaset>
+    </sect2>
+  </sect1>
+
+  <sect1 id="small-lan">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Mike</firstname>
+	  <surname>Meyer</surname>
+	</author>
+      </authorgroup>
+    </sect1info>
+    <title>$BJ#?t$N%^%7%s$GDI$C$+$1$k(B</title>
+    <indexterm>
+      <primary>NFS</primary>
+      <secondary>$BJ#?t$N%^%7%s$K%$%s%9%H!<%k(B</secondary>
+    </indexterm>
+    
+    <para>$BF1$8%=!<%9%D%j!<$rDI$$$+$1$?$$J#?t$N%^%7%s$r;}$C$F$$$k$J$i(B,
+      $BA4It$N%^%7%s$K%=!<%9$r%@%&%s%m!<%I$7$FA4It:F9=C[$9$k$N$O;q8;$NL5BL(B,
+      $B$D$^$j%G%#%9%/%9%Z!<%9(B, $B%M%C%H%o!<%/BS0h(B, $B$=$7$F(B CPU $B%5%$%/%k$NL5BL;H$$$K;W$($^$9(B.
+      $B<B:]$3$l$OL5BL$G(B, $B2r7h:v$O(B1$B$D$N%^%7%s$K;E;v$N$[$H$s$I$r$5$;(B,
+      $B;D$j$N%^%7%s$O(B NFS $B7PM3$G$=$l$r%^%&%s%H$9$k(B, $B$H$$$&$b$N$G$9(B.
+      $B$3$N%;%/%7%g%s$G$O$=$N$d$jJ}$r354Q$7$^$9(B.</para>
+
+    <sect2 id="small-lan-preliminaries">
+      <title>$B=`Hw(B</title>
+
+      <para>$B$^$:=i$a$K(B, $BF1$8%P%$%J%j$GF0$+$=$&$H$9$k%^%7%s$?$A$r7h$a$^$9(B.
+	$B$3$N%^%7%s$?$A$N$3$H$r(B<emphasis>$B%S%k%I%;%C%H(B</emphasis>$B$H8F$S$^$7$g$&(B.
+	$B$=$l$>$l$N%^%7%s$O%+%9%?%`%+!<%M%k$r;}$C$F$$$k$+$b$7$l$^$;$s$,(B,
+	$BF1$8%f!<%6%i%s%I%P%$%J%j$rF0$+$=$&$H$$$&$N$G$9(B.
+	$B$3$N%S%k%I%;%C%H$+$i(B,
+	<emphasis>$B%S%k%I%^%7%s(B</emphasis>$B$H$J$k%^%7%s$r(B1$BBfA*$S$^$9(B.
+	$B%Y!<%9%7%9%F%`$H%+!<%M%k$r9=C[$9$k$N$O$3$N%^%7%s$K$J$j$^$9(B.
+	$BM}A[E*$K$O(B, $B$3$N%^%7%s$O(B <command>make world</command>
+	$B$r<B9T$9$k$N$K==J,$J(B CPU $B$r;}$C$?B.$$%^%7%s$G$"$k$Y$-$G$9(B.
+	<emphasis>$B%F%9%H%^%7%s(B</emphasis>$B$H$J$k$Y$-%^%7%s$bA*$S$?$$$G$7$g$&(B.
+	$B99?7$5$l$?%=%U%H%&%'%"$r;H$&A0$K$=$N%^%7%s$G%F%9%H$9$k$N$G$9(B.
+	$B%F%9%H%^%7%s$O$+$J$jD9$$;~4VMn$A$F$$$F$b$@$$$8$g$&$V$J%^%7%s(B
+	<emphasis>$B$G$J$1$l$P$J$j$^$;$s(B</emphasis>.
+	$B%S%k%I%^%7%s$G$b$+$^$$$^$;$s$,(B, $B%S%k%I%^%7%s$G$"$kI,MW$O$"$j$^$;$s(B.</para>
+
+      <para>$B$3$N%S%k%I%;%C%H$N%^%7%s$OA4$F(B
+	<filename>/usr/obj</filename> $B$H(B
+	<filename>/usr/src</filename>
+	$B$rF1$8%^%7%s$NF1$8>l=j$+$i%^%&%s%H$9$kI,MW$,$"$j$^$9(B.
+	$BM}A[E*$K$O%S%k%I%^%7%s$N(B2$B$D$N0c$&%I%i%$%V>e$K$"$k$H$h$$$N$G$9$,(B,
+	$B%S%k%I%^%7%s$K(B NFS $B%^%&%s%H$5$l$F$$$F$b$+$^$$$^$;$s(B.
+	If you have multiple build sets,
+	<filename>/usr/src</filename> should be on one build machine, and
+	NFS mounted on the rest.</para>
+	  
+      <para>$B:G8e$K%S%k%I%;%C%H$NA4$F$N%^%7%s>e$N(B
+	<filename>/etc/make.conf</filename>
+	$B$,%S%k%I%^%7%s$H0lCW$7$F$$$k$3$H$r3NG'$7$F$/$@$5$$(B.
+	$B$D$^$j(B, $B%S%k%I%^%7%s$O%S%k%I%;%C%H$N$I$N%^%7%s$b%$%s%9%H!<%k$7$h$&$H$7$F$$$k(B
+	$B%Y!<%9%7%9%F%`$rA4It%S%k%I$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G$9(B.
+	$B$^$?(B, $B3F%S%k%I%^%7%s$O(B <filename>/etc/make.conf</filename>
+	$B$K$=$l$>$l$N%S%k%I%^%7%s$N%+!<%M%kL>$r(B
+	<makevar>KERNCONF</makevar> $B$G;XDj$7(B,
+	$B%S%k%I%^%7%s$O<+J,<+?H$N%+!<%M%k$+$i=g$KA4It$N%+!<%M%kL>$r(B
+	<makevar>KERNCONF</makevar> $B$K%j%9%H%"%C%W$7$F$/$@$5$$(B.
+	$B3F%^%7%s$N%+!<%M%k$b%S%k%I$9$k$N$G$"$l$P(B,
+	$B%S%k%I%^%7%s$O3F%^%7%s$N%+!<%M%k@_Dj%U%!%$%k$r(B
+	<filename>/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>
+	$B$K;}$C$F$$$J$1$l$P$J$j$^$;$s(B.</para>
+    </sect2>
+
+    <sect2>
+      <title>$B%Y!<%9%7%9%F%`(B</title>
+
+      <para>$B$5$F(B, $B=`Hw$O@0$C$?$N$G(B, $B%S%k%I$7$^$7$g$&(B.
+        <xref linkend="make-buildworld">
+	$B$K=q$$$F$"$k$h$&$K%+!<%M%k$H%Y!<%9%7%9%F%`$r9=C[$7$F$/$@$5$$(B.
+	$B$G$b(B, $B$^$@%$%s%9%H!<%k$7$J$$$G$/$@$5$$(B.
+	$B%S%k%I$,=*$o$C$?$i(B, $B%F%9%H%^%7%s$K0\$j(B,
+	$B%S%k%I$7$?$P$+$j$N%+!<%M%k$r%$%s%9%H!<%k$7$F$/$@$5$$(B.
+	$B%F%9%H%^%7%s$,(B NFS $B7PM3$G(B
+	<filename>/usr/src</filename> $B$H(B
+	<filename>/usr/obj</filename> $B$r%^%&%s%H$7$F$$$k$J$i(B,
+	$B%7%s%0%k%f!<%6$G:F5/F0$7$?$H$-%M%C%H%o!<%/$r;H$($k$h$&$K$7$F%^%&%s%H$9$kI,MW$,$"$j$^$9(B.
+	$B$b$C$H$b4JC1$JJ}K!$O(B,
+	$B%^%k%A%f!<%6$G5/F0$7$F(B, <command>shutdown now</command>
+	$B$r<B9T$7$F%7%s%0%k%f!<%6%b!<%I$K0\9T$9$k$3$H$G$9(B.
+	$B$=$&$7$?$i(B, $B%+!<%M%k$H%Y!<%9%7%9%F%`$r%$%s%9%H!<%k$7(B,
+	$B$$$D$b$9$k$h$&$K(B
+	<command>mergemaster</command> $B$r<B9T$G$-$^$9(B.
+	$B=*$o$C$?$i(B,
+	$B%F%9%H%^%7%s$r:F5/F0$7$FDL>o$N%^%k%A%f!<%6F0:n$KLa$7$^$9(B.</para>
+
+      <para>$B%F%9%H%^%7%s$K$"$k$b$NA4$F$,$A$c$s$HF0$$$F$$$k3N?.$,F@$i$l$?$i(B,
+        $BF1$8<j=g$G%S%k%I%;%C%H$NB>$N%^%7%s$K$b?7$7$$%=%U%H%&%'%"$r%$%s%9%H!<%k$7$^$9(B.</para>
+    </sect2>
+
+    <sect2>
+      <title>Ports</title>
+
+      <para>ports $B%D%j!<$K$bF1$8%"%$%G%"$,;H$($^$9(B.
+        $B:G=i$K=EMW$JE@$O(B,
+	$B%S%k%I%;%C%H$NA4$F$N%^%7%s$KF1$8%^%7%s$N(B
+	<filename>/usr/ports</filename> $B$r%^%&%s%H$9$k$3$H$G$9(B.
+	$B$=$7$F(B, distfiles $B$r6&M-$9$k$?$a$K(B,
+	<filename>/etc/make.conf</filename> $B$rE,@Z$K@_Dj$7$^$9(B.
+	NFS $B%^%&%s%H$K$h$C$F%^%C%W$5$l$k(B <username>root</username>
+	$B%f!<%6$,2?$G$"$l(B, <makevar>DISTDIR</makevar>
+	$B$O$=$N%f!<%6$,=q$-9~$a$k6&DL$N6&M-%G%#%l%/%H%j$K@_Dj$9$kI,MW$,$"$j$^$9(B.
+	$B3F%^%7%s$O(B <makevar>WRKDIRPREFIX</makevar>
+	$B$r<+J,$N%^%7%s$N%S%k%I%G%#%l%/%H%j$K@_Dj$7$J$1$l$P$J$j$^$;$s(B.
+	$B:G8e$K(B, $B%Q%C%1!<%8$r%S%k%I$7$FG[I[$7$h$&$H$7$F$$$k$J$i(B,
+	<makevar>DISTDIR</makevar> $B$HF1$8$h$&$K(B
+	<makevar>PACKAGES</makevar> $B%G%#%l%/%H%j$b@_Dj$7$F$/$@$5$$(B.</para> 
     </sect2>
   </sect1>
 </chapter>

--X1bOJ3K7DJ5YkBrT--
