Synch with trunk.

diff --git a/NEWS b/NEWS
index ddbfb89..34b262d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Wanderlust NEWS -- User-visible changes in Wanderlust.
 
-* Changes in 2.10.0 from 2.8.1.
+* Changes in 2.10.0 from 2.8.1
 
 ** You can alter the format of summary lines.
    Specify format by wl-summary-line-format. If you want to change ones
@@ -152,7 +152,8 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
    the actual message itself is deleted.
    Please visit the 'mark folder to review the messages with the "$" mark.
 
-* Version 2.6.1 is basically a bug fix version of 2.6.0.
+* Changes in 2.6.1 from 2.6.0
+  Version 2.6.1 is basically a bug fix version of 2.6.0.
 
 ** Fixed a problem that Emacs 21 causes `Recursive load...' error.
 
@@ -165,7 +166,7 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 ** Some other fixes.
 
-* Changes in 2.6.0 from 2.4.1.
+* Changes in 2.6.0 from 2.4.1
 
 ** FLIM 1.13.x is not supported any longer.
    Please install FLIM 1.14.1 or later.
@@ -193,7 +194,8 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 ** Many bug fixes.
 
-* Version 2.4.1 is basically a bug fix version of 2.4.0.
+* Changes in 2.4.1 from 2.4.0
+  Version 2.4.1 is basically a bug fix version of 2.4.0.
 
 ** Wanderlust 2.4.1 now works on FLIM 1.14.x. 
 
@@ -211,7 +213,7 @@ Example:
 should be changed to
 (setq elmo-default-imap4-authenticate-type 'clear)
 
-* Changes in 2.4.0 from 1.1.1.
+* Changes in 2.4.0 from 1.1.1
 
 ** Version Number
 The version numbering convention for Wanderlust is changed. 
@@ -378,7 +380,8 @@ Less colors are used by DEMO pixmap.
 Emacsen on character based terminal also display suitable DEMO.
 
 \f
-* Version 1.1.1 is a bug fix version of 1.1.0 with minor user-visible changes.
+* Changes in 1.1.1 from 1.1.0
+  Version 1.1.1 is a bug fix version of 1.1.0 with minor user-visible changes.
 
 ** Development on the CVS server is started.
 
@@ -397,7 +400,7 @@ Emacsen on character based terminal also display suitable DEMO.
 Progress gauge is displayed while processing in the Emacsen with
 progress gauge feature.
 
-* Changes in version 1.1.0 from 1.0.3.
+* Changes in 1.1.0 from 1.0.3
 
 ** Install
 

diff --git a/NEWS.ja b/NEWS.ja
index 9887af1..7d33665 100644 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -155,7 +155,8 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
    "$" \e$B%^!<%/$NIU$$$?%a%C%;!<%8$r8+D>$7$?$$>l9g$O\e(B 'mark \e$B%U%)%k%@$r;2>H$7$F\e(B
    \e$B$/$@$5$$!#\e(B
 
-* 2.6.1 \e$B$O\e(B 2.6.0 \e$B$N=$@5HG$G$9!#\e(B
+* 2.6.0 \e$B$+$i\e(B 2.6.1 \e$B$X$NJQ99E@\e(B
+  2.6.1 \e$B$O\e(B 2.6.0 \e$B$N=$@5HG$G$9!#\e(B
 
 ** Emacs 21 \e$B$G\e(B Recursive load... \e$B$H=P$kIT6q9g$,=$@5$5$l$^$7$?!#\e(B
 
@@ -195,7 +196,8 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 
 ** \e$BB?$/$N%P%0%U%#%C%/%9\e(B
 
-* 2.4.1 \e$B$O\e(B 2.4.0 \e$B$N=$@5HG$G$9!#\e(B
+* 2.4.0 \e$B$+$i\e(B 2.4.1 \e$B$X$NJQ99E@\e(B
+  2.4.1 \e$B$O\e(B 2.4.0 \e$B$N=$@5HG$G$9!#\e(B
 
 ** FLIM 1.14.x \e$B>e$G$bF0:n$9$k$h$&$K$J$j$^$7$?!#\e(B
 
@@ -212,7 +214,7 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 (setq elmo-default-imap4-authenticate-type 'clear)
 \e$B$KJQ99$9$kI,MW$,$"$j$^$9!#\e(B
 
-* 1.1.1 \e$B$+$i\e(B version 2.4.0 \e$B$X$NJQ99E@\e(B
+* 1.1.1 \e$B$+$i\e(B 2.4.0 \e$B$X$NJQ99E@\e(B
 
 ** \e$B%P!<%8%g%sHV9f\e(B
 \e$B%P!<%8%g%sHV9f$NIU$1J}$,JQ$o$j$^$7$?!#\e(B
@@ -374,7 +376,8 @@ wl-message-visible-field-list \e$B$G!"\e(BWanderlust \e$B%l%Y%k$G@_Dj$,2DG=\e(B
 \e$B$J$j$^$7$?!#\e(B
 
 \f
-* 1.1.1 \e$B$O\e(B 1.1.0 \e$B$N%P%0=$@5HG$G$9!#$$$/$D$+$N:Y$+$$=$@5$,2C$o$C$F$$$^$9!#\e(B
+* 1.1.0 \e$B$+$i\e(B 1.1.1 \e$B$X$NJQ99E@\e(B
+  1.1.1 \e$B$O\e(B 1.1.0 \e$B$N%P%0=$@5HG$G$9!#$$$/$D$+$N:Y$+$$=$@5$,2C$o$C$F$$$^$9!#\e(B
 
 ** CVS \e$B%5!<%P>e$G$N3+H/$,;O$a$i$l$^$7$?!#\e(B
 
@@ -390,7 +393,7 @@ wl-message-visible-field-list \e$B$G!"\e(BWanderlust \e$B%l%Y%k$G@_Dj$,2DG=\e(B
 progress gauge \e$B$NI=<(5!G=$r$b$D\e(B Emacs \e$B$G$O!"=hM}$N?JD=$,\e(B progress gauge \e$B$K\e(B
 \e$BI=<($5$l$k$h$&$K$J$j$^$7$?!#\e(B
 
-* 1.0.3 \e$B$+$i\e(B version 1.1.0 \e$B$X$NJQ99E@\e(B 
+* 1.0.3 \e$B$+$i\e(B 1.1.0 \e$B$X$NJQ99E@\e(B 
 
 ** \e$B%$%s%9%H!<%k\e(B