From owner-doc-jp-work@jp.FreeBSD.org Sun Jul 28 21:59:40 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g6SCxeI01277;
	Sun, 28 Jul 2002 21:59:40 +0900 (JST)
	(envelope-from owner-doc-jp-work@jp.FreeBSD.org)
Received: from wasley.bl.mmtr.or.jp (wasley.bl.mmtr.or.jp [210.228.160.21])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with SMTP/inet id g6SCxen01272
	for <doc-jp-work@jp.FreeBSD.org>; Sun, 28 Jul 2002 21:59:40 +0900 (JST)
	(envelope-from rushani@bl.mmtr.or.jp)
Received: (qmail 16573 invoked from network); 28 Jul 2002 21:59:35 +0900
Received: from unknown (HELO localhost) (210.165.137.210)
  by mx.bl.mmtr.or.jp with SMTP; 28 Jul 2002 21:59:35 +0900
Date: Sun, 28 Jul 2002 21:59:32 +0900 (JST)
Message-Id: <20020728.215932.66174709.rushani@bl.mmtr.or.jp>
To: doc-jp-work@jp.FreeBSD.org
From: Hideyuki KURASHINA <rushani@bl.mmtr.or.jp>
In-Reply-To: <20020701210934.A23351@extro.usyd.edu.au>
References: <20020701210934.A23351@extro.usyd.edu.au>
X-PGP-Public-Key: http://www.bl.mmtr.or.jp/~rushani/public_key.txt
X-PGP-Fingerprint: A052 6F98 6146 6FE3 91E2  DA6B F2FA 2088 439A DC57
X-URL: http://www.bl.mmtr.or.jp/~rushani/
X-Mailer: Mew version 3.0.54 on Emacs 21.2 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Sun_Jul_28_21:59:32_2002_398)--"
Content-Transfer-Encoding: 7bit
Reply-To: doc-jp-work@jp.FreeBSD.org
Precedence: list
X-Sequence: doc-jp-work 434
Subject: [doc-jp-work 434] Re: books/handbook/cutting-edge/chapter.sgml
 (1.82 -> 1.127) =?ISO-2022-JP?B?GyRCOjpGSTRqJCQbKEI=?= 
Errors-To: owner-doc-jp-work@jp.FreeBSD.org
Sender: owner-doc-jp-work@jp.FreeBSD.org
X-Originator: rushani@bl.mmtr.or.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020727

