diff ja/filenames.tex @ 835:8a3041e6f3cb

reflect comments by Hiroshi Someya.

--- a/ja/filenames.tex	Fri Jul 10 02:32:17 2009 +0900
+++ b/ja/filenames.tex	Sat Jul 11 19:25:35 2009 +0900
@@ -22,8 +22,8 @@
 
 %If you explicitly name real files on the command line, Mercurial works
 %with exactly those files, as you would expect.
-$B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$O$=$l$i(B
-$B$N%U%!%$%k$=$N$b$N$r07$&!%(B
+$B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$OM?$($i(B
+$B$l$?%U%!%$%k$@$1$r07$&!%(B
 \interaction{filenames.files}
 
 %When you provide a directory name, Mercurial will interpret this as
@@ -66,10 +66,10 @@
 %  or pattern (see below).  This protects you from accidentally
 %  deleting files by running \hgcmd{remove} with no arguments, for
 %  example.
- \item $BI|85$,Fq$7$+$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:GDc(B
-       1$B$D$NL>A0$d%Q%?!<%s$rM[$KMW5a$9$k!%!J2<5-$r;2>H!%!K$3$l$K$h$j!$Nc(B
-       $B$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$3$H$K$h$C$F8m$C$F%U%!%$%k$r(B
-       $B$9$Y$F>C$7$?$j$9$k$3$H$,$J$/$J$k!%(B
+ \item $BI|85$,:$Fq$G$"$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:G(B
+       $BDc(B1$B$D$NL>A0$d%Q%?!<%s$rL@<($9$k$3$H$r5a$a$k!J2<5-$r;2>H!%!K!%$3$&(B
+       $B$9$k$3$H$G!$Nc$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$?$a$K%U%!%$%k(B
+       $B$9$Y$F$r8m$C$F>C$9$3$H$,$J$/$J$k!%(B
 \end{itemize}
 
 %It's easy to work around these default behaviours if they don't suit
@@ -87,27 +87,20 @@
 %Along the same lines, some commands normally print file names relative
 %to the root of the repository, even if you're invoking them from a
 %subdirectory.  Such a command will print file names relative to your
-
 %subdirectory if you give it explicit names.  Here, we're going to run
-
 %\hgcmd{status} from a subdirectory, and get it to operate on the
 %entire working directory while printing file names relative to our
-
 %subdirectory, by passing it the output of the \hgcmd{root} command.
 %\interaction{filenames.wdir-relname}
 
-$B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%j%]%8%H%j$N%k!<%H$X$NAjBP%Q%9$G%U%!%$%kL>(B
-$B$rI=<($9$k%3%^%s%I$b$"$k!%$=$N$h$&$J%3%^%s%I$G$O!$%5%V%G%#%l%/%H%j$NL>A0(B
-$B$rL@<(E*$KM?$($k$H!$%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$rI=<($9$k$h$&$K$J$k!%(B
-
-$B$3$3$G$O%5%V%G%#%l%/%H%j$+$i(B\hgcmd{status}$B$r<B9T$9$k:]$K!$(B
-
-
-$B$7$F!$(B
-$B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%jA4BN$N%U%!%$%kL>$r%5%V%G%#%l%/%H%j$KBP$7$FAjBPE*$K(B
-$BI=<($9$kMM$r8+$F$_$h$&!%(B
-
-
+$B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%U%!%$%kL>$r%j%]%8%H%j$N%k!<%H$+$i$NAjBP%Q(B
+$B%9$GI=<($9$k%3%^%s%I$,$"$k!%$=$N$h$&$J%3%^%s%I$KL@<(E*$K%5%V%G%#%l%/%H%j(B
+$BL>$rM?$($k$H!$8=:_$N%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$,I=<($5$l$k!%$3$3$G!$(B
+$B%5%V%G%#%l%/%H%jFb$+$i(B\hgcmd{status}$B%3%^%s%I$K(B\hgcmd{root}$B%3%^%s%I$N=PNO(B
+$B$r0z?t$H$7$FM?$($F5/F0$7!$(B \hgcmd{status}$B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%j(B
+$BFb$N%U%!%$%k$r8=:_$N%5%V%G%#%l%/%H%j$KBP$9$kAjBP%Q%9$GI=<($9$kMM;R$r8+$F(B
+$B$_$h$&!%(B
+\interaction{filenames.wdir-relname}
 
 
 %\section{Telling you what's going on}
@@ -593,7 +586,8 @@
 $B$A$OLdBj$H$J$i$J$$!%$7$+$7%o!<%-%s%0%G%#%l%/%H%j$r$=$N%A%'%s%8%;%C%H$K(B
 \hgcmd{update}$B$7$h$&$H$7$?$j!$$=$N%A%'%s%8%;%C%H$H(B\hgcmd{merge}$B$7$h$&$H$9(B
 $B$k$H!$(BMercurial$B$O!$(B 2$B$D$N%U%!%$%kL>$r%U%!%$%k%7%9%F%`$,F1$8L>A0$H$7$F07$&(B
-$B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B update$B$d(Bmerge$B$r5v$5$J$$!%(B
+$B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B \hgcmd{update}$B$d(B\hgcmd{merge}$B$r5v$5$J(B
+$B$$!%(B
 
 %\subsection{Fixing a case conflict}
 \subsection{$BBgJ8;z>.J8;z$N>WFM$r2r7h$9$k(B}
@@ -627,7 +621,7 @@
 %you can continue development unimpeded.
 
 $BBg>.J8;z$N%U%!%$%kL>%3%s%U%j%/%H$,$"$k%A%'%s%8%;%C%H$O%W%m%8%'%/%H$NMzNr(B
-$B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B$7$9$F$`$G$O$=$N%A%'%s%8%;%C%H$X(B
+$B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B%7%9%F%`$G$O$=$N%A%'%s%8%;%C%H$X(B
 \hgcmd{update}$B$9$k$3$H$O$G$-$J$$$b$N$N!$LdBj$J$/3+H/$rB3$1$k$3$H$,$G$-$k!%(B