Update description for global flags.

Add chapter `Migration'.
Add section `File Folder' into chapter `Folders'.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 191bb1d..925095e 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -147,6 +147,7 @@ into another language, under the above conditions for modified versions.
 * Address Book::             \e$B%"%I%l%9D"\e(B
 * Spam Filter::              Spam \e$B%U%#%k%?\e(B
 * Customization::            \e$B%+%9%?%^%$%:\e(B
+* Migration::                \e$B5l%P!<%8%g%s$+$i$N0\9T\e(B
 * Terminology::              \e$BMQ8l$N2r@b\e(B
 * Mailing List::             \e$B%a!<%j%s%0%j%9%H\e(B
 * Addition::                 \e$B$*$^$1\e(B
@@ -696,7 +697,7 @@ Wanderlust \e$B$O\e(B ELMO \e$B$N%$%s%?%U%'!<%9$rMxMQ$7$F$$$k$?$a!"\e(BELMO \e$B%b%8%
 
 \e$B%P!<%8%g%s\e(B @value{VERSION} \e$B8=:_!"MQ0U$5$l$F$$$k%U%)%k%@$O!"\e(BIMAP, NNTP,
 LocalDir(MH), Maildir, News Spool, Archive, POP, Shimbun, Namazu, Multi,
-Filter, Pipe, Internal \e$B$N\e(B 13 \e$B<oN`$G$9!#\e(B
+Filter, Pipe, Internal, File \e$B$N\e(B 14 \e$B<oN`$G$9!#\e(B
 
 @menu
 * IMAP Folder::              @samp{%} -- IMAP \e$B%U%)%k%@\e(B
@@ -712,6 +713,7 @@ Filter, Pipe, Internal \e$B$N\e(B 13 \e$B<oN`$G$9!#\e(B
 * Filter Folder::            @samp{/} -- \e$B%U%#%k%?%U%)%k%@\e(B
 * Pipe Folder::              @samp{|} -- \e$B%Q%$%W%U%)%k%@\e(B
 * Internal Folder::          @samp{'} -- \e$BFbIt%U%)%k%@\e(B
+* File Folder::                  -- \e$B%U%!%$%k%U%)%k%@\e(B
 @end menu
 
 
@@ -1474,6 +1476,7 @@ namazu (@uref{http://www.namazu.org/}) \e$B$rMQ$$$F!"8!:w<0$K%^%C%A$7$?\e(B
 @cindex Folder, Filtering
 @cindex Folder, Virtual
 @cindex Folder, Conditional
+@cindex Flag
 
 \e$B;XDj$7$?>r7o$rK~$?$9%a%C%;!<%8$N$_$r4^$`2>A[E*$J%U%)%k%@$G$9!#\e(B
 
@@ -1548,6 +1551,37 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @end example
 
 @item
+\e$B%U%i%0%U%#%k%?!'\e(B @samp{flag:@var{\e$B%U%i%0L>\e(B}}
+
+@var{\e$B%U%i%0L>\e(B}\e$B$G;XDj$5$l$?%U%i%0$r;}$D%a%C%;!<%8$r<h$j=P$7$^$9!#\e(B
+
+\e$B;XDj=PMh$k%U%i%0L>$K$O!"0J2<$N$b$N$,$"$j$^$9!#\e(B
+
+@example
+@group
+unread    -> \e$BL$FI\e(B
+important -> \e$B=EMW\e(B
+answered  -> \e$BJV?.:Q$_\e(B
+digest    -> \e$BL$FI$^$?$O=EMW\e(B
+any       -> \e$BL$FI$^$?$O=EMW$^$?$OJV?.:Q$_\e(B
+@end group
+@end example
+
+\e$B$^$?!"%0%m!<%P%k%U%i%0$H$7$F@_Dj$7$?%U%i%0$bF1MM$K@_Dj$9$k$3$H$,=PMh$^$9!#\e(B
+@xref{Internal Folder}.
+
+\e$BNc\e(B:
+
+@example
+@group
+/flag:digest/%inbox     -> %inbox \e$B$N$&$A!"L$FI$^$?$O=EMW$J\e(B
+                           \e$B%a%C%;!<%8$N%U%)%k%@\e(B
+/flag:wl/+ML/Wanderlust -> +ML/Wanderlust \e$B$N$&$A!"\e(Bwl \e$B$H$$$&\e(B
+                           \e$B%0%m!<%P%k%U%i%0$,IU$$$?%a%C%;!<%8$N%U%)%k%@\e(B
+@end group
+@end example
+
+@item
 \e$BJ#9g>r7o\e(B
 
 \e$B>r7oItJ,$,\e(B @samp{!} \e$B$G;O$^$k$HH]Dj$N>r7o;XDj$H$J$j$^$9!#J#?t$N>r7o$r\e(B 
@@ -1675,11 +1709,12 @@ POP \e$B%5!<%P$K%a!<%k$r;D$7$?$^$^!"%a%C%;!<%8$r\e(B @samp{+inbox} \e$B$K%3%T!<$7$F
 \e$B$^$9$N$G!"%@%&%s%m!<%I8e$K<B9T$7$?$$4X?t$rEPO?$7$F$*$/$HNI$$$G$7$g$&!#\e(B
 
 
-@node Internal Folder,  , Pipe Folder, Folders
+@node Internal Folder, File Folder, Pipe Folder, Folders
 @section \e$BFbIt%U%)%k%@\e(B
 @cindex @samp{'}
 @cindex Internal Folder
 @cindex Folder, @samp{$} mark
+@cindex Flag
 @cindex Cache
 @c @cindex Folder, Null
 
@@ -1695,13 +1730,17 @@ Wanderlust \e$B$NFbIt$KJ];}$7$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 @end group
 @end example
 
-@samp{'flag} \e$B$H$$$&%U%)%k%@$O!"\e(B@var{\e$B%0%m!<%P%k%U%i%0\e(B} \e$B$G;XDj$7$?%U%i%0$N\e(B
+@samp{'flag} \e$B$H$$$&%U%)%k%@$O!"\e(B@var{\e$B%0%m!<%P%k%U%i%0\e(B}\e$B$G;XDj$7$?%U%i%0$N\e(B
 \e$BIU$$$?%a%C%;!<%8$r=8$a$?2>A[%U%)%k%@$G$9!#\e(B
 
-\e$B8=:_$O!"\e(B@var{\e$B%0%m!<%P%k%U%i%0\e(B} \e$B$H$7$F\e(B @samp{important} \e$B%U%i%0$,%5%]!<%H\e(B
-\e$B$5$l$F$$$^$9!#$3$N%U%i%0$O!"8e=R$N=EMW%^!<%/\e(B(@samp{$})\e$B$rIU$1$k$3$H$G%a%C\e(B
-\e$B%;!<%8$KIU2C$5$l$^$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"$"$H$+$i8+D>\e(B
-\e$B$7$?$$$H$-$J$I$KJXMx$G$9!#\e(B
+\e$B%G%U%)%k%H$GDj5A$5$l$F$$$k\e(B@var{\e$B%0%m!<%P%k%U%i%0\e(B}\e$B$H$7$F\e(B @samp{important} 
+\e$B%U%i%0$,$"$j$^$9!#$3$N%U%i%0$O!"8e=R$N=EMW%^!<%/\e(B(@samp{$})\e$B$rIU$1$k$3$H$G\e(B
+\e$B%a%C%;!<%8$KIU2C$5$l$^$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"$"$H$+$i\e(B
+\e$B8+D>$7$?$$$H$-$J$I$KJXMx$G$9!#\e(B@var{\e$B%0%m!<%P%k%U%i%0\e(B}\e$B$r>JN,$7$?>l9g$O!"$3\e(B
+\e$B$N\e(B @samp{important} \e$B%U%i%0$r;XDj$7$?$b$N$H4GJo$5$l$^$9!#\e(B
+
+\e$B$^$?!"8e=R$N%5%^%j%b!<%I$K$*$$$F!"<+M3$K%0%m!<%P%k%U%i%0$rDj5A$7$F%a%C%;!<\e(B
+\e$B%8$KIU2C$9$k$3$H$b=PMh$^$9!#\e(B@xref{Usage of Summary mode}
 
 \e$B$3$N%U%)%k%@$G%a%C%;!<%8$r:o=|$9$k$H!"$=$N%a%C%;!<%8$K$D$$$F$$$?\e(B 
 @var{\e$B%0%m!<%P%k%U%i%0\e(B} \e$B$,:o=|$5$l$^$9!#$^$?!"$3$N%U%)%k%@$K%a%C%;!<%8\e(B
@@ -1720,6 +1759,11 @@ Wanderlust \e$B$NFbIt$KJ];}$7$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 \e$B%G%#%l%/%H%j\e(B (@file{~/.elmo/cache})\e$B$N%5%V%G%#%l%/%H%jL>$r;XDj$7$^$9!#\e(B
 
 
+@node File Folder,  , Internal Folder, Folders
+@section \e$B%U%!%$%k%U%)%k%@\e(B
+@cindex File Folder
+
+
 @node Folder, Summary, Folders, Top
 @chapter \e$B%U%)%k%@%b!<%I\e(B
 @cindex Folder
@@ -2617,10 +2661,11 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 \e$BJV?.:Q$_%a%C%;!<%8$KIU$-$^$9!#\e(B@samp{A} \e$B$H$O0[$J$j!"\e(B@samp{&} \e$B$N%a%C%;!<%8\e(B
 \e$B$O%-%c%C%7%e$5$l$F$$$^$9!#\e(B
 @item $
-@kbd{$} \e$B%-!<$r2!$9$H!"\e(B@samp{$} \e$B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O\e(B Emacs \e$B$r=*N;\e(B
-\e$B$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=EMW$J\e(B
-\e$B%a%C%;!<%8$KIU$1$F$*$/$HJXMx$G$9!#\e(B@samp{$} \e$B$NIU$$$?%a%C%;!<%8$O!"\e(B
-(\e$B<B:]$N%a%C%;!<%8$,>C$5$l$?$H$7$F$b\e(B) @samp{'mark} \e$B%U%)%k%@$G1\Mw$G$-$^$9!#\e(B
+\e$B%0%m!<%P%k%U%i%0$N@_Dj$5$l$?%a%C%;!<%8$KIU$-$^$9!#$3$N%^!<%/$O\e(B Emacs \e$B$r\e(B
+\e$B=*N;$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=E\e(B
+\e$BMW$J%a%C%;!<%8$KIU$1$F$*$/$HJXMx$G$9!#\e(B@samp{$} \e$B$NIU$$$?%a%C%;!<%8$O!"\e(B(\e$B<B\e(B
+\e$B:]$N%a%C%;!<%8$,>C$5$l$?$H$7$F$b\e(B) @samp{'flag} \e$B%U%)%k%@$G1\Mw$G$-$^$9!#\e(B
+\e$B%0%m!<%P%k%U%i%0$O!"\e(B@kbd{$} \e$B$^$?$O!"\e(B@kbd{F} \e$B$GIU$1$k$3$H=PMh$^$9!#\e(B
 
 @item \e$B$J$7\e(B
 \e$B4{FI%a%C%;!<%8$K$O%^!<%/$,B8:_$7$^$;$s!#\e(B
@@ -3108,9 +3153,19 @@ prefix argument \e$B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @item $
 @kindex $ (Summary)
 @findex wl-summary-mark-as-important
-@samp{$} \e$B%^!<%/$r$D$1$^$9!#4{$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P%^!<%/$r<h$j=|$-$^$9!#\e(B
+@samp{important} \e$B%U%i%0$r$D$1$^$9!#4{$K\e(B @samp{important} \e$B%U%i%0$,$"$l$P\e(B
+\e$B%U%i%0$r<h$j=|$-$^$9!#\e(Bprefix argument \e$B$r$D$1$F<B9T$7$?>l9g$O!"\e(B@kbd{F} \e$B$H\e(B
+\e$BF1MM$KIU2C$9$k%0%m!<%P%k%U%i%0$r?R$$$F$-$^$9!#\e(B
 (@code{wl-summary-mark-as-important})
 
+@item F
+@kindex F (Summary)
+@findex wl-summary-set-flags
+\e$B%_%K%P%C%U%!$GF~NO$7$?G$0U$N%0%m!<%P%k%U%i%0$r$D$1$^$9!#\e(BEmacs 21\e$B0J9_$J$i\e(B 
+@samp{,} \e$B$G6h@Z$C$FJ#?t$N%U%i%0$rF1;~$K@_Dj=PMh$^$9!#\e(Bprefix argument \e$B$r\e(B
+\e$B$D$1$F<B9T$7$?>l9g$O!"4{$K$D$$$F$$$k%0%m!<%P%k%U%i%0$r<h$j=|$-$^$9!#\e(B
+(@code{wl-summary-set-flags})
+
 @item y
 @itemx e
 @kindex y (Summary)
@@ -3446,10 +3501,17 @@ last:\e$B?t;z\e(B        \e$B%U%#%k%?%U%)%k%@$K0\F0$7$^$9!#\e(B
 @item r $
 @kindex r $ (Summary)
 @findex wl-summary-mark-as-important-region
-\e$B;XDj%j!<%8%g%s$K$"$k%a%C%;!<%8A4$F$K\e(B @samp{$} \e$B%^!<%/$r$D$1$^$9!#\e(B
-\e$B$9$G$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P%^!<%/$r<h$j=|$-$^$9!#\e(B
+\e$B;XDj%j!<%8%g%s$K$"$k%a%C%;!<%8A4$F$K\e(B @samp{important} \e$B%U%i%0$r$D$1$^$9!#\e(B
+\e$B$9$G$K\e(B @samp{important} \e$B%U%i%0$,$"$l$P%^!<%/$r<h$j=|$-$^$9!#\e(B
 (@code{wl-summary-mark-as-important-region})
 
+@item r F
+@kindex r F (Summary)
+@findex wl-summary-set-flags-region
+\e$B;XDj%j!<%8%g%s$K$"$k%a%C%;!<%8A4$F$K%_%K%P%C%U%!$GF~NO$7$?G$0U$N%0%m!<%P\e(B
+\e$B%k%U%i%0$r$D$1$^$9!#\e(B
+(@code{wl-summary-set-flags-region})
+
 @item r !
 @kindex r ! (Summary)
 @findex wl-summary-mark-as-unread-region
@@ -3515,11 +3577,18 @@ prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4$F$rFI$s$
 @item t $
 @kindex t $ (Summary)
 @findex wl-thread-mark-as-important
-\e$B%+!<%=%k9T$,$"$k%a%C%;!<%8$r@hF,$H$9$k%9%l%C%I$K\e(B @samp{$} \e$B%^!<%/$r$D$1$^$9!#\e(B
-\e$B4{$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P%^!<%/$r<h$j=|$-$^$9!#\e(B
-prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4BN$K\e(B
-\e$BE,MQ$7$^$9!#\e(B
-(@code{wl-thread-mark-as-important})
+\e$B%+!<%=%k9T$,$"$k%a%C%;!<%8$r@hF,$H$9$k%9%l%C%I$K\e(B @samp{important} \e$B%U%i%0\e(B
+\e$B$r$D$1$^$9!#4{$K\e(B @samp{important} \e$B%U%i%0$,$"$l$P<h$j=|$-$^$9!#\e(Bprefix
+argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4BN$KE,MQ$7\e(B
+\e$B$^$9!#\e(B(@code{wl-thread-mark-as-important})
+
+@item t F
+@kindex t F (Summary)
+@findex wl-thread-set-flags
+\e$B%+!<%=%k9T$,$"$k%a%C%;!<%8$r@hF,$H$9$k%9%l%C%I$K%_%K%P%C%U%!$GF~NO$7$?G$\e(B
+\e$B0U$N%0%m!<%P%k%U%i%0$r$D$1$^$9!#\e(Bprefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"\e(B
+\e$B$k%a%C%;!<%8$r4^$`%9%l%C%IA4BN$KE,MQ$7$^$9!#\e(B
+(@code{wl-thread-set-flags})
 
 @item t !
 @kindex t ! (Summary)
@@ -3600,10 +3669,17 @@ prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4BN$rJ]B8$
 @item m $
 @kindex m $ (Summary)
 @findex wl-summary-target-mark-mark-as-important
-\e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$K\e(B @samp{$} \e$B%^!<%/$r$D$1$^$9!#\e(B
-\e$B$9$G$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P%^!<%/$r<h$j=|$-$^$9!#\e(B
+\e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$K\e(B @samp{important} \e$B%U%i%0\e(B
+\e$B$r$D$1$^$9!#$9$G$K\e(B @samp{important} \e$B%U%i%0$,$"$l$P<h$j=|$-$^$9!#\e(B
 (@code{wl-summary-target-mark-mark-as-important})
 
+@item m F
+@kindex m F (Summary)
+@findex wl-summary-target-mark-set-flags
+\e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$K%_%K%P%C%U%!$GF~NO$7$?G$\e(B
+\e$B0U$N%0%m!<%P%k%U%i%0$r$D$1$^$9!#\e(B
+(@code{wl-summary-target-mark-set-flags})
+
 @item m !
 @kindex m ! (Summary)
 @findex wl-summary-target-mark-mark-as-unread
@@ -4065,6 +4141,20 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
                    ("^\\*.*" . hide) (".*" . read)))
 @end group
 @end lisp
+
+@item wl-summary-flag-alist
+@vindex wl-summary-flag-alist
+\e$B=i4|@_Dj$O0J2<$NDL$j!#\e(B
+
+@lisp
+@group
+((important "orange"))
+@end group
+@end lisp
+
+\e$B%5%^%j$G$N%U%i%0$D$-%a%C%;!<%8$N?'$r;XDj$7$^$9!#0l$D$N%a%C%;!<%8$KJ#?t$N\e(B
+\e$B%0%m!<%P%k%U%i%0$,@_Dj$5$l$F$$$k>l9g$K$O!"$3$N%j%9%H$NA0J}$K$"$k%U%i%0$,\e(B
+\e$BM%@h$5$l$^$9!#$^$?!"%5%^%j$G%U%i%0$rF~NO$9$k>l9g$NJd408uJd$K;H$o$l$^$9!#\e(B
 @end table
 
 
@@ -6624,7 +6714,7 @@ LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 @end table
 
 
-@node Spam Filter, Customization, Address Book, Top
+@node Spam Filter, Migration, Address Book, Top
 @chapter Spam \e$B%U%#%k%?\e(B
 @cindex Spam Filter
 
@@ -7039,7 +7129,7 @@ bsfilter \e$B$r5/F0$9$k%7%'%k$KM?$($k0z?t$r;XDj$7$^$9!#\e(B
 
 @end table
 
-@node SpamAssassin, , bsfilter, Spam Filter Processors
+@node SpamAssassin, Regular Expressions Header Matching, bsfilter, Spam Filter Processors
 @subsection SpamAssassin
 @cindex SpamAssassin
 
@@ -7141,7 +7231,11 @@ overview \e$B>pJs$K4^$^$l$J$$%U%#!<%k%I$r8!::$NBP>]$H$9$k>l9g!"\e(B
 @end table
 
 
-@node Customization, Terminology, Spam Filter, Top
+@node Migration, Customization, Spam Filter, Top
+@chapter \e$B5l%P!<%8%g%s$+$i$N0\9T\e(B
+
+
+@node Customization, Terminology, Migration, Top
 @chapter Wanderlust \e$B$N%+%9%?%^%$%:\e(B
 @cindex Customization