Merged from upstream

ChangeLog

@@ -1,3 +1,22 @@
+2012-04-27  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+	* README.ja (MAKEIT.BAT): Modify for apel-ja@lists.chise.org.
+
+2012-04-27  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+	* README.ja, README.en: Remove descriptions about CVS and add
+	description about the new Git repository.
+
+2012-04-27  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+	* README.en (make.bat (for MS-DOS family)): Modify for
+	apel-en@lists.chise.org.
+
+2012-04-26  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+	* README.ja, README.en (Bug reports): Modify for
+	apel-{en|ja}@lists.chise.org.
+
 2011-06-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
 
 	* mcs-20.el (detect-mime-charset-region): (Emacs23 or later) Do
@@ -7,11 +26,6 @@
 	* mcs-e20.el (charsets-mime-charset-alist): Remove non charset
 	symbol for Emacs 23 and later.
 
-2012-04-26  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
-
-	* README.ja, README.en (Bug reports): Modify for
-	apel-{en|ja}@lists.chise.org.
-
 2010-10-06  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
 
 	* mcs-xm.el (charsets-mime-charset-alist):

README.en

@@ -226,9 +226,10 @@ to such directory by default.  If you want install APEL to such an Emacs
 you may install all APEL modules to an Emacs version independent
 site-lisp directory such as c:\usr\mule\site-lisp.
 
-We cannot provide you with a Demacs example for make.bat.  If you install
-APEL to Demacs, please send us such an example to apel-en@m17n.org (you
-can post a message to the ML, even if you are not a member).
+We cannot provide you with a Demacs example for make.bat.  If you
+install APEL to Demacs, please send us such an example to
+apel-en@lists.chise.org (you can post a message to the ML, even if you
+are not a member).
 
 If you checkout APEL by using Windows native cvs.exe (not cygwin
 version), cvs.exe will regularize end of line codes, LF to CRLF.  And
@@ -468,26 +469,18 @@ Latest release of APEL can be obtained from:
   ftp://ftp.m17n.org/pub/mule/apel/
 
 
-* CVS
+* Git
 
-Development of APEL uses CVS.  So latest developing version is
-available at CVS.
+Development of APEL uses Git.  So the latest developing version is
+available at the following Git repository:
 
-** cvs login (first time only)
+  % git clone http://git.chise.org/git/elisp/apel.git
 
-  % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
+Or you can view the APEL repository via WWW at:
 
-  CVS password: [CR] # NULL string
+    http://git.chise.org/gitweb/?p=elisp/apel.git
 
-** checkout
-
-  % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout apel
-
-  If you would like to join CVS based development, please send mail to
-
-  cvs@cvs.m17n.org
-
-with your account name and your public key for ssh.  cvsroot is
-:ext:cvs@cvs.m17n.org:/cvs/root.
+If you would like to join Git based development, please declare it in
+the APEL mailing list.
 
 We hope you will join the open development.

README.ja

@@ -202,7 +202,7 @@ MS-DOS $B7O$N(B OS $B$N$?$a$K(B MAKEIT.BAT $B$H(B MAKE1.BAT $B$,MQ0U$5$l$
 
 $B3+H/!"F0:n3NG'$,(B Windows $B$G$7$+9T$J$o$l$F$$$J$$$?$a!"8E$$%P!<%8%g%s$N(B
 DOS $B$G$OF0:n$7$J$$2DG=@-$,$"$j$^$9!#ITET9g$rH/8+$7$?J}$O(B
-apel-ja@m17n.org $B$^$G$4O"Mm2<$5$$!#(B
+apel-ja@lists.chise.org $B$^$G$4O"Mm2<$5$$!#(B
 
 *** MAKEIT.BAT $B$NJT=8(B
 
@@ -243,8 +243,8 @@ c:\usr\Meadow\1.10\site-lisp) $B$,B8:_$;$:!"%G%#%U%)%k%H$G$O(B load-path $B$b
 $B$&!#(B
 
 Demacs $B$N@_DjNc$r=`Hw$9$k$3$H$,$G$-$^$;$s$G$7$?!#(BDemacs $B$K(B APEL $B$r%$%s(B
-$B%9%H!<%k$7$?J}$O!"@_DjNc$r(B apel-ja@m17n.org $B$KAw$C$F2<$5$$(B ($BHs9XFI<T$G(B
-$B$bAw?.$O$G$-$^$9(B)$B!#(B
+$B%9%H!<%k$7$?J}$O!"@_DjNc$r(B apel-ja@lists.chise.org $B$KAw$C$F2<$5$$(B ($BHs(B
+$B9XFI<T$G$bAw?.$O$G$-$^$9(B)$B!#(B
 
 
 *** MAKEIT.BAT $B$NJT=8$N:]!"CN$C$F$*$/$HJXMx$J(B Tips
@@ -558,26 +558,18 @@ APEL ML $B$rDL$7$F!"(BAPEL $B$N%P%0$rJs9p$7$?$j!"(BAPEL $B$N:G?7$N%j%j!<%9$
     ftp://ftp.m17n.org/pub/mule/apel/
 
 
-* CVS
+* Git
 
-APEL $B$N3+H/$O(B CVS $B$r;H$C$F$$$^$9!#:G?7$N3+H/%P!<%8%g%s$r(B CVS $B$G<hF@$G(B
-$B$-$^$9!#(B
-
-** cvs login ($B0l2sL\$@$1(B)
-
-  % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
-
-  CVS password: [CR] # $B6uJ8;zNs(B
-
-** checkout
+APEL $B$N3+H/$K$O(B Git $B$r;H$C$F$$$^$9!#:G?7$N3+H/%P!<%8%g%s$r0J2<$N(B Git$B%j(B
+$B%]%8%H%j!<$+$i<hF@$G$-$^$9!#(B
 
-  % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout apel
+  % git clone http://git.chise.org/git/elisp/apel.git
 
-CVS $B$K4p$E$$$?3+H/$K;22C$7$?$$$H$-$O!"(B
+$B$3$N(B APEL $B$N%j%]%8%H%j!<$O(B WWW $B7PM3$G$b1\Mw$9$k$3$H$,$G$-$^$9!'(B
 
-  cvs@cvs.m17n.org
+    http://git.chise.org/gitweb/?p=elisp/apel.git
 
-$B$K%"%+%&%s%HL>$H!"(Bssh $B$N8x3+80$rAw$C$F$/$@$5$$!#(Bssh $B7PM3$G$O!"(Bcvsroot
-$B$O(B :ext:cvs@cvs.m17n.org:/cvs/root $B$H$J$j$^$9!#(B
+Git $B$K4p$E$$$?3+H/$K;22C$7$?$$$H$-$O!"(BAPEL $B%a!<%j%s%0%j%9%H$G$=$N;]$r(B
+$B@k8@$7$F$/$@$5$$!#(B
 
-$B3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$r4|BT$7$^$9!#(B
+$B2f!9$OB?$/$NJ}$,$3$N3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$rK>$s$G$$$^$9!#(B