diff etc/TUTORIAL.ja @ 83285:865f9b91fdbe

Merged from [e-mail]--gnu-2005 (patch 56-58, 232-239) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-232 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-233 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-234 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-235 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-236 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-237 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-238 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-239 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-56 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-57 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-58 Collapse feature addition/removal within single ChangeLog entry git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-325

--- a/etc/TUTORIAL.ja	Mon Apr 04 16:43:15 2005 +0000
+++ b/etc/TUTORIAL.ja	Fri Apr 08 16:25:22 2005 +0000
@@ -1,5 +1,5 @@
-Emacs $BF~Lg%,%$%I(B.
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
+Emacs $BF~Lg%,%$%I(B.  $BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#(B
+Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 
 Emacs $B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K(B
 CONTROL $B$H$+(B CTRL $B$H$+(B CTL $B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K(B META
@@ -372,7 +372,7 @@
 
 $B>C5n$7$?J8>O$rI|3h$5$;$kA`:n$r:FF~!J(Byanking$B!K$H8F$S$^$9!#>C$7$?J8>O$O!"(B
 $B85$HF1$8>l=j$K$G$b85$H$O0c$&>l=j$K$G$b!"$5$i$K$OJL$N%U%!%$%k$K$b:FF~$G(B
-$B$-$^$9!#$^$?!"2?EY$b:FF~$7$FJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#(B
+$B$-$^$9!#$^$?!"2?EY$b:FF~$9$k$3$H$GJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#(B
 
 $B:FF~$N$?$a$N%3%^%s%I$O(B C-y $B$G$9!#$3$l$O!":G8e$K>C5n$7$?J8>O$r8=:_%+!<(B
 $B%=%k$,$"$k0LCV$K:FF~$7$^$9!#(B
@@ -592,7 +592,7 @@
 $B;H$$$^$9!#$=$l$K$O!"0J2<$N#2$D$N<oN`$,$"$j$^$9!#(B
 
      C-x     $BJ8;z$K$h$k3HD%!#B3$1$F0lJ8;z$rF~NO$7$^$9!#(B
-     ESC x   $BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#(B
+     M-x     $BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#(B
 
 $B$3$l$i$O!"0lHLE*$K$OJXMx$@$1$l$I$b!"$3$l$^$G8+$F$-$?$b$N$[$I$OIQHK$KMQ(B
 $B$$$i$l$J$$%3%^%s%I$G$9!#(BC-x C-f $B!J%U%!%$%k$r3+$/!K$d(B C-x C-s$B!J%U%!%$%k(B
@@ -1027,7 +1027,7 @@
 $B!v$3$NK]LuHG$K$D$$$F$N<U<-(B
 ==========================
 
-$B$3$NJ8=q$O(B Emacs Ver.21 $BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N(B
+$B$3$NJ8=q$O(B Emacs Ver.22 $BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N(B
 $B$G$9!#$=$N:]!"(BEmacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$r%Y!<%9$K$7$^$7$?!#(B
 Emacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$O!"(BMule $BIUB0$NF|K\8l%,%$%I$r;2(B
 $B9M$K$7$?$b$N$G!"$=$N85$O(B SANETO Takanori $B;a$,F|K\8l(B MicroEmacs(kemacs)
@@ -1048,7 +1048,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the