X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=doc%2Fwl-ja.texi;h=22303ebf1e407f7abb741d3cee3173102b8a2ca5;hb=64688ab10328a4f0ec3391f21db0758fc7a11ebd;hp=3ce5f451e198aa1f7967dca704d3bad17233304e;hpb=a7e016ea31e2cf25f2f41edaafbdd822865776dd;p=elisp%2Fwanderlust.git

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 3ce5f45..22303eb 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage ja
 @documentencoding iso-2022-jp
-@set VERSION 2.5.7
+@include version.texi
 @synindex pg cp
 @finalout
 
@@ -245,7 +245,7 @@ Emacs19.28 $B0JA0$r%Y!<%9$H$7$?(B Mule $B$r$*;H$$$N>l9g$O(B SEMI $B$,F0$+$J
 $B$J$N$G(B tm $B$r%$%s%9%H!<%k$7$^$9!#(B
 (tm $B$O%P!<%8%g%s(B 8.7 $B0J9_$r$4MxMQ$/$@$5$$!#(B)
 
-SEMI $B$,;H$($k(B Emacsen $B$G$O!"(Btm $B$h$j$b5!G=$N=<<B$7$?(B SEMI$B$r%$%s%9%H!<%k$9(B
+SEMI $B$,;H$($k(B Emacsen $B$G$O!"(Btm $B$h$j$b5!G=$N=<<B$7$?(B SEMI $B$r%$%s%9%H!<%k$9(B
 $B$k$3$H$r$*4+$a$7$^$9!#(B
 
 $B%$%s%9%H!<%k$NJ}K!$O3F%Q%C%1!<%8$KE:IU$5$l$F$$$k%I%-%e%a%s%H$r;2>H$7$F(B
@@ -277,7 +277,7 @@ APEL, FLIM, SEMI $B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(B
 $B?d>)$5$l$k(B APEL, FLIM, SEMI $B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#(B
 
 @itemize @minus
-@item APEL 10.2, FLIM 1.13.2, SEMI 1.13.7
+@item APEL 10.3, FLIM 1.14.2, SEMI 1.14.3
 @end itemize
 
 $B$=$NB>!"(BFLIM, SEMI $B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"(B
@@ -389,7 +389,7 @@ Cannot open load file: mime-setup
 
 @noindent
 $B$H$$$&%(%i!<$,=P$k$3$H$,$"$j$^$9!#$3$N>l9g$O!"(Bcustom, APEL, FLIM, SEMI 
-$B$N%$%s%9%H!<%k@h$r4D6-JQ?t(B @env{EMACSLOADPATH}$B$K2C$($k$+!"E83+%G%#%l%/%H(B
+$B$N%$%s%9%H!<%k@h$r4D6-JQ?t(B @env{EMACSLOADPATH} $B$K2C$($k$+!"E83+%G%#%l%/%H(B
 $B%j$N(B @file{WL-CFG} $B$H$$$&%U%!%$%kCf$G(B@code{load-path} $B$rDL$7$F$*$/$H$h$$(B
 $B$G$7$g$&!#(B
 
@@ -403,7 +403,7 @@ Cannot open load file: mime-setup
 $B%$%s%9%H!<%k$G(B SEMI $BEy$N(B @code{load-path} $B$N@_Dj$,I,MW$G$"$l$P!"(B
 @file{WL-CFG} $B$K@_Dj$7$F$/$@$5$$!#(B
 
-$B%$%s%9%H!<%k@h$O(B @file{Makefile}$BCf$N(B @code{LISPDIR} $B$G;XDj$7$^$9$,!"(B
+$B%$%s%9%H!<%k@h$O(B @file{Makefile} $BCf$N(B @code{LISPDIR} $B$G;XDj$7$^$9$,!"(B
 $B<B:]$K(B @file{*.el}, @file{*.elc} $B$,F~$k%G%#%l%/%H%j(B
 (@code{LISPDIR} $B$+$i$NAjBP%Q%9(B)$B$O(B
  @file{WL-CFG} $BCf$NJQ?t(B @code{WL_PREFIX}, @code{ELMO_PREFIX} $B$G;XDj$7$^$9!#(B
@@ -463,7 +463,7 @@ package $B$N%G%#%l%/%H%j$O(B SEMI $B$,%$%s%9%H!<%k$5$l$F$$$l$P<+F08!=P$5$l$^$
 @subsection $B%$%s%9%H!<%k$7$J$$$GMxMQ(B
 
 Wanderlust $B$O%P%$%H%3%s%Q%$%k!"%$%s%9%H!<%k$7$J$/$F$b!"(B@file{wl},
-@file{elmo}$B$N%G%#%l%/%H%j$K(B @code{load-path} $B$,@_Dj$5$l$F$$$l$P5/F0$9$k(B
+@file{elmo} $B$N%G%#%l%/%H%j$K(B @code{load-path} $B$,@_Dj$5$l$F$$$l$P5/F0$9$k(B
 $B$3$H$,$G$-$^$9!#Nc$($P(B @file{~/work} $B$K%Q%C%1!<%8$rE83+$7$?>l9g!"(B
 @file{~/.emacs} $B$K0J2<$N@_Dj$r$9$k$H5/F0$G$-$^$9!#(B
 
@@ -533,9 +533,9 @@ Wanderlust $B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#(B
 (setq wl-icon-dir "~/work/wl/etc")
 
 ;; @r{$B%a!<%k$rAw?.$9$k(B SMTP $B%5!<%P!#(B $B=i4|@_Dj$O(B @code{nil}$B!#(B}
-(setq wl-smtp-posting-server "your.smtp.server.com")
+(setq wl-smtp-posting-server "your.smtp.example.com")
 ;; @r{$B%K%e!<%9Ej9FMQ$N(B NNTP $B%5!<%P!#(B $B=i4|@_Dj$O(B @code{nil}$B!#(B}
-(setq wl-nntp-posting-server "your.nntp.server.com")
+(setq wl-nntp-posting-server "your.nntp.example.com")
 @end group
 @end lisp
 
@@ -583,7 +583,7 @@ Wanderlust $B$K8GM-$N@_Dj$O(B @file{~/.wl} $B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 @cindex .addresses
 @cindex Alias, Address
 
-$B%"%I%l%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OHt$P$7$F$b9=$$(B
+$B%"%I%l%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OFI$_Ht$P$7$F$b9=$$(B
 $B$^$;$s!#(B
 
 $B%"%I%l%9%U%!%$%k(B @file{~/.addresses} $B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#(B
@@ -592,7 +592,7 @@ Wanderlust $B$K8GM-$N@_Dj$O(B @file{~/.wl} $B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 $B5/F0$7$?$"$H$G%5%^%j$N%P%C%U%!$+$i(B @file{~/.addresses} $B$K%"%I%l%9$rDI2C(B/
 $BJQ99(B/$B:o=|$9$k$3$H$b2DG=$G$9!#(B
 
-$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J$+$s$8$G$9!#(B
+$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#(B
 
 @example
 @group
@@ -612,9 +612,9 @@ bar@@foo.gohome.org             "Bar $B$5$s(B"      "Michael Bar"
 $B0l9T$,0l?MJ,$NDj5A$G$9!#(B
 
 $B<B:]$K$O(B($B%G%U%)%k%H@_Dj$G$O(B)$B%5%^%jI=<($G(B@var{$B$"$@L>(B}$B!"%I%i%U%H:n@.;~$N%"(B
-$B%I%l%9>pJs$H$7$F(B@var{$BK\L>(B}$B$,$D$+$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,(B
+$B%I%l%9>pJs$H$7$F(B@var{$BK\L>(B}$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,(B
 $B$o$+$j$d$9$$$H;W$o$l$^$9!#$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%"%I%l%9D"$N(B
-$BDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#(B
+$BDj5A$r$d$jD>$9$N$,$h$$$G$7$g$&!#(B
 
 $B$^$?!"JQ?t(B @code{wl-alias-file} $B$K(B MH $B$N(B alias file $B$,;XDj$5$l$F$$$l$P!"(B
 $B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#(B
@@ -638,9 +638,10 @@ LDAP $B$rMxMQ$9$k>l9g$O!"(B@code{wl-ldap-server}$B!"(B@code{wl-ldap-port},
 @file{~/.folders} $B$K=q$+$l$?FbMF$,$=$N$^$^$"$J$?$N9XFI$9$k%U%)%k%@$H$J$j$^$9!#(B
 
 $B5/F0$7$?$"$H$G%U%)%k%@0lMw$N%P%C%U%!$+$i9XFI%U%)%k%@$rDI2C(B/$BJT=8$9$k$3$H(B
-$B$b2DG=$G$9$N$G!"$3$N9`$OHt$P$7$F$b9=$$$^$;$s!#(B
+$B$b2DG=$G$9$N$G!"$3$N9`$OFI$_Ht$P$7$F$b9=$$$^$;$s!#(B
+@xref{Folder Manager}.
 
-@file{~/.folders} $B$N=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J$+$s$8$G$9!#(B
+@file{~/.folders} $B$N=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#(B
 
 @example
 @group
@@ -654,14 +655,14 @@ LDAP $B$rMxMQ$9$k>l9g$O!"(B@code{wl-ldap-server}$B!"(B@code{wl-ldap-port},
 %inbox  "$B<u?.H"(B"
 +trash  "$B%4%_H"(B"
 +draft  "$BAp9F(B"
-%#mh/Backup@@my.imap.server.com "$BAw?.:Q$_(B"
+%#mh/Backup@@my.imap.example.com "$BAw?.:Q$_(B"
 # $B%0%k!<%W$NDj5A(B
 Emacsen@{
     %#mh/spool/wl            "Wanderlust ML"
     %#mh/spool/elips         "ELIPS ML"
     %#mh/spool/apel-ja       "APEL ($BF|K\8l(B) ML"
     %#mh/spool/xemacs-beta   "XEmacs $B%Y!<%?(B"
-    -fj.news.reader.gnus@@other.nntp.server.com
+    -fj.news.reader.gnus@@other.nntp.example.com
     *-fj.editor.xemacs,-fj.editor.mule,-fj.editor.emacs "fj $B$N(B Emacsen"
 @}
 #
@@ -693,7 +694,7 @@ Emacsen@{
 $B%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#(B)
 
 $B<B:]$K;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,$o$+$j$d$9$$$H;W$o$l$^$9!#(B
-$B$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%U%)%k%@$NDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#(B
+$B$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%U%)%k%@$NDj5A$r$d$jD>$9$N$,$h$$$G$7$g$&!#(B
 
 
 @node Start Wanderlust,  , Folder Definition, Start Me Up
@@ -708,7 +709,7 @@ M-x wl
 
 @noindent
 $B$G5/F0$G$-$^$9!#(B
-$B=i4|2=$N$N$A!"%U%)%k%@0lMw$rI=<($9$k%U%)%k%@%b!<%I$,$"$i$o$l$^$9!#(B
+$B=i4|2=$N8e!"%U%)%k%@0lMw$rI=<($9$k%U%)%k%@%b!<%I$,8=$l$^$9!#(B
 
 @kbd{C-u M-x wl} $B$N$h$&$K(B prefix argument $B$D$-$G<B9T$9$k$H!"(B
 $B%U%)%k%@$N%A%'%C%/$r>JN,$7$F5/F0$7$^$9!#(B
@@ -775,36 +776,51 @@ default $BCM(B:
              $B=i4|@_Dj$O(B $B4D6-JQ?t(B @env{USER} $B$+!"(B@env{LOGNAME} $B$+!"(B
              @code{(user-login-name)} $B$NJV$jCM!#(B
 $BG'>ZK!(B    -> $BJQ?t(B @code{elmo-default-imap4-authenticate-type} $B$NCM!#(B
-             $B=i4|@_Dj$O(B 'login$B!#(B
+             $B=i4|@_Dj$O(B @code{login}$B!#(B
 $B%[%9%HL>(B  -> $BJQ?t(B @code{elmo-default-imap4-server} $B$NCM!#(B
-             $B=i4|@_Dj$O(B "localhost"$B!#(B
+             $B=i4|@_Dj$O(B @samp{localhost}$B!#(B
 $B%]!<%HHV9f(B-> $BJQ?t(B @code{elmo-default-imap4-port} $B$NCM!#(B
              $B=i4|@_Dj$O(B 143$B!#(B
 @end example
 
 $B%a%$%s$G;HMQ$9$k(B IMAP $B%5!<%P$rJQ?t(B @code{elmo-default-imap4-server} 
-$B$K;XDj$9$k$H!"$$$A$$$A%U%)%k%@L>$K%[%9%HL>$r=q$+$:$K$9$_$^$9!#Nc$($P%U%!(B
+$B$K;XDj$9$k$H!"$$$A$$$A%U%)%k%@L>$K%[%9%HL>$r=q$+$:$K:Q$_$^$9!#Nc$($P%U%!(B
 $B%$%"%&%)!<%k$r1[$($J$1$l$P$J$i$J$$>l9g$G$b(B @samp{foo%imap@@gateway} $B$N$h(B
 $B$&$K;XDj$G$-$^$9!#(B
 
+@lisp
+;; $BNc(B: imap4.exaple.org $B$r%a%$%s$G;HMQ$9$k(B IMAP $B%5!<%P$H$7$F@_Dj(B
+(setq elmo-default-imap4-server "imap4.example.org")
+@end lisp
+
 $B%U%)%k%@L>$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL (Secure Socket Layer)$B$r(B
-$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B@samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(BSSL$B%3%M%/(B
+$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B@samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(BSSL $B%3%M%/(B
 $B%7%g%s$rD%$j$^$9!#JQ?t(B @code{elmo-default-imap4-stream-type} $B$NCM$,(B 
-non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttls $B$J$i(B 
-@samp{!!} $B$r0UL#$7$^$9!#(B
+@code{ssl} $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} 
+$B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B
+
+@lisp
+;; $BNc(B: SSL $B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k(B
+(setq elmo-default-imap4-stream-type 'ssl) 
+@end lisp
 
 (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9(B
-$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B
-$BDL$C$F$$$kI,MW$,$"$j$^$9!#(BSTARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls$B%Q%C(B
+$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL $B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B
+$BDL$C$F$$$kI,MW$,$"$j$^$9!#(BSTARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls $B%Q%C(B
 $B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#(B)
 
 $BG'>ZK!$H$7$F!"(B@code{login}$B!"(B@code{cram-md5} $B$b$7$/$O(B @code{digest-md5} 
 $B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,(B
-$B%Q%9%o!<%I$r%(%s%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N$N$A!"(B
+$B%Q%9%o!<%I$r%(%s%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N8e!"(B
 @code{clear} ($B@8%Q%9%o!<%I$rAw$k(B) $B$K@ZBX$($^$9!#JQ?t(B 
 @code{elmo-imap4-force-login} $B$,(B non-nil $B$J$i$P!"3NG'L5$7$K(B @code{clear} 
 $B$K@ZBX$($^$9(B($B=i4|@_Dj$O(B @code{nil})$B!#(B
 
+@lisp
+;; $BNc(B: $B@8%Q%9%o!<%I$GG'>Z(B
+(setq elmo-default-imap4-authenticate-type 'clear) 
+@end lisp
+
 $BNc(B:
 
 @example
@@ -891,15 +907,15 @@ default $BCM(B:
              $B=i4|@_Dj$O(B 119$B!#(B
 @end example
 
-@var{$B%f!<%6L>(B}$B$,(B non-nil $B$N>l9g$O(BAUTHINFO$B$K$h$kG'>Z$r9T$J$$$^$9!#(B
+@var{$B%f!<%6L>(B}$B$,(B non-nil $B$N>l9g$O(B AUTHINFO $B$K$h$kG'>Z$r9T$J$$$^$9!#(B
 $B%U%)%k%@L>$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL $B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B
 @samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(B SSL $B%3%M%/%7%g%s$rD%$j$^$9!#(B
 $BJQ?t(B @code{elmo-default-nntp-stream-type} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B
 $B$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} $B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B
 
 (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9(B
-$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B
-$BDL$C$F$$$kI,MW$,$"$j$^$9!#(BSTARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls$B%Q%C(B
+$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL $B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B
+$BDL$C$F$$$kI,MW$,$"$j$^$9!#(BSTARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls $B%Q%C(B
 $B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#(B)
 
 $BNc(B:
@@ -1047,7 +1063,7 @@ ange-ftp $BI=5-$b(B ange-ftp, efs $B$,;H$($k4D6-$G$O(B OK $B$G$9!#(B
 @var{$B%"!<%+%$%P%?%$%W(B}$B$r>JN,$7$?>l9g!"JQ?t(B @code{elmo-archive-default-type}
 ($B=i4|@_Dj$O(B @code{zip})$B$,;2>H$5$l$^$9!#(B
 
-@var{$B%W%l%U%#%/%9(B}$B$O!"=q8K$,%G%#%l%/%H%j9=B$$r$b$C$F$$$k>l9g$K!"$=$N%G%#(B
+@var{$B%W%l%U%#%/%9(B}$B$O!"=q8K$,%G%#%l%/%H%j9=B$$r;}$C$F$$$k>l9g$K!"$=$N%G%#(B
 $B%l%/%H%jItJ,$r;XDj$7$^$9!#$3$l$O<g$K%"!<%+%$%V%5!<%S%9$d(B @command{tar} +
 @command{gzip} + @command{uuencode} $B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k(B 
 ML $B$N=q8K%U%!%$%k$rE83+$9$k$3$H$J$/%^%&%s%H$9$k$?$a$N$b$N!"$D$^$j1\Mw;~(B
@@ -1160,7 +1176,7 @@ GNU tar $B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#(B
 
 $B$^$?!"0l$D$N=q8K%U%!%$%k$KB?$/$N%U%!%$%k$,4^$^$l$F$$$k$H%"!<%+%$%P5/F0;~(B
 $B$N%*!<%P!<%X%C%I$,2CB.EYE*$KA}2C$9$k(B($BFC$K(B LHA $B$N>l9g(B)$B$?$a!"(B150 $BDLDxEY!"(B
-$B:GBg$G$b(B 200$BDL$^$G$K$7$F$*$/$H!"%9%H%l%9$J$/FI$_=q$-$G$-$k$G$7$g$&!#(B
+$B:GBg$G$b(B 200 $BDL$^$G$K$7$F$*$/$H!"%9%H%l%9$J$/FI$_=q$-$G$-$k$G$7$g$&!#(B
 
 $B$J$*!"EvA3$N$3$H$J$,$i(B
 
@@ -1292,7 +1308,7 @@ default $BCM(B:
 @end group
 @end example
 
-APOP $B$rMxMQ$9$k$K$O!"(B@file{md5.el} $B$,I,MW$G$9!#(B(XEmacs$B$G$OI,MW$"$j$^$;$s!#(B
+APOP $B$rMxMQ$9$k$K$O!"(B@file{md5.el} $B$,I,MW$G$9!#(B(XEmacs $B$G$OI,MW$"$j$^$;$s!#(B
 ) @file{md5.el} $B$O(B $BK\%Q%C%1!<%8$N(B @file{utils/sasl/lisp/} $B$+(B Emacs/W3 $B%Q%C(B
 $B%1!<%8(B (@uref{http://www.cs.indiana.edu/elisp/w3/docs.html})$B!"$^$?$O(B LCD
 archive $B$+$iF~<j2DG=$G$9(B(GPL2)$B!#(B
@@ -1301,9 +1317,9 @@ archive $B$+$iF~<j2DG=$G$9(B(GPL2)$B!#(B
 $BJQ?t(B @code{elmo-default-pop3-stream-type} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B
 $B$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} $B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B
 (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9$k(B
-$BI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @file{openssl} $B$K%Q%9$,DL$C$F$$$k(B
+$BI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL $B$K4^$^$l$k(B @file{openssl} $B$K%Q%9$,DL$C$F$$$k(B
 $BI,MW$,$"$j$^$9!#(B
-STARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls$B%Q%C%1!<%8$r%$%s%9%H!<%k(B
+STARTTLS $B$rMxMQ$9$k$K$O!"$5$i$K!"(Bstarttls $B%Q%C%1!<%8$r%$%s%9%H!<%k(B
 $B$9$kI,MW$,$"$j$^$9!#(B)
 
 @node Multi Folder, Filter Folder, POP Folder, Folders
@@ -1399,7 +1415,7 @@ lastyear  ->  $B5nG/$N:#F|(B
 @example
 @group
 /since:3daysago/+inbox $B"*(B $B:G6a#3F|4V$N(B +inbox $BCf$N%a%C%;!<%8!#(B
-/before:yesterday/+inbox $B"*(B $B$-$N$&$h$j0JA0$N(B +inbox $BCf$N%a%C%;!<%8!#(B
+/before:yesterday/+inbox $B"*(B $B:rF|$h$j0JA0$N(B +inbox $BCf$N%a%C%;!<%8!#(B
 @end group
 @end example
 
@@ -1474,7 +1490,7 @@ lastyear  ->  $B5nG/$N:#F|(B
 /last:100//to:teranisi/*+inbox,%inbox
        -> +inbox $B$H(B %inbox $BCf$N%a%C%;!<%8$N$&$A!"(B
           To: $B%U%#!<%k%I$,(B "teranisi" $B$K%^%C%A$9$k(B
-          $B%a%C%;!<%8$N:G6a$N(B100$B8D$rI=<($9$k%U%)%k%@!#(B
+          $B%a%C%;!<%8$N:G6a$N(B 100 $B8D$rI=<($9$k%U%)%k%@!#(B
 
 /from:hogehoge//last:20//tocc:teranisi/%#mh/inbox@@localhost
        -> %#mh/inbox@@localhost $B$NCf$G!"(BTo $B$+(B Cc $B$K(B "teranisi" $B$,4^$^$l$k(B
@@ -1524,7 +1540,7 @@ lastyear  ->  $B5nG/$N:#F|(B
 @end group
 @end example
 
-$B%a%C%;!<%8$,0\F0$7$?$"$H!"%U%C%/(B @code{elmo-pipe-drained-hook} $B$,8F$P$l(B
+$B%a%C%;!<%8$,0\F0$7$?8e!"%U%C%/(B @code{elmo-pipe-drained-hook} $B$,8F$P$l(B
 $B$^$9$N$G!"%@%&%s%m!<%I8e$K<B9T$7$?$$4X?t$rEPO?$7$F$*$/$H$h$$$G$7$g$&!#(B
 
 @node Internal Folder,  , Pipe Folder, Folders
@@ -1547,7 +1563,7 @@ Wanderlust $B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#(B
 @end example
 
 @samp{'mark} $B$H$$$&%U%)%k%@$O!"8e=R$N=EMW%^!<%/(B(@samp{$})$B$,$D$$$?%a%C%;!<(B
-$B%8$r$"$D$+$&FCJL$J2>A[%U%)%k%@$G$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"(B
+$B%8$r07$&FCJL$J2>A[%U%)%k%@$G$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"(B
 $B$"$H$+$i8+D>$7$?$$$H$-$J$I$KJXMx$G$9!#(B
 
 $B$3$N%U%)%k%@$G%a%C%;!<%8$r:o=|$9$k$H!"$=$N%a%C%;!<%8$K$D$$$F$$$?(B 
@@ -1826,7 +1842,7 @@ Wanderlust $B$N%5!<%P!&%]!<%HJL$N%*%U%i%$%s(B/$B%*%s%i%$%s$rJQ99$7$^$9!#(B
 @item wl-folder-info-save
 @vindex wl-folder-info-save
 $B=i4|@_Dj$O(B @code{t}$B!#(B
-$B<!$KN)$A>e$2D>$7$?$H$-$KA02s$NL$FI?t$J$I$N7k2L$r;H$$$^$o$7$9$k$+$I$&$+!"$G$9!#(B
+$B<!$KN)$A>e$2D>$7$?$H$-$KA02s$NL$FI?t$J$I$N7k2L$r;H$$2s$7$9$k$+$I$&$+!"$G$9!#(B
 
 @item wl-stay-folder-window
 @vindex wl-stay-folder-window
@@ -1836,7 +1852,7 @@ Non-nil $B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 @item wl-folder-window-width
 @vindex wl-folder-window-width
 $B=i4|@_Dj$O(B 20$B!#(B
-@code{wl-stay-folder-window} $B$,(B non-nil $B$N$H$-$K$N$3$9%U%)%k%@%P%C%U%!$N%&%#%s%I%&$NI}$G$9!#(B
+@code{wl-stay-folder-window} $B$,(B non-nil $B$N$H$-$K;D$9%U%)%k%@%P%C%U%!$N%&%#%s%I%&$NI}$G$9!#(B
 
 @item wl-folder-many-unsync-threshold
 @vindex wl-folder-many-unsync-threshold
@@ -2012,7 +2028,7 @@ Non-nil $B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 $B%0%k!<%WFb$N%U%)%k%@$rJB$SJQ$($9$k:]!"(B@code{wl-fldmgr-sort-func} $B$K;XDj(B
 $B$5$l$?4X?t$rMQ$$$^$9!#=i4|@_Dj$G$O(B @code{wl-fldmgr-sort-standard} $B$,;XDj(B
 $B$5$l$F$*$j!"$3$l$O%"%k%U%!%Y%C%H=g$KJB$S$+$(%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#(B
-$BJB$SJQ$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SJQ$($O$7$^$;$s!#(B
+$BJB$SBX$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SBX$($O$7$^$;$s!#(B
 $B$D$^$j!":F5"E*$K$O9T$$$^$;$s!#(B
 
 @subsubsection $B%"%/%;%9%0%k!<%WFb$NI=<($7$J$$%U%)%k%@$N;XDj(B
@@ -2056,7 +2072,7 @@ unsubscribe $B$9$k$+$I$&$+$r@_Dj$7$F$$$k$@$1$G$9$N$G!"EvA3$=$N%"%/%;%9%0%k!<(B
 $B%"%/%;%9%0%k!<%W$r(B @kbd{C-u @key{RET}} $B$G99?7$7$F$/$@$5$$!#(B
 @xref{Selecting Folder}.
 
-$B$^$?!"A^F~(B/$B:o=|(B/$BJB$SJQ$($J$I$r9T$C$?$"$H$N%U%)%k%@$NJB$S$OJ];}$5$l$^$9!#(B
+$B$^$?!"A^F~(B/$B:o=|(B/$BJB$SBX$($J$I$r9T$C$?$"$H$N%U%)%k%@$NJB$S$OJ];}$5$l$^$9!#(B
 $B$b$7(B @code{wl-force-fetch-folders} $B$r@_Dj$9$k$+!"(B
 @kbd{C-u @key{RET}} $B$G%0%k!<%W$r3+$/$+$9$k$H!"(B
 $BB8:_$7$J$$%U%)%k%@$O:o=|$5$l!"(B
@@ -2178,7 +2194,7 @@ nntp$B$J$I$N:o=|$G$-$J$$%U%)%k%@$G$O(B msgdb $B$N$_:o=|$7$^$9!#(B
 @item m s
 @kindex m s (Folder)
 @findex wl-fldmgr-sort
-$B%0%k!<%WFb$N%U%)%k%@$rJB$SJQ$($k(B ($B$=$N%0%k!<%W3,AX$N$_(B)$B!#(B
+$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($k(B ($B$=$N%0%k!<%W3,AX$N$_(B)$B!#(B
 (@code{wl-fldmgr-sort})
 
 @item m C-s
@@ -2379,7 +2395,7 @@ News $B%U%)%k%@$G$O(B article $BHV9f!"(BIMAP $B%U%)%k%@$G$O(B UID$B!"(BM
 @table @samp
 @item *
 $B$^$H$a=hM}MQ%^!<%/$G$9!#(B
-@kbd{m} $B$G$O$8$^$k%3%^%s%I$G(B @samp{*}$B%^!<%/$N$D$$$?%a%C%;!<%8BP$7$F0l3g$7$?=hM}(B
+@kbd{m} $B$G;O$^$k%3%^%s%I$G(B @samp{*}$B%^!<%/$N$D$$$?%a%C%;!<%8BP$7$F0l3g$7$?=hM}(B
 $B$,$G$-$^$9!#(B
 
 @item D
@@ -2398,7 +2414,7 @@ News $B%U%)%k%@$G$O(B article $BHV9f!"(BIMAP $B%U%)%k%@$G$O(B UID$B!"(BM
 
 @subsection $B1JB3E*%^!<%/(B
 
-$B1JB3E*%^!<%/$O!"%a%C%;!<%8$N>uBV$r$7$a$9%^!<%/$G$9!#(B
+$B1JB3E*%^!<%/$O!"%a%C%;!<%8$N>uBV$r<($9%^!<%/$G$9!#(B
 
 $B1JB3E*%^!<%/$K$O!"(B@samp{N}, @samp{U}, @samp{!}, @samp{u}, @samp{$} $B$,$"$j$^$9!#(B
 
@@ -2415,7 +2431,7 @@ News $B%U%)%k%@$G$O(B article $BHV9f!"(BIMAP $B%U%)%k%@$G$O(B UID$B!"(BM
 $B4{FI%a%C%;!<%8$KIU$-$^$9!#%^!<%/$J$7$H$N0c$$$O!"(B@samp{u} $B$N%a%C%;!<%8$O(B
 $B%-%c%C%7%e$5$l$F$$$J$$$3$H$G$9!#(B
 @item $
-@kbd{$} $B%-!<$r2!$9$H!"(B@samp{$} $B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O(BEmacs$B$r=*N;(B
+@kbd{$} $B%-!<$r2!$9$H!"(B@samp{$} $B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O(B Emacs $B$r=*N;(B
 $B$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=EMW$J(B
 $B%a%C%;!<%8$KIU$1$F$*$/$HJXMx$G$9!#(B@samp{$} $B$NIU$$$?%a%C%;!<%8$O!"%K%e!<(B
 $B%95-;v$d%5!<%P>e$N(B IMAP $B%U%)%k%@$N%a%C%;!<%8$,(B expire $B$5$l$k$J$I$7$F>C$((B
@@ -2425,12 +2441,12 @@ News $B%U%)%k%@$G$O(B article $BHV9f!"(BIMAP $B%U%)%k%@$G$O(B UID$B!"(BM
 @end table
 
 @samp{N}, @samp{U}, @samp{u} $B$O!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$J$$(B
-$B$3$H$r$7$a$7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C(B
+$B$3$H$r<($7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C(B
 $B%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"%M%C%H%o!<%/$K@\B3$5$l$F$$$J$/$F$b(B
 IMAP $B%U%)%k%@$N%a%C%;!<%8$d(B NNTP $B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-(B
 $B$^$9!#(B
 
-@subsection $B%a%C%;!<%8$NFI$_$9$9$a$+$?(B
+@subsection $B%a%C%;!<%8$NFI$_?J$a$+$?(B
 
 $B4pK\E*$K%9%Z!<%9%-!<$r2!$9$@$1$GFI$_?J$a$k$3$H$,$G$-$^$9!#(B
 $B%5%^%j$NI=<(FbMF$r%U%)%k%@$N:G?7$N>uBV$K9g$o$;$k(B($BF14|$9$k(B)$B$K$O!"(B
@@ -2513,7 +2529,6 @@ prefix argument $B$D$-$G(B @kbd{/} $B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#(
 @item wl-cache-prefetch-folder-type-list
 @vindex wl-cache-prefetch-folder-type-list
 $B=i4|@_Dj$O0J2<$N%j%9%H!#(B
-The initial setting is the list shown below:
 @lisp
 @group
 (nntp imap4)
@@ -2770,7 +2785,7 @@ prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @item E
 @kindex E (Summary)
 @findex wl-summary-reedit
-$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$NFbMF$r$b$D%I%i%U%H$rMQ0U$7$^$9!#(B
+$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$NFbMF$r;}$D%I%i%U%H$rMQ0U$7$^$9!#(B
 $B$b$7!"(Bprefix argument $B$D$-$G<B9T$9$l$P(B Supersedes $B%a%C%;!<%8$r:n@.$7$^$9!#(B
 $B$?$@$7!"(BNNTP $B%U%)%k%@$G$+$D<+J,$,Ej9F$7$?%a%C%;!<%8$K8B$j$^$9!#(B
 (@code{wl-summary-reedit})
@@ -2825,6 +2840,9 @@ prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @findex wl-summary-down
 $B2<J}8~$K$"$kL$FI$b$7$/$O(B @samp{$}$B%^!<%/$D$-$N%a%C%;!<%8$X0\F0$7$^$9!#(B
 $B%*%U%i%$%s%b!<%I$N$H$-$K$O!"%-%c%C%7%e$5$l$F$$$J$$%a%C%;!<%8$K0\F0$7$^$;$s!#(B
+$B$?$@$7!"$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$,$"$k>l9g$O!"(B
+$B$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#(B
+$B$3$N5sF0$O(B @code{wl-summary-move-order}$B$NCM$K1~$8$FJQ$o$j$^$9!#(B
 (@code{wl-summary-down})
 
 @item P
@@ -2832,6 +2850,9 @@ prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @findex wl-summary-up
 $B>eJ}8~$K$"$kL$FI$b$7$/$O(B @samp{$}$B%^!<%/$D$-$N%a%C%;!<%8$X0\F0$7$^$9!#(B
 $B%*%U%i%$%s%b!<%I$N$H$-$K$O!"%-%c%C%7%e$5$l$F$$$J$$%a%C%;!<%8$K0\F0$7$^$;$s!#(B
+$B$?$@$7!"$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$,$"$k>l9g$O!"(B
+$B$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#(B
+$B$3$N5sF0$O(B @code{wl-summary-move-order}$B$NCM$K1~$8$FJQ$o$j$^$9!#(B
 (@code{wl-summary-up})
 
 @item w
@@ -2874,7 +2895,7 @@ MIME $B$G%+%W%;%k2=$5$l$?J#?t$N%a%C%;!<%84^$`>l9g!"(B
 @kindex @@ (Summary)
 @findex wl-summary-edit-petname
 $B%5%^%j9T$N%a!<%k$N(B @samp{From:} ($BH/?.<T(B)$B$r(B @file{~/.addresses} $B$K%$%s%?(B
-$B%i%/%F%#%V$KDI2C$7$^$9!#$9$G$KEPO?$5$l$F$$$k>l9g$OJQ99(B/$B:o=|$b$G$-$^$9!#(B
+$B%i%/%F%#%V$KDI2C$7$^$9!#4{$KEPO?$5$l$F$$$k>l9g$OJQ99(B/$B:o=|$b$G$-$^$9!#(B
 prefix argument $B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?(B/$BJQ99(B/$B:o=|$G$-(B
 $B$^$9!#(B(@code{wl-summary-edit-petname})
 
@@ -2895,7 +2916,7 @@ prefix argument $B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?(B/$BJQ99(B/$B:
 @findex wl-summary-print-message
 $B8=:_$N%a%C%;!<%8$NFbMF$r0u:~$7$^$9!#(BEmacs 20$B0J9_(B $B$G$O(B @code{ps-print} $B$r(B
 $B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"(B@code{wl-ps-print-buffer-func} $B$r(B
-@code{ps-print-buffer} $B$K@_Dj$7$?$[$&$,$h$$$+$b$7$l$^$;$s!#(B
+@code{ps-print-buffer} $B$K@_Dj$7$?$[$&$,NI$$$+$b$7$l$^$;$s!#(B
 
 @lisp
 (setq wl-ps-print-buffer-func 'ps-print-buffer)
@@ -2924,7 +2945,7 @@ prefix argument $B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?(B/$BJQ99(B/$B:
 
 @item I
 @kindex I (Summary)
-$B%5%^%j$NI=<($r99?7$7$?$"$H!"(B
+$B%5%^%j$NI=<($r99?7$7$?8e!"(B
 @code{wl-summary-incorporate-marks} $B$K4^$^$l$k%^!<%/$r;}$D%a%C%;!<%8$r(B
 $B%W%j%U%'%C%A$7$^$9!#(B
 @findex wl-summary-incorporate
@@ -2933,7 +2954,7 @@ prefix argument $B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?(B/$BJQ99(B/$B:
 @item M-j
 @kindex M-j (Summary)
 @findex wl-summary-jump-to-msg-by-message-id
-$BF~NO$7$?(B @samp{Message-ID:} $B$r$b$D%a%C%;!<%8$N9T$K%8%c%s%W$7$^$9!#(B
+$BF~NO$7$?(B @samp{Message-ID:} $B$r;}$D%a%C%;!<%8$N9T$K%8%c%s%W$7$^$9!#(B
 @code{elmo-use-database} $B$,(B non-nil$B$J$i!"8=:_$N%5%^%j0J30$+$i$b8uJd$r8!(B
 $B:w$7$^$9!#(B(@code{wl-summary-jump-to-msg-by-message-id})
 
@@ -2953,8 +2974,8 @@ prefix argument $B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?(B/$BJQ99(B/$B:
 @kindex s (Summary)
 @findex wl-summary-sync
 $B%a%C%;!<%8$N0lMwI=<($N99?7%l%s%8(B(@samp{all}, @samp{update},
-@samp{rescan}, @samp{first}, @samp{last})$B$NF~NO$r<u$1IU$1$?$N$A!"$=$l$K(B
-$B$b$H$E$$$F%a%C%;!<%8$N0lMwI=<($r99?7$7$^$9!#(B
+@samp{rescan}, @samp{first}, @samp{last})$B$NF~NO$r<u$1IU$1$?8e!"$=$l$K(B
+$B4p$E$$$F%a%C%;!<%8$N0lMwI=<($r99?7$7$^$9!#(B
 
 @example
 @group
@@ -2972,9 +2993,9 @@ first, last    ...$B%U%#%k%?%U%)%k%@$K0\F0(B
 @item S
 @kindex S (Summary)
 @findex wl-summary-sort
-$B%5%^%j$NI=<(=g=x$rJB$SJQ$($^$9!#(B@samp{date} ($BF|IU(B)$B!"(B@samp{from}($BH/?.<T(B)$B!"(B
+$B%5%^%j$NI=<(=g=x$rJB$SBX$($^$9!#(B@samp{date} ($BF|IU(B)$B!"(B@samp{from}($BH/?.<T(B)$B!"(B
 @samp{number}($B%a%C%;!<%8HV9f(B)$B!"(B@samp{subject}($B%5%V%8%'%/%H(B) $B$N$$$:$l$+$r(B
-$B85$KJB$SJQ$($^$9!#(B(@code{wl-summary-sort})
+$B85$KJB$SBX$($^$9!#(B(@code{wl-summary-sort})
 
 @item T
 @kindex T (Summary)
@@ -2999,7 +3020,7 @@ first, last    ...$B%U%#%k%?%U%)%k%@$K0\F0(B
 
 @item V
 @kindex V (Summary)
-$BM?$($i$l$?>r7o$r;}$D%a%C%;!<%8$N$_$r$b$D2>A[%U%)%k%@$X0\F0$7$^$9!#(B
+$BM?$($i$l$?>r7o$r;}$D%a%C%;!<%8$N$_$r;}$D2>A[%U%)%k%@$X0\F0$7$^$9!#(B
 prefix argument $B$D$-$G<B9T$9$k$H2>A[%U%)%k%@$+$iC&=P$7$^$9!#(B
 @findex wl-summary-virtual
 (@code{wl-summary-virtual})
@@ -3025,7 +3046,7 @@ prefix argument $B$D$-$G<B9T$9$k$H2>A[%U%)%k%@$+$iC&=P$7$^$9!#(B
 @item i
 @kindex i (Summary)
 $B%+!<%=%k9T$N%a%C%;!<%8$r%W%j%U%'%C%A$7$^$9!#(B
-prefix argument $B$D$-$J$i$P$9$G$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b(B
+prefix argument $B$D$-$J$i$P4{$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b(B
 $B:FEY%W%j%U%'%C%A$7$^$9!#(B
 @findex wl-summary-prefetch
 (@code{wl-summary-prefetch})
@@ -3163,7 +3184,7 @@ prefix argument $B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4$F$rFI$s$
 @kindex t $ (Summary)
 @findex wl-thread-mark-as-important
 $B%+!<%=%k9T$,$"$k%a%C%;!<%8$r@hF,$H$9$k%9%l%C%I$K(B @samp{$} $B%^!<%/$r$D$1$^$9!#(B
-$B$9$G$K(B @samp{$} $B%^!<%/$,$"$l$P:o=|$7$^$9!#(B
+$B4{$K(B @samp{$} $B%^!<%/$,$"$l$P:o=|$7$^$9!#(B
 prefix argument $B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%I$K(B
 @samp{$} $B%^!<%/$r$D$1$k$+:o=|$9$k$+$7$^$9!#(B
 (@code{wl-thread-mark-as-important})
@@ -3327,7 +3348,7 @@ prefix argument $B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4$F$rJ]B8$
 @item m ?
 @kindex m ? (Summary)
 @findex wl-summary-target-mark-pick
-$B$^$H$a=hM}MQ%^!<%/(B @samp{*} $B$N$D$$$?%a%C%;!<%8$N$J$+$G!"(B
+$B$^$H$a=hM}MQ%^!<%/(B @samp{*} $B$N$D$$$?%a%C%;!<%8$NFb!"(B
 $B>r7o$K%^%C%A$9$k%a%C%;!<%8$N(B @samp{*} $B%^!<%/$N$_$r;D$7$^$9!#(B
 (@code{wl-summary-target-mark-pick})
 
@@ -3416,9 +3437,11 @@ Non-nil $B$J$i%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$KI=<($7$^$9!#(B
 $B1Q8l!"(B@samp{fr} $B$J$i%U%i%s%98l!"(B@samp{de} $B$J$i%I%$%D8l$H$J$j$^$9!#(B
 
 @item wl-summary-fix-timezone
-@vindex  wl-summary-fix-timezone
-$B=i4|@_Dj$O(B @samp{JST}$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#(B
-@code{nil} $B$J$i(B GMT $B$KD>$7$^$9!#(B
+@vindex wl-summary-fix-timezone
+$B=i4|@_Dj$O(B @samp{nil}$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#(B
+@code{nil} $B$J$i$P!"%G%U%)%k%H$N%?%$%`%>!<%s$r;2>H$7$FD>$7$^$9!#(B
+$B%G%U%)%k%H$N%?%$%`%>!<%s$H$O!"%7%9%F%`$K$"$i$+$8$a@_Dj$5$l$?%?%$%`%>!<%s$+!"(B
+$B4D6-JQ?t(B @samp{TZ} $B$NCM$G$9!#(B
 
 @item wl-use-petname
 @vindex  wl-use-petname
@@ -3489,7 +3512,7 @@ petname $B$G$bJd40$,$G$-$^$9!#(B
 @vindex  wl-summary-move-direction-toggle
 $B=i4|@_Dj$O(B @code{t}$B!#(BNon-nil $B$J$i:G8e$K<B9T$5$l$?(B @kbd{p}, @kbd{P},
 @kbd{n}, @kbd{N} $B$N7k2L$G!"<!$N%a%C%;!<%8$,>e$+2<$+$r@Z$jBX$($k!#FI$s$G(B
-$B$$$kJ}8~$r0U<1$7$?$$$H$-$O(B @code{t} $B$K$9$k$H$h$$$G$7$g$&!#(B
+$B$$$kJ}8~$r0U<1$7$?$$$H$-$O(B @code{t} $B$K$9$k$HNI$$$G$7$g$&!#(B
 
 @item wl-from-width
 @vindex wl-from-width
@@ -3513,7 +3536,7 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8
 
 @code{confirm} $B$J$i(B @code{elmo-default-nntp-*} $B$G;XDj$5$l$?%5!<%P$+$i8!(B
 $B:w$9$k$+!"%5!<%P$r;XDj$9$k$+$r3NG'$7$^$9!#$3$N>l9g!"%5!<%P$N%[%9%HL>!"$b(B
-$B$7$/$O(B @samp{-:username@@servername:119!}  $B$N$h$&$K(B NTTP$B%U%)%k%@7A<0$G$N(B
+$B$7$/$O(B @samp{-:username@@servername:119!}  $B$N$h$&$K(B NTTP $B%U%)%k%@7A<0$G$N(B
 $B;XDj$,2DG=$G$9!#(B
 
 @item wl-summary-keep-cursor-command
@@ -3526,7 +3549,7 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8
 @end lisp
 
 @noindent
-$B$9$G$KB8:_$9$k%5%^%j$X0\F0$7$?$H$-$K99?7$;$:!"%+!<%=%k0LCV$rJ]B8$9$k(B
+$B4{$KB8:_$9$k%5%^%j$X0\F0$7$?$H$-$K99?7$;$:!"%+!<%=%k0LCV$rJ]B8$9$k(B
 $B%3%^%s%I$N%j%9%H$G$9!#(B
 
 @item wl-summary-update-confirm-threshold
@@ -3604,6 +3627,29 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8
 @vindex elmo-pop3-use-cache
 $B=i4|@_Dj$O(B @code{t}$B!#(BNon-nil $B$J$i!"(BPOP3 $B$GFI$s$@%a%C%;!<%8$r%-%c%C%7%e$7(B
 $B$^$9!#(B
+
+@item wl-folder-process-duplicates-alist
+@vindex wl-folder-process-duplicates-alist
+$B=i4|@_Dj$O(B @code{nil}$B!#=EJ#$7$?%a%C%;!<%8$,F1$8%U%)%k%@$K$"$k>l9g$NF0:n(B
+$B$r;XDj$7$^$9!#3F9`L\$O!"%U%)%k%@L>$N@55,I=8=$HF0:n$+$i$J$j$^$9!#(B
+$BF0:n$H$7$F$O0J2<$N$b$N$,;XDj$G$-$^$9!#(B
+
+@example
+@code{nil} : $B=EJ#%a%C%;!<%8$KBP$7!$2?$b$7$J$$!%(B
+@code{hide} : $B=EJ#%a%C%;!<%8$r%5%^%j$KI=<($7$J$$!%(B
+@code{read} : $B=EJ#%a%C%;!<%8$r4{FI$K$9$k!%(B
+@end example
+
+@noindent
+$BNc$($P0J2<$N$h$&$K@_Dj$7$^$9(B ($B%^%k%A%U%)%k%@$G=EJ#%a%C%;!<%8$r1#$9>l9g(B)
+
+@lisp
+@group
+(setq wl-folder-process-duplicates-alist
+                 '(("^\\+draft$" . nil) ("^\\+trash$" . nil)
+                   ("^\\*.*" . hide) (".*" . read)))
+@end group
+@end lisp
 @end table
 
 
@@ -3727,13 +3773,13 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B
 @lisp
 @group
 (setq wl-draft-config-alist
-      '(((string-match "aaa.ne.jp$" (system-name))
+      '(((string-match "aaa.example.com$" (system-name))
          ;; @r{$B<0$,(Bnon-nil$B$J$iE,MQ$9$k(B}
          (wl-smtp-posting-server . "mailserver-B")
          (wl-nntp-posting-server . "newsserver-B")
          ;; @r{$B0l;~E*$JJQ?t$N@_Dj(B}
          )
-        ("^To: .*user@@aaa.bbb.com"
+        ("^To: .*user@@aaa.bbb.example.com"
          ;; @r{$B%I%i%U%H%P%C%U%!$N%X%C%@$K%^%C%A$9$l$PE,MQ$9$k(B}
          ("Organization" . (format "Go %s" my-webpage)))
                            ;; @r{elisp $B<0$,=q$1$k(B (eval $B$7$F$$$k$@$1(B)}
@@ -3764,7 +3810,7 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B
 @example
 'header:      $B%X%C%@$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#(B
 'header-file: $B%X%C%@$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#(B
-'x-face:      $B;XDj$7$?%U%!%$%k$NFbMF$r$b$D(B @samp{X-Face:} $B%U%#!<%k%I$r(B
+'x-face:      $B;XDj$7$?%U%!%$%k$NFbMF$r;}$D(B @samp{X-Face:} $B%U%#!<%k%I$r(B
               $BA^F~$7$^$9!#(B
 'top:         $BK\J8$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#(B
 'top-file:    $BK\J8$N@hF,$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#(B
@@ -3781,10 +3827,10 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B
 $BJQ99$7$?$j<+J,$G:n$C$?4X?t$rDI2C$9$k$3$H$,$G$-$^$9!#4X?t$N=q$-J}$O$3$3$G(B
 $B@bL@$9$k$h$jD>@\%3!<%I$r8+$?J}$,J,$+$j$d$9$$$G$7$g$&$+$i>JN,$7$^$9!#(B
 
-$B3FMWAG$N(B1$BHVL\$K$O(B @var{$B%X%C%@$N@55,I=8=(B} $B$+(B elisp$B<0(B $B$r;XDj$7$^$9!#(Belisp
+$B3FMWAG$N(B1$BHVL\$K$O(B @var{$B%X%C%@$N@55,I=8=(B} $B$+(B elisp $B<0(B $B$r;XDj$7$^$9!#(Belisp
 $B<0$N>l9g$OI>2A$7$?CM$,(B non-nil $B$N>l9g$KE,MQ$5$l$^$9!#(B
 
-$B$^$?!"%G%U%)%k%H$G$OJ#?t$NMWAG$,%^%C%A$^$?$O(Bnon-nil$B$K$J$C$?>l9g$K!"$=$N(B
+$B$^$?!"%G%U%)%k%H$G$OJ#?t$NMWAG$,%^%C%A$^$?$O(B non-nil $B$K$J$C$?>l9g$K!"$=$N(B
 $BA4$F$,E,MQ$5$l$^$9$,!"JQ?t(B @code{wl-draft-config-matchone} $B$r(B@code{t} $B$K(B
 $B$9$k$3$H$G:G=i$K%^%C%A$7$?(B1$B$D$@$1$rE,MQ$9$k$3$H$b$G$-$^$9!#(B
 
@@ -3861,7 +3907,7 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B
          (body . "  $B!{!{$G$9!#(B\n"))
         ("report"
          (template . "default")                 ;; @r{(a)}
-         ("To" . "jousi@@kaisha.jp")
+         ("To" . "jousi@@example.com")
          ("Subject" . "$BJs9p(B")
          (body-file . "~/work/report.txt")
          )
@@ -3895,11 +3941,11 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B
 @noindent
 $B$H=q$/$3$H$G(B @samp{default} $B$N%F%s%W%l!<%H$rE,MQ$9$k$3$H$,$G$-$^$9!#(B
 
-@subsection POP-before-SMTP$B$K$h$k%a!<%k$NAw?.(B
+@subsection POP-before-SMTP $B$K$h$k%a!<%k$NAw?.(B
 @cindex POP-before-SMTP
 @cindex SMTP-after-POP
 
-POP-before-SMTP$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#(B
+POP-before-SMTP $B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#(B
 $B@_Dj$O!"(B
 
 @lisp
@@ -3911,34 +3957,34 @@ POP-before-SMTP$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#(B
 
 @table @code
 @item wl-pop-before-smtp-user
-POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$B%f!<%6L>$G$9!#(B
+POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(B POP $B%f!<%6L>$G$9!#(B
 $B@_Dj$5$l$F$$$J$$>l9g$O(B @code{elmo-default-pop3-user} $B$,;H$o$l$^$9!#(B
 
 @item wl-pop-before-smtp-server
-POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$B%5!<%PL>$G$9!#(B
+POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(B POP $B%5!<%PL>$G$9!#(B
 $B@_Dj$5$l$F$$$J$$>l9g$O(B @code{elmo-default-pop3-server} $B$,;H$o$l$^$9!#(B
 
 @item wl-pop-before-smtp-authenticate-type
-POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$BG'>ZJ}<0$G$9!#(B
+POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(B POP $BG'>ZJ}<0$G$9!#(B
 $B@_Dj$5$l$F$$$J$$>l9g$O(B @code{elmo-default-pop3-authenticate-type}
 $B$,;H$o$l$^$9!#(B
 
 @item wl-pop-before-smtp-port
-POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$B%]!<%HHV9f$G$9!#(B
+POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(B POP $B%]!<%HHV9f$G$9!#(B
 $B@_Dj$5$l$F$$$J$$>l9g$O(B  @code{elmo-default-pop3-port} $B$,;H$o$l$^$9!#(B
 
 @item wl-pop-before-smtp-stream-type
-Non-nil $B$J$i(B SSL $B$rMxMQ$7$F(B POP$B%3%M%/%7%g%s$rD%$j$^$9!#(B@code{starttls} 
-$B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J(B
+Non-nil $B$J$i(B SSL $B$rMxMQ$7$F(B POP $B%3%M%/%7%g%s$rD%$j$^$9!#(B@code{starttls} 
+$B$J$i(B STARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J(B
 $B$$>l9g$O(B @code{elmo-default-pop3-stream-type} $B$,;H$o$l$^$9!#(B
 @end table
 
-POP-before-SMTP$BMQ$NJQ?t(B (@code{wl-pop-before-smtp-*})$B$,@_Dj$5$l$F$$$J$$(B
+POP-before-SMTP $BMQ$NJQ?t(B (@code{wl-pop-before-smtp-*})$B$,@_Dj$5$l$F$$$J$$(B
 $B>l9g$O!"(BPOP $B%U%)%k%@$N@_Dj(B (@code{elmo-default-pop3-*}) $B$,MQ$$$i$l$^$9!#(B
-$B$=$N$?$a!"(BSMTP$B%5!<%P$H(BPOP$B%5!<%P$N<BBN$,F1$8$G!"%G%U%)%k%H@_Dj$N(BPOP$B%U%)%k(B
+$B$=$N$?$a!"(BSMTP $B%5!<%P$H(B POP $B%5!<%P$N<BBN$,F1$8$G!"%G%U%)%k%H@_Dj$N(B POP $B%U%)%k(B
 $B%@(B(@samp{&} $B$J$I(B)$B$,MxMQ2DG=$J$i!"@_Dj$OITMW$G$9!#(B
 
-$B$J$*!"(BPOP-before-SMTP$B$K$D$$$F$O0J2<$r;2>H$7$F$/$@$5$$!#(B
+$B$J$*!"(BPOP-before-SMTP $B$K$D$$$F$O0J2<$r;2>H$7$F$/$@$5$$!#(B
 
 @example
 @group
@@ -4101,8 +4147,8 @@ Non-nil $B$J$i!"Aw?.;~$K(B @samp{Message-ID:} $B%U%#!<%k%I$r<+F0E*$KA^F~$7$^$
 
 @code{system-name} $B$,(B FQDN (@samp{smtp.gohome.org} $B$N$h$&$J%[%9%H$N%U%k(B
 $B%M!<%`(B) $B$rJV$5$J$$>l9g$O!"$3$NJQ?t$K(B @strong{$BI,$:(B} $B%[%9%HL>$r=|$$$?%I%a(B
-$B%$%sL>(B (@samp{gohome.org}$B$J$I(B) $B$r@_Dj$7$F$/$@$5$$!#(B $B$b$7!"%0%m!<%P%k$J(BIP
-$B$r;}$?$J$$>l9g$O!"(B@code{wl-message-id-domain}$B$r@_Dj$7$F$/$@$5$$!#(B
+$B%$%sL>(B (@samp{gohome.org}$B$J$I(B) $B$r@_Dj$7$F$/$@$5$$!#(B $B$b$7!"%0%m!<%P%k$J(B IP
+$B%"%I%l%9$r;}$?$J$$>l9g$O!"(B@code{wl-message-id-domain}$B$r@_Dj$7$F$/$@$5$$!#(B
 (@samp{Message-ID:} $B$N%I%a%$%s$,$*$+$7$$$H!"%M%C%H%K%e!<%9$G$U$/$mC!$-$K(B
 $B$"$C$F$7$^$&2DG=@-$,$"$j$^$9!#(B)
 
@@ -4211,8 +4257,9 @@ Non-nil $B$J$iJV?.%"%I%l%9$N(B @samp{To:}, @samp{Cc:} $B%U%#!<%k%I$KAj<j$N%U%
 
 @item wl-draft-use-cache
 @vindex wl-draft-use-cache
-$B=i4|@_Dj$O(B @code{t}$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U(B
-$B%i%0$G$9!#(BNon-nil $B$J$i%-%c%C%7%e$7$^$9!#(B
+$B=i4|@_Dj$O(B @code{nil}$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U(B
+$B%i%0$G$9!#(BNon-nil $B$J$i%-%c%C%7%e$7$^$9!#$?$@$7(B @code{wl-insert-message-id}$B$,(B
+nil $B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
@@ -4235,6 +4282,11 @@ Non-nil $B$J$i<+F0E*$KAw?.$7$^$9(B ($B$$$A$*$&(B @code{y-or-n-p} $B$G3NG'$7
 Non-nil $B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K(B @samp{To:},
 @samp{Cc:} $B$+$i<+J,$N%a!<%k%"%I%l%9$r:o=|$7$^$9!#(B
 
+@item wl-draft-delete-myself-from-bcc-fcc
+@vindex wl-draft-delete-myself-from-bcc-fcc
+Non-nil $B$G!"(B@samp{To:}, @samp{Cc:} $B$,(B $BJQ?t(B @code{wl-subscribed-mailing-list} $B$K(B
+$B4^$^$l$F$$$k>l9g!"(B@samp{Bcc:} , @samp{FCC:} $B$r$D$1$^$;$s!%(B
+
 @item wl-smtp-posting-server
 @vindex wl-smtp-posting-server
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
@@ -4243,22 +4295,22 @@ Non-nil $B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K(B @samp{To:},
 @item wl-smtp-posting-user
 @vindex wl-smtp-posting-user
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-SMTP AUTH$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#(B
+SMTP AUTH $B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#(B
 @code{nil} $B$J$i(B @code{smtp-authenticate-user} $B$r;H$$$^$9!#(B
 
 @item wl-smtp-authenticate-type
 @vindex wl-smtp-authenticate-type
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-SMTP AUTH$B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#(B
+SMTP AUTH $B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#(B
 @code{nil} $B$N$^$^$J$i(B @code{smtp-authenticate-type}$B$rMxMQ$7$^$9!#(B
 @code{smtp-authenticate-type} $B$b(B @code{nil} $B$J$iG'>Z$r9T$$$^$;$s!#(B
 
 @item wl-smtp-connection-type
 @vindex wl-smtp-connection-type
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-SMTP$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#(B
+SMTP $B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#(B
 @code{nil} $B$J$i(B @code{smtp-connection-type} $B$rMxMQ$7$^$9!#(B
-@code{starttls} $B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
+@code{starttls} $B$J$i(B STARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
 
 @item wl-nntp-posting-server
 @vindex wl-nntp-posting-server
@@ -4284,30 +4336,30 @@ SMTP$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#(B
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
 @code{nil} $B$J$i(B @code{elmo-default-nntp-stream-type} $B$rI>2A$7$^$9!#(B
 Non-nil $B$J$i%K%e!<%9Ej9F;~$K(B SSL $B$rMxMQ$7$^$9!#(B
-@code{starttls}$B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
+@code{starttls}$B$J$i(B STARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
 
 @item wl-pop-before-smtp-user
 @vindex wl-pop-before-smtp-user
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-POP-before-SMTP$B$G(BPOP $B$r9T$J$&$H$-$N%f!<%6L>$G$9!#(B
+POP-before-SMTP $B$G(B POP $B$r9T$J$&$H$-$N%f!<%6L>$G$9!#(B
 @code{nil} $B$N$^$^$J$i(B @code{elmo-default-pop3-user}$B$rMxMQ$7$^$9!#(B
 
 @item wl-pop-before-smtp-server
 @vindex wl-pop-before-smtp-server
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-POP-before-SMTP$B$G(BPOP $B$r9T$J$&$H$-$N%5!<%PL>$G$9!#(B
+POP-before-SMTP $B$G(B POP $B$r9T$J$&$H$-$N%5!<%PL>$G$9!#(B
 @code{nil} $B$N$^$^$J$i(B @code{elmo-default-pop3-server}$B$rMxMQ$7$^$9!#(B
 
 @item wl-pop-before-smtp-authenticate-type
 @vindex wl-pop-before-smtp-authenticate-type
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-POP-before-SMTP$B$G(BPOP$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#(B
+POP-before-SMTP $B$G(B POP$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#(B
 @code{nil} $B$N$^$^$J$i(B @code{elmo-default-pop3-authenticate}$B$rMxMQ$7$^$9!#(B
 
 @item wl-pop-before-smtp-port
 @vindex wl-pop-before-smtp-port
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-POP-before-SMTP$B$G(BPOP$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#(B
+POP-before-SMTP $B$G(B POP$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#(B
 @code{nil} $B$N$^$^$J$i(B @code{elmo-default-pop3-port}$B$rMxMQ$7$^$9!#(B
 
 @item wl-pop-before-smtp-stream-type
@@ -4315,7 +4367,7 @@ POP-before-SMTP$B$G(BPOP$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#(B
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
 POP-before-SMTP $B$G(B SSL$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#(B@code{nil} $B$N(B
 $B$^$^$J$i(B @code{elmo-default-pop3-stream-type}$B$rMxMQ$7$^$9!#(B
-@code{starttls}$B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
+@code{starttls}$B$J$i(B STARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B
 
 @item wl-draft-queue-save-variables
 @vindex wl-draft-queue-save-variables
@@ -4347,7 +4399,7 @@ POP-before-SMTP $B$G(B SSL$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#(B@code{nil}
 @item wl-use-ldap
 @vindex wl-use-ldap
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-Non-nil$B$J$i(B LDAP $B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#(B
+Non-nil $B$J$i(B LDAP $B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#(B
 
 @item wl-ldap-server
 @vindex wl-ldap-server
@@ -4367,7 +4419,7 @@ Non-nil$B$J$i(B LDAP $B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#(B
 @item wl-draft-remove-group-list-contents
 @vindex wl-draft-remove-group-list-contents
 $B=i4|@_Dj$O(B @code{t}$B!#(B
-Non-nil$B$J$i%a!<%kAw?.$N:]$K08@h$+$i(B group-list $B$NFbMF$r:o=|$7$^$9(B
+Non-nil $B$J$i%a!<%kAw?.$N:]$K08@h$+$i(B group-list $B$NFbMF$r:o=|$7$^$9(B
 (group-list $B$H$O08@h$K4^$^$l$k(B @samp{Group: foo@@gohome.org,
 bar@@gohome.org;}$B$N$h$&$J5-=R$r;X$7$^$9(B)$B!#(B
 @end table
@@ -4397,8 +4449,8 @@ Wanderlust $B$K$O%*%s%i%$%s%b!<%I$H%*%U%i%$%s%b!<%I$,$"$j$^$9!#%*%U%i%$%s(B
 $B%b!<%I$G$O!"%M%C%H%o!<%/7PM3$G$J$1$l$PFI$a$J$$%a%C%;!<%8$O%"%/%;%9$G$-$^(B
 $B$;$s(B($B%-%c%C%7%e$5$l$F$$$l$P%"%/%;%9$G$-$^$9(B)$B!#(B
 
-$B%b!<%I%i%$%s$K(B @samp{[ON]} $B$H=P$F$$$k$H$-$O%*%s%i%$%s%b!<%I$K$"$k$3$H$r(B
-$B<($7$F$$$^$9!#%b!<%I%i%$%s$K(B @samp{[--]} $B$H=P$F$$$k$H$-$O%*%U%i%$%s%b!<(B
+$B%b!<%I%i%$%s$K(B @samp{[ON]} $B$HI=<($5$l$F$$$k$H$-$O%*%s%i%$%s%b!<%I$K$"$k$3$H$r(B
+$B<($7$F$$$^$9!#%b!<%I%i%$%s$K(B @samp{[--]} $B$HI=<($5$l$F$$$k$H$-$O%*%U%i%$%s%b!<(B
 $B%I$G$9!#%U%)%k%@%b!<%I!"%5%^%j%b!<%I$G(B @kbd{M-t} $B$r2!$9$H%*%U%i%$%s(B/$B%*%s(B
 $B%i%$%s$N@Z$jBX$($,$G$-$^$9!#(B
 
@@ -4450,7 +4502,7 @@ Wanderlust $B$K$O%*%s%i%$%s%b!<%I$H%*%U%i%$%s%b!<%I$,$"$j$^$9!#%*%U%i%$%s(B
 
 $B%*%U%i%$%s>uBV$N$"$$$@$K<B9T$5$l$?(B IMAP $B%U%)%k%@$KBP$9$k%j%U%!%$%k(B/$B%3%T!<(B
 $BA`:n$O%-%e!<$K$?$a$i$l!"%*%s%i%$%s$K$J$C$?$H$-$K%5!<%PB&$KH?1G$5$l$^$9!#(B
-$B%*%U%i%$%s!&%j%U%!%$%k(B/$B%3%T!<$N$"$H!"%j%U%!%$%k(B/$B%3%T!<@h$N%U%)%k%@$rK,$l(B
+$B%*%U%i%$%s!&%j%U%!%$%k(B/$B%3%T!<$N8e!"%j%U%!%$%k(B/$B%3%T!<@h$N%U%)%k%@$rK,$l(B
 $B$k$H!"%*%U%i%$%s$G$b%a%C%;!<%8$,DI2C$5$l$F$$$k$h$&$K8+$($^$9!#(B
 
 $B%*%U%i%$%s!&%j%U%!%$%k$N%-%e!<=hM};~$N:o=|=hM}$O0BA4$r4|$7$F%5!<%P>e$N%a%C(B
@@ -4489,7 +4541,7 @@ IMAP $B$b$7$/$O(B NNTP $B%U%)%k%@$K$"$k%a%C%;!<%8$KBP$7$F!"%W%j%U%'%C%A$NM=Ls
 $B%$%k(B/$B%3%T!<Ey$NA`:n$OC1$K%(%i!<$K$J$j$^$9!#(B
 
 $B%*%U%i%$%s=hM}$G%-%c%C%7%e%U%!%$%k$r;H$&$N$G!"%-%c%C%7%e%U%!%$%k$r<j$G>C(B
-$B$9$H(B Wanderlust $B$,8mF0:n$9$k$*$=$l$,$"$j$^$9!#%-%c%C%7%e$r>C$7$?$$$H$-$O(B
+$B$9$H(B Wanderlust $B$,8mF0:n$9$k62$l$,$"$j$^$9!#%-%c%C%7%e$r>C$7$?$$$H$-$O(B
 @kbd{M-x elmo-cache-expire-by-size}$B$r<B9T$9$k$h$&$K$7$F$/$@$5$$!#(B
 @code{elmo-cache-expire-by-size} $B$O%*%U%i%$%s=hM}$NBP>]$H$J$k%a%C%;!<%8(B
 $B$N%-%c%C%7%e$O:o=|$7$^$;$s!#(B
@@ -4570,7 +4622,7 @@ plug $B>uBV$K$h$j(B 2$B9TL\$N(B @samp{(wl-plugged)} $B$,JQ2=$7$^$9!#(B
 
 $BDL>o!"5/F0;~$K$O(B @file{~/.folder} $B$H(B @code{wl-smtp-posting-server},
 @code{wl-nntp-posting-server} $B$J$I$+$i3F%]!<%H$N(B plug $B>uBV$,<+F0E*$KDI2C(B
-$B$5$l$^$9$,!"$3$l$i$N%]!<%H$N(Bplug$B>uBV$rJQ99$7$?$j!">e5-0J30$N%]!<%H$rDI2C(B
+$B$5$l$^$9$,!"$3$l$i$N%]!<%H$N(B plug $B>uBV$rJQ99$7$?$j!">e5-0J30$N%]!<%H$rDI2C(B
 $B$7$?$j$9$k>l9g$K$O(B @code{wl-make-plugged-hook} $B$KJQ99$9$k4X?t$r5-=R$7$^(B
 $B$9!#(B
 
@@ -4604,7 +4656,7 @@ plug $B>uBV$K$h$j(B 2$B9TL\$N(B @samp{(wl-plugged)} $B$,JQ2=$7$^$9!#(B
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
 $B=i4|@_Dj$O(B @code{t}$B!#%*%s%i%$%s$K$J$C$?$H$-$K<+F0E*$K%-%e!<$rAw?.$9$k$+(B
-$B$I$&$+!#(BNon-nil $B$J$i<+F0E*$KAw?.$7$^$9(B ($B$$$A$*$&(B @code{y-or-n-p} $B$G3NG'(B
+$B$I$&$+!#(BNon-nil $B$J$i<+F0E*$KAw?.$7$^$9(B ($B0l1~(B @code{y-or-n-p} $B$G3NG'(B
 $B$7$^$9(B)$B!#<jF0$G%-%e!<$rAw?.$9$k$K$O!"%U%)%k%@%b!<%I$G(B @kbd{F} $B$r2!$7$F$/(B
 $B$@$5$$!#(B
 
@@ -4623,7 +4675,7 @@ Non-nil $B$J$i%*%U%i%$%s=hM}$r<B9T$7$^$9!#(B
 $B=i4|@_Dj$O(B @code{one}$B!#(B
 @code{wl-plugged} $B$NCM$O4X?t(B @code{elmo-plugged-p} ($B0z?t$J$7(B)$B$NLa$jCM$K(B
 $B$h$j7hDj$5$l$^$9!#$3$NJQ?t(B @code{elmo-plugged-condition} $B$O(B 
-@code{(elmo-plugged-p)} $B$NLa$jCM$,(B @code{t} $B$K$J$k>r7o$r3F%]!<%H$N(Bplug$B>u(B
+@code{(elmo-plugged-p)} $B$NLa$jCM$,(B @code{t} $B$K$J$k>r7o$r3F%]!<%H$N(B plug $B>u(B
 $BBV$K$h$j;XDj$7$^$9!#(B
 
 @example
@@ -4785,13 +4837,13 @@ expire $B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"(B2,3 $BHVL\$NMWAG$N$$$:$l$+$,(B
 $B%a%C%;!<%8$r(B@var{string}$B$G;XDj$7$?%U%)%k%@$K0\F0$7$^$9!#(B
 
 $B%"!<%+%$%V%U%)%k%@$r;XDj$9$k$HJXMx$G$9$,!"(B@samp{$} $B%^!<%/$NIU$$$?=EMW%a%C(B
-$B%;!<%8$J$I$O0\F0$5$l$J$$$?$a!"2<5-$NI8=`4X?t$r;H$&J}$,$h$j$h$$$G$9!#(B
+$B%;!<%8$J$I$O0\F0$5$l$J$$$?$a!"2<5-$NI8=`4X?t$r;H$&J}$,$h$jNI$$$G$9!#(B
 
 @item @var{function}
 $B;XDj$N4X?t$r8F$S=P$7$^$9!#(B
 
 $B;XDj$7$?4X?t$K$O<!$N(B3$B$D$N0z?t!"%U%)%k%@L>!":o=|$9$k%a%C%;!<%8$N%j%9%H!"(B
-$B$=$7$F%5%^%j$N(Bmsgdb$B>pJs$,EO$5$l$^$9!#$^$?!"4X?tL>$N8e$K4X?tFH<+$N0z?t$b(B
+$B$=$7$F%5%^%j$N(B msgdb $B>pJs$,EO$5$l$^$9!#$^$?!"4X?tL>$N8e$K4X?tFH<+$N0z?t$b(B
 $B;XDj$G$-$^$9!#$J$*!"$3$N4X?t$K$O(B@code{wl-summary-expire-reserve-marks}$B$G(B
 $B;XDj$7$?%a%C%;!<%8$b4^$s$@%j%9%H$,EO$5$l$^$9$N$G!"FH<+$K4X?t$r:n$k>l9g$O(B
 $BCm0U$7$F$/$@$5$$!#(B
@@ -4812,7 +4864,7 @@ expire $B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"(B2,3 $BHVL\$NMWAG$N$$$:$l$+$,(B
 
 $B%j%U%!%$%k@h$N%"!<%+%$%V%U%)%k%@$O:o=|85$N%U%)%k%@L>$K$h$j<!$N$h$&$K7hDj(B
 $B$5$l$^$9!#(B($B$3$N$H$-!"%"!<%+%$%V%U%)%k%@$O(B @code{elmo-archive-treat-file} 
-$B$,(B non-nil $B$N>l9g$H$7$F$"$D$+$o$l$^$9(B)
+$B$,(B non-nil $B$N>l9g$H$7$F07$o$l$^$9(B)
 
 @table @asis
 @item $B%U%)%k%@%?%$%W$,(Blocaldir$B$N>l9g(B
@@ -4907,8 +4959,8 @@ non-nil $B$r;XDj$9$k$H!"%U%)%k%@$N%a%C%;!<%8HV9f$r$=$N$^$^J]B8$9$k$3$H$,$G(B
 $B$KJQ$($k$H$h$$$G$7$g$&!#$$$-$J$j(B @code{remove} $B$r;XDj$9$k$N$O4m81$G$9!#(B
 
 $B$^$?!"(B@code{wl-expire-archive-number1}$B$J$I$N4X?t$rMxMQ$9$k>l9g!"$^$:$O;H(B
-$BMQ$9$k%"!<%+%$%P%?%$%W(B(@code{zip} $B$d(B @code{lha})$B$J$I$N%U%)%k%@$r;n$7$K$D(B
-$B$/$C$F!"@5$7$/DI2C$G$-$k$+$I$&$+$r3NG'$7$F$/$@$5$$!#$?$H$(!"(B
+$BMQ$9$k%"!<%+%$%P%?%$%W(B(@code{zip} $B$d(B @code{lha})$B$J$I$N%U%)%k%@$r;n$7$K:n(B
+$B$C$F!"@5$7$/DI2C$G$-$k$+$I$&$+$r3NG'$7$F$/$@$5$$!#$?$H$(!"(B
 @code{wl-expire-alist} $B$d(B @code{elmo-archive} $B$N@_Dj$,@5$7$/$F$b!"%"!<%+(B
 $B%$%V%W%m%0%i%`$,@5$7$/F0$+$J$1$l$P$I$3$K$bJ]B8$5$l$:$K%a%C%;!<%8$,>C$($F(B
 $B$7$^$&$+$bCN$l$^$;$s!#(B
@@ -4925,7 +4977,7 @@ move    +ml/wl -> $ml/wl-00600;tgz;wl  (600 601 602)
 @end example
 
 $B:G=i$N9`L\$OF0:n$r<($9$b$N$G!"(B@samp{delete}, @samp{copy}, @samp{move} $B$,(B
-$B$"$j$^$9!#<!$,(B expire$B$r<B9T$7$?%U%)%k%@L>$G!"(B@samp{copy} $B$H(B @samp{move} 
+$B$"$j$^$9!#<!$,(B expire $B$r<B9T$7$?%U%)%k%@L>$G!"(B@samp{copy} $B$H(B @samp{move} 
 $B$N>l9g$O(B@samp{->}$B$KB3$1$F%3%T!<$b$7$/$O0\F0@h$N%U%)%k%@L>$,5-O?$5$l$^$9!#(B
 $B:G8e$N9`L\$O!"<B:]$K:o=|$d0\F0$5$l$?%a%C%;!<%8HV9f$N%j%9%H$G$9(B
 (@samp{copy} $B$d(B @samp{move} $B$N>l9g!"0\F08e$G$O$J$/0\F0A0$N%a%C%;!<%8HV9f(B
@@ -4933,17 +4985,17 @@ move    +ml/wl -> $ml/wl-00600;tgz;wl  (600 601 602)
 
 @subsection reserve$B%a%C%;!<%8$N%j%U%!%$%k(B
 
-$BI8=`$GMQ0U$5$l$F$$$k(B3$B$D$N4X?t$G$O!"(Breserve$B%a%C%;!<%8$O%"!<%+%$%V%U%)%k%@(B
+$BI8=`$GMQ0U$5$l$F$$$k(B3$B$D$N4X?t$G$O!"(Breserve $B%a%C%;!<%8$O%"!<%+%$%V%U%)%k%@(B
 $B$K%3%T!<$7$^$9$,!"85$N%U%)%k%@$+$i$O:o=|$7$J$$$h$&$K$J$C$F$$$^$9!#$J$*!"(B
 $B=EMW%^!<%/$J$I$O>o$K;D$k$?$a!"2?EY$b%3%T!<$5$l$k$3$H$,$J$$$h$&$K(B
 @file{~/.elmo/expired-alist} $B$K5-O?$9$k$h$&$K$7$F$$$^$9!#(B
-$B$?$@$7!"(Breserve$B%a%C%;!<%8$,(Brefile$BBP>]$K$J$C$?$H$-$N$_$G$9!#(B
+$B$?$@$7!"(Breserve $B%a%C%;!<%8$,(B refile $BBP>]$K$J$C$?$H$-$N$_$G$9!#(B
 $B$^$?!"(B@code{wl-summary-archive} $B$J$I$G%3%T!<$5$l$k>l9g$O5-O?$5$l$^$;$s!#(B
 
 $B%m%05!G=$rM-8z$K$7$F$$$?>l9g$O!"%j%U%!%$%k;~$K$ODL>o(B @samp{move} $B$,5-(B
-$BO?$5$l$^$9$,!"(Breserve$B%a%C%;!<%8$,4^$^$l$F$$$k$H!"(B@samp{copy} $B$H(B 
-@samp{delete} $B$KJ,$1$F5-O?$5$l$^$9!#$3$l$O(B reserve$B%a%C%;!<%8$r4^$a$?%a%C(B
-$B%;!<%8$r%3%T!<$7$?8e!"(Breserve$B%a%C%;!<%8$r=|$$$?%a%C%;!<%8$r:o=|$9$k!"(B
+$BO?$5$l$^$9$,!"(Breserve $B%a%C%;!<%8$,4^$^$l$F$$$k$H!"(B@samp{copy} $B$H(B 
+@samp{delete} $B$KJ,$1$F5-O?$5$l$^$9!#$3$l$O(B reserve $B%a%C%;!<%8$r4^$a$?%a%C(B
+$B%;!<%8$r%3%T!<$7$?8e!"(Breserve $B%a%C%;!<%8$r=|$$$?%a%C%;!<%8$r:o=|$9$k!"(B
 $B$H$$$&=hM}$r9T$C$F$$$k$?$a$G$9!#(B
 
 @section $B%+%9%?%^%$%:JQ?t(B
@@ -5051,7 +5103,7 @@ Non-nil $B$K$9$k$H!"(B
 $B%"!<%+%$%V%U%)%k%@$KIU$1$k(B prefix $B$r;XDj$7$^$9!#(B
 $B$?$@$7!"%"!<%+%$%V%U%)%k%@$K(B prefix ($B%G%#%l%/%H%j9=B$(B)$B$rIU$1$k;EMM$O(B
 $B$*$^$15!G=$G$9$N$G!"<h$j07$$$O?5=E$K9T$C$F2<$5$$!#(B
-$B:G0-%"!<%+%$%V%U%!%$%k$r2u$962$l$,$"$j$^$9!#(B
+$B:G0-$N>l9g!$%"!<%+%$%V%U%!%$%k$r2u$962$l$,$"$j$^$9!#(B
 
 @table @code
 @item nil
@@ -5084,7 +5136,7 @@ prefix $B$OIU$-$^$;$s!#(B
 @item wl-expire-delete-oldmsg-confirm
 @vindex wl-expire-delete-oldmsg-confirm
 $B=i4|@_Dj$O(B @code{t}$B!#(B
-Non-nil$B$N>l9g!"4{$KB8:_$7$F$$$k%"!<%+%$%V%U%)%k%@$N:GBg%a%C%;!<%8HV9f$h$j$b(B
+Non-nil $B$N>l9g!"4{$KB8:_$7$F$$$k%"!<%+%$%V%U%)%k%@$N:GBg%a%C%;!<%8HV9f$h$j$b(B
 $B8E$$%a%C%;!<%8$,$"$C$?>l9g$K3NG'$7$F$+$i:o=|$7$^$9!#(B
 @code{nil} $B$N>l9g$O3NG'$;$:$K:o=|$7$^$9!#(B
 
@@ -5103,10 +5155,10 @@ Non-nil $B$K$9$k$H!"(B@file{~/.elmo/expired-log}$B$K(B expire $B$N<B9T7k2L$
 Non-nil $B$N>l9g!"(Bexpire $B$K$h$j%a%C%;!<%8$r%j%U%!%$%k$7$?>l9g!"4{FI>pJs$r(B
 $B%j%U%!%$%k@h$N%U%)%k%@$KEA$($k$h$&$K$7$^$9!#(B
 
-$B$?$@$7!"%j%U%!%$%k@h$N%U%)%k%@$r(B Wanderlust$B>e$+$iFI$^$J$$$H!"(B
+$B$?$@$7!"%j%U%!%$%k@h$N%U%)%k%@$r(B Wanderlust $B>e$+$iFI$^$J$$$H!"(B
 @file{~/.elmo/}$B0J2<$K$"$k(B @file{seen} $B%U%!%$%k$,Bg$-$/$J$C$F$$$/$N$G!"(B
 $B%"!<%+%$%V%U%)%k%@$J$I$KC1$KJ]B8$7$F$*$/$@$1$J$i(B
-@code{nil} $B$K@_Dj$7$F$*$/$H$h$$$G$7$g$&!#(B@code{nil} $B$K@_Dj$7$F$b!"(B
+@code{nil} $B$K@_Dj$7$F$*$/$HNI$$$G$7$g$&!#(B@code{nil} $B$K@_Dj$7$F$b!"(B
 $B%j%U%!%$%k$7$?%"!<%+%$%V%U%)%k%@$rFI$`$H$-$K?75,%a%C%;!<%807$$$5$l$k$@$1$G!"(B
 expire $B$J$I$NF0:n$K$O1F6A$O$"$j$^$;$s!#(B
 
@@ -5204,7 +5256,7 @@ prefix argument $B$rIU$1$F(B @kbd{C-u M-x wl-summary-archive} $B$G<B9T$9$k$H!
 
 @noindent
 $B%"!<%+%$%V%U%)%k%@$K%3%T!<$9$k=hM}$r9T$&4X?t$r;XDj$7$^$9!#$3$N4X?t$K$O!"(B
-$B%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N(Bmsgdb$B>pJs!"$N(B3$B$D(B
+$B%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N(B msgdb $B>pJs!"$N(B3$B$D(B
 $B$N0z?t$,EO$5$l$^$9!#$b$A$m$s%f!<%6$,FH<+$K:n$C$F;XDj$9$k$3$H$,$G$-$^$9!#(B
 @end table
 
@@ -5257,7 +5309,7 @@ prefix argument $B$rIU$1$F(B @kbd{C-u M-x wl-summary-archive} $B$G<B9T$9$k$H!
 
 $B$^$?!"(B@code{wl-score-folder-alist} $B$N@_Dj$K4X$o$i$:(B
 $B%G%U%)%k%H$N%9%3%"%U%!%$%k(B @code{wl-score-default-file} (@file{all.SCORE})
- $B$OI,$:FI$_9~$^$l$^$9(B($B%U%!%$%k$,B8:_$7$F$$$J$/$F$b$+$^$$$^$;$s(B)$B!#(B
+ $B$OI,$:FI$_9~$^$l$^$9(B($B%U%!%$%k$,B8:_$7$F$$$J$/$F$b9=$$$^$;$s(B)$B!#(B
 $B$7$?$,$C$F!">e5-Nc$N(B @samp{^-.*} $B$K%^%C%A$7$?%U%)%k%@$G$O(B 
 @file{news.SCORE}, @file{my.SCORE}, @file{all.SCORE} $B$N(B3$B$D$N%9%3%"%U%!%$%k(B
 $B$,FI$_9~$^$l$k$3$H$K$J$j$^$9!#(B
@@ -5272,9 +5324,9 @@ prefix argument $B$rIU$1$F(B @kbd{C-u M-x wl-summary-archive} $B$G<B9T$9$k$H!
 @subsection $B%9%3%"%U%!%$%k$N:n@.(B
 
 $B$^$:%5%^%j%P%C%U%!$GE,Ev$J%a%C%;!<%8$K0\F0$7$F$+$i(B @kbd{L} $B$r%?%$%W$7$^(B
-$B$9!#$=$N8e%_%K%P%C%U%!$G$NF~NO$r5a$a$i$l$^$9$N$G!"$D$E$1$F(B @kbd{s},
+$B$9!#$=$N8e%_%K%P%C%U%!$G$NF~NO$r5a$a$i$l$^$9$N$G!"B3$1$F(B @kbd{s},
 @kbd{s}, @kbd{p} $B$H%?%$%W$7$F$_$F$/$@$5$$!#$9$k$H(B Subject $B$NJ8;zNs$,F~NO(B
-$B$5$l$F$$$k>uBV$K$J$j$^$9$N$G!"E,Ev$KJT=8$7$?$N$A(B @kbd{@key{RET}} $B$r2!$7$^$9!#(B
+$B$5$l$F$$$k>uBV$K$J$j$^$9$N$G!"E,Ev$KJT=8$7$?8e(B @kbd{@key{RET}} $B$r2!$7$^$9!#(B
 
 $B$3$l$G!"F~NO$7$?J8;zNs$HF1$8(B @samp{Subject:} $B$r;}$D%a%C%;!<%8$KBP$7$F%9%3%"(B 
 @minus{}1000 $B$,$D$1$i$l$k$h$&$K$J$j$^$9!#(B
@@ -5322,19 +5374,19 @@ prefix argument $B$rIU$1$F(B @kbd{C-u M-x wl-summary-archive} $B$G<B9T$9$k$H!
 $B:FEY(B @kbd{C-u 200 L a} $B$G%9%3%"$,(B @minus{}200 $B$N(B @samp{from} $B%(%s%H%j$r:n@.$9$k$H!"(B
 $B%9%3%"$,(B @minus{}1200 $B$N%(%s%H%j$,(B1$B$D:n@.$5$l$k$3$H$K$J$j$^$9!#(B
 
-@subsubsection Thread$B%-!<$N:n@.(B
+@subsubsection Thread $B%-!<$N:n@.(B
 
 @code{wl-summary-increase-score} $B$+(B @code{wl-summary-lower-score} $B$G(B
 @samp{Thread}$B%-!<$r:n@.$9$k$H!";R%9%l%C%I$N(B @samp{Message-ID} $B$bA4$F(B
 $BDI2C$5$l$^$9!#(B
 
-@subsubsection Followup$B%-!<$N:n@.(B
+@subsubsection Followup $B%-!<$N:n@.(B
 
 @code{wl-summary-increase-score} $B$+(B @code{wl-summary-lower-score} $B$G(B
 @samp{Followup}$B%-!<$r:n@.$9$k$H!"%+!<%=%k>e$N%a%C%;!<%8$N(B
 @samp{Message-ID} $B$b(B @samp{References} $B%-!<$KDI2C$5$l$^$9!#(B
 $B$b$7!"(B@code{wl-score-auto-make-followup-entry} $B$,(B non-nil $B$G$"$l$P(B
-@code{wl-score-expiry-days} $B$G;XDj$7$?F|$K$A0JFb$NA4(Bfollowup$BBP>]$N%a%C%;!<(B
+@code{wl-score-expiry-days} $B$G;XDj$7$?F|$K$A0JFb$NA4(B followup $BBP>]$N%a%C%;!<(B
 $B%8$N(B @samp{Message-ID} $B$,DI2C$5$l$^$9!#(B
 
 @subsection $B%-!<%P%$%s%I(B
@@ -5703,7 +5755,7 @@ pop3                    $B!_(B    $B"$(B    $B"$(B    $B"$(B
 @menu
 * Living with other packages::  $B%Q%C%1!<%8$N$"$k@83h(B
 * Highlights::                  $B%O%$%i%$%H$N@_Dj(B
-* Biff::                        $B%a!<%k$NCe?.$r$7$i$;$k(B
+* Biff::                        $B%a!<%k$NCe?.$rCN$i$;$k(B
 * Advanced Settings::           $B%+%9%?%^%$%:!A1~MQJT!A(B
 * Customizable Valiables::      $B$=$NB>$N%+%9%?%^%$%:JQ?t0lMw(B
 * Hooks::                       $B%U%C%/(B
@@ -5722,6 +5774,7 @@ pop3                    $B!_(B    $B"$(B    $B"$(B    $B"$(B
 * mu-cite::                     mu-cite.el
 * x-face-mule::                 x-face-mule.el
 * dired-dd::                    dired-dd.el
+* MHC::                         MHC
 @end menu
 
 
@@ -5870,7 +5923,7 @@ bitmap-mule 8.0$B0J9_$KIUB0$N(B @file{x-face-mule.el}
 ($BJQ?t(B @code{wl-auto-insert-x-face} $B$,(B non-nil $B$N>l9g(B)
 
 
-@node dired-dd,  , x-face-mule, Living with other packages
+@node dired-dd, MHC, x-face-mule, Living with other packages
 @subsection dired-dd(Dired-DragDrop)
 @pindex Dired-DragDrop
 @pindex Dired-DD
@@ -5896,6 +5949,34 @@ Emacs $B$GJT=8Cf$NAp9F%P%C%U%!$X(B dired $B$+$i%I%i%C%0(B&$B%I%m%C%W$9$k$@$
 @end group
 @end lisp
 
+@node MHC, , dired-dd, Living with other packages
+@subsection mhc.el
+@pindex MHC
+
+Message Harmonized Calendaring system
+(@uref{http://www.quickhack.net/mhc/})
+
+MHC $B$rMQ$$$k$H!"%a%C%;!<%8$r85$KM=DjI=$r:n$l$^$9!#(B
+
+mhc-0.25 $B$N>l9g!'(B
+
+@lisp
+@group
+(setq mhc-mailer-package 'wl)
+(autoload 'mhc-mode "mhc" nil t)
+(add-hook 'wl-summary-mode-hook 'mhc-mode)
+(add-hook 'wl-folder-mode-hook 'mhc-mode)
+@end group
+@end lisp
+
+mhc-current $B$N>l9g!'(B
+
+@lisp
+@group
+(autoload 'mhc-wl-setup "mhc-wl")
+(add-hook 'wl-init-hook 'mhc-wl-setup)
+@end group
+@end lisp
 
 @node Highlights, Biff, Living with other packages, Customization
 @section $B%O%$%i%$%H$N@_Dj(B
@@ -5941,13 +6022,13 @@ Non-nil $B$J$i%I%i%U%H$*$h$S%a%C%;!<%8$NK\J8$b%O%$%i%$%H$NBP>]$H$7$^$9!#(B
 $BFsHVL\$K=EMW(B (@code{wl-highlight-message-important-header-contents2})$B$J!"(B
 $B$=$7$F=EMW$G$O$J$$(B (@code{wl-highlight-message-unimportant-header-contents})
 $B$3$H$rI=$9(B face $B$r$=$l$>$l$I$N%a%C%;!<%8%X%C%@$K3d$jEv$F$k$+$r@_Dj$7$^$9!#(B
-$BF1MM$K!"G$0U$N@55,I=8=$KBP$7$FG$0U$N(Bface$B$r3d$jEv$F$k$3$H$b$G$-$^$9!#(B
+$BF1MM$K!"G$0U$N@55,I=8=$KBP$7$FG$0U$N(B face $B$r3d$jEv$F$k$3$H$b$G$-$^$9!#(B
 
 @item wl-highlight-citation-prefix-regexp
 @vindex  wl-highlight-citation-prefix-regexp
 $B%I%i%U%H$*$h$S%a%C%;!<%8$NK\J8Fb$N0zMQ9T$r<($9@55,I=8=$r;XDj$7$^$9!#(B
 $B$3$N@55,I=8=$K%^%C%A$7$?K\J8$O!"(B
-(@code{wl-highlight-message-cited-text-*})$B$G;XDj$5$l$k(Bface$B$G%O%$%i%$%H$5$l$^$9!#(B
+(@code{wl-highlight-message-cited-text-*})$B$G;XDj$5$l$k(B face $B$G%O%$%i%$%H$5$l$^$9!#(B
 
 @item wl-highlight-highlight-citation-too
 @vindex wl-highlight-highlight-citation-too
@@ -6091,18 +6172,18 @@ face $B$N@_Dj$O(B @file{.emacs} $B$K=q$/$3$H$O$G$-$J$$$N$G(B @file{~/.wl} $
 $B%5%^%j$G%9%l%C%I%H%C%W$G$O$J$$%a%C%;!<%89T$N(B face $B$G$9!#(B
 
 @item wl-highlight-folder-unknown-face
-$B%U%)%k%@%b!<%I$G!"$$$/$DL$F14|%a%C%;!<%8$,$"$k$+$o$+$i$J$$%U%)%k%@$N(B
+$B%U%)%k%@%b!<%I$G!"$$$/$DL$F14|%a%C%;!<%8$,$"$k$+J,$i$J$$%U%)%k%@$N(B
  face $B$G$9!#(B
 
 @item wl-highlight-folder-zero-face
 $B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$J$$%U%)%k%@$N(B face $B$G$9!#(B
 
 @item wl-highlight-folder-few-face
-$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$9$3$7$"$k%U%)%k%@$N(B face $B$G$9!#(B
+$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,>/$7$"$k%U%)%k%@$N(B face $B$G$9!#(B
 
 @item wl-highlight-folder-many-face
 $B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$?$/$5$s$"$k%U%)%k%@$N(B face $B$G$9!#(B
-$B!V$9$3$7!W$H!V$?$/$5$s!W$N@Z$lL\$O!"(B
+$B!V>/$7!W$H!V$?$/$5$s!W$N@Z$lL\$O!"(B
 $BJQ?t(B @code{wl-folder-many-unsync-threshold} $B$G@_Dj$5$l$^$9!#(B
 
 @item wl-highlight-folder-unread-face
@@ -6157,6 +6238,16 @@ face $B$N@_Dj$O(B @file{.emacs} $B$K=q$/$3$H$O$G$-$J$$$N$G(B @file{~/.wl} $
 @vindex wl-biff-check-interval
 $B=i4|@_Dj$O(B 40 ($BC10L(B:$BIC(B)$B!#(B
 $B$3$NCM$4$H$K%a!<%kCe?.$N%A%'%C%/$r9T$J$$$^$9!#(B
+
+@item wl-biff-notify-hook
+@vindex wl-biff-notify-hook
+$B=i4|@_Dj$O(B @code{nil}$B!#(B
+$B?7$7$$%a!<%k$,FO$$$?:]$K<B9T$5$l$k%U%C%/!#(B
+$BNc$($P%S!<%W2;$rLD$i$9$J$i(B
+@lisp
+(setq wl-biff-notify-hook '(beep))
+@end lisp
+$B$N$h$&$K@_Dj$7$^$9!#(B
 @end table
 
 
@@ -6172,10 +6263,14 @@ face $B$N@_Dj$O(B @file{.emacs} $B$K=q$/$3$H$O$G$-$J$$$N$G(B @file{~/.wl} $
 
 @node Draft for Reply, Thread Format, Advanced Settings, Advanced Settings
 @subsection $BJV;vMQ%I%i%U%H(B
+@vindex wl-draft-reply-with-argument-list
+@vindex wl-draft-reply-without-argument-list
+@vindex wl-draft-reply-myself-with-argument-list
+@vindex wl-draft-reply-myself-without-argument-list
 
 $B%a!<%j%s%0%j%9%H$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G(B @kbd{a} $B$r2!$7(B
 $B$?$@$1$G855-;v$N(B @samp{Reply-To:} $B$K$"$k%"%I%l%9$r(B @samp{To:} $B$KMQ0U$7$F(B
-$B$[$7$$!"$H$$$&>l9g$O0J2<$N$h$&$K$7$?$i$h$$$G$7$g$&!#(B
+$BM_$7$$!"$H$$$&>l9g$O0J2<$N$h$&$K$7$?$iNI$$$G$7$g$&!#(B
 
 @lisp
 @group
@@ -6318,7 +6413,7 @@ Non-nil $B$J$i$P!"(BWanderlust $B=*N;;~$K3NG'$r9T$$$^$9!#(B
 @item wl-interactive-send
 @vindex wl-interactive-send
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
-Non-nil $B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$F$h$$$+$r3NG'$7$^$9!#(B
+Non-nil $B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$FNI$$$+$r3NG'$7$^$9!#(B
 
 @item wl-folder-sync-range-alist
 @vindex wl-folder-sync-range-alist
@@ -6364,7 +6459,7 @@ XEmacs $B$^$?$O(B Emacs 21 $B$GM-8z$G$9!#=i4|@_Dj$O$=$N(B Emacs $B$K0MB8$7$
 $B%A%'%C%/$7$?>l9g!"DL>o$O4J0WE*$JJ}K!$G%A%'%C%/$7$F$$$^$9(B($B=hM}$OB.$$$,!"@53N$G$O$J$$(B)$B!#(B
 $B$3$NJQ?t$K%^%C%A$9$k%U%)%k%@$O87L)$K%A%'%C%/$7$^$9!#(B
 IMAP4 $B%U%)%k%@$KBP$9$k>r7o%U%#%k%?%U%)%k%@$N$h$&$J>l9g$K$O!"(B
-$B$3$NJQ?t$K%^%C%A$9$k$h$&@_Dj$9$k$H$h$$$G$7$g$&!#(B
+$B$3$NJQ?t$K%^%C%A$9$k$h$&@_Dj$9$k$HNI$$$G$7$g$&!#(B
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
 
 @item wl-folder-use-server-diff
@@ -6551,7 +6646,7 @@ Non-nil $B$J$i!"(BNNTP $B$K$*$$$F(B $BAm5-;v?t$rD4$Y$k$?$a$K(B @samp{listg
 @vindex elmo-pop3-send-command-synchronously
 $B=i4|@_Dj$O(B @code{nil}$B!#(B
 Non-nil $B$J$i(B POP3 $B$N%3%^%s%I$rF14|E*$KH/9T$7$^$9!#%5!<%P$K$h$C$F$O$3$NCM$r@_Dj$7$J$$$H%5%^%j>pJs$r<h$j=P$;$J$$>l9g$,$"$k$h$&$G$9!#(B
-POP3 $B;2>H;~$K=hM}$,%O%s%0$9$k$h$&$J>l9g$O!"(B@code{t} $B$K$9$k$H$$$$$+$b$7$l$^$;$s!#(B
+POP3 $B;2>H;~$K=hM}$,%O%s%0$9$k$h$&$J>l9g$O!"(B@code{t} $B$K$9$k$HNI$$$+$b$7$l$^$;$s!#(B
 
 @item elmo-dop-flush-confirm
 @vindex elmo-dop-flush-confirm
@@ -6645,9 +6740,10 @@ Wanderlust $B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#(B
       9/12    biff $B5!G=(B with $B:72eED$5$s!u;32,$5$s!#(B
      10/17    expire-hide by $B2,ED$5$s!#(B
      11/08    2.4.0 stable $B%j%j!<%9!#(B
+2001  7/04    2.6.0 stable $B%j%j!<%9!#(B
 @end example
 
-$B$/$o$7$$JQA+$O(B @file{ChangeLog} $B$r8fMw$/$@$5$$!#(B
+$B>\$7$$JQA+$O(B @file{ChangeLog} $B$r8fMw$/$@$5$$!#(B
 
 @section $BL>A0(B