----Next_Part(Sun_Jul_28_21:59:32_2002_398)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$BARIJ(B@$B?73c$G$9(B.
# $BK\6H$GK;$7$/$F:n6H$,F_$C$F$^$7$?(B.

handbook/boot/ $B$NJ}$O(B hrs $B$5$s$,::FI$7$F$i$C$7$c$k$H4|BT$7$D$D(B. :-)

>>> On Mon, 1 Jul 2002 21:09:34 +1000, KOMACHI Mamoru <c10344@mail.ecc.u-tokyo.ac.jp> said:

> $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$*$D$+$l$5$^$G$7$?(B.

$BFbMF$KLdBj$O$J$$$H;W$$$^$9(B. $B$=$N>e$G(B,

  o $BLu$7;D$7$OLu$7$F(B, $B=EJ#$7$F$$$?$H$3$m$O:o$k(B
  o $B!V(B19.5.1. $B=`Hw!W$G6(D4$5$l$F$$$k(B must $B$NMQK!$N8+D>$7(B
    # inspired by [doc-jp 8220]
  o $BFq$7$$4A;z(B -> $B$R$i$,$J(B
  o typo $B$N=$@5(B
  o $B<c43$N<qL#E*$JJQ99(B

$B$J$I$r9T$$$^$7$?(B.

$B>.D.$5$s$N%Q%C%A$r$"$F$?>e$G(B, $B$3$N%Q%C%A$r$"$F$F$/$@$5$$(B.

-- rushani

----Next_Part(Sun_Jul_28_21:59:32_2002_398)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="cutting-edge.diff"

--- chapter.sgml.orig2	Sun Jul 28 01:56:48 2002
+++ chapter.sgml	Sun Jul 28 21:56:34 2002
@@ -109,7 +109,7 @@
       <sect3>
 	<title>&os.current; $B$C$F$J$K(B?</title>
 
-        <para>&os.current; $B$O(B &os; $B$N:G?7$N%=!<%9$G$9(B.
+        <para>&os.current; $B$O(B &os; $B$N:G?7$N(B, $B$=$7$F:n6H?J9TCf$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,
@@ -118,9 +118,9 @@
           $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.
           $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$O(B,
-	  $B$^$5$K%=!<%9%3!<%I$r<j$KF~$l$?;~4V<!Bh$N>l9g$b$"$k$N$G$9(B.</para>
+          &os.current; $B$,IT9,$r$b$?$i$9$+(B,
+          $B$=$l$H$bHs>o$KAG@2$i$7$$5!G=$r$b$?$i$9$+$O(B,
+          $B$^$5$K%=!<%9%3!<%I$r<j$KF~$l$?=V4V$K$h$k$N$G$9(B!</para>
       </sect3>
 
       <sect3>
@@ -140,8 +140,8 @@
 	<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$,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.
+              $B$,(B <quote>$B7rA4$G$"$k(B</quote> $B$3$H$r2DG=$J8B$jJ]>Z$9$k$?$a$K(B,
+              $B<o!9$NLdBj$r2r7h$9$k$N$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(B, $B$=$l$r<BAu$9$k$?$a$N%Q%C%A$rDs<($7$^$9(B.</para>
@@ -174,7 +174,7 @@
             <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>
+	      $B?7$7$$%P%0$r@8$_=P$9$*$=$l$,$"$j$^$9(B.</para>
           </listitem>
 
           <listitem>
@@ -192,8 +192,7 @@
               $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<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$OA0<T$rA*Br$9$k$G$7$g$&(B.</para>
+              $B$H$$$&Fs$D$NA*Br$rGw$i$l$?$i(B, $B3+H/<T$OA0<T$rA*$V$G$7$g$&(B.</para>
           </listitem>
         </orderedlist>
       </sect3>
@@ -239,7 +238,7 @@
               <literal>help</literal>
               $B$H=q$1$P(B, Majordomo $B$+$i$"$J$?$X(B,
               $B$o$?$7$?$A$,%5%]!<%H$9$kMM!9$J%a!<%j%s%0%j%9%H$K;22C(B
-              /$BC&B`$9$kJ}K!$K4X$9$k(B, $B>\$7$$%X%k%W$,Aw$i$l$^$9(B.</para>
+              /$BC&B`$9$kJ}K!$K4X$9$k>\$7$$%X%k%W$,Aw$i$l$^$9(B.</para>
           </listitem>
 
           <listitem>
@@ -268,9 +267,9 @@
                   $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>e$K5s$2$?%5%s%W%k(B supfile $B$O%+%9%?%^%$%:$7$F4D6-$K9g$o$;$F(B
+		  $B>e$K5s$2$?%5%s%W%k(B supfile $B$O%+%9%?%^%$%:$7$F(B, $B4D6-$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>
+		  $B$=$N@_Dj$r9T$J$&$N$K%X%k%W$,I,MW$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>
@@ -503,7 +502,7 @@
 
                 <para>compress/tar $B$G%D%j!<A4BN$rF~<j$G$-$k(B
 		  FTP $B%_%i!<$b$"$j$^$9(B.
-		  $BNc$($P(B :</para>
+		  $BNc$($P(B:</para>
 
                 <screen>usr.bin/lex</screen>
 
@@ -522,7 +521,7 @@
 	      <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%$%s%?!<%M%C%H$X$N@\B3$K9bB.$G0B2A$J2s@~$rMxMQ$G$-$J$$$N$G$"$l$P(B,
 		  $B$3$NJ}K!$r8!F$$7$F$_$^$7$g$&(B.</para>
 	      </listitem>
 	   </orderedlist>
@@ -701,9 +700,8 @@
       </para>
 
       <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>
+        &a.stable; $B$d(B &a.current; $B$r2a5n$K$5$+$N$\$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>
       $B$3$l$i$N%a!<%j%s%0%j%9%H$O1Q8l$G$d$j$H$j$5$l$F$$$k$?$a(B,
@@ -785,13 +783,12 @@
       </para>
 
       <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. 
-        <command>mtree</command> $B$,(B
+	<username>smmsp</username> $B%f!<%6$,DI2C$5$l$?;~$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>
+	$B$=$N%f!<%6L>(B ($B$*$h$S%0%k!<%W(B)
+	$B$,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,
         $B<+J,$N%7%9%F%`$N%0%k!<%WL>%j%9%H$HHf3S$9$k$3$H$G$9(B.
@@ -805,7 +802,7 @@
       </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$r$D$1$F(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.
@@ -880,7 +877,7 @@
 <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,
+	    $B3N<B$KCO0h;~9o$,@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>
 
@@ -999,7 +996,7 @@
           $B$I$N$h$&$KF0:n$9$k$N$+$r;X<($9$k$?$a$N$b$N$G$9(B.  
           $B3F!9$N(B <filename>Makefile</filename> $B$K$O(B, $B?tB?$/$N0[$J$k(B
           <quote>$B%?!<%2%C%H(B(target)</quote> $B$,Dj5A$5$l$F$$$F(B, 
-          $B;XDj$5$l$?%?!<%2%C%H$K$h$C$F(B, $BF0:n$,7h$^$j$^$9(B.  
+          $B;XDj$5$l$?%?!<%2%C%H$K$h$C$FF0:n$,7h$^$j$^$9(B.  
         </para>
 
 	<para>
@@ -1066,8 +1063,9 @@
 	<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
-          <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.
+          <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$,$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
           $B%^%7%s$K$b8z2L$,$"$j$^$9(B.</para>
@@ -1136,11 +1134,11 @@
 
       <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)
-        $B8E$$%+!<%M%k9=C[<j=g$O;H$($^$;$s(B.
+        $B8E$$%+!<%M%k9=C[<j=g$O$*$9$9$a$G$-$^$;$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>
+	<link linkend="make-buildworld"><maketarget>buildworld</maketarget>
+	  $B$r;H$C$F%7%9%F%`$r9=C[(B</link>$B$7$?(B<emphasis>$B$"$H(B</emphasis>$B$K(B,
+	$B0J2<$N%3%^%s%I$r<B9T$7$F$/$@$5$$(B.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildkernel</userinput>
@@ -1234,61 +1232,64 @@
       <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$D$^$j(B, 3.3 $B0J9_$N(B -STABLE $B$H(B -CURRENT $B$N%7%9%F%`$K$O$9$Y$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%U%!%$%k$NHf3S$r3+;O$9$k$N$r8+$F$/$@$5$$(B. /* $B;O$a$k!"3+;O!D!#(B*/
+	<command>mergemaster</command> $B$O(B
+	<filename>/</filename> $B$r5/E@$H$7$?0l;~E*$J%k!<%H4D6-$r9=C[$7(B,
+	$B$5$^$6$^$J%7%9%F%`@_Dj%U%!%$%k$r(B
+	($BLuCm(B: $B%G%U%)%k%H$G$O(B <filename>/var/tmp/temproot</filename> $B$K(B)
+	$BCV$$$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,
+	<option>+</option> $B$N5-9f$ODI2C$^$?$OJQ99$5$l$?9T$rI=$7(B,
+	<option>-</option> $B$O40A4$K:o=|$5$l$?$+?7$7$/CV$-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$j>\$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,
+      <para>&man.mergemaster.8; $B$O?)$$0c$$$,5/$-$F$$$k%U%!%$%k$r$=$l$>$l<($7$^$9(B.
+        $B$3$3$G$O?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>
+	$B$b$7$/$O(B &man.diff.1; $B$N7k2L$r$b$&0lEY8+$k$+A*Br$G$-$^$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,
+      <para>$B0l;~%U%!%$%k$N:o=|$rA*$V$H(B, &man.mergemaster.8;
+        $B$K8=:_$N%U%!%$%k$rJQ99$7$J$$$G?7$7$$%P!<%8%g%s$r:o=|$;$h$HEA$($^$9(B.
+        $B$3$NA*Br$O(B, $B8=:_$N%U%!%$%k$rJQ99$9$kM}M3$,J,$+$i$J$$$N$G$"$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%U%!%$%k$N%9%-%C%W$rA*$V$H(B, $BB>$N$9$Y$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.
+	$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.
+	$B%F%-%9%H%(%G%#%?$,5/F0$5$l(B, $BN>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.
+	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,
+	<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$O:81&N>J}$NItJ,$G$G$-$?%U%!%$%k$K$J$k$G$7$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>
+	$B$?$$$F$$(B, $B$3$N%*%W%7%e%s$O%f!<%6$,@_Dj$rJQ99$7$?%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$A$g$&$I@h$[$I(B &man.mergemaster.8; $B$,A*Br;h$rI=<($9$kA0$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.
+	$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>
+	<filename>MAKEDEV</filename> $B$r<B9T$9$k$+$I$&$+$r?V$+$l$k$3$H$,$"$j$^$9(B.
+	$B:G8e$K;D$C$?0l;~%U%!%$%k$r:o=|$9$k$+$I$&$+$r?R$M$F=*N;$7$^$9(B.</para>
       </sect3>
 
       <sect3>
@@ -1309,7 +1310,7 @@
 	<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),
+      <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>
@@ -1924,14 +1925,14 @@
 &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>
+	      $B$OK\Ev$K(B 2 $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$=$7$F(B, <command>make buildworld</command> $B$r9T$$(B,
+	      $BA4%W%m%;%9$r:G=i$+$i$d$jD>$7$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>
+	      $B<+J,$N@_Dj$K$D$$$F$5$i$K<ALd$5$l$F$bEz$($i$l$k$h$&MQ0U$7$F$/$@$5$$(B!</para>
           </answer>
         </qandaentry>
       </qandaset>
@@ -1953,10 +1954,10 @@
       <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,
+    <para>$BF1$8%=!<%9%D%j!<$rDI$$$+$1$?$$%^%7%s$rJ#?t$N;}$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;(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<B:]$3$l$OL5BL$G(B, $B2r7h:v$O(B 1 $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>
 
@@ -1968,25 +1969,25 @@
 	$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.
+	<emphasis>$B%S%k%I%^%7%s(B</emphasis>$B$H$J$k%^%7%s$r(B 1 $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%F%9%H%^%7%s$O$+$J$jD9$$;~4VMn$A$F$$$F$b(B
+	$B$@$$$8$g$&$V$J%^%7%s(B<emphasis>$B$G$"$C$?$[$&$,$$$$$G$7$g$&(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
+      <para>$B$3$N%S%k%I%;%C%H$N%^%7%s$O$9$Y$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,
+	$BM}A[E*$K$O%S%k%I%^%7%s$N(B 2 $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>
+	$B%S%k%I%;%C%H<+BN$,J#?t$"$k>l9g$O(B,
+	<filename>/usr/src</filename> $B$O$R$H$D$N%S%k%I%^%7%s>e$K$"$k$Y$-$G$9(B.
+	$BB>$N%^%7%s$+$i$O$=$l$r(B NFS $B%^%&%s%H$9$k$h$&$K$7$^$7$g$&(B.</para>
 	  
       <para>$B:G8e$K%S%k%I%;%C%H$NA4$F$N%^%7%s>e$N(B
 	<filename>/etc/make.conf</filename>
@@ -2018,7 +2019,7 @@
 	<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%^%k%A%f!<%6%b!<%I$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
@@ -2026,7 +2027,7 @@
 	$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,
+      <para>$B%F%9%H%^%7%s$K$"$k$b$N$9$Y$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>
 
@@ -2035,7 +2036,7 @@
 
       <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
+	$B%S%k%I%;%C%H$N$9$Y$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.

----Next_Part(Sun_Jul_28_21:59:32_2002_398)----
