From owner-man-jp-reviewer@jp.freebsd.org  Sun Dec  5 17:25:26 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id RAA20968;
	Sun, 5 Dec 1999 17:25:26 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id RAA20963
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 5 Dec 1999 17:25:25 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (pppa13.yk.rim.or.jp [202.247.186.13])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id RAA29581
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 5 Dec 1999 17:25:24 +0900 (JST)
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19991205172435N.k-horik@yk.rim.or.jp>
Date: Sun, 05 Dec 1999 17:24:35 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 161
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: man-jp-reviewer 1758
Subject: [man-jp-reviewer 1758] (check) mergemaster.8
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

 $BKY@n$G$9!#(B

 mergemaster.8 $B$N%A%'%C%/$G$9!#(B

 o root
   wordlist $B$K$"$o$;$F!"%U%!%$%k%7%9%F%`$N(B root $B$r!V%k!<%H!W$K$7$^$7$?!#(B

 o temporary
   - temporary root environment : $B2>$N%k!<%H4D6-(B
   $B$K$"$o$;$F(B
   - temporary file             : $B2>$N%U%!%$%k(B
   - temporary directory        : $B2>$N%G%#%l%/%H%j(B
   $B$K$7$^$7$?!#(B

--- mergemaster.8~	Sun Dec  5 15:01:55 1999
+++ mergemaster.8	Sun Dec  5 17:12:14 1999
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.1 1999/11/03 20:58:47 billf Exp $
 .\"
-.Dd September 10, 1999
 .\" jpman %Id: mergemaster.8,v 1.2 1999/11/30 16:13:21 mzaki Stab %
+.Dd September 10, 1999
 .Dt MERGEMASTER 8
 .Os FreeBSD
 .Sh $BL>>N(B
@@ -53,9 +53,9 @@
 .Pa /usr/src/etc/Makefile
 $B$r;H$C$F(B
 .Pa /
-$B$+$i2<$N(B root $B4D6-$r2>$K:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B
+$B$+$i2<$N2>$N%k!<%H4D6-$r:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B
 .Op Fl m
-$B%3%^%s%I%i%$%s%*%W%7%g%s$G0c$&%=!<%9%G%#%l%/%H%j$r;XDj$9$k$3$H$b$G$-$^$9!#(B
+$B%3%^%s%I%i%$%s%*%W%7%g%s$G!"0c$&%=!<%9%G%#%l%/%H%j$r;XDj$9$k$3$H$b$G$-$^$9!#(B
 $B$=$7$F$=$N4D6-Cf$N$=$l$>$l$N%U%!%$%k$r!"(B
 $B%$%s%9%H!<%k$5$l$F$$$k$b$N$HHf3S$7$^$9!#(B
 $B%9%/%j%W%H$,?7$7$$%U%!%$%k$KJQ99E@$r8+$D$1$?>l9g$d!"(B
@@ -66,22 +66,22 @@
 $B?75l$N%U%!%$%k$r(B
 .Xr sdiff 1
 $B$r;H$C$FE,@Z$K%^!<%8$9$k!"(B
-$B8e$G<j$G%^!<%8$9$k$?$a$K%U%!%$%k$r2>$N(B root $B4D6-$K;D$7$F$*$/!"(B
+$B8e$G<j$G%^!<%8$9$k$?$a$K%U%!%$%k$r2>$N%k!<%H4D6-$K;D$7$F$*$/!"(B
 $B$N$$$:$l$+$rA*$Y$^$9!#(B
 .Pp
 $B%G%U%)%k%H$G$O!"(B
 .Pa /var/tmp/temproot
-$B$K2>$N(B root $B$r:n$j!"(B
+$B$K2>$N%k!<%H$r:n$j!"(B
 .Xr cvs 1
 $B%P!<%8%g%sJ8;zNs(B $Id/$FreeBSD $B$,$"$k%U%!%$%k$K$D$$$F$O$=$l$rHf3S$7$F!"(B
-$B$b$7F1$8$G$"$l$P0l;~%U%!%$%k$r:o=|$7$^$9!#(B
+$B$b$7F1$8$G$"$l$P2>$N%U%!%$%k$r:o=|$7$^$9!#(B
 $Id $BJ8;zNs$,$J$$;~$d!"$"$C$F$b0lCW$7$J$$>l9g$K$O!"(B
 $B%U%!%$%k$=$N$b$N$rHf3S$7$^$9!#(B
 $Id $BJ8;zNs$rL5;k$7$FA4$F$N%U%!%$%k$rHf3S$9$k$h$&$K;XDj$9$k$3$H$b$G$-$^$9!#(B
 .Pp
 .Nm
-$B$O(B umask $B$rD4$Y$F!"(B 022 $B0J30$G$"$l$P7Y9p$r=P$7$^$9!#(B
-$B$[$H$s$I$N@_Dj%U%!%$%k$K(B world read $B%Q!<%_%C%7%g%s$rM?$($k$3$H$,(B
+$B$O(B umask $B$rD4$Y$F!"(B022 $B0J30$G$"$l$P7Y9p$r=P$7$^$9!#(B
+$B$[$H$s$I$N@_Dj%U%!%$%k$O(B world read $B%Q!<%_%C%7%g%s$rM?$($k$3$H$,(B
 $B6/@)$5$l$F$$$k$o$1$G$O$"$j$^$;$s$,!"(B
 $B$=$&$7$J$$$HLdBj$K$J$k$+$b$7$l$^$;$s!#(B
 $B$b$7(B 022 $B0J30(B $B$N(B umask $B$rA*$S!"$"$H$G2?$i$+$N%H%i%V%k$,@8$8$?>l9g!"(B
@@ -112,7 +112,7 @@
 .It Fl c
 unified diff $B$NBe$o$j$K(B context diff $B$rMQ$$$^$9!#(B
 .It Fl r
-$B2>$N(B root $B4D6-$r?75,$K:n$k$3$H$r$;$:$K!"(B
+$B2>$N%k!<%H4D6-$r?75,$K:n$k$3$H$r$;$:$K!"(B
 $B0JA0A]=|$7$?%G%#%l%/%H%j$G:F<B9T$7$^$9!#(B
 $B$3$N%*%W%7%g%s$OB>$NA4$F$N%*%W%7%g%s$H0l=o$K;H$($^$9!#(B
 .It Fl v
@@ -127,30 +127,30 @@
 .It Fl a
 $B<+F0<B9T!#(B
 $B$3$N%*%W%7%g%s$O%$%s%9%H!<%k$5$l$F$$$k$b$N$H?)$$0c$&A4$F$N%U%!%$%k$r!"(B
-$B<j$G=hM}$9$k$?$a$K0l;~%G%#%l%/%H%j$K;D$7$F$*$-$^$9!#(B
+$B<j$G=hM}$9$k$?$a$K2>$N%G%#%l%/%H%j$K;D$7$F$*$-$^$9!#(B
 $B$b$7$9$G$K(B
 .Pa temproot
 $B%G%#%l%/%H%j$,$"$k>l9g$K$O!"(B
 $B0JA0$O$J$+$C$?%G%#%l%/%H%j$K?7$7$/:n$j$^$9!#(B
 $B$3$N%*%W%7%g%s$O>iD9%U%i%0$r2r=|$7$^$9$,!"(B
 $BB>$NA4$F$N%*%W%7%g%s$H0l=o$K;H$($^$9!#(B
--a $B%*%W%7%g%s$r;H$&$H!"(B -w $B%*%W%7%g%s$OL50UL#$K$J$j$^$9!#(B
+-a $B%*%W%7%g%s$r;H$&$H!"(B-w $B%*%W%7%g%s$OL50UL#$K$J$j$^$9!#(B
 .It Fl h
 $B;HMQK!$H%X%k%W>pJs$rI=<($7$^$9!#(B
 .It Fl m Ar /path/to/sources
 .Xr make 1
 $B$r<B9T$9$k%G%#%l%/%H%j$N%Q%9$r;XDj$7$^$9!#(B
-$B!J8@$$BX$($k$H%=!<%9$N>l=j$G$9!#(B -s $B$,$b$&;H$o$l$F$$$k$N$G!K(B
+($B8@$$BX$($k$H%=!<%9$N>l=j$G$9!#(B-s $B$,$b$&;H$o$l$F$$$k$N$G(B)
 .It Fl t Ar /path/to/temp/root
-$B2>$N(B root $B4D6-$r%G%U%)%k%H$N(B
+$B2>$N%k!<%H4D6-$r%G%U%)%k%H$N(B
 .Pa /var/tmp/temproot
 $B$NBe$o$j$K(B
 .Pa /path/to/temp/root
 $B$K:n$j$^$9!#(B
 .It Fl d
-$B2>$N(B root $B%G%#%l%/%H%j$NL>A0$K!"F|IU$H;~4V$rB-$7$^$9!#(B
--t $B%*%W%7%g%s$r;XDj$7$F$$$k$H$-$O!"(B
-$BF|IU$rB-$7$?$$$J$i$3$N%*%W%7%g%s$O$=$N8e$m$K$D$1$J$1$l$P$J$j$^$;$s!#(B
+$B2>$N%k!<%H%G%#%l%/%H%j$NL>A0$K!"F|IU$H;~4V$rB-$7$^$9!#(B
+-t $B%*%W%7%g%s$r;XDj$7$F$$$k$H$-$KF|IU$bB-$7$?$$$J$i!"(B
+$B$3$N%*%W%7%g%s$O(B -t $B$N8e$KCV$/I,MW$,$"$j$^$9!#(B
 .It Fl u Ar N
 umask $B$r?t;z$G;XDj$7$^$9!#%G%U%)%k%H$O(B 022 $B$G$9!#(B
 .It Fl w Ar N
@@ -185,7 +185,7 @@
 .Dl # mergemaster -cv
 .Pp
 .Nm
-$B$,2>$N(B root $B4D6-$r(B
+$B$,2>$N%k!<%H4D6-$r(B
 .Pa /usr/tmp/root
 $B$K:n$k$h$&$K;XDj$9$k$K$O(B:
 .Pp
@@ -207,7 +207,7 @@
 # mergemaster $B$N%*%W%7%g%s$,!"%G%U%)%k%HCM$H$H$b$K0lMw$7$F$"$j$^$9(B
 # $B0J2<$N%*%W%7%g%s$O%3%^%s%I%i%$%s$,>e=q$-$7$^$9(B
 #
-# $B2>$N(B root $B4D6-$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j(B
+# $B2>$N%k!<%H4D6-$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j(B
 #TEMPROOT='/var/tmp/temproot'
 #
 # CVS $Id $B$N8!::$r>JN,$7$FA4$F$N%U%!%$%k$rHf3S$9$k87L)$JHf3S(B
@@ -252,16 +252,16 @@
 .Pa $B$d$C$F$_$h$&$h(B ``make world'' ,
 by MAEKAWA Masahide)
 .Sh $B?GCG(B
-$B@.8y=*N;!"$J$$$7%f!<%6!<$,<B9TCf$K<jF0$GC&=P$7$?>l9g$K$O!"(B
+$B@.8y=*N;!"$J$$$7%f!<%6$,<B9TCf$K<jF0$GC&=P$7$?>l9g$K$O!"(B
 $B=*N;%9%F!<%?%9$O(B 0 $B$G$9!#(B
 .Pp
-$B0J2<$K5s$2$k$$$:$l$+$NM}M3$G<:GT$7$?>l9g$K$O=*N;%9%F!<%?%9$O(B 1 $B$G$9(B:
+$B0J2<$K5s$2$k$$$:$l$+$NM}M3$G<:GT$7$?>l9g$K$O!"=*N;%9%F!<%?%9$O(B 1 $B$G$9(B:
 .Pp
 $B%3%^%s%I%i%$%s%*%W%7%g%s$,IT@5(B
 .Pp
-$B2>$N(B root $B4D6-$r:n@.$9$k$N$K<:GT$7$?(B
+$B2>$N%k!<%H4D6-$r:n@.$9$k$N$K<:GT(B
 .Pp
-$B2>$N(B root $B$K%U%!%$%k$r3JG<$9$k$N$K<:GT$7$?!#(B
+$B2>$N%k!<%H$K%U%!%$%k$r3JG<$9$k$N$K<:GT(B
 .Pp
 .Sh $BNr;K(B
 .Nm
@@ -271,7 +271,7 @@
 $B$b$C$HC1=c$J7A$G(B
 .Pa comproot
 $B$H$$$&L>A0$G:G=i$K8x3+$5$l$^$7$?!#(B
-$B2>$N(B root $B4D6-$r:n$k$H$$$&%"%$%G%"$O!"(B
+$B2>$N%k!<%H4D6-$r:n$k$H$$$&%"%$%G%"$O!"(B
 $B>e$G;2>H$7$?(B Nik Clayton $B$N(B make world tutorial $B$+$iMh$F$$$^$9!#(B
 .Pp
 .Sh $B:n<T(B
