From owner-man-jp-reviewer@jp.FreeBSD.org Sat Dec  1 00:05:08 2007
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id lAUF58237091;
	Sat, 1 Dec 2007 00:05:08 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.asahi-net.or.jp (mail2.asahi-net.or.jp [202.224.39.198])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id lAUF58637086
	for <man-jp-reviewer@jp.FreeBSD.org>; Sat, 1 Dec 2007 00:05:08 +0900 (JST)
	(envelope-from CQG00620@nifty.ne.jp)
Received: from asahi-net.jp (h204198.ppp.asahi-net.or.jp [61.114.204.198])
	by mail.asahi-net.or.jp (Postfix) with ESMTP id 423FE51244
	for <man-jp-reviewer@jp.FreeBSD.org>; Sat,  1 Dec 2007 00:05:08 +0900 (JST)
From: Watanabe Kazuhiro <CQG00620@nifty.ne.jp>
To: jpman reviewer <man-jp-reviewer@jp.FreeBSD.org>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8
 (=?ISO-8859-4?Q?Shij=F2?=) APEL/10.7 Emacs/20.7 (i386--freebsd) MULE/4.1
 (AOI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=ISO-2022-JP
Message-Id: <20071130150508.423FE51244@mail.asahi-net.or.jp>
Reply-To: man-jp-reviewer@jp.FreeBSD.org
Precedence: list
Date: Sat, 01 Dec 2007 00:02:24 +0900
X-Sequence: man-jp-reviewer 5177
Subject: [man-jp-reviewer 5177] diff.1 diff3.1 sdiff.1 (6.3-RC1)
Sender: owner-man-jp-reviewer@jp.FreeBSD.org
X-Originator: CQG00620@nifty.ne.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+060209

$BEOJU0l42$G$9!#(B

diff $B$N%P!<%8%g%s$,>e$,$C$?$h$&$G$9$,!"%^%K%e%"%k$,(B help2man $B$N=PNO$K(B
$B4JAG2=$5$lJLJ*$K$J$C$F$7$^$C$?$N$G!"?75,$KLu$7$^$7$?!#BP>]$H$J$k$N$O(B

diff.1
diff3.1
sdiff.1

$B$G$9!#(B

--- diff.1.orig	Tue Nov 27 21:59:29 2007
+++ diff.1	Thu Nov 29 22:37:43 2007
@@ -1,121 +1,127 @@
+.\" $FreeBSD$
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
 .TH DIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
-.SH NAME
-diff \- compare files line by line
-.SH SYNOPSIS
+.SH $BL>>N(B
+diff \- $B9TC10L$G%U%!%$%k$rHf3S$9$k(B
+.SH $B=q<0(B
 .B diff
 [\fIOPTION\fR]... \fIFILES\fR
-.SH DESCRIPTION
-Compare files line by line.
+.SH $B2r@b(B
+$B9TC10L$G%U%!%$%k$rHf3S$7$^$9!#(B
 .TP
 \fB\-i\fR  \fB\-\-ignore\-case\fR
-Ignore case differences in file contents.
+$B%U%!%$%k$NFbMF$K$*$1$k(B
+$B1QBgJ8;z$H>.J8;z$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-\-ignore\-file\-name\-case\fR
-Ignore case when comparing file names.
+$B%U%!%$%kL>$NHf3S$N:]$K(B
+$B1QBgJ8;z$H>.J8;z$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-\-no\-ignore\-file\-name\-case\fR
-Consider case when comparing file names.
+$B%U%!%$%kL>$NHf3S$N:]$K(B
+$B1QBgJ8;z$H>.J8;z$N0c$$$rL5;k$7$^$;$s!#(B
 .TP
 \fB\-E\fR  \fB\-\-ignore\-tab\-expansion\fR
-Ignore changes due to tab expansion.
+$B%?%V$NE83+$K$h$k0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-b\fR  \fB\-\-ignore\-space\-change\fR
-Ignore changes in the amount of white space.
+$B6uGr$N?t$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-w\fR  \fB\-\-ignore\-all\-space\fR
-Ignore all white space.
+$B$9$Y$F$N6uGr$rL5;k$7$^$9!#(B
 .TP
 \fB\-B\fR  \fB\-\-ignore\-blank\-lines\fR
-Ignore changes whose lines are all blank.
+$B6u9T$N?t$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-I\fR RE  \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
-Ignore changes whose lines all match RE.
+$B@55,I=8=(B RE $B$K%^%C%A$9$k9T$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-\-strip\-trailing\-cr\fR
-Strip trailing carriage return on input.
+$BF~NO$N9TKv$N2~9T$r<h$j=|$-$^$9!#(B
 .TP
 \fB\-a\fR  \fB\-\-text\fR
-Treat all files as text.
+$B$9$Y$F$N%U%!%$%k$r%F%-%9%H$H$_$J$7$^$9!#(B
 .TP
 \fB\-c\fR  \fB\-C\fR NUM  \fB\-\-context\fR[=\fINUM\fR]
-Output NUM (default 3) lines of copied context.
+$B:9J,$rA08e(B NUM $B9T(B ($B%G%U%)%k%H$O(B 3) $B$H6&$K(B context $B7A<0$G=PNO$7$^$9!#(B
 .TP
 \fB\-u\fR  \fB\-U\fR NUM  \fB\-\-unified\fR[=\fINUM\fR]
-Output NUM (default 3) lines of unified context.
+$B:9J,$rA08e(B NUM $B9T(B ($B%G%U%)%k%H$O(B 3) $B$H6&$K(B unified $B7A<0$G=PNO$7$^$9!#(B
 .TP
 \fB\-\-label\fR LABEL
-Use LABEL instead of file name.
+$B=PNO$N%X%C%@$KIU2C$5$l$k%U%!%$%kL>$NBe$o$j$K!"%i%Y%k(B LABEL $B$r;HMQ$7$^$9!#(B
 .TP
 \fB\-p\fR  \fB\-\-show\-c\-function\fR
-Show which C function each change is in.
+$B:9J,$,4^$^$l$k(B C $B$N4X?t$rI=<($7$^$9!#(B
 .TP
 \fB\-F\fR RE  \fB\-\-show\-function\-line\fR=\fIRE\fR
-Show the most recent line matching RE.
+$B:9J,$N%V%m%C%/$K@h9T$7!"$+$D@55,I=8=(B RE $B$K%^%C%A$9$k9T$N$&$A$G(B
+$B$b$C$H$b%V%m%C%/$K6a$$9T$r!":9J,$N%V%m%C%/Kh$KI=<($7$^$9!#(B
 .TP
 \fB\-q\fR  \fB\-\-brief\fR
-Output only whether files differ.
+$B%U%!%$%k$,0c$C$F$$$k$+$I$&$+$@$1$r=PNO$7$^$9!#(B
 .TP
 \fB\-e\fR  \fB\-\-ed\fR
-Output an ed script.
+ed $B%9%/%j%W%H$N7A<0$G=PNO$7$^$9!#(B
 .TP
 \fB\-\-normal\fR
-Output a normal diff.
+$BDL>o7A<0$N:9J,$r=PNO$7$^$9!#(B
 .TP
 \fB\-n\fR  \fB\-\-rcs\fR
-Output an RCS format diff.
+RCS $B7A<0$N:9J,$r=PNO$7$^$9!#(B
 .TP
 \fB\-y\fR  \fB\-\-side\-by\-side\fR
-Output in two columns.
+2 $BCJAH$_7A<0$G=PNO$7$^$9!#(B
 .TP
 \fB\-W\fR NUM  \fB\-\-width\fR=\fINUM\fR
-Output at most NUM (default 130) print columns.
+2 $BCJAH$_7A<0$K$*$$$F!"9T$NI}$r(B NUM $B9T(B ($B%G%U%)%k%H$O(B 130) $B$G=PNO$7$^$9!#(B
 .TP
 \fB\-\-left\-column\fR
-Output only the left column of common lines.
+2 $BCJAH$_7A<0$K$*$$$F!"6&DL$9$k9T$N:8$NCJ$N$_=PNO$7$^$9!#(B
 .TP
 \fB\-\-suppress\-common\-lines\fR
-Do not output common lines.
+2 $BCJAH$_7A<0$K$*$$$F!"6&DL$9$k9T$rI=<($7$^$;$s!#(B
 .TP
 \fB\-D\fR NAME  \fB\-\-ifdef\fR=\fINAME\fR
-Output merged file to show `#ifdef NAME' diffs.
+$B:9J,$r(B `#ifdef NAME' $B7A<0$K%^!<%8$7$F=PNO$7$^$9!#(B
 .TP
 \fB\-\-GTYPE\-group\-format\fR=\fIGFMT\fR
-Similar, but format GTYPE input groups with GFMT.
+\fB\-D\fR $B$H;w$F$$$^$9$,!"(BGTYPE $B$NF~NO%0%k!<%W$r(B GFMT $B$G%U%)!<%^%C%H$7$^$9!#(B
 .TP
 \fB\-\-line\-format\fR=\fILFMT\fR
-Similar, but format all input lines with LFMT.
+\fB\-D\fR $B$H;w$F$$$^$9$,!"$9$Y$F$NF~NO9T$r(B LFMT $B$G%U%)!<%^%C%H$7$^$9!#(B
 .TP
 \fB\-\-LTYPE\-line\-format\fR=\fILFMT\fR
-Similar, but format LTYPE input lines with LFMT.
+\fB\-D\fR $B$H;w$F$$$^$9$,!"(BLTYPE $B$NF~NO9T$r(B LFMT $B$G%U%)!<%^%C%H$7$^$9!#(B
 .TP
-LTYPE is `old', `new', or `unchanged'.
-GTYPE is LTYPE or `changed'.
+$B$3$3$G(B LTYPE $B$O(B `old', `new', $B$^$?$O(B `unchanged' $B$G$9!#(B
+$B$^$?(B GTYPE $B$O(B LTYPE $B$^$?$O(B `changed' $B$G$9!#(B
 .IP
-GFMT may contain:
+$B0J2<$,(B GFMT $B$K;HMQ2DG=$G$9(B:
 .TP
 %<
-lines from FILE1
+FILE1 $B$K4^$^$l$k9T(B
 .TP
 %>
-lines from FILE2
+FILE2 $B$K4^$^$l$k9T(B
 .TP
 %=
-lines common to FILE1 and FILE2
+FILE1 $B$H(B FILE2 $B$G6&DL$N9T(B
 .TP
 %[-][WIDTH][.[PREC]]{doxX}LETTER
-printf-style spec for LETTER
+LETTER $B$KBP$9$k(B printf $B%U%)!<%^%C%H$N;XDj(B
 .IP
-LETTERs are as follows for new group, lower case for old group:
+$B0J2<$N(B LETTER $B$O?7$7$$%0%k!<%W$KBP$9$k$b$N$G$9!#(B
+$B$J$*>.J8;z$@$H8E$$%0%k!<%W$KBP$9$k$b$N$K$J$j$^$9(B:
 .TP
 F
-first line number
+$B:G=i$N9THV9f(B
 .TP
 L
-last line number
+$B:G8e$N9THV9f(B
 .TP
 N
-number of lines = L-F+1
+$B9T?t(B = L-F+1
 .TP
 E
 F-1
@@ -123,105 +129,111 @@
 M
 L+1
 .IP
-LFMT may contain:
+$B0J2<$,(B LFMT $B$K;HMQ2DG=$G$9(B:
 .TP
 %L
-contents of line
+$B9T$NFbMF(B
 .TP
 %l
-contents of line, excluding any trailing newline
+$B9TKv$N2~9T$r=|$$$?!"9T$NFbMF(B
 .TP
 %[-][WIDTH][.[PREC]]{doxX}n
-printf-style spec for input line number
+$BF~NO9T$N9THV9f$KBP$9$k(B printf $B%U%)!<%^%C%H$N;XDj(B
 .IP
-Either GFMT or LFMT may contain:
+$B0J2<$,(B GFMT $B$^$?$O(B LFMT $B$NN>J}$K;HMQ2DG=$G$9(B:
 .TP
 %%
 %
 .TP
 %c'C'
-the single character C
+$BC10l$NJ8;z(B C
 .TP
 %c'\eOOO'
-the character with octal code OOO
+8 $B?J?t$NJ8;z%3!<%I(B OOO $B$NJ8;z(B
 .TP
 \fB\-l\fR  \fB\-\-paginate\fR
-Pass the output through `pr' to paginate it.
+$B=PNO$r(B `pr' $B$KDL$7$F%Z!<%8IU$1$r9T$$$^$9!#(B
 .TP
 \fB\-t\fR  \fB\-\-expand\-tabs\fR
-Expand tabs to spaces in output.
+$B%?%V$r6uGr$KE83+$7$F=PNO$7$^$9!#(B
 .TP
 \fB\-T\fR  \fB\-\-initial\-tab\fR
-Make tabs line up by prepending a tab.
+$B9TF,$K%?%V$rA^F~$9$k$3$H$G!"9TCf$N%?%V$,85$HF1$8$h$&$J7A$G8+$($k$h$&$K$7$^$9!#(B
 .TP
 \fB\-\-tabsize\fR=\fINUM\fR
-Tab stops are every NUM (default 8) print columns.
+$B9T$rI=<($9$k:]$N%?%V%9%H%C%W$r(B NUM $BJ8;z(B ($B%G%U%)%k%H$O(B 8) $BKh$K$7$^$9!#(B
 .TP
 \fB\-r\fR  \fB\-\-recursive\fR
-Recursively compare any subdirectories found.
+$B%5%V%G%#%l%/%H%j$,$"$l$P!"$=$NG[2<$b:F5"E*$K8!:w$7$FHf3S$r9T$$$^$9!#(B
 .TP
 \fB\-N\fR  \fB\-\-new\-file\fR
-Treat absent files as empty.
+$BB8:_$7$J$$%U%!%$%k$r!"6u$N%U%!%$%k$H$7$F07$$$^$9!#(B
 .TP
 \fB\-\-unidirectional\-new\-file\fR
-Treat absent first files as empty.
+$BHf3S85$KB8:_$7$J$$%U%!%$%k$r!"6u$N%U%!%$%k$H$7$F07$$$^$9!#(B
 .TP
 \fB\-s\fR  \fB\-\-report\-identical\-files\fR
-Report when two files are the same.
+$B%U%!%$%k$NFbMF$,F1$8$@$C$?>l9g$K!"$=$N;]$rJs9p$7$^$9!#(B
 .TP
 \fB\-x\fR PAT  \fB\-\-exclude\fR=\fIPAT\fR
-Exclude files that match PAT.
+$B%U%!%$%kL>$,%Q%?!<%s(B PAT $B$K%^%C%A$9$k%U%!%$%k$rL5;k$7$^$9!#(B
 .TP
 \fB\-X\fR FILE  \fB\-\-exclude\-from\fR=\fIFILE\fR
-Exclude files that match any pattern in FILE.
+$B%U%!%$%kL>$,%U%!%$%k(B FILE $B$K4^$^$l$k%Q%?!<%s$K%^%C%A$9$k%U%!%$%k$rL5;k$7$^$9!#(B
 .TP
 \fB\-S\fR FILE  \fB\-\-starting\-file\fR=\fIFILE\fR
-Start with FILE when comparing directories.
+$B%G%#%l%/%H%jC10L$NHf3S$N:]$K!"%U%!%$%kL>$,(B FILE $B$G$"$k%U%!%$%k$+$i;O$a$^$9!#(B
 .TP
 \fB\-\-from\-file\fR=\fIFILE1\fR
-Compare FILE1 to all operands.  FILE1 can be a directory.
+FILE1 $B$H$9$Y$F$N%*%Z%i%s%I$rHf3S$7$^$9!#(B
+FILE1 $B$O%G%#%l%/%H%j$r;XDj$9$k$3$H$,2DG=$G$9!#(B
 .TP
 \fB\-\-to\-file\fR=\fIFILE2\fR
-Compare all operands to FILE2.  FILE2 can be a directory.
+$B$9$Y$F$N%*%Z%i%s%I$H(B FILE2 $B$rHf3S$7$^$9!#(B
+FILE2 $B$O%G%#%l%/%H%j$r;XDj$9$k$3$H$,2DG=$G$9!#(B
 .TP
 \fB\-\-horizon\-lines\fR=\fINUM\fR
-Keep NUM lines of the common prefix and suffix.
+$BHf3S$9$k%U%!%$%k$N@hF,$HKvHx$K$*$1$k6&DLItJ,$N$&$A!"(B
+NUM $B9T$r;D$7$?$^$^$GHf3S$r9T$$$^$9!#(B
 .TP
 \fB\-d\fR  \fB\-\-minimal\fR
-Try hard to find a smaller set of changes.
+$B$h$j>.$5$J:9J,$r8+$D$1$h$&$H$7$^$9!#(B
 .TP
 \fB\-\-speed\-large\-files\fR
-Assume large files and many scattered small changes.
+$B>.$5$J0c$$$,$"$A$3$A$K$"$k$h$&$JBg$-$J%U%!%$%k$G$"$k$H2>Dj$7$^$9!#(B
 .TP
 \fB\-v\fR  \fB\-\-version\fR
-Output version info.
+$B%P!<%8%g%s>pJs$r=PNO$7$^$9!#(B
 .TP
 \fB\-\-help\fR
-Output this help.
+$B%X%k%W$r=PNO$7$^$9!#(B
 .PP
-FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'.
-If \fB\-\-from\-file\fR or \fB\-\-to\-file\fR is given, there are no restrictions on FILES.
-If a FILE is `-', read standard input.
-Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
-.SH AUTHOR
-Written by Paul Eggert, Mike Haertel, David Hayes,
-Richard Stallman, and Len Tower.
-.SH "REPORTING BUGS"
-Report bugs to <bug-gnu-utils@gnu.org>.
+$B=q<0$K$*$1$k(B
+FILES $B$O(B `FILE1 FILE2', `DIR1 DIR2', `DIR FILE...', $B$^$?$O(B `FILE... DIR' $B$G$9!#(B
+$B$3$3$G(B FILE $B$O%U%!%$%kL>!"(BDIR $B$O%G%#%l%/%H%jL>$G$9!#(B
+\fB\-\-from\-file\fR $B$^$?$O(B \fB\-\-to\-file\fR $B$r;XDj$7$?>l9g!"(B
+FILES $B$N@)8B$O$"$j$^$;$s!#(B
+FILE $B$,(B `-' $B$G$"$k>l9g!"I8=`F~NO$+$iFI$_9~$_$^$9!#(B
+$B=*N;%9%F!<%?%9$O!"F~NO$,F1$8$@$C$?>l9g$O(B 0$B!"0[$J$C$F$$$?>l9g$O(B 1$B!"(B
+$B%H%i%V%k$,5/$-$?>l9g$O(B 2 $B$G$9!#(B
+.SH $B:n<T(B
+Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower
+$B$K$h$C$F=q$+$l$^$7$?!#(B
+.SH "$B%P%0$NJs9p(B"
+$B%P%0$O(B <bug-gnu-utils@gnu.org> $B$KJs9p$7$F$/$@$5$$!#(B
 .SH COPYRIGHT
 Copyright \(co 2004 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-The full documentation for
+.SH "$B4XO"9`L\(B"
 .B diff
-is maintained as a Texinfo manual.  If the
+$B$N40A4$J%I%-%e%a%s%H$O(B Texinfo $B%^%K%e%"%k$G4IM}$5$l$F$$$^$9!#(B
 .B info
-and
+$B$*$h$S(B
 .B diff
-programs are properly installed at your site, the command
+$B%W%m%0%i%`$,E,@Z$K%$%s%9%H!<%k$5$l$F$$$l$P!"%3%^%s%I(B
 .IP
 .B info diff
 .PP
-should give you access to the complete manual.
+$B$r<B9T$9$k$3$H$G40A4$J%^%K%e%"%k$rFI$`$3$H$,=PMh$k$O$:$G$9!#(B
--- diff3.1.orig	Tue Nov 27 21:59:29 2007
+++ diff3.1	Thu Nov 29 22:38:32 2007
@@ -1,78 +1,82 @@
+.\" $FreeBSD$
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
 .TH DIFF3 "1" "April 2004" "diffutils 2.8.7" "User Commands"
-.SH NAME
-diff3 \- compare three files line by line
-.SH SYNOPSIS
+.SH $BL>>N(B
+diff3 \- $B9TC10L$G(B 3 $B$D$N%U%!%$%k$rHf3S$9$k(B
+.SH $B=q<0(B
 .B diff3
 [\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
-.SH DESCRIPTION
-Compare three files line by line.
+.SH $B2r@b(B
+$B9TC10L$G(B 3 $B$D$N%U%!%$%k$rHf3S$7$^$9!#(B
 .TP
 \fB\-e\fR  \fB\-\-ed\fR
-Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
+OLDFILE $B$+$i(B YOURFILE $B$X$NJQ99$G!"(BMYFILE $B$K$^$@E}9g$5$l$F$$$J$$JQ99$r(B
+$B=PNO$7$^$9!#(B
 .TP
 \fB\-E\fR  \fB\-\-show\-overlap\fR
-Output unmerged changes, bracketing conflicts.
+$B$^$@E}9g$5$l$F$$$J$$JQ99$H!"%V%i%1%C%H$G3g$C$?=EJ#$9$kJQ99$r(B
+$B=PNO$7$^$9!#(B
 .TP
 \fB\-A\fR  \fB\-\-show\-all\fR
-Output all changes, bracketing conflicts.
+$B$9$Y$F$NJQ99$H!"%V%i%1%C%H$G3g$C$?=EJ#$9$kJQ99$r(B    
+$B=PNO$7$^$9!#(B
 .TP
 \fB\-x\fR  \fB\-\-overlap\-only\fR
-Output overlapping changes.
+$B=EJ#$9$kJQ99$N$_$r=PNO$7$^$9!#(B
 .TP
 \fB\-X\fR
-Output overlapping changes, bracketing them.
+$B=EJ#$9$kJQ99$N$_$r%V%i%1%C%H$G3g$C$F=PNO$7$^$9!#(B
 .TP
 \fB\-3\fR  \fB\-\-easy\-only\fR
-Output unmerged nonoverlapping changes.
+$B$^$@E}9g$5$l$F$$$J$$JQ99$N$&$A!"=EJ#$7$J$$$b$N$N$_$r=PNO$7$^$9!#(B
 .TP
 \fB\-m\fR  \fB\-\-merge\fR
-Output merged file instead of ed script (default \fB\-A\fR).
+ed $B%9%/%j%W%H$NBe$o$j$K!"E}9g$7$?%U%!%$%k$r=PNO$7$^$9(B ($B%G%U%)%k%H$O(B \fB\-A\fR)$B!#(B
 .TP
 \fB\-L\fR LABEL  \fB\-\-label\fR=\fILABEL\fR
-Use LABEL instead of file name.
+$B=PNO$N%X%C%@$KIU2C$5$l$k%U%!%$%kL>$NBe$o$j$K!"%i%Y%k(B LABEL $B$r;HMQ$7$^$9!#(B
 .TP
 \fB\-i\fR
-Append `w' and `q' commands to ed scripts.
+ed $B%9%/%j%W%H$K(B `w' $B$*$h$S(B `q' $B%3%^%s%I$rDI2C$7$^$9!#(B
 .TP
 \fB\-a\fR  \fB\-\-text\fR
-Treat all files as text.
+$B$9$Y$F$N%U%!%$%k$r%F%-%9%H$H$_$J$7$^$9!#(B
 .TP
 \fB\-\-strip\-trailing\-cr\fR
-Strip trailing carriage return on input.
+$BF~NO$N9TKv$N2~9T$r<h$j=|$-$^$9!#(B
 .TP
 \fB\-T\fR  \fB\-\-initial\-tab\fR
-Make tabs line up by prepending a tab.
+$B9TF,$K%?%V$rA^F~$9$k$3$H$G!"9TCf$N%?%V$,85$HF1$8$h$&$J7A$G8+$($k$h$&$K$7$^$9!#(B
 .TP
 \fB\-\-diff\-program\fR=\fIPROGRAM\fR
-Use PROGRAM to compare files.
+$B%U%!%$%k$rHf3S$9$k%W%m%0%i%`$H$7$F!"(BPROGRAM $B$r;HMQ$7$^$9!#(B
 .TP
 \fB\-v\fR  \fB\-\-version\fR
-Output version info.
+$B%P!<%8%g%s>pJs$r=PNO$7$^$9!#(B
 .TP
 \fB\-\-help\fR
-Output this help.
+$B%X%k%W$r=PNO$7$^$9!#(B
 .PP
-If a FILE is `-', read standard input.
-Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
-.SH AUTHOR
-Written by Randy Smith.
-.SH "REPORTING BUGS"
-Report bugs to <bug-gnu-utils@gnu.org>.
+$B%U%!%$%kL>$,(B `-' $B$G$"$k>l9g!"I8=`F~NO$+$iFI$_9~$_$^$9!#(B
+$B=*N;%9%F!<%?%9$O!"@.8y$7$?>l9g$O(B 0$B!"L7=b$,$"$k>l9g$O(B 1$B!"(B
+$B%H%i%V%k$,5/$-$?>l9g$O(B 2 $B$G$9!#(B
+.SH $B:n<T(B
+Randy Smith $B$K$h$C$F=q$+$l$^$7$?!#(B
+.SH "$B%P%0$NJs9p(B"
+$B%P%0$O(B <bug-gnu-utils@gnu.org> $B$KJs9p$7$F$/$@$5$$!#(B
 .SH COPYRIGHT
 Copyright \(co 2004 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-The full documentation for
+.SH "$B4XO"9`L\(B"
 .B diff3
-is maintained as a Texinfo manual.  If the
+$B$N40A4$J%I%-%e%a%s%H$O(B Texinfo $B%^%K%e%"%k$G4IM}$5$l$F$$$^$9!#(B
 .B info
-and
+$B$*$h$S(B
 .B diff3
-programs are properly installed at your site, the command
+$B%W%m%0%i%`$,E,@Z$K%$%s%9%H!<%k$5$l$F$$$l$P!"%3%^%s%I(B
 .IP
 .B info diff
 .PP
-should give you access to the complete manual.
+$B$r<B9T$9$k$3$H$G40A4$J%^%K%e%"%k$rFI$`$3$H$,=PMh$k$O$:$G$9!#(B
--- sdiff.1.orig	Tue Nov 27 21:59:29 2007
+++ sdiff.1	Thu Nov 29 22:41:27 2007
@@ -1,90 +1,91 @@
+.\" $FreeBSD$
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
 .TH SDIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
-.SH NAME
-sdiff \- side-by-side merge of file differences
-.SH SYNOPSIS
+.SH $BL>>N(B
+sdiff \- $B%U%!%$%k$N0c$$$r:81&$KJB$Y$F%^!<%8$9$k(B
+.SH $B=q<0(B
 .B sdiff
 [\fIOPTION\fR]... \fIFILE1 FILE2\fR
-.SH DESCRIPTION
-Side-by-side merge of file differences.
+.SH $B2r@b(B
+$B%U%!%$%k$N0c$$$r:81&$KJB$Y$F%^!<%8$7$^$9!#(B
 .TP
 \fB\-o\fR FILE  \fB\-\-output\fR=\fIFILE\fR
-Operate interactively, sending output to FILE.
+$BBPOCE*$KA`:n$7!"=PNO$r(B FILE $B$K=PNO$7$^$9!#(B
 .TP
 \fB\-i\fR  \fB\-\-ignore\-case\fR
-Consider upper- and lower-case to be the same.
+$BBgJ8;z$H>.J8;z$H$rF10l;k$7$^$9!#(B
 .TP
 \fB\-E\fR  \fB\-\-ignore\-tab\-expansion\fR
-Ignore changes due to tab expansion.
+$B%?%V$NE83+$K$h$k0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-b\fR  \fB\-\-ignore\-space\-change\fR
-Ignore changes in the amount of white space.
+$B6uGr$N?t$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-W\fR  \fB\-\-ignore\-all\-space\fR
-Ignore all white space.
+$B$9$Y$F$N6uGr$rL5;k$7$^$9!#(B
 .TP
 \fB\-B\fR  \fB\-\-ignore\-blank\-lines\fR
-Ignore changes whose lines are all blank.
+$B6u9T$N?t$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-I\fR RE  \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
-Ignore changes whose lines all match RE.
+$B@55,I=8=(B RE $B$K%^%C%A$9$k9T$N0c$$$rL5;k$7$^$9!#(B
 .TP
 \fB\-\-strip\-trailing\-cr\fR
-Strip trailing carriage return on input.
+$BF~NO$N9TKv$N2~9T$r<h$j=|$-$^$9!#(B
 .TP
 \fB\-a\fR  \fB\-\-text\fR
-Treat all files as text.
+$B$9$Y$F$N%U%!%$%k$r%F%-%9%H$H$_$J$7$^$9!#(B
 .TP
 \fB\-w\fR NUM  \fB\-\-width\fR=\fINUM\fR
-Output at most NUM (default 130) print columns.
+$B9T$NI}$r(B NUM $B9T(B ($B%G%U%)%k%H$O(B 130) $B$G=PNO$7$^$9!#(B
 .TP
 \fB\-l\fR  \fB\-\-left\-column\fR
-Output only the left column of common lines.
+$B6&DL$9$k9T$N:8$NCJ$N$_=PNO$7$^$9!#(B
 .TP
 \fB\-s\fR  \fB\-\-suppress\-common\-lines\fR
-Do not output common lines.
+$B6&DL$9$k9T$rI=<($7$^$;$s!#(B
 .TP
 \fB\-t\fR  \fB\-\-expand\-tabs\fR
-Expand tabs to spaces in output.
+$B%?%V$r6uGr$KE83+$7$F=PNO$7$^$9!#(B
 .TP
 \fB\-\-tabsize\fR=\fINUM\fR
-Tab stops are every NUM (default 8) print columns.
+$B9T$rI=<($9$k:]$N%?%V%9%H%C%W$r(B NUM $BJ8;z(B ($B%G%U%)%k%H$O(B 8) $BKh$K$7$^$9!#(B
 .TP
 \fB\-d\fR  \fB\-\-minimal\fR
-Try hard to find a smaller set of changes.
+$B$h$j>.$5$J:9J,$r8+$D$1$h$&$H$7$^$9!#(B
 .TP
 \fB\-H\fR  \fB\-\-speed\-large\-files\fR
-Assume large files and many scattered small changes.
+$B>.$5$J0c$$$,$"$A$3$A$K$"$k$h$&$JBg$-$J%U%!%$%k$G$"$k$H2>Dj$7$^$9!#(B
 .TP
 \fB\-\-diff\-program\fR=\fIPROGRAM\fR
-Use PROGRAM to compare files.
+$B%U%!%$%k$rHf3S$9$k%W%m%0%i%`$H$7$F!"(BPROGRAM $B$r;HMQ$7$^$9!#(B
 .TP
 \fB\-v\fR  \fB\-\-version\fR
-Output version info.
+$B%P!<%8%g%s>pJs$r=PNO$7$^$9!#(B
 .TP
 \fB\-\-help\fR
-Output this help.
+$B%X%k%W$r=PNO$7$^$9!#(B
 .PP
-If a FILE is `-', read standard input.
-Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
-.SH AUTHOR
-Written by Thomas Lord.
-.SH "REPORTING BUGS"
-Report bugs to <bug-gnu-utils@gnu.org>.
+$B%U%!%$%kL>$,(B `-' $B$G$"$k>l9g!"I8=`F~NO$+$iFI$_9~$_$^$9!#(B
+$B=*N;%9%F!<%?%9$O!"F~NO$,F1$8>l9g$O(B 0$B!"0[$J$C$F$$$?>l9g$O(B 1$B!"(B
+$B%H%i%V%k$,5/$-$?>l9g$O(B 2 $B$G$9!#(B
+.SH $B:n<T(B
+Thomas Lord $B$K$h$C$F=q$+$l$^$7$?!#(B
+.SH "$B%P%0$NJs9p(B"
+$B%P%0$O(B <bug-gnu-utils@gnu.org> $B$KJs9p$7$F$/$@$5$$!#(B
 .SH COPYRIGHT
 Copyright \(co 2004 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-The full documentation for
+.SH "$B4XO"9`L\(B"
 .B sdiff
-is maintained as a Texinfo manual.  If the
+$B$N40A4$J%I%-%e%a%s%H$O(B Texinfo $B%^%K%e%"%k$G4IM}$5$l$F$$$^$9!#(B
 .B info
-and
+$B$*$h$S(B
 .B sdiff
-programs are properly installed at your site, the command
+$B%W%m%0%i%`$,E,@Z$K%$%s%9%H!<%k$5$l$F$$$l$P!"%3%^%s%I(B
 .IP
 .B info diff
 .PP
-should give you access to the complete manual.
+$B$r<B9T$9$k$3$H$G40A4$J%^%K%e%"%k$rFI$`$3$H$,=PMh$k$O$:$G$9!#(B

---
Watanabe Kazuhiro (CQG00620@nifty.ne.jp)
