diff ja/cmdref.tex @ 292:f72e4be6dd37

intermediate commit.

--- a/ja/cmdref.tex	Thu Feb 07 15:52:15 2008 +0900
+++ b/ja/cmdref.tex	Thu Feb 07 18:56:42 2008 +0900
@@ -90,69 +90,116 @@
 
 \optref{diff}{p}{show-function}
 
-Display the name of the enclosing function in a hunk header, using a
-simple heuristic.  This functionality is enabled by default, so the
-\hgopt{diff}{-p} option has no effect unless you change the value of
-the \rcitem{diff}{showfunc} config item, as in the following example.
+%Display the name of the enclosing function in a hunk header, using a
+%simple heuristic.  This functionality is enabled by default, so the
+%\hgopt{diff}{-p} option has no effect unless you change the value of
+%the \rcitem{diff}{showfunc} config item, as in the following example.
+%\interaction{cmdref.diff-p}
+
+$B%O%s%/%X%C%@$NCf$K4^$^$l$F$$$k4X?t$NL>A0$rI=<($9$k!%8!:w$OC1=c$JH/8+E*J}(B
+$BK!$G9T$J$&!%$3$N5!G=$O%G%U%)%k%H$GM-8z$K$5$l$F$*$j!$(B\hgopt{diff}{-p}$B%*%W(B
+$B%7%g%s$O2<$NNc$N$h$&$K(B\rcitem{diff}{showfunc}$B@_Dj$rJQ99$5$l$k$^$G0UL#$r$J(B
+$B$5$J$$!%(B
 \interaction{cmdref.diff-p}
 
 \optref{diff}{r}{rev}
 
-Specify one or more revisions to compare.  The \hgcmd{diff} command
-accepts up to two \hgopt{diff}{-r} options to specify the revisions to
-compare.
+%Specify one or more revisions to compare.  The \hgcmd{diff} command
+%accepts up to two \hgopt{diff}{-r} options to specify the revisions to
+%compare.
+
+$BHf3S$9$kBP>]$N%j%S%8%g%s$r0l$D0J>e;XDj$9$k!%(B\hgcmd{diff}$B%3%^%s%I$O!$(B
+$BHf3S$9$k%j%S%8%g%s$r;XDj$9$k$?$a$K(B\hgopt{diff}{-r}$B%*%W%7%g%s$r(B2$B$D$^(B
+$B$G<u$1IU$1$k!%(B
+
+%\begin{enumerate}
+%\setcounter{enumi}{0}
+%\item Display the differences between the parent revision of the
+%  working directory and the working directory.
+%\item Display the differences between the specified changeset and the
+%  working directory.
+%\item Display the differences between the two specified changesets.
+%\end{enumerate}
 
 \begin{enumerate}
 \setcounter{enumi}{0}
-\item Display the differences between the parent revision of the
-  working directory and the working directory.
-\item Display the differences between the specified changeset and the
-  working directory.
-\item Display the differences between the two specified changesets.
+\item $B?F%j%S%8%g%s$N%o!<%-%s%0%G%#%l%/%H%j$H!$8=:_$N%o!<%-%s%0%G%#%l%/%H(B
+      $B%j$N:9J,$rI=<(!%(B
+\item $B;XDj$5$l$?%A%'%s%8%;%C%H$H8=:_$N%o!<%-%s%0%G%#%l%/%H%j$N:9J,$rI=<(!%(B
+\item $B;XDj$5$l$?(B2$B$D$N%A%'%s%8%;%C%H4V$N:9J,$rI=<(!%(B
 \end{enumerate}
 
-You can specify two revisions using either two \hgopt{diff}{-r}
-options or revision range notation.  For example, the two revision
-specifications below are equivalent.
+%You can specify two revisions using either two \hgopt{diff}{-r}
+%options or revision range notation.  For example, the two revision
+%specifications below are equivalent.
+
+2$B$D$N%j%S%8%g%s$r;XDj$9$kJ}K!$H$7$F!$(B\hgopt{diff}{-r}$B$r(B2$B$D;H$C$F$b$$$$$7!$(B
+$B%j%S%8%g%s%l%s%85-K!$r;H$C$F$bNI$$!%Nc$($P!$2<$N(B2$B$D$N%j%S%8%g%s;XDj$OEy(B
+$B2A$G$"$k!%(B
 \begin{codesample2}
   hg diff -r 10 -r 20
   hg diff -r10:20
 \end{codesample2}
 
-When you provide two revisions, Mercurial treats the order of those
-revisions as significant.  Thus, \hgcmdargs{diff}{-r10:20} will
-produce a diff that will transform files from their contents as of
-revision~10 to their contents as of revision~20, while
-\hgcmdargs{diff}{-r20:10} means the opposite: the diff that will
-transform files from their revision~20 contents to their revision~10
-contents.  You cannot reverse the ordering in this way if you are
-diffing against the working directory.
+%When you provide two revisions, Mercurial treats the order of those
+%revisions as significant.  Thus, \hgcmdargs{diff}{-r10:20} will
+%produce a diff that will transform files from their contents as of
+%revision~10 to their contents as of revision~20, while
+%\hgcmdargs{diff}{-r20:10} means the opposite: the diff that will
+%transform files from their revision~20 contents to their revision~10
+%contents.  You cannot reverse the ordering in this way if you are
+%diffing against the working directory.
+
+2$B$D$N%j%S%8%g%s$r;XDj$9$k;~!$%j%S%8%g%s;XDj$N=g=x$K$O0UL#$,$"$k!%(B
+\hgcmdargs{diff}{-r10:20}$B$O%U%!%$%k$NFbMF$,%j%S%8%g%s(B10$B$+$i%j%S%8%g%s(B20
+$B$KJQ$o$C$?$H$7$F:9J,$r:n@.$9$k!%(B\hgcmdargs{diff}{-r20:10}$B$G$"$l$P5U$N0U(B
+$BL#$K$J$k!%%o!<%-%s%0%G%#%l%/%H%j$N:9J,$r<h$k>l9g$K$O$3$N$h$&$K%j%S%8%g%s(B
+$B$N=g=x$r5U$K$9$k$3$H$O$G$-$J$$!%(B
 
 \optref{diff}{w}{ignore-all-space}
 
-\cmdref{version}{print version and copyright information}
+\cmdref{version}{$B%P!<%8%g%s>pJs$H%3%T!<%i%$%H>pJs$rI=<($9$k(B}
 
-This command displays the version of Mercurial you are running, and
-its copyright license.  There are four kinds of version string that
-you may see.
+%This command displays the version of Mercurial you are running, and
+%its copyright license.  There are four kinds of version string that
+%you may see.
+$B$3$N%3%^%s%I$O8=:_F0:nCf$N(BMercurial$B$N%P!<%8%g%s$H%3%T!<%i%$%H%i%$%;%s%9(B
+$B$rI=<($9$k!%%a%C%;!<%8$O(B4$B<oN`$"$k!%(B
+%\begin{itemize}
+%\item The string ``\texttt{unknown}''. This version of Mercurial was
+%  not built in a Mercurial repository, and cannot determine its own
+%  version.
+%\item A short numeric string, such as ``\texttt{1.1}''. This is a
+%  build of a revision of Mercurial that was identified by a specific
+%  tag in the repository where it was built.  (This doesn't necessarily
+%  mean that you're running an official release; someone else could
+%  have added that tag to any revision in the repository where they
+%  built Mercurial.)
+%\item A hexadecimal string, such as ``\texttt{875489e31abe}''.  This
+%  is a build of the given revision of Mercurial.
+%\item A hexadecimal string followed by a date, such as
+%  ``\texttt{875489e31abe+20070205}''.  This is a build of the given
+%  revision of Mercurial, where the build repository contained some
+%  local changes that had not been committed.
+%\end{itemize}
 \begin{itemize}
-\item The string ``\texttt{unknown}''. This version of Mercurial was
-  not built in a Mercurial repository, and cannot determine its own
-  version.
-\item A short numeric string, such as ``\texttt{1.1}''. This is a
-  build of a revision of Mercurial that was identified by a specific
-  tag in the repository where it was built.  (This doesn't necessarily
-  mean that you're running an official release; someone else could
-  have added that tag to any revision in the repository where they
-  built Mercurial.)
-\item A hexadecimal string, such as ``\texttt{875489e31abe}''.  This
-  is a build of the given revision of Mercurial.
-\item A hexadecimal string followed by a date, such as
-  ``\texttt{875489e31abe+20070205}''.  This is a build of the given
-  revision of Mercurial, where the build repository contained some
-  local changes that had not been committed.
+\item $BJ8;zNs(B``\texttt{unknown}''$B!%(B $B$3$N%P!<%8%g%s$N(BMercurial$B$O(BMercurial$B%j(B
+      $B%]%8%H%j$NCf$G%S%k%I$5$l$?$N$G$O$J$$$?$a!$<+J,<+?H$N%j%S%8%g%s$OJ,(B
+      $B$+$i$J$$(B
+\item ``\texttt{1.1}''$B$N$h$&$JC;$$?tCMJ8;zNs!%$3$l$O%S%k%I%j%]%8%H%jFb$G(B
+      $B%?%0IU$1$5$l$?FCDj$N%j%S%8%g%s$N(BMercurial$B$G$"$k$3$H$r<($9!%!J$3$l$O(B
+      $B@5<0%j%j!<%9HG$G$"$k$H$$$&$3$H$rI,$:$7$b0UL#$7$J$$!%(BMercurial$B$r%S%k(B
+      $B%I$9$k%j%]%8%H%j$G%?%0$rIU$1$k$N$OC/$G$b$I$N%j%S%8%g%s$KBP$7$F$b2D(B
+      $BG=$G$"$k!K(B
+\item ``\texttt{875489e31abe}''$B$N$h$&$J(B16$B?J?tJ8;zNs!%$3$l$O(BMercurial$B$,I=(B
+      $B<($5$l$?%j%S%8%g%s$N%S%k%I$G$"$k$3$H$r<($9!%(B
+
+\item ``\texttt{875489e31abe+20070205}''$B$N$h$&$J(B16$B?JJ8;zNs!\F|IU!%$3$l$O(B
+      $B$=$N%j%S%8%g%s$KBP$7$F%3%_%C%H$5$l$F$$$J$$%m!<%+%k$JJQ99$r2C$($?%=!<(B
+      $B%9$+$i%S%k%I$5$l$?(BMercurial$B$G$"$k$3$H$r<($9!%(B
 \end{itemize}
 
+%\subsection{Tips and tricks}
 \subsection{Tips and tricks}
 
 \subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status}
@@ -203,6 +250,6 @@
 binary patches at all.
 
 %%% Local Variables: 
-%%% mode: latex
+%%% mode: yatex
 %%% TeX-master: "00book"
 %%% End: