Change bahavior of wl-summary-width and wl-summary-indent-length-limit.
[elisp/wanderlust.git] / doc / wl-ja.texi
index 5d6e261..d2a2cbf 100644 (file)
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage ja
 @documentencoding iso-2022-jp
-@set VERSION 2.5.4
+@include version.texi
 @synindex pg cp
 @finalout
 
@@ -22,9 +22,10 @@ Yet another message interface on Emacsen.
 \e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$GF0$/%a!<%k\e(B/\e$B%K%e!<%94IM}%7%9%F%`\e(B Wanderlust \e$B$K4X$9\e(B
 \e$B$k@bL@=q$G$9!#\e(B
 
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi},
+Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
 @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@w{Kenichi Okada} and @w{Kaoru Takahashi}.
+@w{Kenichi Okada}, @w{Kaoru Takahashi}, @w{Katsumi Yamaoka},
+@w{Hiroya Murata} and @w{Yoichi Nakayama}.
 
 This edition is for Wanderlust version @value{VERSION}.
 
@@ -74,12 +75,16 @@ into another language, under the above conditions for modified versions.
 @author \e$BB<EDA442\e(B
 @author \e$B2,ED7r0l\e(B
 @author \e$B9b66\e(B  \e$B0j\e(B
+@author \e$B;32,9nH~\e(B
+@author \e$BB<ED9@Li\e(B
+@author \e$BCf;3MN0l\e(B
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi},
-@w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada}, and
-@w{Kaoru Takahashi}.
+Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
+@w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada},
+@w{Kaoru Takahashi}, @w{Katsumi Yamaoka}, @w{Hiroya Murata} and 
+@w{Yoichi Nakayama}.
 
 This manual is for Wanderlust version @value{VERSION}.
 
@@ -119,6 +124,9 @@ into another language, under the above conditions for modified versions.
 \e$BB<EDA442\e(B
 \e$B2,ED7r0l\e(B
 \e$B9b66\e(B  \e$B0j\e(B
+\e$B;32,9nH~\e(B
+\e$BB<ED9@Li\e(B
+\e$BCf;3MN0l\e(B
 @end flushright
 
 \e$B$3$NJ8=q$O\e(B Wanderlust @value{VERSION} \e$B$KBP1~$7$^$9!#\e(B
@@ -136,6 +144,7 @@ into another language, under the above conditions for modified versions.
 * Disconnected Operations::  \e$B%*%U%i%$%s=hM}\e(B
 * Expire and Archive::       \e$B%a%C%;!<%8$N<+F0:o=|$H%"!<%+%$%V\e(B
 * Scoring::                  \e$B%a%C%;!<%8$N%9%3%"\e(B
+* Address Book::             \e$B%"%I%l%9D"\e(B
 * Customization::            \e$B%+%9%?%^%$%:\e(B
 * Mailing List::             \e$B%a!<%j%s%0%j%9%H\e(B
 * Addition::                 \e$B$*$^$1\e(B
@@ -162,7 +171,7 @@ Wanderlust \e$B$N<g$JFCD'\e(B/\e$BFCD9$O0J2<$NDL$j$G$9!#\e(B
 @item \e$B9XFI%U%)%k%@$N0lMw$rI=<($9$k%U%)%k%@%b!<%I!#\e(B
 @item \e$B%a%C%;!<%8%-%c%C%7%e!"\e(BDisconnected Operation (\e$B8=:_$OI=<($N$_\e(B)\e$B!#\e(B
 @item MH \e$BE*\e(B FCC\e$B!#\e(B(@samp{FCC: %Backup} \e$B$d\e(B @samp{FCC: $Backup} \e$B$b2D\e(B)\e$B!#\e(B
-@item MIME \e$BBP1~\e(B (by SEMI or tm)\e$B!#\e(B
+@item MIME \e$BBP1~\e(B (by SEMI)\e$B!#\e(B
 @item \e$B%K%e!<%9\e(B/\e$B%a!<%k$NAw?.$rE}9g$7$?%a%C%;!<%8Aw?.%I%i%U%H!#\e(B
 @item \e$B%U%)%k%@0lMw$N%"%$%3%sI=<(\e(B (XEmacs \e$B$H\e(B Emacs 21)\e$B!#\e(B
 @item \e$BBg$-$J%Q!<%H$r<h$j4s$;$:$KI=<(\e(B(IMAP4)\e$B!#\e(B
@@ -178,17 +187,12 @@ Wanderlust \e$B$N<g$JFCD'\e(B/\e$BFCD9$O0J2<$NDL$j$G$9!#\e(B
 @section \e$BF0:n4D6-\e(B
 
 Wanderlust \e$B$O0J2<$N\e(B Emacsen \e$B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#\e(B
-@c \e$B$5$i$K\e(B Nemacs 3.3.2 \e$B>e$G$b!"\e(B(\e$B;H$($k5!G=$O8BDj$5$l$k$b$N$N\e(B) \e$BF0:n$9$k$3$H\e(B
-@c \e$B$,3NG'$5$l$F$$$^$9!#\e(B
 
 @itemize @bullet
-@item Nemacs 3.3.2 (\e$BCm\e(B: \e$B;H$($k5!G=$O8BDj$5$l$^$9\e(B)
-@item Mule 2.3 based on Emacs 19.28
 @item Mule 2.3 based on Emacs 19.34
 @item Emacs 20.2 \e$B0J9_\e(B
 @item XEmacs 20.4 \e$B0J9_\e(B
 @item Meadow 1.00 \e$B0J9_\e(B
-@item Mule for Windows v1.22
 @item NTEmacs 20.4 \e$B0J9_\e(B
 @item PMMule
 @end itemize
@@ -198,15 +202,20 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 
 @itemize @bullet
 @item UW imapd 4.1\e$B!A\e(B4.7, 4.7a, 4.7b, 4.7c, 2000 \e$B0J9_\e(B
-@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 \e$B0J9_\e(B
+@item Cyrus imapd 1.4, 1.5.19, 1.6.22\e$B!A\e(B1.6.24, 2.0.5 \e$B0J9_\e(B
+@item Courier-IMAP 1.3.2 \e$B0J9_\e(B
 @item AIR MAIL (AIRC imapd release 2.00)
 @item Express Mail
 @item Microsoft Exchange Server 5.5
-@item Sun Internet Mail Server 4.0
+@item Sun Internet Mail Server 3.5, 3.5.alpha, 4.0
 @end itemize
 
-@c Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B LDAP \e$B%5!<%P$O0J2<$NDL\e(B
-@c \e$B$j$G$9!#\e(B
+Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B LDAP \e$B%5!<%P$O0J2<$NDL\e(B
+\e$B$j$G$9!#\e(B
+
+@itemize @bullet
+@item OpenLDAP 2.0.6 \e$B0J9_\e(B
+@end itemize
 
 
 @node Start Me Up, Folders, Introduction, Top
@@ -215,14 +224,14 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 
 Wanderlust \e$B$r5/F0$9$k$^$G$KI,MW$J<j=g$r=gHV$K@bL@$7$^$9!#\e(B
 
-(\e$BEvA3$N$3$H$J$,$i!"$3$l$i$h$j$b@h$K!"%a!<%k\e(B/\e$B%K%e!<%9$rFI$`$3$H$N$G$-$k4D6-$,$"$i$+$8$aI,MW$G$9!#\e(B)
+(\e$BEvA3$N$3$H$J$,$i!"$3$l$i$h$j$b@h$K!"%a!<%k\e(B/\e$B%K%e!<%9$rFI$`$3$H$N$G$-$k4D\e(B
+\e$B6-$,$"$i$+$8$aI,MW$G$9!#\e(B)
 
 @menu
 * MIME Modules::      MIME \e$BMQ%b%8%e!<%k$N%$%s%9%H!<%k\e(B
 * Download::          \e$B%Q%C%1!<%8$NF~<j$HE83+\e(B
 * Install::           \e$B%P%$%H%3%s%Q%$%k$H%$%s%9%H!<%k\e(B
 * Minimal Settings::  @file{.emacs} \e$B$N@_Dj\e(B
-* Mail Addresses::    \e$B%"%I%l%9D"$NDj5A\e(B
 * Folder Definition:: \e$B9XFI$9$k%U%)%k%@$NDj5A\e(B
 * Start Wanderlust::  Wanderlust \e$B$N5/F0\e(B
 @end menu
@@ -234,29 +243,15 @@ Wanderlust \e$B$r5/F0$9$k$^$G$KI,MW$J<j=g$r=gHV$K@bL@$7$^$9!#\e(B
 @pindex APEL
 @pindex FLIM
 @pindex SEMI
-@pindex tm
-
-Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$b$7$/$O\e(B tm \e$B$,%$%s%9\e(B
-\e$B%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
-
-Emacs19.28 \e$B0JA0$r%Y!<%9$H$7$?\e(B Mule \e$B$r$*;H$$$N>l9g$O\e(B SEMI \e$B$,F0$+$J$$$O$:\e(B
-@footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$G$O\e(B SEMI \e$B$rF0:n$5$;$k$3$H$b2DG=$G$9!#\e(B@*
-@uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J$j$^$9!#\e(B}
-\e$B$J$N$G\e(B tm \e$B$r%$%s%9%H!<%k$7$^$9!#\e(B
-(tm \e$B$O%P!<%8%g%s\e(B 8.7 \e$B0J9_$r$4MxMQ$/$@$5$$!#\e(B)
 
-SEMI \e$B$,;H$($k\e(B Emacsen \e$B$G$O!"\e(Btm \e$B$h$j$b5!G=$N=<<B$7$?\e(B SEMI\e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$k$3$H$r$*4+$a$7$^$9!#\e(B
-
-\e$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\e(B
-\e$B$/$@$5$$!#\e(B
+Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$,%$%s%9%H!<%k$5$l$F$$$k\e(B
+\e$BI,MW$,$"$j$^$9!#\e(B
 
-SEMI, tm \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
+SEMI \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
 
 @example
 @group
 SEMI:   ftp://ftp.m17n.org/pub/mule/semi/
-tm:     http://cvs.m17n.org/tomo/comp/emacsen/tm/tm-8/
 @end group
 @end example
 
@@ -274,10 +269,16 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 \e$B4pK\E*$K$9$Y$F\e(B @samp{make install} \e$B$N<B9T$G:Q$`$O$:$G$9\e(B
 (XEmacs 21 \e$B$G$O\e(B @samp{make install-package})\e$B!#\e(B
 
+\e$B%$%s%9%H!<%k$NJ}K!$N>\:Y$K$D$$$F$O!"3F%Q%C%1!<%8$KE:IU$5$l$F$$$k%I%-%e%a\e(B
+\e$B%s%H$r;2>H$7$F$/$@$5$$\e(B @footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$r;H$C$F$$$k\e(B
+\e$B>l9g!"\e(B@* @uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J\e(B
+\e$B$k$+$b$7$l$^$;$s!#\e(B}\e$B!#\e(B
+
+
 \e$B?d>)$5$l$k\e(B APEL, FLIM, SEMI \e$B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#\e(B
 
 @itemize @minus
-@item APEL 10.2, FLIM 1.13.2, SEMI 1.13.7
+@item APEL 10.3, FLIM 1.14.3, SEMI 1.14.3
 @end itemize
 
 \e$B$=$NB>!"\e(BFLIM, SEMI \e$B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"\e(B
@@ -290,8 +291,8 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 @item APEL 10.2, SLIM 1.14.3, EMY 1.13.9
 @end itemize
 
-APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r%$\e(B
-\e$B%s%9%H!<%k$7$J$*$7$F$/$@$5$$!#\e(B
+APEL, FLIM \e$B$b$7$/$O\e(B SEMI \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r\e(B
+\e$B%$%s%9%H!<%k$7D>$7$F$/$@$5$$!#\e(B
 
 
 @node Download, Install, MIME Modules, Start Me Up
@@ -389,8 +390,8 @@ Cannot open load file: mime-setup
 
 @noindent
 \e$B$H$$$&%(%i!<$,=P$k$3$H$,$"$j$^$9!#$3$N>l9g$O!"\e(Bcustom, APEL, FLIM, SEMI 
-\e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @env{EMACSLOADPATH}\e$B$K2C$($k$+!"E83+%G%#%l%/%H\e(B
-\e$B%j$N\e(B @file{WL-CFG} \e$B$H$$$&%U%!%$%kCf$G\e(B@code{load-path} \e$B$rDL$7$F$*$/$H$h$$\e(B
+\e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @env{EMACSLOADPATH} \e$B$K2C$($k$+!"E83+%G%#%l%/%H\e(B
+\e$B%j$N\e(B @file{WL-CFG} \e$B$H$$$&%U%!%$%kCf$G\e(B@code{load-path} \e$B$rDL$7$F$*$/$HNI$$\e(B
 \e$B$G$7$g$&!#\e(B
 
 \e$B$^$?!"\e(BBBDB \e$B$rMxMQ$7$?$$>l9g!"\e(BBBDB \e$B$X$b\e(B @code{load-path} \e$B$rDL$7$F$*$/$HI,\e(B
@@ -403,7 +404,7 @@ Cannot open load file: mime-setup
 \e$B%$%s%9%H!<%k$G\e(B SEMI \e$BEy$N\e(B @code{load-path} \e$B$N@_Dj$,I,MW$G$"$l$P!"\e(B
 @file{WL-CFG} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
-\e$B%$%s%9%H!<%k@h$O\e(B @file{Makefile}\e$BCf$N\e(B @code{LISPDIR} \e$B$G;XDj$7$^$9$,!"\e(B
+\e$B%$%s%9%H!<%k@h$O\e(B @file{Makefile} \e$BCf$N\e(B @code{LISPDIR} \e$B$G;XDj$7$^$9$,!"\e(B
 \e$B<B:]$K\e(B @file{*.el}, @file{*.elc} \e$B$,F~$k%G%#%l%/%H%j\e(B
 (@code{LISPDIR} \e$B$+$i$NAjBP%Q%9\e(B)\e$B$O\e(B
  @file{WL-CFG} \e$BCf$NJQ?t\e(B @code{WL_PREFIX}, @code{ELMO_PREFIX} \e$B$G;XDj$7$^$9!#\e(B
@@ -421,7 +422,7 @@ ELMO \e$B%b%8%e!<%k$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j$r;XDj$7$^$9!#\e(B
 ELMO \e$B%b%8%e!<%k$K$O%U%!%$%k\e(B @file{elmo*.el} @file{elmo*.elc} \e$B$,4^$^$l$^$9!#\e(B
 @c  @file{utf7.el}, @file{utf7.elc} \e$B$b\e(B ELMO \e$B%b%8%e!<%k$K4^$^$l$^$9!#\e(B
 @end table
-  
+
 @noindent
 @code{WL_PREFIX}, @code{ELMO_PREFIX}
  \e$B$N%G%U%)%k%H$O$$$:$l$b\e(B @file{wl} \e$B$G$9!#\e(B
@@ -463,7 +464,7 @@ package \e$B$N%G%#%l%/%H%j$O\e(B SEMI \e$B$,%$%s%9%H!<%k$5$l$F$$$l$P<+F08!=P$5$l$^$
 @subsection \e$B%$%s%9%H!<%k$7$J$$$GMxMQ\e(B
 
 Wanderlust \e$B$O%P%$%H%3%s%Q%$%k!"%$%s%9%H!<%k$7$J$/$F$b!"\e(B@file{wl},
-@file{elmo}\e$B$N%G%#%l%/%H%j$K\e(B @code{load-path} \e$B$,@_Dj$5$l$F$$$l$P5/F0$9$k\e(B
+@file{elmo} \e$B$N%G%#%l%/%H%j$K\e(B @code{load-path} \e$B$,@_Dj$5$l$F$$$l$P5/F0$9$k\e(B
 \e$B$3$H$,$G$-$^$9!#Nc$($P\e(B @file{~/work} \e$B$K%Q%C%1!<%8$rE83+$7$?>l9g!"\e(B
 @file{~/.emacs} \e$B$K0J2<$N@_Dj$r$9$k$H5/F0$G$-$^$9!#\e(B
 
@@ -496,7 +497,7 @@ http://www.gohome.org/wl/doc/wl-euc_toc.html
 @end example
 
 
-@node Minimal Settings, Mail Addresses, Install, Start Me Up
+@node Minimal Settings, Folder Definition, Install, Start Me Up
 @section @file{.emacs}, @file{.wl} \e$B$N@_Dj\e(B
 @cindex Minimal Settings
 @cindex Settings
@@ -520,8 +521,8 @@ Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 
 @lisp
 @group
-;; @r{SEMI/tm \e$B$r;H$&$?$a$N@_Dj\e(B}
-(load "mime-setup")
+;; @r{SEMI \e$B$r;H$&$?$a$N@_Dj\e(B}
+(require 'mime-setup)
 
 ;; @r{autoload \e$B$N@_Dj\e(B}
 ;; @r{(XEmacs \e$B$N\e(B package \e$B$H$7$F%$%s%9%H!<%k$5$l$F$$$k>l9g!"I,MW$"$j$^$;$s\e(B)}
@@ -533,9 +534,9 @@ Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 (setq wl-icon-dir "~/work/wl/etc")
 
 ;; @r{\e$B%a!<%k$rAw?.$9$k\e(B SMTP \e$B%5!<%P!#\e(B \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B}
-(setq wl-smtp-posting-server "your.smtp.server.com")
+(setq wl-smtp-posting-server "your.smtp.example.com")
 ;; @r{\e$B%K%e!<%9Ej9FMQ$N\e(B NNTP \e$B%5!<%P!#\e(B \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B}
-(setq wl-nntp-posting-server "your.nntp.server.com")
+(setq wl-nntp-posting-server "your.nntp.example.com")
 @end group
 @end lisp
 
@@ -544,7 +545,7 @@ Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 \e$B$&!#\e(Bface \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B@file{~/.wl} 
 \e$B$K=q$$$F$/$@$5$$!#\e(B@xref{Highlights}.
 
-\e$B>e5-$N$&$A!"\e(B@samp{(load "mime-setup")} \e$B$H\e(B @code{autoload} \e$B$N@_Dj$O\e(B
+\e$B>e5-$N$&$A!"\e(B@samp{(require 'mime-setup)} \e$B$H\e(B @code{autoload} \e$B$N@_Dj$O\e(B
 @file{~/.emacs} \e$B$K=q$/I,MW$,$"$j$^$9!#$=$l0J30$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-\e(B
 \e$B=R$G$-$^$9!#\e(B
 
@@ -557,7 +558,7 @@ Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 \e$B0J2<$N$h$&$J@_Dj$r\e(B @file{.emacs} \e$BEy$K$7$F$*$/$H!"\e(B@kbd{C-x m}
 (@code{compose-mail}) \e$BEy$K$h$C$F\e(B Wanderlust \e$B$N%I%i%U%H%b!<%I$,5/F0$5$l$k\e(B
 \e$B$h$&$K$J$j$^$9!#\e(BWanderlust \e$B$r\e(B Emacs \e$B>e$NI8=`%a!<%i$H$7$F;H$$$?$$>l9g$O@_\e(B
-\e$BDj$7$F$*$/$H$h$$$G$7$g$&!#$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,\e(B
+\e$BDj$7$F$*$/$HNI$$$G$7$g$&!#$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,\e(B
 \e$B2DG=$J\e(B Emacsen \e$B$N>l9g$N$_M-8z$G$9!#\e(B
 @xref{Mail Methods, , ,emacs-ja, The Emacs Editor}.
 
@@ -576,60 +577,7 @@ Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 @end group
 @end lisp
 
-
-@node Mail Addresses, Folder Definition, Minimal Settings, Start Me Up
-@section \e$B%"%I%l%9D"$NDj5A\e(B
-@cindex Address book Definition
-@cindex .addresses
-@cindex Alias, Address
-
-\e$B%"%I%l%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OHt$P$7$F$b9=$$\e(B
-\e$B$^$;$s!#\e(B
-
-\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
-@file{~/.addresses} \e$B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<\e(B
-\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$^$?!"\e(B
-\e$B5/F0$7$?$"$H$G%5%^%j$N%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9$rDI2C\e(B/
-\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
-
-\e$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J$+$s$8$G$9!#\e(B
-
-@example
-@group
-#
-# @r{@samp{#} \e$B$G;O$^$k9T$O%3%a%s%H!#\e(B}
-# @r{\e$B6u9T$OL5;k!#\e(B}
-#
-# @var{\e$B%a!<%k%"%I%l%9\e(B}  "@var{\e$B$"$@L>\e(B}"  "@var{\e$BK\L>\e(B}"
-#
-teranisi@@gohome.org            "\e$B$F$i$K$7\e(B"      "\e$B;{@>M50l\e(B"
-foo@@bar.gohome.org             "Foo \e$B$5$s\e(B"      "John Foo"
-bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
-@end group
-@end example
-
-@noindent
-\e$B0l9T$,0l?MJ,$NDj5A$G$9!#\e(B
-
-\e$B<B:]$K$O\e(B(\e$B%G%U%)%k%H@_Dj$G$O\e(B)\e$B%5%^%jI=<($G\e(B@var{\e$B$"$@L>\e(B}\e$B!"%I%i%U%H:n@.;~$N%"\e(B
-\e$B%I%l%9>pJs$H$7$F\e(B@var{\e$BK\L>\e(B}\e$B$,$D$+$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,\e(B
-\e$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\e(B
-\e$BDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#\e(B
-
-\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F$$$l$P!"\e(B
-\e$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
-
-\e$B$5$i$K!"JQ?t\e(B @code{wl-use-ldap} (\e$B=i4|@_Dj$O\e(B @code{nil}) \e$B$r\e(B non-nil \e$B$K@_\e(B
-\e$BDj$9$k$H!"\e(BLDAP \e$B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^\e(B
-\e$B$9!#\e(B
-
-LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
-@code{wl-ldap-base} \e$B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"\e(BLDAP \e$BBP1~$N\e(B XEmacs \e$B0J\e(B
-\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B @command{ldapsearch} \e$B$rMxMQ$7$^$9$N$G!"\e(B
-@command{ldapsearch} \e$B$X$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"\e(B
-\e$B$j$^$9!#\e(B
-
-@node Folder Definition, Start Wanderlust, Mail Addresses, Start Me Up
+@node Folder Definition, Start Wanderlust, Minimal Settings, Start Me Up
 @section \e$B9XFI$9$k%U%)%k%@$NDj5A\e(B
 @cindex Folder Definition
 @cindex .folders
@@ -637,10 +585,11 @@ LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 \e$B9XFI$9$k%U%)%k%@$r%U%!%$%k\e(B @file{~/.folders} \e$B$KDj5A$7$^$9!#\e(B
 @file{~/.folders} \e$B$K=q$+$l$?FbMF$,$=$N$^$^$"$J$?$N9XFI$9$k%U%)%k%@$H$J$j$^$9!#\e(B
 
-\e$B5/F0$7$?$"$H$G%U%)%k%@0lMw$N%P%C%U%!$+$i9XFI%U%)%k%@$rDI2C\e(B/\e$BJT=8$9$k$3$H\e(B
-\e$B$b2DG=$G$9$N$G!"$3$N9`$OHt$P$7$F$b9=$$$^$;$s!#\e(B
+\e$B5/F0$7$?>uBV$G%U%)%k%@0lMw$N%P%C%U%!$+$i9XFI%U%)%k%@$rDI2C\e(B/\e$BJT=8$9$k$3$H\e(B
+\e$B$b2DG=$G$9$N$G!"$3$N9`$OFI$_Ht$P$7$F$b9=$$$^$;$s!#\e(B
+@xref{Folder Manager}.
 
-@file{~/.folders} \e$B$N=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J$+$s$8$G$9!#\e(B
+@file{~/.folders} \e$B$N=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#\e(B
 
 @example
 @group
@@ -654,19 +603,19 @@ LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 %inbox  "\e$B<u?.H"\e(B"
 +trash  "\e$B%4%_H"\e(B"
 +draft  "\e$BAp9F\e(B"
-%#mh/Backup@@my.imap.server.com "\e$BAw?.:Q$_\e(B"
+%#mh/Backup@@my.imap.example.com "\e$BAw?.:Q$_\e(B"
 # \e$B%0%k!<%W$NDj5A\e(B
 Emacsen@{
     %#mh/spool/wl            "Wanderlust ML"
     %#mh/spool/elips         "ELIPS ML"
     %#mh/spool/apel-ja       "APEL (\e$BF|K\8l\e(B) ML"
     %#mh/spool/xemacs-beta   "XEmacs \e$B%Y!<%?\e(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 \e$B$N\e(B Emacsen"
 @}
 #
 # @r{\e$B9TKv$K\e(B @samp{/} \e$B$,$D$/$H!"$=$N%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$,\e(B}
-# @r{\e$B$R$H$D$N%0%k!<%W$H$J$k!#\e(B}
+# @r{\e$B$R$H$D$N%0%k!<%W$H$J$k!J%"%/%;%9%0%k!<%W!K!#\e(B}
 #
 %#mh/expire@@localhost /
 # @r{MH \e$B$N%U%)%k%@A4$F$r$R$H$D$N%0%k!<%W$K$9$kNc!#\e(B}
@@ -687,13 +636,13 @@ Emacsen@{
 \e$B%0%k!<%W$K$O!"#2$D$N<oN`$,$"$j$^$9!#0l$D$O!">e$NNc$N\e(B @samp{Emacsen} \e$B$N$h\e(B
 \e$B$&$KD>@\<+J,$G9%$-$J%U%)%k%@$r%0%k!<%W$H$7$FDj5A$9$k%?%$%W$G$9!#\e(B
 
-\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
+\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+ /} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
 \e$B$O!"$"$k%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$r0l$D$N%0%k!<%W$H$9$k$b$N$G$9!#\e(B
-(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
+(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+ /} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
 \e$B%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
 
 \e$B<B:]$K;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,$o$+$j$d$9$$$H;W$o$l$^$9!#\e(B
-\e$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$&!#\e(B
+\e$B$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%U%)%k%@$NDj5A$r$d$jD>$9$N$,$h$$$G$7$g$&!#\e(B
 
 
 @node Start Wanderlust,  , Folder Definition, Start Me Up
@@ -708,7 +657,7 @@ M-x wl
 
 @noindent
 \e$B$G5/F0$G$-$^$9!#\e(B
-\e$B=i4|2=$N$N$A!"%U%)%k%@0lMw$rI=<($9$k%U%)%k%@%b!<%I$,$"$i$o$l$^$9!#\e(B
+\e$B=i4|2=$N8e!"%U%)%k%@0lMw$rI=<($9$k%U%)%k%@%b!<%I$,8=$l$^$9!#\e(B
 
 @kbd{C-u M-x wl} \e$B$N$h$&$K\e(B prefix argument \e$B$D$-$G<B9T$9$k$H!"\e(B
 \e$B%U%)%k%@$N%A%'%C%/$r>JN,$7$F5/F0$7$^$9!#\e(B
@@ -724,8 +673,8 @@ 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$h$C$F%5%]!<%H$5$l$F$$$l$P!"$I$s$J%U%)%k%@$G$bMxMQ$9$k$3$H$,$G$-$^$9!#\e(B
 
 \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, POP, Archive, Multi, Filter, Pipe,
-Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
+LocalDir(MH), Maildir, News Spool, Archive, POP, Multi, Filter, Pipe,
+Internal \e$B$N\e(B 11 \e$B<oN`$G$9!#\e(B
 
 @menu
 * IMAP Folder::              @samp{%} -- IMAP \e$B%U%)%k%@\e(B
@@ -735,6 +684,8 @@ Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
 * News Spool Folder::        @samp{=} -- News Spool \e$B%U%)%k%@\e(B
 * Archive Folder::           @samp{$} -- \e$B%"!<%+%$%V%U%)%k%@\e(B
 * POP Folder::               @samp{&} -- POP \e$B%U%)%k%@\e(B
+* Shimbun Folder::           @samp{@@} -- \e$B?7J9%U%)%k%@\e(B
+* Namazu Folder::            @samp{[} -- Namazu \e$B%U%)%k%@\e(B
 * Multi Folder::             @samp{*} -- \e$B%^%k%A%U%)%k%@\e(B
 * Filter Folder::            @samp{/} -- \e$B%U%#%k%?%U%)%k%@\e(B
 * Pipe Folder::              @samp{|} -- \e$B%Q%$%W%U%)%k%@\e(B
@@ -744,8 +695,9 @@ Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
 
 @node IMAP Folder, NNTP Folder, Folders, Folders
 @section IMAP \e$B%U%)%k%@\e(B
-@cindex IMAP Folder
 @cindex @samp{%}
+@cindex IMAP Folder
+@cindex Folder, IMAP
 @cindex RFC 2060
 @cindex IMAP4rev1
 
@@ -763,49 +715,64 @@ RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$
 @var{\e$BG'>ZK!\e(B}\e$B$K$O\e(B @code{login} (\e$B%(%s%3!<%I$7$F%Q%9%o!<%I$rAw?.\e(B)\e$B$+\e(B
            @code{cram-md5} (CRAM-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
            @code{digest-md5} (DIGEST-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
-           @code{plain} (\e$B$^$?$O\e(B @code{nil}\e$B!#@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
+           @code{clear} (\e$B$^$?$O\e(B @code{nil}\e$B!#@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
 @end example
 
-(CRAM-MD5 \e$B$d\e(B DIGEST-MD5 \e$B$K$h$kG'>Z$r9T$J$&$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B
-@file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
-
 default \e$BCM\e(B:
 
 @example
-\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-imap4-user} \e$B$NCM!#\e(B
+\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-imap4-default-user} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
              @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
-\e$BG'>ZK!\e(B    -> \e$BJQ?t\e(B @code{elmo-default-imap4-authenticate-type} \e$B$NCM!#\e(B
-             \e$B=i4|@_Dj$O\e(B 'login\e$B!#\e(B
-\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-imap4-server} \e$B$NCM!#\e(B
-             \e$B=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-default-imap4-port} \e$B$NCM!#\e(B
+\e$BG'>ZK!\e(B    -> \e$BJQ?t\e(B @code{elmo-imap4-default-authenticate-type} \e$B$NCM!#\e(B
+             \e$B=i4|@_Dj$O\e(B @code{login}\e$B!#\e(B
+\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-imap4-default-server} \e$B$NCM!#\e(B
+             \e$B=i4|@_Dj$O\e(B @samp{localhost}\e$B!#\e(B
+\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-imap4-default-port} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B 143\e$B!#\e(B
 @end example
 
-\e$B%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$rJQ?t\e(B @code{elmo-default-imap4-server} 
-\e$B$K;XDj$9$k$H!"$$$A$$$A%U%)%k%@L>$K%[%9%HL>$r=q$+$:$K$9$_$^$9!#Nc$($P%U%!\e(B
+\e$B%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$rJQ?t\e(B @code{elmo-imap4-default-server} 
+\e$B$K;XDj$9$k$H!"$$$A$$$A%U%)%k%@L>$K%[%9%HL>$r=q$+$:$K:Q$_$^$9!#Nc$($P%U%!\e(B
 \e$B%$%"%&%)!<%k$r1[$($J$1$l$P$J$i$J$$>l9g$G$b\e(B @samp{foo%imap@@gateway} \e$B$N$h\e(B
 \e$B$&$K;XDj$G$-$^$9!#\e(B
 
+@lisp
+@group
+;; @r{\e$BNc\e(B: imap4.exaple.org \e$B$r%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$H$7$F@_Dj\e(B}
+(setq elmo-imap4-default-server "imap4.example.org")
+@end group
+@end lisp
+
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL (Secure Socket Layer)\e$B$r\e(B
-\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(BSSL\e$B%3%M%/\e(B
-\e$B%7%g%s$rD%$j$^$9!#JQ?t\e(B @code{elmo-default-imap4-stream-type} \e$B$NCM$,\e(B 
-non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B 
-@samp{!!} \e$B$r0UL#$7$^$9!#\e(B
+\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(BSSL \e$B%3%M\e(B
+\e$B%/%7%g%s$rD%$j$^$9!#JQ?t\e(B @code{elmo-imap4-default-stream-type} \e$B$NCM$,\e(B 
+@code{ssl} \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} 
+\e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
+
+@lisp
+@group
+;; @r{\e$BNc\e(B: SSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k\e(B}
+(setq elmo-imap4-default-stream-type 'ssl) 
+@end group
+@end lisp
 
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
-\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C\e(B
-\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
+(OpenSSL \e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,DL$C$F$$$kI,MW$,$"$j$^$9!#\e(B
+STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k$9$kI,\e(B
+\e$BMW$,$"$j$^$9!#\e(B)
 
 \e$BG'>ZK!$H$7$F!"\e(B@code{login}\e$B!"\e(B@code{cram-md5} \e$B$b$7$/$O\e(B @code{digest-md5} 
 \e$B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,\e(B
-\e$B%Q%9%o!<%I$r%(%s%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N$N$A!"\e(B
-@code{plain} (\e$B@8%Q%9%o!<%I$rAw$k\e(B) \e$B$K@ZBX$($^$9!#JQ?t\e(B 
-@code{elmo-imap4-force-login} \e$B$,\e(B non-nil \e$B$J$i$P!"3NG'L5$7$K\e(B @code{plain} 
+\e$B%Q%9%o!<%I$r%(%s%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N8e!"\e(B
+@code{clear} (\e$B@8%Q%9%o!<%I$rAw$k\e(B) \e$B$K@ZBX$($^$9!#JQ?t\e(B 
+@code{elmo-imap4-force-login} \e$B$,\e(B non-nil \e$B$J$i$P!"3NG'L5$7$K\e(B @code{clear} 
 \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B @code{nil})\e$B!#\e(B
 
+@lisp
+;; @r{\e$BNc\e(B: \e$B@8%Q%9%o!<%I$GG'>Z\e(B}
+(setq elmo-imap4-default-authenticate-type 'clear) 
+@end lisp
+
 \e$BNc\e(B:
 
 @example
@@ -814,9 +781,9 @@ non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttl
 %#mh/inbox -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"#mh/inbox"
 
 %inbox:hoge -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox" \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
-%inbox:hoge/plain@@server1
+%inbox:hoge/clear@@server1
             -> server1 \e$B>e$N\e(B IMAP \e$B$N%a!<%k%\%C%/%9\e(B "inbox" \e$B$X\e(B
-               \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B('plain \e$B$G\e(B)
+               \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B('clear \e$B$G\e(B)
                \e$B%"%/%;%9!#\e(B
 @end group
 @end example
@@ -868,10 +835,17 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 @end example
 @end itemize
 
+
 @node NNTP Folder, MH Folder, IMAP Folder, Folders
 @section NNTP \e$B%U%)%k%@\e(B
-@cindex NNTP Folder
 @cindex @samp{-}
+@cindex NNTP Folder
+@cindex Folder, NNTP
+@cindex Folder, News
+@cindex NetNews
+@cindex News
+@cindex Newsgroup
+@cindex RFC 977
 
 \e$B%M%C%H%K%e!<%9$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 \e$B0l$D$N%K%e!<%9%0%k!<%W$,0l$D$N%U%)%k%@$H$7$F07$o$l$^$9!#\e(B
@@ -886,23 +860,18 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 
 default \e$BCM\e(B:
 @example
-\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-nntp-server} \e$B$NCM!#=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
-\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-nntp-user} \e$B$NCM!#=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-default-nntp-port} \e$B$NCM!#\e(B
+\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-nntp-default-server} \e$B$NCM!#=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
+\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-nntp-default-user} \e$B$NCM!#=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-nntp-default-port} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B 119\e$B!#\e(B
 @end example
 
-@var{\e$B%f!<%6L>\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(BAUTHINFO\e$B$K$h$kG'>Z$r9T$J$$$^$9!#\e(B
+@var{\e$B%f!<%6L>\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$$$^$9!#\e(B
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 @samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(B SSL \e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-nntp-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+\e$BJQ?t\e(B @code{elmo-nntp-default-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
-\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C\e(B
-\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
-
 \e$BNc\e(B:
 
 @example
@@ -915,10 +884,10 @@ default \e$BCM\e(B:
 
 @node MH Folder, Maildir Folder, NNTP Folder, Folders
 @section MH \e$B%U%)%k%@\e(B
-@cindex MH Folder
 @cindex @samp{+}
+@cindex MH Folder
+@cindex Folder, MH
 @pindex MH
-@cindex Maildir
 
 MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -948,9 +917,10 @@ MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)
 
 @node Maildir Folder, News Spool Folder, MH Folder, Folders
 @section Maildir \e$B%U%)%k%@\e(B
-@cindex Maildir Folder
 @cindex @samp{.}
+@cindex Maildir Folder
 @pindex Maildir
+@pindex qmail
 
 Maildir \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -988,8 +958,8 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 
 @node News Spool Folder, Archive Folder, Maildir Folder, Folders
 @section News Spool \e$B%U%)%k%@\e(B
-@cindex News spool Folder
 @cindex @samp{=}
+@cindex News spool Folder
 @pindex gnspool
 
 Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
@@ -1048,7 +1018,7 @@ ange-ftp \e$BI=5-$b\e(B ange-ftp, efs \e$B$,;H$($k4D6-$G$O\e(B OK \e$B$G$9!#\e(B
 @var{\e$B%"!<%+%$%P%?%$%W\e(B}\e$B$r>JN,$7$?>l9g!"JQ?t\e(B @code{elmo-archive-default-type}
 (\e$B=i4|@_Dj$O\e(B @code{zip})\e$B$,;2>H$5$l$^$9!#\e(B
 
-@var{\e$B%W%l%U%#%/%9\e(B}\e$B$O!"=q8K$,%G%#%l%/%H%j9=B$$r$b$C$F$$$k>l9g$K!"$=$N%G%#\e(B
+@var{\e$B%W%l%U%#%/%9\e(B}\e$B$O!"=q8K$,%G%#%l%/%H%j9=B$$r;}$C$F$$$k>l9g$K!"$=$N%G%#\e(B
 \e$B%l%/%H%jItJ,$r;XDj$7$^$9!#$3$l$O<g$K%"!<%+%$%V%5!<%S%9$d\e(B @command{tar} +
 @command{gzip} + @command{uuencode} \e$B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k\e(B 
 ML \e$B$N=q8K%U%!%$%k$rE83+$9$k$3$H$J$/%^%&%s%H$9$k$?$a$N$b$N!"$D$^$j1\Mw;~\e(B
@@ -1152,7 +1122,7 @@ GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 @cindex Archive Tips
 
 \e$B2wE,$K0\9T$9$k$K$O!"\e(B@code{wl-summary-archive} \e$B$r<B9T$9$k\e(B 
-(@pxref{Archive}) \e$B$+!"\e(BExpire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$\e(B
+(@pxref{Archive}) \e$B$+!"\e(BExpire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$HNI$$\e(B
 \e$B$G$7$g$&!#$?$@$7!"\e(BExpire \e$B5!G=$G:n@.$7$?%"!<%+%$%V%U%)%k%@$r07$&>l9g$O!"\e(B
 \e$BJQ?t\e(B @code{elmo-archive-treat-file} \e$B$r\e(B non-nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#\e(B
 \e$B$J$*!"\e(BOS/2 \e$B>e$G$N%F%9%H$G$O!"\e(BMule2.3(19.28) \e$B$H\e(B Emacs20.2 \e$B$G$O=hM}B.EY$K\e(B
@@ -1161,7 +1131,7 @@ GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 
 \e$B$^$?!"0l$D$N=q8K%U%!%$%k$KB?$/$N%U%!%$%k$,4^$^$l$F$$$k$H%"!<%+%$%P5/F0;~\e(B
 \e$B$N%*!<%P!<%X%C%I$,2CB.EYE*$KA}2C$9$k\e(B(\e$BFC$K\e(B LHA \e$B$N>l9g\e(B)\e$B$?$a!"\e(B150 \e$BDLDxEY!"\e(B
-\e$B:GBg$G$b\e(B 200\e$BDL$^$G$K$7$F$*$/$H!"%9%H%l%9$J$/FI$_=q$-$G$-$k$G$7$g$&!#\e(B
+\e$B:GBg$G$b\e(B 200 \e$BDL$^$G$K$7$F$*$/$H!"%9%H%l%9$J$/FI$_=q$-$G$-$k$G$7$g$&!#\e(B
 
 \e$B$J$*!"EvA3$N$3$H$J$,$i\e(B
 
@@ -1209,7 +1179,7 @@ GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 @end example
 
 @noindent
-\e$B$G$9!#3g8LFb$N$b$N$O!"$J$/$F$b9=$$$^$;$s\e(B(\e$B$"$l$PM%@hE*$K;H$$$^$9\e(B)\e$B!#\e(B
+\e$B$G$9!#3g8LFb$N$b$N$O!"L5$/$F$b9=$$$^$;$s\e(B(\e$B$"$l$PM%@hE*$K;H$$$^$9\e(B)\e$B!#\e(B
 
 @item elmo-archive-suffix-alist
 @vindex elmo-archive-suffix-alist
@@ -1248,10 +1218,10 @@ OS/2 \e$B$G$O%7%'%k$r2p$5$:$KH/9T$G$-$k%3%^%s%IJ8;zNs$O\e(B 8190 \e$B%P%$%H$^$G$J$N
 @end table
 
 
-@node POP Folder, Multi Folder, Archive Folder, Folders
+@node POP Folder, Shimbun Folder, Archive Folder, Folders
 @section POP \e$B%U%)%k%@\e(B
-@cindex POP Folder
 @cindex @samp{&}
+@cindex POP Folder
 @cindex RFC 1939
 @cindex POP3
 @cindex APOP
@@ -1272,14 +1242,14 @@ RFC 1939 \e$B$G5,Dj$5$l$?\e(B POP3 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(
 default \e$BCM\e(B:
 
 @example
-\e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-user} \e$B$NCM!#\e(B
+\e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-pop3-default-user} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
               @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
-\e$BG'>ZK!\e(B     -> \e$BJQ?t\e(B @code{elmo-default-pop3-authenticate-type} \e$B$NCM!#\e(B
+\e$BG'>ZK!\e(B     -> \e$BJQ?t\e(B @code{elmo-pop3-default-authenticate-type} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B "user"\e$B!#\e(B
-\e$B%[%9%HL>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-server} \e$B$NCM!#\e(B
+\e$B%[%9%HL>\e(B   -> \e$BJQ?t\e(B @code{elmo-pop3-default-server} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B -> \e$BJQ?t\e(B @code{elmo-default-pop3-port} \e$B$NCM!#\e(B
+\e$B%]!<%HHV9f\e(B -> \e$BJQ?t\e(B @code{elmo-pop3-default-port} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B 110\e$B!#\e(B
 @end example
 
@@ -1293,24 +1263,98 @@ default \e$BCM\e(B:
 @end group
 @end example
 
-APOP \e$B$rMxMQ$9$k$K$O!"\e(B@file{md5.el} \e$B$,I,MW$G$9!#\e(B(XEmacs\e$B$G$OI,MW$"$j$^$;$s!#\e(B
+APOP \e$B$rMxMQ$9$k$K$O!"\e(B@file{md5.el} \e$B$,I,MW$G$9!#\e(B(XEmacs \e$B$G$OI,MW$"$j$^$;$s!#\e(B
 ) @file{md5.el} \e$B$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/sasl/lisp/} \e$B$+\e(B Emacs/W3 \e$B%Q%C\e(B
 \e$B%1!<%8\e(B (@uref{http://www.cs.indiana.edu/elisp/w3/docs.html})\e$B!"$^$?$O\e(B LCD
 archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
 
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-pop3-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+\e$BJQ?t\e(B @code{elmo-pop3-default-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 (SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9$k\e(B
-\e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
+\e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
 \e$BI,MW$,$"$j$^$9!#\e(B
-STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
+STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 \e$B$9$kI,MW$,$"$j$^$9!#\e(B)
 
-@node Multi Folder, Filter Folder, POP Folder, Folders
+
+@node Shimbun Folder, Namazu Folder, POP Folder, Folders
+@section \e$B?7J9%U%)%k%@\e(B
+@cindex @samp{@@}
+@cindex Shimbun Folder
+@cindex Folder, Shimbun
+@cindex Folder, Web
+@pindex w3m
+@pindex emacs-w3m
+
+emacs-w3m (@uref{http://emacs-w3m.namazu.org/}) \e$B$rMQ$$$F\e(B
+WWW \e$B>e$N?7J9$d%K%e!<%9%5%$%H!"%a!<%j%s%0%j%9%H%"!<%+%$%V$J$I$r\e(B
+\e$BFI$`$?$a$N%U%)%k%@$G$9!#\e(B
+
+w3m \e$B$*$h$S\e(B emacs-w3m \e$B$,%$%s%9%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
+
+\e$B=q<0\e(B:
+
+@example
+@group
+@samp{@@} @var{\e$B%b%8%e!<%kL>\e(B} @samp{.} @var{\e$B%U%)%k%@L>\e(B}
+@end group
+@end example
+
+@var{\e$B%b%8%e!<%kL>\e(B}\e$B!"$*$h$S\e(B @var{\e$B%U%)%k%@L>\e(B} \e$B$KF~$kCM$K$D$$$F$O\e(B
+emacs-w3m \e$B$KIUB0$N\e(B @file{README.shimbun.ja} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+
+\e$BNc\e(B:
+
+@example
+@group
+@@airs.wl  -> wanderlust ML \e$B%"!<%+%$%V\e(B (\e$B%b%8%e!<%k\e(B @file{sb-airs.el} \e$B;HMQ\e(B)
+@@asahi/   -> @file{sb-asahi.el} \e$B%b%8%e!<%k$K4^$^$l$k%U%)%k%@$N%"%/%;%9%0%k!<%W\e(B
+@end group
+@end example
+
+
+@node Namazu Folder, Multi Folder, Shimbun Folder, Folders
+@section Namazu \e$B%U%)%k%@\e(B
+@cindex Namazu Folder
+@cindex @samp{[}
+@cindex Folder, Namazu
+@cindex Folder, Text Search
+@pindex Namazu
+@pindex nmz
+namazu (@uref{http://www.namazu.org/}) \e$B$rMQ$$$F!"8!:w<0$K%^%C%A$7$?\e(B
+\e$B%a%C%;!<%8$r=8$a$?2>A[E*$J%U%)%k%@$r9=@.$7$^$9!#\e(B
+
+\e$B=q<0\e(B:
+
+@example
+@group
+@samp{[} @var{namazu \e$B8!:w<0\e(B} @samp{]} [ @var{namazu index \e$B$N%Q%9!J@dBP%Q%9!K\e(B} ]
+@end group
+@end example
+
+namazu index \e$B$N%Q%9$N%G%U%)%k%HCM$O\e(B @code{elmo-nmz-default-index-path} \e$B$G;XDj$G$-$^$9!#\e(B
+
+\e$BNc\e(B:
+
+@example
+@group
+[wanderlust]           -> \e$B%G%U%)%k%H$N\e(B index \e$B$+$i\e(B "wanderlust"
+                          \e$B$K%^%C%A$9$k$b$N$rC5$9\e(B
+[semi flim]~/Mail/semi -> \e$B%G%#%l%/%H%j\e(B "~/Mail/semi" \e$B$K$"$k\e(B index
+                          \e$B$+$i\e(B "semi flim" \e$B$rC5$9\e(B
+@end group
+@end example
+
+Tips
+
+\e$B%U%)%k%@L>F~NO;~$K6uGr$rF~NO$7$?$$>l9g!"\e(B@kbd{C-q @key{SPC}} \e$B$G$G$-$^$9!#\e(B
+
+
+@node Multi Folder, Filter Folder, Namazu Folder, Folders
 @section \e$B%^%k%A%U%)%k%@\e(B
-@cindex Multi Folder
 @cindex @samp{*}
+@cindex Multi Folder
 @cindex Folder, Multiple
 @cindex Folder, Marge
 
@@ -1344,10 +1388,11 @@ STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 
 @node Filter Folder, Pipe Folder, Multi Folder, Folders
 @section \e$B%U%#%k%?%U%)%k%@\e(B
-@cindex Filter Folder
 @cindex @samp{/}
+@cindex Filter Folder
 @cindex Folder, Filtering
 @cindex Folder, Virtual
+@cindex Folder, Conditional
 
 \e$B;XDj$7$?>r7o$rK~$?$9%a%C%;!<%8$N$_$r4^$`2>A[E*$J%U%)%k%@$G$9!#\e(B
 
@@ -1400,7 +1445,7 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @example
 @group
 /since:3daysago/+inbox \e$B"*\e(B \e$B:G6a#3F|4V$N\e(B +inbox \e$BCf$N%a%C%;!<%8!#\e(B
-/before:yesterday/+inbox \e$B"*\e(B \e$B$-$N$&$h$j0JA0$N\e(B +inbox \e$BCf$N%a%C%;!<%8!#\e(B
+/before:yesterday/+inbox \e$B"*\e(B \e$B:rF|$h$j0JA0$N\e(B +inbox \e$BCf$N%a%C%;!<%8!#\e(B
 @end group
 @end example
 
@@ -1475,7 +1520,7 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 /last:100//to:teranisi/*+inbox,%inbox
        -> +inbox \e$B$H\e(B %inbox \e$BCf$N%a%C%;!<%8$N$&$A!"\e(B
           To: \e$B%U%#!<%k%I$,\e(B "teranisi" \e$B$K%^%C%A$9$k\e(B
-          \e$B%a%C%;!<%8$N:G6a$N\e(B100\e$B8D$rI=<($9$k%U%)%k%@!#\e(B
+          \e$B%a%C%;!<%8$N:G6a$N\e(B 100 \e$B8D$rI=<($9$k%U%)%k%@!#\e(B
 
 /from:hogehoge//last:20//tocc:teranisi/%#mh/inbox@@localhost
        -> %#mh/inbox@@localhost \e$B$NCf$G!"\e(BTo \e$B$+\e(B Cc \e$B$K\e(B "teranisi" \e$B$,4^$^$l$k\e(B
@@ -1486,8 +1531,8 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 
 @node Pipe Folder, Internal Folder, Filter Folder, Folders
 @section \e$B%Q%$%W%U%)%k%@\e(B
-@cindex Pipe Folder
 @cindex @samp{|}
+@cindex Pipe Folder
 @cindex Get Message
 @cindex Download Message
 @cindex Incorporate Message
@@ -1525,15 +1570,16 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @end group
 @end example
 
-\e$B%a%C%;!<%8$,0\F0$7$?$"$H!"%U%C%/\e(B @code{elmo-pipe-drained-hook} \e$B$,8F$P$l\e(B
-\e$B$^$9$N$G!"%@%&%s%m!<%I8e$K<B9T$7$?$$4X?t$rEPO?$7$F$*$/$H$h$$$G$7$g$&!#\e(B
+\e$B%a%C%;!<%8$,0\F0$7$?8e!"%U%C%/\e(B @code{elmo-pipe-drained-hook} \e$B$,8F$P$l\e(B
+\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
 @section \e$BFbIt%U%)%k%@\e(B
-@cindex Internal Folder
 @cindex @samp{'}
+@cindex Internal Folder
 @cindex Folder, @samp{$} mark
 @cindex Cache
+@c @cindex Folder, Null
 
 Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -1542,13 +1588,13 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 @example
 @group
 'mark
-@r{\e$B$b$7$/$O\e(B}
+'sendlog
 'cache/00\e$B!A\e(B1F
 @end group
 @end example
 
 @samp{'mark} \e$B$H$$$&%U%)%k%@$O!"8e=R$N=EMW%^!<%/\e(B(@samp{$})\e$B$,$D$$$?%a%C%;!<\e(B
-\e$B%8$r$"$D$+$&FCJL$J2>A[%U%)%k%@$G$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"\e(B
+\e$B%8$r07$&FCJL$J2>A[%U%)%k%@$G$9!#=EMW%^!<%/$r%a%C%;!<%8$K$D$1$F$*$$$F!"\e(B
 \e$B$"$H$+$i8+D>$7$?$$$H$-$J$I$KJXMx$G$9!#\e(B
 
 \e$B$3$N%U%)%k%@$G%a%C%;!<%8$r:o=|$9$k$H!"$=$N%a%C%;!<%8$K$D$$$F$$$?\e(B 
@@ -1558,6 +1604,14 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 (\e$B8=:_!"\e(B@samp{'mark} \e$B%U%)%k%@$+$i$O\e(B IMAP \e$B%5!<%P>e$N%^!<%/$r>C$;$^$;$s!#\e(B
 IMAP \e$B%U%)%k%@$GD>@\>C$7$?>l9g$@$1%5!<%P>e$N%^!<%/$,>C$($^$9!#\e(B)
 
+
+@samp{'sendlog} \e$B$O\e(B @file{~/.elmo/sendlog} \e$B$K5-:\$5$l$F$$$k%a%C%;!<%8$G\e(B
+\e$B%-%c%C%7%e$5$l$F$$$k$b$N$r=8$a$?2>A[%U%)%k%@$G$9!#<+J,<+?H$X$N\e(B cc \e$B$r\e(B
+\e$BIU$1K:$l$?;~$J$I$KM-MQ$+$b$7$l$^$;$s!#\e(B
+\e$B$3$l$rMxMQ$9$k$K$O!"\e(B@code{wl-draft-use-cache} \e$B$r\e(B non-nil \e$B$K@_Dj$7$F!"\e(B
+\e$BAw?.$7$?%a%C%;!<%8$r%-%c%C%7%e$9$k$h$&$K$7$F$/$@$5$$!#\e(B
+
+
 @samp{'cache/00} \e$B!A\e(B @samp{'cache/1F} \e$B$O%M%C%H%o!<%/7PM3$GFI$s$@%a%C%;!<\e(B
 \e$B%8$N%-%c%C%7%e$K%"%/%;%9$9$k$?$a$N%U%)%k%@$G$9!#\e(B00 \e$B!A\e(B 1F \e$B$K$O!"%-%c%C%7%e\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
@@ -1827,7 +1881,7 @@ Wanderlust \e$B$N%5!<%P!&%]!<%HJL$N%*%U%i%$%s\e(B/\e$B%*%s%i%$%s$rJQ99$7$^$9!#\e(B
 @item wl-folder-info-save
 @vindex wl-folder-info-save
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
-\e$B<!$KN)$A>e$2D>$7$?$H$-$KA02s$NL$FI?t$J$I$N7k2L$r;H$$$^$o$7$9$k$+$I$&$+!"$G$9!#\e(B
+\e$B<!$KN)$A>e$2D>$7$?$H$-$KA02s$NL$FI?t$J$I$N7k2L$r;H$$2s$7$9$k$+$I$&$+!"$G$9!#\e(B
 
 @item wl-stay-folder-window
 @vindex wl-stay-folder-window
@@ -1837,7 +1891,12 @@ Non-nil \e$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
 \e$B=i4|@_Dj$O\e(B 20\e$B!#\e(B
-@code{wl-stay-folder-window} \e$B$,\e(B non-nil \e$B$N$H$-$K$N$3$9%U%)%k%@%P%C%U%!$N%&%#%s%I%&$NI}$G$9!#\e(B
+@code{wl-stay-folder-window} \e$B$,\e(B non-nil \e$B$N$H$-$K;D$9%U%)%k%@%P%C%U%!$N%&%#%s%I%&$NI}$G$9!#\e(B
+
+@item wl-folder-use-frame
+@vindex wl-folder-use-frame
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+Non-nil \e$B$J$i%U%)%k%@0lMwMQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
 @item wl-folder-many-unsync-threshold
 @vindex wl-folder-many-unsync-threshold
@@ -1991,7 +2050,7 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 \e$B$O!"$^$:$3$N%0%k!<%W$r3+$$$?>uBV$K$7$^$9!#$=$7$F<!$N9T$GDI2C$dA^F~$N%3\e(B
 \e$B%^%s%I$r<B9T$9$k$H%0%k!<%W$KDI2C$5$l$^$9!#JD$8$?>uBV$G$O$=$N%0%k!<%W$H\e(B
 \e$BF1$8%l%Y%k$KA^F~$5$l$^$9!#8@MU$G@bL@$9$k$N$OFq$7$$$N$G<B:]$K<B9T$7$F$_\e(B
-\e$B$k$H$$$$$G$7$g$&!#$D$^$j!"%+!<%=%k0LCV$h$j>e$K$"$k%0%k!<%W$N3+JD>uBV$K\e(B
+\e$B$k$HNI$$$G$7$g$&!#$D$^$j!"%+!<%=%k0LCV$h$j>e$K$"$k%0%k!<%W$N3+JD>uBV$K\e(B
 \e$B$h$jA^F~$5$l$k0LCV$,0[$J$k$N$G$9!#\e(B
 
 @subsubsection \e$B%;!<%V;~$N8@8l%3!<%I\e(B
@@ -2008,12 +2067,12 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 \e$B%U%#%k%?%U%)%k%@:n@.;~$K$O0lEY$KJ#?t$N\e(B(\e$BB?CJ$N\e(B)\e$B%U%#%k%?$,;XDj$G$-$^$9!#\e(B
 ``''(@var{NULL})\e$B$rF~NO$9$l$P!"@hF,$N%U%#%k%?$OA4$F:o=|$5$l$^$9!#\e(B
 
-@subsubsection \e$B%U%)%k%@$NJB$SJQ$(\e(B
+@subsubsection \e$B%U%)%k%@$NJB$SBX$(\e(B
 
-\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SJQ$($9$k:]!"\e(B@code{wl-fldmgr-sort-func} \e$B$K;XDj\e(B
+\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($9$k:]!"\e(B@code{wl-fldmgr-sort-function} \e$B$K;XDj\e(B
 \e$B$5$l$?4X?t$rMQ$$$^$9!#=i4|@_Dj$G$O\e(B @code{wl-fldmgr-sort-standard} \e$B$,;XDj\e(B
-\e$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!#\e(B
-\e$BJB$SJQ$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SJQ$($O$7$^$;$s!#\e(B
+\e$B$5$l$F$*$j!"$3$l$O%"%k%U%!%Y%C%H=g$KJB$SBX$(%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
+\e$BJB$SBX$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SBX$($O$7$^$;$s!#\e(B
 \e$B$D$^$j!":F5"E*$K$O9T$$$^$;$s!#\e(B
 
 @subsubsection \e$B%"%/%;%9%0%k!<%WFb$NI=<($7$J$$%U%)%k%@$N;XDj\e(B
@@ -2057,7 +2116,7 @@ unsubscribe \e$B$9$k$+$I$&$+$r@_Dj$7$F$$$k$@$1$G$9$N$G!"EvA3$=$N%"%/%;%9%0%k!<\e(B
 \e$B%"%/%;%9%0%k!<%W$r\e(B @kbd{C-u @key{RET}} \e$B$G99?7$7$F$/$@$5$$!#\e(B
 @xref{Selecting Folder}.
 
-\e$B$^$?!"A^F~\e(B/\e$B:o=|\e(B/\e$BJB$SJQ$($J$I$r9T$C$?$"$H$N%U%)%k%@$NJB$S$OJ];}$5$l$^$9!#\e(B
+\e$B$^$?!"A^F~\e(B/\e$B:o=|\e(B/\e$BJB$SBX$($J$I$r9T$C$?$"$H$N%U%)%k%@$NJB$S$OJ];}$5$l$^$9!#\e(B
 \e$B$b$7\e(B @code{wl-force-fetch-folders} \e$B$r@_Dj$9$k$+!"\e(B
 @kbd{C-u @key{RET}} \e$B$G%0%k!<%W$r3+$/$+$9$k$H!"\e(B
 \e$BB8:_$7$J$$%U%)%k%@$O:o=|$5$l!"\e(B
@@ -2068,7 +2127,7 @@ unsubscribe \e$B$9$k$+$I$&$+$r@_Dj$7$F$$$k$@$1$G$9$N$G!"EvA3$=$N%"%/%;%9%0%k!<\e(B
 @cindex Keybind, Folder Buffer
 
 \e$B%U%)%k%@$NJT=8$K4X$9$k<g$J%3%^%s%I$N%-!<%P%$%s%I$O0J2<$NDL$j$G$9!#0l1~\e(B 
-@kbd{m} \e$B$G;O$^$k%-!<$KA4$F3d$jEv$F$F!"<g$J$b$N$N$_\e(B1\e$B%9%H%m!<%/$G;HMQ$G$-$k$h\e(B
+@kbd{m} \e$B$G;O$^$k%-!<$KA4$F3d$jEv$F$F!"<g$J5!G=$N$_\e(B1\e$B%9%H%m!<%/$G;HMQ$G$-$k$h\e(B
 \e$B$&$K$7$F$$$^$9!#\e(B
 
 @table @kbd
@@ -2096,7 +2155,7 @@ unsubscribe \e$B$9$k$+$I$&$+$r@_Dj$7$F$$$k$@$1$G$9$N$G!"EvA3$=$N%"%/%;%9%0%k!<\e(B
 @kindex m d (Folder)
 @findex wl-fldmgr-delete
 \e$B%U%)%k%@$N<BBN$H$=$N\e(B msgdb \e$B$r:o=|$7$^$9!#\e(B
-nntp\e$B$J$I$N:o=|$G$-$J$$%U%)%k%@$G$O\e(B msgdb \e$B$N$_:o=|$7$^$9!#\e(B
+nntp \e$B$J$I$N:o=|$G$-$J$$%U%)%k%@$G$O\e(B msgdb \e$B$N$_:o=|$7$^$9!#\e(B
 (@code{wl-fldmgr-delete})
 
 @item R
@@ -2121,7 +2180,7 @@ nntp\e$B$J$I$N:o=|$G$-$J$$%U%)%k%@$G$O\e(B msgdb \e$B$N$_:o=|$7$^$9!#\e(B
 @kindex | (Folder)
 @kindex m f (Folder)
 @findex wl-fldmgr-make-filter
-\e$B%U%#%k%?%U%)%k%@$r:n@.$7$^$9\e(B (\e$BA*Br$7$?%U%)%k%@$K\e(Bfilter\e$B$rIU$1$^$9\e(B)\e$B!#\e(B
+\e$B%U%#%k%?%U%)%k%@$r:n@.$7$^$9\e(B (\e$BA*Br$7$?%U%)%k%@$K\e(B filter \e$B$rIU$1$^$9\e(B)\e$B!#\e(B
 (@code{wl-fldmgr-make-filter})
 
 @item M-c
@@ -2179,7 +2238,7 @@ nntp\e$B$J$I$N:o=|$G$-$J$$%U%)%k%@$G$O\e(B msgdb \e$B$N$_:o=|$7$^$9!#\e(B
 @item m s
 @kindex m s (Folder)
 @findex wl-fldmgr-sort
-\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SJQ$($k\e(B (\e$B$=$N%0%k!<%W3,AX$N$_\e(B)\e$B!#\e(B
+\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($k\e(B (\e$B$=$N%0%k!<%W3,AX$N$_\e(B)\e$B!#\e(B
 (@code{wl-fldmgr-sort})
 
 @item m C-s
@@ -2240,8 +2299,8 @@ wl-folders-file \e$B$K%;!<%V$9$k!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"%;!<%V$9$k:]$K\e(B @file{~/.folders.bak} 
 \e$B$K%P%C%/%"%C%W$r<h$j$^$9!#\e(B
 
-@item wl-fldmgr-sort-func
-@vindex wl-fldmgr-sort-func
+@item wl-fldmgr-sort-function
+@vindex wl-fldmgr-sort-function
 \e$B=i4|@_Dj$O\e(B @code{wl-fldmgr-sort-standard}\e$B!#\e(Bsort \e$B;~$K;HMQ$9$k4X?t$r;XDj$7\e(B
 \e$B$^$9!#=i4|@_Dj$O!"%"%k%U%!%Y%C%H=g$KJB$Y%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
 (@code{wl-fldmgr-sort-group-first} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)\e$B!#\e(B
@@ -2357,7 +2416,7 @@ 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
 @code{wl-summary-weekday-name-lang} \e$B$r\e(B @samp{en} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @var{\e$B:9=P?M\e(B}\e$B$O!"%9%l%C%I$N?<$5J,%$%s%G%s%H$5$l$FI=<($5$l$^$9!#\e(B@var{\e$B:9=P\e(B
-\e$B?M\e(B}\e$B$O!"%"%I%l%9D"$K$"$@L>$,$"$l$P$"$@L>$GI=<($7$^$9!#$"$@L>I=5-$r$d$a$?\e(B
+\e$B?M\e(B}\e$B$O!"%"%I%l%9D"$K$"$@L>$,$"$l$P$"$@L>$GI=<($7$^$9!#$"$@L>I=5-$r;_$a$?\e(B
 \e$B$$>l9g$O!"\e(B@code{wl-use-petname} \e$B$r\e(B @code{nil} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @var{\e$B:9=P?M\e(B}\e$B$NItJ,$K$"$k\e(B @samp{+2} \e$B$N$h$&$J?t;z$NI=<($O!"$=$N%a%C%;!<%8\e(B
@@ -2367,7 +2426,7 @@ 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
 @var{\e$B%5%V%8%'%/%H\e(B}\e$B$O!"%a%C%;!<%8$N\e(B @samp{Subject:} \e$B%U%#!<%k%I$G$9!#F1$8\e(B
 \e$B%9%l%C%I$G!"$+$D?F$HF1$8\e(B @samp{Subject:} \e$B$r;}$D%a%C%;!<%8$J$iI=<($5$l$^\e(B
 \e$B$;$s!#%a!<%j%s%0%j%9%H$J$I$NDL$7HV9fI=<($OL5;k$5$l$^$9!#\e(B @samp{Subject:} 
-\e$B$,$J$$>l9g!"JQ?t\e(B @code{wl-summary-no-subject-message} \e$B$NFbMF$,I=<($5$l$^\e(B
+\e$B$,L5$$>l9g!"JQ?t\e(B @code{wl-summary-no-subject-message} \e$B$NFbMF$,I=<($5$l$^\e(B
 \e$B$9!#\e(B
 
 @subsection \e$B0l;~E*%^!<%/\e(B
@@ -2380,7 +2439,7 @@ 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
 @table @samp
 @item *
 \e$B$^$H$a=hM}MQ%^!<%/$G$9!#\e(B
-@kbd{m} \e$B$G$O$8$^$k%3%^%s%I$G\e(B @samp{*}\e$B%^!<%/$N$D$$$?%a%C%;!<%8BP$7$F0l3g$7$?=hM}\e(B
+@kbd{m} \e$B$G;O$^$k%3%^%s%I$G\e(B @samp{*}\e$B%^!<%/$N$D$$$?%a%C%;!<%8BP$7$F0l3g$7$?=hM}\e(B
 \e$B$,$G$-$^$9!#\e(B
 
 @item D
@@ -2399,7 +2458,7 @@ 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
 
 @subsection \e$B1JB3E*%^!<%/\e(B
 
-\e$B1JB3E*%^!<%/$O!"%a%C%;!<%8$N>uBV$r$7$a$9%^!<%/$G$9!#\e(B
+\e$B1JB3E*%^!<%/$O!"%a%C%;!<%8$N>uBV$r<($9%^!<%/$G$9!#\e(B
 
 \e$B1JB3E*%^!<%/$K$O!"\e(B@samp{N}, @samp{U}, @samp{!}, @samp{u}, @samp{$} \e$B$,$"$j$^$9!#\e(B
 
@@ -2413,10 +2472,10 @@ 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$BL$FI%a%C%;!<%8$KIU$-$^$9!#\e(B@samp{U} \e$B$H$N0c$$$O!"\e(B@samp{!} \e$B$N%a%C%;!<%8$O\e(B
 \e$B%-%c%C%7%e$5$l$F$$$k$3$H$G$9!#\e(B
 @item u
-\e$B4{FI%a%C%;!<%8$KIU$-$^$9!#%^!<%/$J$7$H$N0c$$$O!"\e(B@samp{u} \e$B$N%a%C%;!<%8$O\e(B
+\e$B4{FI%a%C%;!<%8$KIU$-$^$9!#%^!<%/L5$7$H$N0c$$$O!"\e(B@samp{u} \e$B$N%a%C%;!<%8$O\e(B
 \e$B%-%c%C%7%e$5$l$F$$$J$$$3$H$G$9!#\e(B
 @item $
-@kbd{$} \e$B%-!<$r2!$9$H!"\e(B@samp{$} \e$B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O\e(BEmacs\e$B$r=*N;\e(B
+@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!"%K%e!<\e(B
 \e$B%95-;v$d%5!<%P>e$N\e(B IMAP \e$B%U%)%k%@$N%a%C%;!<%8$,\e(B expire \e$B$5$l$k$J$I$7$F>C$(\e(B
@@ -2426,12 +2485,12 @@ 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
 @end table
 
 @samp{N}, @samp{U}, @samp{u} \e$B$O!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$J$$\e(B
-\e$B$3$H$r$7$a$7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C\e(B
+\e$B$3$H$r<($7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C\e(B
 \e$B%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"%M%C%H%o!<%/$K@\B3$5$l$F$$$J$/$F$b\e(B
 IMAP \e$B%U%)%k%@$N%a%C%;!<%8$d\e(B NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-\e(B
 \e$B$^$9!#\e(B
 
-@subsection \e$B%a%C%;!<%8$NFI$_$9$9$a$+$?\e(B
+@subsection \e$B%a%C%;!<%8$NFI$_?J$a$+$?\e(B
 
 \e$B4pK\E*$K%9%Z!<%9%-!<$r2!$9$@$1$GFI$_?J$a$k$3$H$,$G$-$^$9!#\e(B
 \e$B%5%^%j$NI=<(FbMF$r%U%)%k%@$N:G?7$N>uBV$K9g$o$;$k\e(B(\e$BF14|$9$k\e(B)\e$B$K$O!"\e(B
@@ -2472,7 +2531,13 @@ MH Folder, News Spool Folder, Maildir Folder \e$B$N$_$G$9!#\e(B
 \e$B$b$&0l2s\e(B @kbd{/} \e$B$r2!$9$H!"%9%l%C%I$rJD$8$^$9!#\e(B
 prefix argument \e$B$D$-$G\e(B @kbd{/} \e$B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#\e(B
 
-@kbd{t} \e$B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#\e(B
+@kbd{[} \e$B$G%5%^%j$NA4$F$N%9%l%C%I$r3+$-!"\e(B@kbd{]}\e$B$GA4$F$N%9%l%C%I$rJD$8$^\e(B
+\e$B$9!#\e(B
+
+@kbd{t} \e$B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g\e(B
+\e$B$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#\e(B
+@xref{Key Bindings of Summary}.
+
 
 @subsection \e$B%9%l%C%I$N7R$.$J$*$7\e(B
 
@@ -2494,44 +2559,37 @@ prefix argument \e$B$D$-$G\e(B @kbd{/} \e$B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#\e(
 
 @subsection \e$B%P%C%U%!%-%c%C%7%e$H@hFI$_5!G=\e(B
 
-@code{elmo-use-buffer-cache} \e$B$,\e(B non-nil \e$B$G$"$l$P!"0lEYFI$s$@%a%C%;!<%8$,\e(B
-\e$B0lDj?t%P%C%U%!$KJ];}$5$l$^$9!#J];}$9$k%P%C%U%!$N?t$O\e(B 
-@code{elmo-buffer-cache-size} \e$B$G;XDj$7$^$9!#\e(B
+\e$B0lEYFI$s$@%a%C%;!<%8$O0lDj?t%P%C%U%!$KJ];}$5$l$^$9!#\e(B
+\e$BJ];}$9$k%P%C%U%!$N?t$O\e(B 
+@code{wl-message-buffer-cache-size} \e$B$G;XDj$7$^$9!#\e(B
 
 \e$B$^$?!"%a%C%;!<%8$rFI$s$G$$$k4V$K<!$N%a%C%;!<%8$r<hF@$7$F$*$/@hFI$_5!G=$,\e(B
-\e$B$"$j$^$9!#$3$l$O@hFI$_$7$?%a%C%;!<%8$r%P%C%U%!%-%c%C%7%e$K$?$a$F$*$/$?$a!"\e(B
-@code{elmo-use-buffer-cache} \e$B$,\e(B non-nil \e$B$G$"$k$3$H$,I,MW$G$9!#\e(B
+\e$B$"$j$^$9!#\e(B
 
 \e$B$3$N@hFI$_$9$k%U%)%k%@$O<!$N\e(B2\e$B$D$NJQ?t$K$h$j;XDj$G$-$^$9!#\e(B
 
 @table @code
-@item wl-cache-prefetch-folder-type-list
-@vindex wl-cache-prefetch-folder-type-list
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
-The initial setting is the list shown below:
-@lisp
-@group
-(nntp imap4)
-@end group
-@end lisp
-
-@noindent
-\e$B@hFI$_5!G=$rM-8z$K$9$k%U%)%k%@$r<oJL$N%j%9%H$G;XDj$7$^$9!#=i4|@_Dj$N>l9g!"\e(B
-\e$B$b$7\e(B localdir \e$B$H\e(B IMAP \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B IMAP \e$B$N%a%C%;!<\e(B
-\e$B%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B @code{wl-cache-prefetch-folder-list} 
-\e$B$h$j$bM%@h$5$l$^$9!#\e(B
-
-\e$B$b$7!"\e(Blocaldir \e$B$H\e(B localnews \e$B%U%)%k%@$b@hFI$_$9$k>l9g$O<!$N$h$&$K;XDj$7$^$9!#\e(B
+@item wl-message-buffer-prefetch-folder-type-list
+@vindex wl-message-buffer-prefetch-folder-type-list
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#$3$N>l9g!"A4$F$N%U%)%k%@$G@hFI$_5!G=$,M-8z$K$J$j$^\e(B
+\e$B$9!#FCDj$N%U%)%k%@<oJL$N>l9g$K$@$1@hFI$_5!G=$rM-8z$K$7$?$$>l9g$K$O!"%U%)\e(B
+\e$B%k%@<oJL$N%j%9%H$r;XDj$7$^$9!#\e(B
+\e$BNc$($P0J2<$N$h$&$K@_Dj$7$^$9!#\e(B(NNTP \e$B%U%)%k%@$H\e(B IMAP \e$B%U%)%k%@$G$@$1@hFI$_\e(B
+\e$B$7$?$$>l9g\e(B)
 
 @lisp
 @group
-(setq wl-cache-prefetch-folder-type-list
-      '(nntp imap4 localdir localnews))
+(setq wl-message-buffer-prefetch-folder-type-list
+      '(nntp imap4))
 @end group
 @end lisp
 
-@item wl-cache-prefetch-folder-list
-@vindex wl-cache-prefetch-folder-list
+\e$B$3$N>l9g!"$b$7\e(B localdir \e$B$H\e(B IMAP \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B 
+IMAP \e$B$N%a%C%;!<%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B 
+@code{wl-message-buffer-prefetch-folder-list} \e$B$h$j$bM%@h$5$l$^$9!#\e(B
+
+@item wl-message-buffer-prefetch-folder-list
+@vindex wl-message-buffer-prefetch-folder-list
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B@hFI$_5!G=$rM-8z$K$9$k%U%)%k%@$r%U%)%k%@L>\e(B(\e$B@55,I=8=\e(B)\e$B$N%j%9%H$G;XDj$7$^$9!#\e(B
 @end table
@@ -2561,7 +2619,7 @@ The initial setting is the list shown below:
 @end lisp
 
 @noindent
-\e$B$H$7$F3HD%9`L\$,\e(B msgdb \e$B$K4^$^$l$k$h$&$K$7$F$/$@$5$$!#$9$G$K<hF@$7$?%a%C\e(B
+\e$B$H$7$F3HD%9`L\$,\e(B msgdb \e$B$K4^$^$l$k$h$&$K$7$F$/$@$5$$!#4{$K<hF@$7$?%a%C\e(B
 \e$B%;!<%8$N3HD%9`L\$r<h$j9~$`$K$O\e(B @kbd{s all} \e$B$J$I$G\e(B msgdb \e$B$r:F:n@.$9$kI,MW\e(B
 \e$B$,$"$j$^$9!#\e(B
 
@@ -2765,7 +2823,7 @@ 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 E
 @kindex E (Summary)
 @findex wl-summary-reedit
-\e$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$NFbMF$r$b$D%I%i%U%H$rMQ0U$7$^$9!#\e(B
+\e$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$NFbMF$r;}$D%I%i%U%H$rMQ0U$7$^$9!#\e(B
 \e$B$b$7!"\e(Bprefix argument \e$B$D$-$G<B9T$9$l$P\e(B Supersedes \e$B%a%C%;!<%8$r:n@.$7$^$9!#\e(B
 \e$B$?$@$7!"\e(BNNTP \e$B%U%)%k%@$G$+$D<+J,$,Ej9F$7$?%a%C%;!<%8$K8B$j$^$9!#\e(B
 (@code{wl-summary-reedit})
@@ -2786,7 +2844,7 @@ 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!#$9$G$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P:o=|$7$^$9!#\e(B
+@samp{$} \e$B%^!<%/$r$D$1$^$9!#4{$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P:o=|$7$^$9!#\e(B
 (@code{wl-summary-mark-as-important})
 
 @item y
@@ -2820,6 +2878,9 @@ prefix argument \e$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
 \e$B2<J}8~$K$"$kL$FI$b$7$/$O\e(B @samp{$}\e$B%^!<%/$D$-$N%a%C%;!<%8$X0\F0$7$^$9!#\e(B
 \e$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!#\e(B
+\e$B$?$@$7!"$^$H$a=hM}%^!<%/\e(B @samp{*} \e$B$,$D$$$?%a%C%;!<%8$,$"$k>l9g$O!"\e(B
+\e$B$^$H$a=hM}%^!<%/\e(B @samp{*} \e$B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#\e(B
+\e$B$3$N5sF0$O\e(B @code{wl-summary-move-order}\e$B$NCM$K1~$8$FJQ$o$j$^$9!#\e(B
 (@code{wl-summary-down})
 
 @item P
@@ -2827,6 +2888,9 @@ prefix argument \e$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
 \e$B>eJ}8~$K$"$kL$FI$b$7$/$O\e(B @samp{$}\e$B%^!<%/$D$-$N%a%C%;!<%8$X0\F0$7$^$9!#\e(B
 \e$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!#\e(B
+\e$B$?$@$7!"$^$H$a=hM}%^!<%/\e(B @samp{*} \e$B$,$D$$$?%a%C%;!<%8$,$"$k>l9g$O!"\e(B
+\e$B$^$H$a=hM}%^!<%/\e(B @samp{*} \e$B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#\e(B
+\e$B$3$N5sF0$O\e(B @code{wl-summary-move-order}\e$B$NCM$K1~$8$FJQ$o$j$^$9!#\e(B
 (@code{wl-summary-up})
 
 @item w
@@ -2869,7 +2933,7 @@ MIME \e$B$G%+%W%;%k2=$5$l$?J#?t$N%a%C%;!<%84^$`>l9g!"\e(B
 @kindex @@ (Summary)
 @findex wl-summary-edit-petname
 \e$B%5%^%j9T$N%a!<%k$N\e(B @samp{From:} (\e$BH/?.<T\e(B)\e$B$r\e(B @file{~/.addresses} \e$B$K%$%s%?\e(B
-\e$B%i%/%F%#%V$KDI2C$7$^$9!#$9$G$KEPO?$5$l$F$$$k>l9g$OJQ99\e(B/\e$B:o=|$b$G$-$^$9!#\e(B
+\e$B%i%/%F%#%V$KDI2C$7$^$9!#4{$KEPO?$5$l$F$$$k>l9g$OJQ99\e(B/\e$B:o=|$b$G$-$^$9!#\e(B
 prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:o=|$G$-\e(B
 \e$B$^$9!#\e(B(@code{wl-summary-edit-petname})
 
@@ -2889,11 +2953,11 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 @kindex # (Summary)
 @findex wl-summary-print-message
 \e$B8=:_$N%a%C%;!<%8$NFbMF$r0u:~$7$^$9!#\e(BEmacs 20\e$B0J9_\e(B \e$B$G$O\e(B @code{ps-print} \e$B$r\e(B
-\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-func} \e$B$r\e(B
-@code{ps-print-buffer} \e$B$K@_Dj$7$?$[$&$,$h$$$+$b$7$l$^$;$s!#\e(B
+\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-function} \e$B$r\e(B
+@code{ps-print-buffer} \e$B$K@_Dj$7$?$[$&$,NI$$$+$b$7$l$^$;$s!#\e(B
 
 @lisp
-(setq wl-ps-print-buffer-func 'ps-print-buffer)
+(setq wl-ps-print-buffer-function 'ps-print-buffer)
 @end lisp
 
 @noindent
@@ -2913,13 +2977,13 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 
 @item J
 @kindex J (Summary)
-\e$B$[$+$N%a%C%;!<%8$K%8%c%s%W$7$^$9!#\e(B
+\e$BB>$N%a%C%;!<%8$K%8%c%s%W$7$^$9!#\e(B
 @findex wl-summary-jump-to-msg
 (@code{wl-summary-jump-to-msg})
 
 @item I
 @kindex I (Summary)
-\e$B%5%^%j$NI=<($r99?7$7$?$"$H!"\e(B
+\e$B%5%^%j$NI=<($r99?7$7$?8e!"\e(B
 @code{wl-summary-incorporate-marks} \e$B$K4^$^$l$k%^!<%/$r;}$D%a%C%;!<%8$r\e(B
 \e$B%W%j%U%'%C%A$7$^$9!#\e(B
 @findex wl-summary-incorporate
@@ -2928,7 +2992,7 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 @item M-j
 @kindex M-j (Summary)
 @findex wl-summary-jump-to-msg-by-message-id
-\e$BF~NO$7$?\e(B @samp{Message-ID:} \e$B$r$b$D%a%C%;!<%8$N9T$K%8%c%s%W$7$^$9!#\e(B
+\e$BF~NO$7$?\e(B @samp{Message-ID:} \e$B$r;}$D%a%C%;!<%8$N9T$K%8%c%s%W$7$^$9!#\e(B
 @code{elmo-use-database} \e$B$,\e(B non-nil\e$B$J$i!"8=:_$N%5%^%j0J30$+$i$b8uJd$r8!\e(B
 \e$B:w$7$^$9!#\e(B(@code{wl-summary-jump-to-msg-by-message-id})
 
@@ -2948,8 +3012,8 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 @kindex s (Summary)
 @findex wl-summary-sync
 \e$B%a%C%;!<%8$N0lMwI=<($N99?7%l%s%8\e(B(@samp{all}, @samp{update},
-@samp{rescan}, @samp{first}, @samp{last})\e$B$NF~NO$r<u$1IU$1$?$N$A!"$=$l$K\e(B
-\e$B$b$H$E$$$F%a%C%;!<%8$N0lMwI=<($r99?7$7$^$9!#\e(B
+@samp{rescan}, @samp{first}, @samp{last})\e$B$NF~NO$r<u$1IU$1$?8e!"$=$l$K\e(B
+\e$B4p$E$$$F%a%C%;!<%8$N0lMwI=<($r99?7$7$^$9!#\e(B
 
 @example
 @group
@@ -2967,9 +3031,9 @@ first, last    ...\e$B%U%#%k%?%U%)%k%@$K0\F0\e(B
 @item S
 @kindex S (Summary)
 @findex wl-summary-sort
-\e$B%5%^%j$NI=<(=g=x$rJB$SJQ$($^$9!#\e(B@samp{date} (\e$BF|IU\e(B)\e$B!"\e(B@samp{from}(\e$BH/?.<T\e(B)\e$B!"\e(B
+\e$B%5%^%j$NI=<(=g=x$rJB$SBX$($^$9!#\e(B@samp{date} (\e$BF|IU\e(B)\e$B!"\e(B@samp{from}(\e$BH/?.<T\e(B)\e$B!"\e(B
 @samp{number}(\e$B%a%C%;!<%8HV9f\e(B)\e$B!"\e(B@samp{subject}(\e$B%5%V%8%'%/%H\e(B) \e$B$N$$$:$l$+$r\e(B
-\e$B85$KJB$SJQ$($^$9!#\e(B(@code{wl-summary-sort})
+\e$B85$KJB$SBX$($^$9!#\e(B(@code{wl-summary-sort})
 
 @item T
 @kindex T (Summary)
@@ -2994,7 +3058,7 @@ first, last    ...\e$B%U%#%k%?%U%)%k%@$K0\F0\e(B
 
 @item V
 @kindex V (Summary)
-\e$BM?$($i$l$?>r7o$r;}$D%a%C%;!<%8$N$_$r$b$D2>A[%U%)%k%@$X0\F0$7$^$9!#\e(B
+\e$BM?$($i$l$?>r7o$r;}$D%a%C%;!<%8$N$_$r;}$D2>A[%U%)%k%@$X0\F0$7$^$9!#\e(B
 prefix argument \e$B$D$-$G<B9T$9$k$H2>A[%U%)%k%@$+$iC&=P$7$^$9!#\e(B
 @findex wl-summary-virtual
 (@code{wl-summary-virtual})
@@ -3020,7 +3084,7 @@ prefix argument \e$B$D$-$G<B9T$9$k$H2>A[%U%)%k%@$+$iC&=P$7$^$9!#\e(B
 @item i
 @kindex i (Summary)
 \e$B%+!<%=%k9T$N%a%C%;!<%8$r%W%j%U%'%C%A$7$^$9!#\e(B
-prefix argument \e$B$D$-$J$i$P$9$G$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b\e(B
+prefix argument \e$B$D$-$J$i$P4{$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b\e(B
 \e$B:FEY%W%j%U%'%C%A$7$^$9!#\e(B
 @findex wl-summary-prefetch
 (@code{wl-summary-prefetch})
@@ -3158,7 +3222,7 @@ prefix argument \e$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
 \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$B$9$G$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P:o=|$7$^$9!#\e(B
+\e$B4{$K\e(B @samp{$} \e$B%^!<%/$,$"$l$P:o=|$7$^$9!#\e(B
 prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%I$K\e(B
 @samp{$} \e$B%^!<%/$r$D$1$k$+:o=|$9$k$+$7$^$9!#\e(B
 (@code{wl-thread-mark-as-important})
@@ -3230,6 +3294,8 @@ prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4$F$rJ]B8$
 @kindex m i (Summary)
 @findex wl-summary-target-mark-prefetch
 \e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$rA4$F%W%j%U%'%C%A$7$^$9!#\e(B
+prefix argument \e$B$D$-$J$i$P4{$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b\e(B
+\e$B:FEY%W%j%U%'%C%A$7$^$9!#\e(B
 (@code{wl-summary-target-mark-prefetch})
 
 @item m R
@@ -3322,7 +3388,7 @@ prefix argument \e$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
-\e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$N$J$+$G!"\e(B
+\e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$NFb!"\e(B
 \e$B>r7o$K%^%C%A$9$k%a%C%;!<%8$N\e(B @samp{*} \e$B%^!<%/$N$_$r;D$7$^$9!#\e(B
 (@code{wl-summary-target-mark-pick})
 
@@ -3380,10 +3446,21 @@ Non-nil \e$B$J$i%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$KI=<($7$^$9!#\e(B
 
 @item wl-auto-select-next
 @vindex wl-auto-select-next
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(BNon-nil \e$B$J$i!"$"$k%U%)%k%@$N%5%^%j$+$i<!$N%U%)%k\e(B
-\e$B%@$N%5%^%j$X<+F0E*$K0\F0$7$^$9!#CM$,\e(B @code{unread} \e$B$J$i!"3NG'$r5a$a$FL$\e(B
-\e$BFI%a%C%;!<%8$,$J$$%U%)%k%@$K0\F0$7$^$9!#CM$,\e(B @code{skip-no-unread} \e$B$J$i!"\e(B
-\e$BL$FI%a%C%;!<%8$,$J$$%U%)%k%@$r<+F0E*$KHt$P$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$KL$FI%a%C%;!<%8$,$J$/$J$C$?;~$NF0:n$r;XDj$7$^$9!#\e(B
+
+@example
+nil\e$B!'\e(B \e$B%U%)%k%@%b!<%I$KLa$k$+?R$M$k\e(B
+'unread\e$B!'\e(B \e$B<!$NL$FI$"$j$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+  \e$B0\F0@h$N%U%)%k%@$G\e(B crosspost \e$B=hM}$d\e(B Score \e$B5!G=$J$I$K$h$j\e(B
+  \e$BL$FI$,$J$/$J$l$P!"$5$i$K<!$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+'skip-no-unread\e$B!'\e(B unread \e$B$HF1MM!#\e(B
+  \e$B$?$@$7!"0\F0$7$?@h$GL$FI$,$J$/$J$C$?>l9g$K$O!"<+F0E*$K<!$N\e(B
+  \e$B%U%)%k%@$K9T$/!#\e(B
+\e$B>e5-0J30!'\e(B \e$B<!$NL$FI$"$j$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+@end example
+
+\e$B%9%Z!<%9%-!<$G$R$?$9$iFI$_?J$a$?$$?M$O\e(B @code{'skip-no-unread} \e$B$K$7$F$*$/$N$,\e(B
+\e$BJXMx$+$b$7$l$^$;$s!#\e(B
 
 @item wl-thread-insert-opened
 @vindex wl-thread-insert-opened
@@ -3409,11 +3486,14 @@ Non-nil \e$B$J$i%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$KI=<($7$^$9!#\e(B
 @vindex  wl-summary-weekday-name-lang
 \e$B=i4|@_Dj$O\e(B @samp{ja}\e$B!#%5%^%j$NMKF|I=<($N8@8l$r;XDj$7$^$9!#\e(B@samp{en} \e$B$J$i\e(B
 \e$B1Q8l!"\e(B@samp{fr} \e$B$J$i%U%i%s%98l!"\e(B@samp{de} \e$B$J$i%I%$%D8l$H$J$j$^$9!#\e(B
+\e$BCM$rJQ99$7$?8e$K$O!"%5%^%j$r\e(B rescan \e$B$7$F2<$5$$!#\e(B
 
 @item wl-summary-fix-timezone
-@vindex  wl-summary-fix-timezone
-\e$B=i4|@_Dj$O\e(B @samp{JST}\e$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#\e(B
-@code{nil} \e$B$J$i\e(B GMT \e$B$KD>$7$^$9!#\e(B
+@vindex wl-summary-fix-timezone
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#\e(B
+@code{nil} \e$B$J$i$P!"%G%U%)%k%H$N%?%$%`%>!<%s$r;2>H$7$FD>$7$^$9!#\e(B
+\e$B%G%U%)%k%H$N%?%$%`%>!<%s$H$O!"%7%9%F%`$K$"$i$+$8$a@_Dj$5$l$?%?%$%`%>!<%s$+!"\e(B
+\e$B4D6-JQ?t\e(B @samp{TZ} \e$B$NCM$G$9!#\e(B
 
 @item wl-use-petname
 @vindex  wl-use-petname
@@ -3430,16 +3510,6 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B '(1 . 4)\e$B!#\e(B
 \e$B%5%^%j$rI=<($9$k%&%#%s%I%&$H%a%C%;!<%8K\BN$rI=<($9$k%&%#%s%I%&$NHf$r\e(B cons \e$B$G;XDj$7$^$9!#\e(Bcar:cdr \e$B$,\e(B \e$B%5%^%j\e(B:\e$B%a%C%;!<%8\e(B \e$B$G$9!#\e(B
 
-@item wl-summary-recenter
-@vindex  wl-summary-recenter
-\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
-\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
-
-@item wl-summary-indent-length-limit
-@vindex  wl-summary-indent-length-limit
-\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
-\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
-
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 \e$B=i4|@_Dj$O\e(B @samp{nobody@@nowhere?}\e$B!#\e(B
@@ -3450,10 +3520,10 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @samp{(WL:No Subject in original.)}\e$B!#%a%C%;!<%8$K\e(B 
 @samp{Subject:} \e$B$,L5$+$C$?>l9g$K%5%^%j$KI=<($9$kJ8;zNs$G$9!#\e(B
 
-@item wl-summary-width
-@vindex  wl-summary-width
-\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
-\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
+@item wl-summary-use-frame
+@vindex wl-summary-use-frame
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+Non-nil \e$B$J$i%5%^%jI=<(MQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
 @item wl-use-folder-petname
 @vindex  wl-use-folder-petname
@@ -3484,12 +3554,34 @@ petname \e$B$G$bJd40$,$G$-$^$9!#\e(B
 @vindex  wl-summary-move-direction-toggle
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i:G8e$K<B9T$5$l$?\e(B @kbd{p}, @kbd{P},
 @kbd{n}, @kbd{N} \e$B$N7k2L$G!"<!$N%a%C%;!<%8$,>e$+2<$+$r@Z$jBX$($k!#FI$s$G\e(B
-\e$B$$$kJ}8~$r0U<1$7$?$$$H$-$O\e(B @code{t} \e$B$K$9$k$H$h$$$G$7$g$&!#\e(B
+\e$B$$$kJ}8~$r0U<1$7$?$$$H$-$O\e(B @code{t} \e$B$K$9$k$HNI$$$G$7$g$&!#\e(B
 
-@item wl-from-width
-@vindex wl-from-width
+@item wl-summary-width
+@vindex  wl-summary-width
+\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
+\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
+
+@item wl-summary-from-width
+@vindex wl-summary-from-width
 \e$B=i4|@_Dj$O\e(B 17\e$B!#%5%^%j$N\e(B From \e$BItJ,$NI=<(I}$G$9!#\e(B
 
+@item wl-summary-subject-length-limit
+@vindex wl-summary-subject-length-limit
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$N\e(B Subject \e$BItJ,$NI=<(I}$N>e8B$G$9!#\e(B
+@code{nil} \e$B$N>l9g!"\e(BSubject \e$BItJ,$ND9$5$N@)8B$r$7$^$;$s!#\e(B
+
+@item wl-summary-indent-length-limit
+@vindex  wl-summary-indent-length-limit
+\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
+\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
+\e$BCM$r\e(B @code{nil} \e$B$K$9$k$H$-$O!"\e(B@code{wl-summary-width} \e$B$b\e(B @code{nil} \e$B$K@_Dj\e(B
+\e$B$9$k$H$h$$$G$7$g$&!#\e(B
+
+@item wl-summary-recenter
+@vindex  wl-summary-recenter
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
+\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
+
 @item wl-summary-divide-thread-when-subject-changed
 @vindex wl-summary-divide-thread-when-subject-changed
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -3502,13 +3594,13 @@ Non-nil \e$B$J$i%5%V%8%'%/%H$,JQ$o$C$?$H$-$K%9%l%C%I$r@Z$j$^$9!#\e(B
 Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8\e(B
 \e$B$r8+$D$1$k$3$H$,$G$-$J$+$C$?$H$-$K!"\e(B
 @code{wl-summary-jump-to-msg-by-message-id-via-nntp} \e$B$r8F$S!"\e(B
-@code{elmo-default-nntp-server} \e$B$G;XDj$5$l$?%5!<%P$+$i8!:w$7$^$9!#$3$N$H\e(B
-\e$B$-\e(B @code{elmo-default-nntp-user}, @code{elmo-default-nntp-port},
-@code{elmo-default-nntp-stream-type} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
+@code{elmo-nntp-default-server} \e$B$G;XDj$5$l$?%5!<%P$+$i8!:w$7$^$9!#$3$N$H\e(B
+\e$B$-\e(B @code{elmo-nntp-default-user}, @code{elmo-nntp-default-port},
+@code{elmo-nntp-default-stream-type} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
 
-@code{confirm} \e$B$J$i\e(B @code{elmo-default-nntp-*} \e$B$G;XDj$5$l$?%5!<%P$+$i8!\e(B
+@code{confirm} \e$B$J$i\e(B @code{elmo-nntp-default-*} \e$B$G;XDj$5$l$?%5!<%P$+$i8!\e(B
 \e$B:w$9$k$+!"%5!<%P$r;XDj$9$k$+$r3NG'$7$^$9!#$3$N>l9g!"%5!<%P$N%[%9%HL>!"$b\e(B
-\e$B$7$/$O\e(B @samp{-:username@@servername:119!}  \e$B$N$h$&$K\e(B NTTP\e$B%U%)%k%@7A<0$G$N\e(B
+\e$B$7$/$O\e(B @samp{-:username@@servername:119!}  \e$B$N$h$&$K\e(B NNTP \e$B%U%)%k%@7A<0$G$N\e(B
 \e$B;XDj$,2DG=$G$9!#\e(B
 
 @item wl-summary-keep-cursor-command
@@ -3521,13 +3613,13 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @end lisp
 
 @noindent
-\e$B$9$G$KB8:_$9$k%5%^%j$X0\F0$7$?$H$-$K99?7$;$:!"%+!<%=%k0LCV$rJ]B8$9$k\e(B
+\e$B4{$KB8:_$9$k%5%^%j$X0\F0$7$?$H$-$K99?7$;$:!"%+!<%=%k0LCV$rJ]B8$9$k\e(B
 \e$B%3%^%s%I$N%j%9%H$G$9!#\e(B
 
 @item wl-summary-update-confirm-threshold
 @vindex wl-summary-update-confirm-threshold
 \e$B=i4|@_Dj$O\e(B 500\e$B!#$3$NCM$h$j%5%^%j$N99?7?t$,B?$$>l9g!"0lItJ,$@$199?7$9$k$+\e(B
-\e$B$I$&$+!"<ALd$7$^$9!#\e(B
+\e$B$I$&$+!"<ALd$7$^$9!#\e(B@code{nil} \e$B$K$9$k$H!"3NG'$;$:$KA4$F$r99?7$7$^$9!#\e(B
 
 @item wl-summary-always-sticky-folder-list
 @vindex wl-summary-always-sticky-folder-list
@@ -3545,7 +3637,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @end lisp
 
 @noindent
-\e$B$3$N%j%9%H$K$"$k0l;~%^!<%/$O!">C$5$J$$$+$.$j>e=q$-$5$l$^$;$s!#\e(B
+\e$B$3$N%j%9%H$K$"$k0l;~%^!<%/$O!">C$5$J$$8B$j>e=q$-$5$l$^$;$s!#\e(B
 
 @item wl-summary-skip-mark-list
 @vindex wl-summary-skip-mark-list
@@ -3599,15 +3691,44 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @vindex elmo-pop3-use-cache
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"\e(BPOP3 \e$B$GFI$s$@%a%C%;!<%8$r%-%c%C%7%e$7\e(B
 \e$B$^$9!#\e(B
+
+@item elmo-shimbun-use-cache
+@vindex elmo-shimbun-use-cache
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"?7J9%U%)%k%@$GFI$s$@%a%C%;!<%8$r\e(B
+\e$B%-%c%C%7%e$7$^$9!#\e(B
+
+@item wl-folder-process-duplicates-alist
+@vindex wl-folder-process-duplicates-alist
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#=EJ#$7$?%a%C%;!<%8$,F1$8%U%)%k%@$K$"$k>l9g$NF0:n\e(B
+\e$B$r;XDj$7$^$9!#3F9`L\$O!"%U%)%k%@L>$N@55,I=8=$HF0:n$+$i$J$j$^$9!#\e(B
+\e$BF0:n$H$7$F$O0J2<$N$b$N$,;XDj$G$-$^$9!#\e(B
+
+@example
+@code{nil} : \e$B=EJ#%a%C%;!<%8$KBP$7!$2?$b$7$J$$!%\e(B
+@code{hide} : \e$B=EJ#%a%C%;!<%8$r%5%^%j$KI=<($7$J$$!%\e(B
+@code{read} : \e$B=EJ#%a%C%;!<%8$r4{FI$K$9$k!%\e(B
+@end example
+
+@noindent
+\e$BNc$($P0J2<$N$h$&$K@_Dj$7$^$9\e(B (\e$B%^%k%A%U%)%k%@$G=EJ#%a%C%;!<%8$r1#$9>l9g\e(B)
+
+@lisp
+@group
+(setq wl-folder-process-duplicates-alist
+                 '(("^\\+draft$" . nil) ("^\\+trash$" . nil)
+                   ("^\\*.*" . hide) (".*" . read)))
+@end group
+@end lisp
 @end table
 
 
 @node Message, Draft, Summary, Top
 @chapter \e$B%a%C%;!<%8%P%C%U%!\e(B
 
-\e$B%a%C%;!<%8%P%C%U%!$O\e(B SEMI/tm \e$B$N\e(B MIME-View mode \e$B$G$9!#\e(B
+\e$B%a%C%;!<%8%P%C%U%!$O\e(B SEMI \e$B$N\e(B MIME-View mode \e$B$G$9!#\e(B
 \e$BA`:n$NJ}K!!"%-!<%P%$%s%I$O$=$l$>$l$N%I%-%e%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
 @xref{MIME-View, , ,mime-ui-ja, a MIME user interface for GNU Emacs}.
+\e$B$^$?!"%a%C%;!<%8%P%C%U%!$K$*$$$F!"\e(B@kbd{?} \e$B$G%X%k%W$,;2>H$G$-$^$9!#\e(B
 
 \e$B%a%C%;!<%8$N@hF,$G\e(B @kbd{p}\e$B!"%a%C%;!<%8$N:G8eHx$G\e(B @kbd{n} \e$B$r2!$9$H!"%5%^\e(B
 \e$B%j%b!<%I$KLa$j$^$9!#$^$?!"\e(B@kbd{l} \e$B$r2!$9$H!"%5%^%j%b!<%I%P%C%U%!$NI=<($,\e(B
@@ -3652,24 +3773,32 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @vindex wl-message-window-size
 \e$B=i4|@_Dj$O\e(B @code{(1 . 4)}\e$B!#\e(Bcons \e$B%;%k$G!"\e(Bcar \e$BCM\e(B: cdr \e$BCM$,%5%^%j$N%&%#%s%I\e(B
 \e$B%&I}!'%a%C%;!<%8$N%&%#%s%I%&I}$H$J$j$^$9!#\e(B
+
 @item wl-message-ignored-field-list
 @vindex wl-message-ignored-field-list
-(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI=<($7$J$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
 \e$B;XDj$7$^$9!#\e(B
-nil \e$B$J$i!"\e(Bmime-view-ignored-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+@code{nil} \e$B$J$i!"\e(B@code{mime-view-ignored-field-list} \e$B$NCM$,;H$o$l$^$9!#\e(B
+
 @item wl-message-visible-field-list
 @vindex wl-message-visible-field-list
-(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI,$:I=<($7$?$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
-\e$B;XDj$7$^$9!#\e(Bwl-message-ignored-field-list \e$B$h$jM%@h$5$l$^$9!#\e(B
-nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+\e$B;XDj$7$^$9!#\e(B@code{wl-message-ignored-field-list} \e$B$h$jM%@h$5$l$^$9!#\e(B
+@code{nil} \e$B$J$i!"\e(B@code{mime-view-visible-field-list} \e$B$NCM$,;H$o$l$^$9!#\e(B
+
 @item wl-message-sort-field-list
 @vindex wl-message-sort-field-list
 (SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B 
 '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From")\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI=<($9$k%X%C%@%U%#!<%k%I$N=gHV$r@55,I=8=$N%j%9%H$G\e(B
 \e$B;XDj$7$^$9!#\e(B
+
+@item wl-message-truncate-lines
+@vindex wl-message-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%a%C%;!<%8%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
 @end table
 
 
@@ -3699,9 +3828,10 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 
 @subsection \e$B%a%C%;!<%8$NJT=8\e(B
 
-\e$B%^%k%A%Q!<%H$NJT=8$O\e(B SEMI/tm \e$B$N\e(B MIME \e$BJT=8%b!<%I$rMxMQ$7$F$$$^$9!#\e(B
+\e$B%^%k%A%Q!<%H$NJT=8$O\e(B SEMI \e$B$N\e(B MIME \e$BJT=8%b!<%I$rMxMQ$7$F$$$^$9!#\e(B
 \e$BJT=8$NJ}K!$O3F%Q%C%1!<%8IUB0$N%I%-%e%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
 @xref{MIME-Edit, , ,mime-ui-ja, a MIME user interface for GNU Emacs}.
+\e$B$^$?!"%I%i%U%H%P%C%U%!$K$*$$$F!"\e(B@kbd{C-c C-x ?} \e$B$G%X%k%W$,;2>H$G$-$^$9!#\e(B
 
 @subsection \e$B%a%C%;!<%8$NF0E*$JJQ99\e(B
 @vindex wl-draft-config-alist
@@ -3722,13 +3852,13 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 @lisp
 @group
 (setq wl-draft-config-alist
-      '(((string-match "aaa.ne.jp$" (system-name))
+      '(((string-match "aaa.example.com$" (system-name))
          ;; @r{\e$B<0$,\e(Bnon-nil\e$B$J$iE,MQ$9$k\e(B}
          (wl-smtp-posting-server . "mailserver-B")
          (wl-nntp-posting-server . "newsserver-B")
          ;; @r{\e$B0l;~E*$JJQ?t$N@_Dj\e(B}
          )
-        ("^To: .*user@@aaa.bbb.com"
+        ("^To: .*user@@aaa.bbb.example.com"
          ;; @r{\e$B%I%i%U%H%P%C%U%!$N%X%C%@$K%^%C%A$9$l$PE,MQ$9$k\e(B}
          ("Organization" . (format "Go %s" my-webpage)))
                            ;; @r{elisp \e$B<0$,=q$1$k\e(B (eval \e$B$7$F$$$k$@$1\e(B)}
@@ -3758,8 +3888,9 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 
 @example
 'header:      \e$B%X%C%@$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
+'header-top:  \e$B%X%C%@$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'header-file: \e$B%X%C%@$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
-'x-face:      \e$B;XDj$7$?%U%!%$%k$NFbMF$r$b$D\e(B @samp{X-Face:} \e$B%U%#!<%k%I$r\e(B
+'x-face:      \e$B;XDj$7$?%U%!%$%k$NFbMF$r;}$D\e(B @samp{X-Face:} \e$B%U%#!<%k%I$r\e(B
               \e$BA^F~$7$^$9!#\e(B
 'top:         \e$BK\J8$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'top-file:    \e$BK\J8$N@hF,$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
@@ -3768,6 +3899,8 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 'body-file:   \e$BK\J8$r;XDj$7$?%U%!%$%k$NFbMF$GCV$-49$($^$9!#\e(B
 'bottom:      \e$BK\J8$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'bottom-file: \e$BK\J8$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
+'part-top:    \e$B8=:_$N%^%k%A%Q!<%H$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
+'part-bottom: \e$B8=:_$N%^%k%A%Q!<%H$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'template:    \e$B;XDj$7$?%F%s%W%l!<%H$rE,MQ$7$^$9!#\e(B
               (\e$B<!9`\e(B \e$B%F%s%W%l!<%H$NA^F~;2>H\e(B)
 @end example
@@ -3776,10 +3909,10 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 \e$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\e(B
 \e$B@bL@$9$k$h$jD>@\%3!<%I$r8+$?J}$,J,$+$j$d$9$$$G$7$g$&$+$i>JN,$7$^$9!#\e(B
 
-\e$B3FMWAG$N\e(B1\e$BHVL\$K$O\e(B @var{\e$B%X%C%@$N@55,I=8=\e(B} \e$B$+\e(B elisp\e$B<0\e(B \e$B$r;XDj$7$^$9!#\e(Belisp
+\e$B3FMWAG$N\e(B1\e$BHVL\$K$O\e(B @var{\e$B%X%C%@$N@55,I=8=\e(B} \e$B$+\e(B elisp \e$B<0\e(B \e$B$r;XDj$7$^$9!#\e(Belisp
 \e$B<0$N>l9g$OI>2A$7$?CM$,\e(B non-nil \e$B$N>l9g$KE,MQ$5$l$^$9!#\e(B
 
-\e$B$^$?!"%G%U%)%k%H$G$OJ#?t$NMWAG$,%^%C%A$^$?$O\e(Bnon-nil\e$B$K$J$C$?>l9g$K!"$=$N\e(B
+\e$B$^$?!"%G%U%)%k%H$G$OJ#?t$NMWAG$,%^%C%A$^$?$O\e(B non-nil \e$B$K$J$C$?>l9g$K!"$=$N\e(B
 \e$BA4$F$,E,MQ$5$l$^$9$,!"JQ?t\e(B @code{wl-draft-config-matchone} \e$B$r\e(B@code{t} \e$B$K\e(B
 \e$B$9$k$3$H$G:G=i$K%^%C%A$7$?\e(B1\e$B$D$@$1$rE,MQ$9$k$3$H$b$G$-$^$9!#\e(B
 
@@ -3856,7 +3989,7 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
          (body . "  \e$B!{!{$G$9!#\e(B\n"))
         ("report"
          (template . "default")                 ;; @r{(a)}
-         ("To" . "jousi@@kaisha.jp")
+         ("To" . "jousi@@example.com")
          ("Subject" . "\e$BJs9p\e(B")
          (body-file . "~/work/report.txt")
          )
@@ -3890,15 +4023,15 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 @noindent
 \e$B$H=q$/$3$H$G\e(B @samp{default} \e$B$N%F%s%W%l!<%H$rE,MQ$9$k$3$H$,$G$-$^$9!#\e(B
 
-@subsection POP-before-SMTP\e$B$K$h$k%a!<%k$NAw?.\e(B
+@subsection POP-before-SMTP \e$B$K$h$k%a!<%k$NAw?.\e(B
 @cindex POP-before-SMTP
 @cindex SMTP-after-POP
 
-POP-before-SMTP\e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
+POP-before-SMTP \e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 \e$B@_Dj$O!"\e(B
 
 @lisp
-(setq wl-draft-send-mail-func 'wl-draft-send-mail-with-pop-before-smtp)
+(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)
 @end lisp
 
 @noindent
@@ -3906,34 +4039,34 @@ POP-before-SMTP\e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 
 @table @code
 @item wl-pop-before-smtp-user
-POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$B%f!<%6L>$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-user} \e$B$,;H$o$l$^$9!#\e(B
+POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%f!<%6L>$G$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-user} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-server
-POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$B%5!<%PL>$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-server} \e$B$,;H$o$l$^$9!#\e(B
+POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%5!<%PL>$G$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-server} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-authenticate-type
-POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$BG'>ZJ}<0$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-authenticate-type}
+POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$BG'>ZJ}<0$G$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-authenticate-type}
 \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-port
-POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$B%]!<%HHV9f$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B  @code{elmo-default-pop3-port} \e$B$,;H$o$l$^$9!#\e(B
+POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%]!<%HHV9f$G$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B  @code{elmo-pop3-default-port} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-stream-type
-Non-nil \e$B$J$i\e(B SSL \e$B$rMxMQ$7$F\e(B POP\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B@code{starttls} 
-\e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J\e(B
-\e$B$$>l9g$O\e(B @code{elmo-default-pop3-stream-type} \e$B$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i\e(B SSL \e$B$rMxMQ$7$F\e(B POP \e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B@code{starttls} 
+\e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J\e(B
+\e$B$$>l9g$O\e(B @code{elmo-pop3-default-stream-type} \e$B$,;H$o$l$^$9!#\e(B
 @end table
 
-POP-before-SMTP\e$BMQ$NJQ?t\e(B (@code{wl-pop-before-smtp-*})\e$B$,@_Dj$5$l$F$$$J$$\e(B
-\e$B>l9g$O!"\e(BPOP \e$B%U%)%k%@$N@_Dj\e(B (@code{elmo-default-pop3-*}) \e$B$,MQ$$$i$l$^$9!#\e(B
-\e$B$=$N$?$a!"\e(BSMTP\e$B%5!<%P$H\e(BPOP\e$B%5!<%P$N<BBN$,F1$8$G!"%G%U%)%k%H@_Dj$N\e(BPOP\e$B%U%)%k\e(B
+POP-before-SMTP \e$BMQ$NJQ?t\e(B (@code{wl-pop-before-smtp-*})\e$B$,@_Dj$5$l$F$$$J$$\e(B
+\e$B>l9g$O!"\e(BPOP \e$B%U%)%k%@$N@_Dj\e(B (@code{elmo-pop3-default-*}) \e$B$,MQ$$$i$l$^$9!#\e(B
+\e$B$=$N$?$a!"\e(BSMTP \e$B%5!<%P$H\e(B POP \e$B%5!<%P$N<BBN$,F1$8$G!"%G%U%)%k%H@_Dj$N\e(B POP \e$B%U%)%k\e(B
 \e$B%@\e(B(@samp{&} \e$B$J$I\e(B)\e$B$,MxMQ2DG=$J$i!"@_Dj$OITMW$G$9!#\e(B
 
-\e$B$J$*!"\e(BPOP-before-SMTP\e$B$K$D$$$F$O0J2<$r;2>H$7$F$/$@$5$$!#\e(B
+\e$B$J$*!"\e(BPOP-before-SMTP \e$B$K$D$$$F$O0J2<$r;2>H$7$F$/$@$5$$!#\e(B
 
 @example
 @group
@@ -4007,6 +4140,12 @@ MIME \e$B$N%^%k%A%Q!<%H%a%C%;!<%8$N3NG'$K;H$&$HJXMx$G$9!#\e(B
 \e$B;XDj$5$l$?%j!<%8%g%s$r%7!<%60E9f$G%(%s%3!<%I\e(B/\e$B%G%3!<%I$7$^$9!#\e(B
 (@code{wl-caesar-region})
 
+@item C-l
+@kindex C-l (Draft)
+@findex wl-draft-highlight-and-recenter
+\e$B8=:_$N%I%i%U%H$r%O%$%i%$%H$7$J$*$7$^$9!#\e(B
+(@code{wl-draft-highlight-and-recenter})
+
 @item M-t
 @kindex M-t (Draft)
 @findex wl-toggle-plugged
@@ -4035,13 +4174,10 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 
 @item C-c C-a
 @kindex C-c C-a (Draft)
-@findex wl-draft-insert-x-face-field
-\e$B%U%!%$%k\e(B @file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM\e(B) \e$B$NFbMF$r\e(B
-\e$B%I%i%U%H%P%C%U%!$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$7$^$9!#\e(B
-
-\e$B%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r$"$i$+$8$a%U%!%$%k\e(B @file{~/.xface}
-\e$B$NFbMF$KMQ0U$7$F$*$/I,MW$,$"$j$^$9!#\e(B
-(@code{wl-draft-insert-x-face-field})
+@findex wl-addrmgr
+\e$B%"%I%l%9%^%M!<%8%c$r5/F0$7$^$9!#\e(B
+@xref{Address Manager}.
+(@code{wl-addrmgr})
 @end table
 
 @section \e$B%+%9%?%^%$%:JQ?t\e(B
@@ -4081,8 +4217,7 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$G$+$D!"%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r\e(B 
 @file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
 \e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5\e(B
-\e$B$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s$,!"\e(B@kbd{C-c C-a} \e$B$r\e(B
-\e$B2!$9$H%X%C%@It$KA^F~$5$l$^$9!#\e(B
+\e$B$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s!#\e(B
 
 @item wl-insert-message-id
 @vindex wl-insert-message-id
@@ -4096,8 +4231,8 @@ Non-nil \e$B$J$i!"Aw?.;~$K\e(B @samp{Message-ID:} \e$B%U%#!<%k%I$r<+F0E*$KA^F~$7$^$
 
 @code{system-name} \e$B$,\e(B FQDN (@samp{smtp.gohome.org} \e$B$N$h$&$J%[%9%H$N%U%k\e(B
 \e$B%M!<%`\e(B) \e$B$rJV$5$J$$>l9g$O!"$3$NJQ?t$K\e(B @strong{\e$BI,$:\e(B} \e$B%[%9%HL>$r=|$$$?%I%a\e(B
-\e$B%$%sL>\e(B (@samp{gohome.org}\e$B$J$I\e(B) \e$B$r@_Dj$7$F$/$@$5$$!#\e(B \e$B$b$7!"%0%m!<%P%k$J\e(BIP
-\e$B$r;}$?$J$$>l9g$O!"\e(B@code{wl-message-id-domain}\e$B$r@_Dj$7$F$/$@$5$$!#\e(B
+\e$B%$%sL>\e(B (@samp{gohome.org}\e$B$J$I\e(B) \e$B$r@_Dj$7$F$/$@$5$$!#\e(B \e$B$b$7!"%0%m!<%P%k$J\e(B IP
+\e$B%"%I%l%9$r;}$?$J$$>l9g$O!"\e(B@code{wl-message-id-domain}\e$B$r@_Dj$7$F$/$@$5$$!#\e(B
 (@samp{Message-ID:} \e$B$N%I%a%$%s$,$*$+$7$$$H!"%M%C%H%K%e!<%9$G$U$/$mC!$-$K\e(B
 \e$B$"$C$F$7$^$&2DG=@-$,$"$j$^$9!#\e(B)
 
@@ -4159,6 +4294,11 @@ Non-nil \e$B$J$i%&%#%s%I%&$rI=<($7$J$,$i%F%s%W%l!<%H$rA*Br$9$k>l9g!"%j%?!<%s\e(B
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 Non-nil \e$B$J$i%I%i%U%HMQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
+@item wl-draft-truncate-lines
+@vindex wl-draft-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%I%i%U%H%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
+
 @item wl-from
 @vindex wl-from
 \e$B=i4|@_Dj$OJQ?t\e(B @code{user-mail-address} \e$B$NCM!#\e(B
@@ -4206,14 +4346,20 @@ Non-nil \e$B$J$iJV?.%"%I%l%9$N\e(B @samp{To:}, @samp{Cc:} \e$B%U%#!<%k%I$KAj<j$N%U%
 
 @item wl-draft-use-cache
 @vindex wl-draft-use-cache
-\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U\e(B
-\e$B%i%0$G$9!#\e(BNon-nil \e$B$J$i%-%c%C%7%e$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U\e(B
+\e$B%i%0$G$9!#\e(BNon-nil \e$B$J$i%-%c%C%7%e$7$^$9!#$?$@$7\e(B @code{wl-insert-message-id}\e$B$,\e(B
+nil \e$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#\e(B
+
+@item wl-fcc-force-as-read
+@vindex wl-fcc-force-as-read
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(BNon-nil \e$B$J$i\e(B @samp{Fcc:} \e$B$GJ]B8$7$?%a%C%;!<%8$r\e(B
+\e$B4{FI$K$7$^$9\e(B(\e$BJ]B8@h$,\e(B IMAP folder \e$B$N>l9g$N$_\e(B)\e$B!#\e(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
 \e$B%*%s%i%$%s$K$J$C$?$H$-$K<+F0E*$K%-%e!<$rAw?.$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B
-Non-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B$$$A$*$&\e(B @code{y-or-n-p} \e$B$G3NG'$7$^$9\e(B)\e$B!#\e(B
+Non-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B0l1~\e(B @code{y-or-n-p} \e$B$G3NG'$7$^$9\e(B)\e$B!#\e(B
 \e$B<jF0$G%-%e!<$rAw?.$9$k$K$O!"%U%)%k%@%b!<%I$G\e(B @kbd{F} \e$B$r2!$7$F$/$@$5$$!#\e(B
 
 @item wl-ignored-forwarded-headers
@@ -4230,6 +4376,11 @@ Non-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B$$$A$*$&\e(B @code{y-or-n-p} \e$B$G3NG'$7
 Non-nil \e$B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K\e(B @samp{To:},
 @samp{Cc:} \e$B$+$i<+J,$N%a!<%k%"%I%l%9$r:o=|$7$^$9!#\e(B
 
+@item wl-draft-delete-myself-from-bcc-fcc
+@vindex wl-draft-delete-myself-from-bcc-fcc
+Non-nil \e$B$G!"\e(B@samp{To:}, @samp{Cc:} \e$B$,\e(B \e$BJQ?t\e(B @code{wl-subscribed-mailing-list} \e$B$K\e(B
+\e$B4^$^$l$F$$$k>l9g!"\e(B@samp{Bcc:} , @samp{FCC:} \e$B$r$D$1$^$;$s!%\e(B
+
 @item wl-smtp-posting-server
 @vindex wl-smtp-posting-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -4238,79 +4389,79 @@ Non-nil \e$B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K\e(B @samp{To:},
 @item wl-smtp-posting-user
 @vindex wl-smtp-posting-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-SMTP AUTH\e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
+SMTP AUTH \e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
 @code{nil} \e$B$J$i\e(B @code{smtp-authenticate-user} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-smtp-authenticate-type
 @vindex wl-smtp-authenticate-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-SMTP AUTH\e$B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
+SMTP AUTH \e$B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
 @code{nil} \e$B$N$^$^$J$i\e(B @code{smtp-authenticate-type}\e$B$rMxMQ$7$^$9!#\e(B
 @code{smtp-authenticate-type} \e$B$b\e(B @code{nil} \e$B$J$iG'>Z$r9T$$$^$;$s!#\e(B
 
 @item wl-smtp-connection-type
 @vindex wl-smtp-connection-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-SMTP\e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
+SMTP \e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
 @code{nil} \e$B$J$i\e(B @code{smtp-connection-type} \e$B$rMxMQ$7$^$9!#\e(B
-@code{starttls} \e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
+@code{starttls} \e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @item wl-nntp-posting-server
 @vindex wl-nntp-posting-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$N\e(B NNTP \e$B%5!<%PL>$G$9!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-server} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-nntp-posting-user
 @vindex wl-nntp-posting-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$K\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-user} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-user} \e$B$r;H$$$^$9!#\e(B
 \e$B$=$l$G$b\e(B @code{nil} \e$B$J$i\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$$$^$;$s!#\e(B
 
 @item wl-nntp-posting-port
 @vindex wl-nntp-posting-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$N\e(B NNTP \e$B%5!<%P$N%]!<%HHV9f!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-server} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-nntp-posting-stream-type
 @vindex wl-nntp-posting-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-stream-type} \e$B$rI>2A$7$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-stream-type} \e$B$rI>2A$7$^$9!#\e(B
 Non-nil \e$B$J$i%K%e!<%9Ej9F;~$K\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
-@code{starttls}\e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
+@code{starttls}\e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-user
 @vindex wl-pop-before-smtp-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-POP-before-SMTP\e$B$G\e(BPOP \e$B$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-user}\e$B$rMxMQ$7$^$9!#\e(B
+POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-user}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-server
 @vindex wl-pop-before-smtp-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-POP-before-SMTP\e$B$G\e(BPOP \e$B$r9T$J$&$H$-$N%5!<%PL>$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-server}\e$B$rMxMQ$7$^$9!#\e(B
+POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%5!<%PL>$G$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-server}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-authenticate-type
 @vindex wl-pop-before-smtp-authenticate-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-POP-before-SMTP\e$B$G\e(BPOP\e$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-authenticate}\e$B$rMxMQ$7$^$9!#\e(B
+POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-authenticate}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-port
 @vindex wl-pop-before-smtp-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-POP-before-SMTP\e$B$G\e(BPOP\e$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-port}\e$B$rMxMQ$7$^$9!#\e(B
+POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-port}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-stream-type
 @vindex wl-pop-before-smtp-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-POP-before-SMTP \e$B$G\e(B SSL\e$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B@code{nil} \e$B$N\e(B
-\e$B$^$^$J$i\e(B @code{elmo-default-pop3-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
-@code{starttls}\e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
+POP-before-SMTP \e$B$G\e(B SSL \e$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B@code{nil} \e$B$N\e(B
+\e$B$^$^$J$i\e(B @code{elmo-pop3-default-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
+@code{starttls}\e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @item wl-draft-queue-save-variables
 @vindex wl-draft-queue-save-variables
@@ -4342,7 +4493,7 @@ POP-before-SMTP \e$B$G\e(B SSL\e$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B@code{nil}
 @item wl-use-ldap
 @vindex wl-use-ldap
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-Non-nil\e$B$J$i\e(B LDAP \e$B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#\e(B
+Non-nil \e$B$J$i\e(B LDAP \e$B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#\e(B
 
 @item wl-ldap-server
 @vindex wl-ldap-server
@@ -4362,7 +4513,7 @@ Non-nil\e$B$J$i\e(B LDAP \e$B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#\e(B
 @item wl-draft-remove-group-list-contents
 @vindex wl-draft-remove-group-list-contents
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
-Non-nil\e$B$J$i%a!<%kAw?.$N:]$K08@h$+$i\e(B group-list \e$B$NFbMF$r:o=|$7$^$9\e(B
+Non-nil \e$B$J$i%a!<%kAw?.$N:]$K08@h$+$i\e(B group-list \e$B$NFbMF$r:o=|$7$^$9\e(B
 (group-list \e$B$H$O08@h$K4^$^$l$k\e(B @samp{Group: foo@@gohome.org,
 bar@@gohome.org;}\e$B$N$h$&$J5-=R$r;X$7$^$9\e(B)\e$B!#\e(B
 @end table
@@ -4392,8 +4543,8 @@ Wanderlust \e$B$K$O%*%s%i%$%s%b!<%I$H%*%U%i%$%s%b!<%I$,$"$j$^$9!#%*%U%i%$%s\e(B
 \e$B%b!<%I$G$O!"%M%C%H%o!<%/7PM3$G$J$1$l$PFI$a$J$$%a%C%;!<%8$O%"%/%;%9$G$-$^\e(B
 \e$B$;$s\e(B(\e$B%-%c%C%7%e$5$l$F$$$l$P%"%/%;%9$G$-$^$9\e(B)\e$B!#\e(B
 
-\e$B%b!<%I%i%$%s$K\e(B @samp{[ON]} \e$B$H=P$F$$$k$H$-$O%*%s%i%$%s%b!<%I$K$"$k$3$H$r\e(B
-\e$B<($7$F$$$^$9!#%b!<%I%i%$%s$K\e(B @samp{[--]} \e$B$H=P$F$$$k$H$-$O%*%U%i%$%s%b!<\e(B
+\e$B%b!<%I%i%$%s$K\e(B @samp{[ON]} \e$B$HI=<($5$l$F$$$k$H$-$O%*%s%i%$%s%b!<%I$K$"$k$3$H$r\e(B
+\e$B<($7$F$$$^$9!#%b!<%I%i%$%s$K\e(B @samp{[--]} \e$B$HI=<($5$l$F$$$k$H$-$O%*%U%i%$%s%b!<\e(B
 \e$B%I$G$9!#%U%)%k%@%b!<%I!"%5%^%j%b!<%I$G\e(B @kbd{M-t} \e$B$r2!$9$H%*%U%i%$%s\e(B/\e$B%*%s\e(B
 \e$B%i%$%s$N@Z$jBX$($,$G$-$^$9!#\e(B
 
@@ -4444,8 +4595,8 @@ Wanderlust \e$B$K$O%*%s%i%$%s%b!<%I$H%*%U%i%$%s%b!<%I$,$"$j$^$9!#%*%U%i%$%s\e(B
 @subsection \e$B%j%U%!%$%k\e(B/\e$B%3%T!<\e(B(IMAP4)
 
 \e$B%*%U%i%$%s>uBV$N$"$$$@$K<B9T$5$l$?\e(B IMAP \e$B%U%)%k%@$KBP$9$k%j%U%!%$%k\e(B/\e$B%3%T!<\e(B
-\e$BA`:n$O%-%e!<$K$?$a$i$l!"%*%s%i%$%s$K$J$C$?$H$-$K%5!<%PB&$KH?1G$5$l$^$9!#\e(B
-\e$B%*%U%i%$%s!&%j%U%!%$%k\e(B/\e$B%3%T!<$N$"$H!"%j%U%!%$%k\e(B/\e$B%3%T!<@h$N%U%)%k%@$rK,$l\e(B
+\e$BA`:n$O%-%e!<$KN/$a$i$l!"%*%s%i%$%s$K$J$C$?$H$-$K%5!<%PB&$KH?1G$5$l$^$9!#\e(B
+\e$B%*%U%i%$%s!&%j%U%!%$%k\e(B/\e$B%3%T!<$N8e!"%j%U%!%$%k\e(B/\e$B%3%T!<@h$N%U%)%k%@$rK,$l\e(B
 \e$B$k$H!"%*%U%i%$%s$G$b%a%C%;!<%8$,DI2C$5$l$F$$$k$h$&$K8+$($^$9!#\e(B
 
 \e$B%*%U%i%$%s!&%j%U%!%$%k$N%-%e!<=hM};~$N:o=|=hM}$O0BA4$r4|$7$F%5!<%P>e$N%a%C\e(B
@@ -4480,11 +4631,11 @@ IMAP \e$B$b$7$/$O\e(B NNTP \e$B%U%)%k%@$K$"$k%a%C%;!<%8$KBP$7$F!"%W%j%U%'%C%A$NM=Ls
 \e$B%W%j%U%'%C%A$5$l$^$9!#\e(B
 
 \e$BJQ?t\e(B @code{elmo-enable-disconnected-operation} \e$B$,\e(B @code{nil} \e$B$J$i!"$3$l\e(B
-\e$B$i$N\e(B IMAP4 \e$B$H\e(B NNTP\e$B$K4X$9$k%*%U%i%$%s=hM}$O<B9T$5$l$:!"%*%U%i%$%sCf$N%j%U%!\e(B
+\e$B$i$N\e(B IMAP4 \e$B$H\e(B NNTP \e$B$K4X$9$k%*%U%i%$%s=hM}$O<B9T$5$l$:!"%*%U%i%$%sCf$N%j%U%!\e(B
 \e$B%$%k\e(B/\e$B%3%T!<Ey$NA`:n$OC1$K%(%i!<$K$J$j$^$9!#\e(B
 
 \e$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\e(B
-\e$B$9$H\e(B Wanderlust \e$B$,8mF0:n$9$k$*$=$l$,$"$j$^$9!#%-%c%C%7%e$r>C$7$?$$$H$-$O\e(B
+\e$B$9$H\e(B Wanderlust \e$B$,8mF0:n$9$k62$l$,$"$j$^$9!#%-%c%C%7%e$r>C$7$?$$$H$-$O\e(B
 @kbd{M-x elmo-cache-expire-by-size}\e$B$r<B9T$9$k$h$&$K$7$F$/$@$5$$!#\e(B
 @code{elmo-cache-expire-by-size} \e$B$O%*%U%i%$%s=hM}$NBP>]$H$J$k%a%C%;!<%8\e(B
 \e$B$N%-%c%C%7%e$O:o=|$7$^$;$s!#\e(B
@@ -4563,9 +4714,9 @@ plug \e$B>uBV$K$h$j\e(B 2\e$B9TL\$N\e(B @samp{(wl-plugged)} \e$B$,JQ2=$7$^$9!#\e(B
 \e$B$5$i$K:Y$+$/%5!<%P$d%]!<%HKh$K%*%U%i%$%s>uBV$r@_Dj$9$k$3$H$b$G$-$^$9!#J;\e(B
 \e$B$;$FJQ?t\e(B @code{wl-reset-plugged-alist} \e$B$b;2>H2<$5$$!#\e(B
 
-\e$BDL>o!"5/F0;~$K$O\e(B @file{~/.folder} \e$B$H\e(B @code{wl-smtp-posting-server},
+\e$BDL>o!"5/F0;~$K$O\e(B @file{~/.folders} \e$B$H\e(B @code{wl-smtp-posting-server},
 @code{wl-nntp-posting-server} \e$B$J$I$+$i3F%]!<%H$N\e(B plug \e$B>uBV$,<+F0E*$KDI2C\e(B
-\e$B$5$l$^$9$,!"$3$l$i$N%]!<%H$N\e(Bplug\e$B>uBV$rJQ99$7$?$j!">e5-0J30$N%]!<%H$rDI2C\e(B
+\e$B$5$l$^$9$,!"$3$l$i$N%]!<%H$N\e(B plug \e$B>uBV$rJQ99$7$?$j!">e5-0J30$N%]!<%H$rDI2C\e(B
 \e$B$7$?$j$9$k>l9g$K$O\e(B @code{wl-make-plugged-hook} \e$B$KJQ99$9$k4X?t$r5-=R$7$^\e(B
 \e$B$9!#\e(B
 
@@ -4599,7 +4750,7 @@ plug \e$B>uBV$K$h$j\e(B 2\e$B9TL\$N\e(B @samp{(wl-plugged)} \e$B$,JQ2=$7$^$9!#\e(B
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#%*%s%i%$%s$K$J$C$?$H$-$K<+F0E*$K%-%e!<$rAw?.$9$k$+\e(B
-\e$B$I$&$+!#\e(BNon-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B$$$A$*$&\e(B @code{y-or-n-p} \e$B$G3NG'\e(B
+\e$B$I$&$+!#\e(BNon-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B0l1~\e(B @code{y-or-n-p} \e$B$G3NG'\e(B
 \e$B$7$^$9\e(B)\e$B!#<jF0$G%-%e!<$rAw?.$9$k$K$O!"%U%)%k%@%b!<%I$G\e(B @kbd{F} \e$B$r2!$7$F$/\e(B
 \e$B$@$5$$!#\e(B
 
@@ -4618,7 +4769,7 @@ Non-nil \e$B$J$i%*%U%i%$%s=hM}$r<B9T$7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{one}\e$B!#\e(B
 @code{wl-plugged} \e$B$NCM$O4X?t\e(B @code{elmo-plugged-p} (\e$B0z?t$J$7\e(B)\e$B$NLa$jCM$K\e(B
 \e$B$h$j7hDj$5$l$^$9!#$3$NJQ?t\e(B @code{elmo-plugged-condition} \e$B$O\e(B 
-@code{(elmo-plugged-p)} \e$B$NLa$jCM$,\e(B @code{t} \e$B$K$J$k>r7o$r3F%]!<%H$N\e(Bplug\e$B>u\e(B
+@code{(elmo-plugged-p)} \e$B$NLa$jCM$,\e(B @code{t} \e$B$K$J$k>r7o$r3F%]!<%H$N\e(B plug \e$B>u\e(B
 \e$BBV$K$h$j;XDj$7$^$9!#\e(B
 
 @example
@@ -4743,7 +4894,7 @@ expire \e$B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"\e(B2,3 \e$BHVL\$NMWAG$N$$$:$l$+$,\e(B
 \e$B$K\e(B expire \e$B$r<B9T$9$k$3$H$K$J$j$^$9!#$3$l$O<+F0<B9T$G\e(B expire \e$B$r9T$&$h$&$K\e(B
 \e$B$7$?>l9g!"IQHK$K%a!<%k$,Mh$k%U%)%k%@$G$OKh2s\e(B expire \e$B$r<B9T$9$k$?$a!"%a!<\e(B
 \e$B%k$rFI$`$^$G$K;~4V$,$+$+$j!"HQ$o$7$/$J$C$F$7$^$$$^$9!#$=$3$G\e(B @var{n2} \e$B$r\e(B 
-@var{n1} \e$B$h$j$bBg$-$a$NCM$K@_Dj$9$k$3$H$K$h$j!"0lDj?tN/$^$k$^$G$O\e(Bexpire 
+@var{n1} \e$B$h$j$bBg$-$a$NCM$K@_Dj$9$k$3$H$K$h$j!"0lDj?tN/$^$k$^$G$O\e(B expire 
 \e$B$r<B9T$7$J$$$h$&$K$9$k$3$H$,$G$-$^$9!#\e(B
 
 \e$B$^$?!"\e(B@code{wl-summary-expire-reserve-marks}\e$B$G;XDj$7$?%a%C%;!<%8\e(B(\e$B=EMW%^!<\e(B
@@ -4780,13 +4931,13 @@ expire \e$B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"\e(B2,3 \e$BHVL\$NMWAG$N$$$:$l$+$,\e(B
 \e$B%a%C%;!<%8$r\e(B@var{string}\e$B$G;XDj$7$?%U%)%k%@$K0\F0$7$^$9!#\e(B
 
 \e$B%"!<%+%$%V%U%)%k%@$r;XDj$9$k$HJXMx$G$9$,!"\e(B@samp{$} \e$B%^!<%/$NIU$$$?=EMW%a%C\e(B
-\e$B%;!<%8$J$I$O0\F0$5$l$J$$$?$a!"2<5-$NI8=`4X?t$r;H$&J}$,$h$j$h$$$G$9!#\e(B
+\e$B%;!<%8$J$I$O0\F0$5$l$J$$$?$a!"2<5-$NI8=`4X?t$r;H$&J}$,$h$jNI$$$G$9!#\e(B
 
 @item @var{function}
 \e$B;XDj$N4X?t$r8F$S=P$7$^$9!#\e(B
 
 \e$B;XDj$7$?4X?t$K$O<!$N\e(B3\e$B$D$N0z?t!"%U%)%k%@L>!":o=|$9$k%a%C%;!<%8$N%j%9%H!"\e(B
-\e$B$=$7$F%5%^%j$N\e(Bmsgdb\e$B>pJs$,EO$5$l$^$9!#$^$?!"4X?tL>$N8e$K4X?tFH<+$N0z?t$b\e(B
+\e$B$=$7$F%5%^%j$N\e(B msgdb \e$B>pJs$,EO$5$l$^$9!#$^$?!"4X?tL>$N8e$K4X?tFH<+$N0z?t$b\e(B
 \e$B;XDj$G$-$^$9!#$J$*!"$3$N4X?t$K$O\e(B@code{wl-summary-expire-reserve-marks}\e$B$G\e(B
 \e$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\e(B
 \e$BCm0U$7$F$/$@$5$$!#\e(B
@@ -4807,7 +4958,7 @@ expire \e$B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"\e(B2,3 \e$BHVL\$NMWAG$N$$$:$l$+$,\e(B
 
 \e$B%j%U%!%$%k@h$N%"!<%+%$%V%U%)%k%@$O:o=|85$N%U%)%k%@L>$K$h$j<!$N$h$&$K7hDj\e(B
 \e$B$5$l$^$9!#\e(B(\e$B$3$N$H$-!"%"!<%+%$%V%U%)%k%@$O\e(B @code{elmo-archive-treat-file} 
-\e$B$,\e(B non-nil \e$B$N>l9g$H$7$F$"$D$+$o$l$^$9\e(B)
+\e$B$,\e(B non-nil \e$B$N>l9g$H$7$F07$o$l$^$9\e(B)
 
 @table @asis
 @item \e$B%U%)%k%@%?%$%W$,\e(Blocaldir\e$B$N>l9g\e(B
@@ -4868,7 +5019,7 @@ non-nil \e$B$r;XDj$9$k$H!"%U%)%k%@$N%a%C%;!<%8HV9f$r$=$N$^$^J]B8$9$k$3$H$,$G\e(B
 \e$B$3$NJQ?t$K$O%G%U%)%k%H$G!"=EMW%^!<%/!"?75,%^!<%/!"L$FI%^!<%/$,@_Dj$5$l$F\e(B
 \e$B$$$^$9$N$G!"$3$l$i$N%^!<%/$N$D$$$?%a%C%;!<%8$O:o=|$5$l$J$$$3$H$K$J$j$^$9!#\e(B
 \e$B$?$@$7!"$3$NJQ?t$K$O0l;~E*%^!<%/$O;XDj$G$-$J$$$?$a\e(B(\e$B$9$J$o$A:o=|$5$l$k$?\e(B
-\e$B$a\e(B)\e$B!"\e(Bexpire\e$B$r<B9T$9$kA0$K0l;~E*%^!<%/$O=hM}$7$F$*$$$F$/$@$5$$!#\e(B
+\e$B$a\e(B)\e$B!"\e(Bexpire \e$B$r<B9T$9$kA0$K0l;~E*%^!<%/$O=hM}$7$F$*$$$F$/$@$5$$!#\e(B
 
 @subsection \e$B<+F0<B9T\e(B
 
@@ -4902,8 +5053,8 @@ non-nil \e$B$r;XDj$9$k$H!"%U%)%k%@$N%a%C%;!<%8HV9f$r$=$N$^$^J]B8$9$k$3$H$,$G\e(B
 \e$B$KJQ$($k$H$h$$$G$7$g$&!#$$$-$J$j\e(B @code{remove} \e$B$r;XDj$9$k$N$O4m81$G$9!#\e(B
 
 \e$B$^$?!"\e(B@code{wl-expire-archive-number1}\e$B$J$I$N4X?t$rMxMQ$9$k>l9g!"$^$:$O;H\e(B
-\e$BMQ$9$k%"!<%+%$%P%?%$%W\e(B(@code{zip} \e$B$d\e(B @code{lha})\e$B$J$I$N%U%)%k%@$r;n$7$K$D\e(B
-\e$B$/$C$F!"@5$7$/DI2C$G$-$k$+$I$&$+$r3NG'$7$F$/$@$5$$!#$?$H$(!"\e(B
+\e$BMQ$9$k%"!<%+%$%P%?%$%W\e(B(@code{zip} \e$B$d\e(B @code{lha})\e$B$J$I$N%U%)%k%@$r;n$7$K:n\e(B
+\e$B$C$F!"@5$7$/DI2C$G$-$k$+$I$&$+$r3NG'$7$F$/$@$5$$!#$?$H$(!"\e(B
 @code{wl-expire-alist} \e$B$d\e(B @code{elmo-archive} \e$B$N@_Dj$,@5$7$/$F$b!"%"!<%+\e(B
 \e$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\e(B
 \e$B$7$^$&$+$bCN$l$^$;$s!#\e(B
@@ -4920,7 +5071,7 @@ move    +ml/wl -> $ml/wl-00600;tgz;wl  (600 601 602)
 @end example
 
 \e$B:G=i$N9`L\$OF0:n$r<($9$b$N$G!"\e(B@samp{delete}, @samp{copy}, @samp{move} \e$B$,\e(B
-\e$B$"$j$^$9!#<!$,\e(B expire\e$B$r<B9T$7$?%U%)%k%@L>$G!"\e(B@samp{copy} \e$B$H\e(B @samp{move} 
+\e$B$"$j$^$9!#<!$,\e(B expire \e$B$r<B9T$7$?%U%)%k%@L>$G!"\e(B@samp{copy} \e$B$H\e(B @samp{move} 
 \e$B$N>l9g$O\e(B@samp{->}\e$B$KB3$1$F%3%T!<$b$7$/$O0\F0@h$N%U%)%k%@L>$,5-O?$5$l$^$9!#\e(B
 \e$B:G8e$N9`L\$O!"<B:]$K:o=|$d0\F0$5$l$?%a%C%;!<%8HV9f$N%j%9%H$G$9\e(B
 (@samp{copy} \e$B$d\e(B @samp{move} \e$B$N>l9g!"0\F08e$G$O$J$/0\F0A0$N%a%C%;!<%8HV9f\e(B
@@ -4928,17 +5079,17 @@ move    +ml/wl -> $ml/wl-00600;tgz;wl  (600 601 602)
 
 @subsection reserve\e$B%a%C%;!<%8$N%j%U%!%$%k\e(B
 
-\e$BI8=`$GMQ0U$5$l$F$$$k\e(B3\e$B$D$N4X?t$G$O!"\e(Breserve\e$B%a%C%;!<%8$O%"!<%+%$%V%U%)%k%@\e(B
+\e$BI8=`$GMQ0U$5$l$F$$$k\e(B3\e$B$D$N4X?t$G$O!"\e(Breserve \e$B%a%C%;!<%8$O%"!<%+%$%V%U%)%k%@\e(B
 \e$B$K%3%T!<$7$^$9$,!"85$N%U%)%k%@$+$i$O:o=|$7$J$$$h$&$K$J$C$F$$$^$9!#$J$*!"\e(B
 \e$B=EMW%^!<%/$J$I$O>o$K;D$k$?$a!"2?EY$b%3%T!<$5$l$k$3$H$,$J$$$h$&$K\e(B
 @file{~/.elmo/expired-alist} \e$B$K5-O?$9$k$h$&$K$7$F$$$^$9!#\e(B
-\e$B$?$@$7!"\e(Breserve\e$B%a%C%;!<%8$,\e(Brefile\e$BBP>]$K$J$C$?$H$-$N$_$G$9!#\e(B
+\e$B$?$@$7!"\e(Breserve \e$B%a%C%;!<%8$,\e(B refile \e$BBP>]$K$J$C$?$H$-$N$_$G$9!#\e(B
 \e$B$^$?!"\e(B@code{wl-summary-archive} \e$B$J$I$G%3%T!<$5$l$k>l9g$O5-O?$5$l$^$;$s!#\e(B
 
 \e$B%m%05!G=$rM-8z$K$7$F$$$?>l9g$O!"%j%U%!%$%k;~$K$ODL>o\e(B @samp{move} \e$B$,5-\e(B
-\e$BO?$5$l$^$9$,!"\e(Breserve\e$B%a%C%;!<%8$,4^$^$l$F$$$k$H!"\e(B@samp{copy} \e$B$H\e(B 
-@samp{delete} \e$B$KJ,$1$F5-O?$5$l$^$9!#$3$l$O\e(B reserve\e$B%a%C%;!<%8$r4^$a$?%a%C\e(B
-\e$B%;!<%8$r%3%T!<$7$?8e!"\e(Breserve\e$B%a%C%;!<%8$r=|$$$?%a%C%;!<%8$r:o=|$9$k!"\e(B
+\e$BO?$5$l$^$9$,!"\e(Breserve \e$B%a%C%;!<%8$,4^$^$l$F$$$k$H!"\e(B@samp{copy} \e$B$H\e(B 
+@samp{delete} \e$B$KJ,$1$F5-O?$5$l$^$9!#$3$l$O\e(B reserve \e$B%a%C%;!<%8$r4^$a$?%a%C\e(B
+\e$B%;!<%8$r%3%T!<$7$?8e!"\e(Breserve \e$B%a%C%;!<%8$r=|$$$?%a%C%;!<%8$r:o=|$9$k!"\e(B
 \e$B$H$$$&=hM}$r9T$C$F$$$k$?$a$G$9!#\e(B
 
 @section \e$B%+%9%?%^%$%:JQ?t\e(B
@@ -4996,8 +5147,8 @@ Non-nil \e$B$K$9$k$H!"\e(B
 \e$B;D$7$F$*$/%a%C%;!<%8?t$K\e(B @code{wl-summary-expire-reserve-marks} \e$B$G@_Dj$5\e(B
 \e$B$l$?%a%C%;!<%8$r4^$a$^$9!#\e(B
 
-@item wl-expire-archive-get-folder-func
-@vindex wl-expire-archive-get-folder-func
+@item wl-expire-archive-get-folder-function
+@vindex wl-expire-archive-get-folder-function
 \e$B=i4|@_Dj$O\e(B @code{wl-expire-archive-get-folder}\e$B!#\e(B
 
 \e$B:o=|@h$NI8=`4X?t$G%"!<%+%$%V%U%)%k%@L>$r<hF@$9$k4X?t$r;XDj$7$^$9!#\e(B
@@ -5029,7 +5180,7 @@ Non-nil \e$B$K$9$k$H!"\e(B
 @code{wl-expire-archive-date}
 \e$B$G;HMQ$5$l$k%"!<%+%$%V$N%U%)%k%@$N\e(B @code{format} \e$B7A<0$NJ8;zNs$r;XDj$7$^$9!#\e(B
 \e$B$J$*!"\e(B2\e$BEY\e(B @code{format} \e$B$G;XDj$9$k$?$a!"\e(B
-\e$B$+$J$i$:HV9f$NItJ,$O\e(B @samp{%%d} \e$B$K$7$J$/$F$O$J$j$^$;$s!#\e(B
+\e$BI,$:HV9f$NItJ,$O\e(B @samp{%%d} \e$B$K$7$J$/$F$O$J$j$^$;$s!#\e(B
 \e$B$^$?!"%a%C%;!<%8$NG/$H7n$,M?$($i$l$k$?$a!"\e(B@samp{%%d} \e$B$O\e(B2\e$B$DI,MW$G$9!#\e(B
 
 \e$B$b$7!"JQ99$9$k>l9g$O\e(B @code{wl-expire-archive-date-folder-num-regexp}
@@ -5046,7 +5197,7 @@ Non-nil \e$B$K$9$k$H!"\e(B
 \e$B%"!<%+%$%V%U%)%k%@$KIU$1$k\e(B prefix \e$B$r;XDj$7$^$9!#\e(B
 \e$B$?$@$7!"%"!<%+%$%V%U%)%k%@$K\e(B prefix (\e$B%G%#%l%/%H%j9=B$\e(B)\e$B$rIU$1$k;EMM$O\e(B
 \e$B$*$^$15!G=$G$9$N$G!"<h$j07$$$O?5=E$K9T$C$F2<$5$$!#\e(B
-\e$B:G0-%"!<%+%$%V%U%!%$%k$r2u$962$l$,$"$j$^$9!#\e(B
+\e$B:G0-$N>l9g!$%"!<%+%$%V%U%!%$%k$r2u$962$l$,$"$j$^$9!#\e(B
 
 @table @code
 @item nil
@@ -5079,7 +5230,7 @@ prefix \e$B$OIU$-$^$;$s!#\e(B
 @item wl-expire-delete-oldmsg-confirm
 @vindex wl-expire-delete-oldmsg-confirm
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
-Non-nil\e$B$N>l9g!"4{$KB8:_$7$F$$$k%"!<%+%$%V%U%)%k%@$N:GBg%a%C%;!<%8HV9f$h$j$b\e(B
+Non-nil \e$B$N>l9g!"4{$KB8:_$7$F$$$k%"!<%+%$%V%U%)%k%@$N:GBg%a%C%;!<%8HV9f$h$j$b\e(B
 \e$B8E$$%a%C%;!<%8$,$"$C$?>l9g$K3NG'$7$F$+$i:o=|$7$^$9!#\e(B
 @code{nil} \e$B$N>l9g$O3NG'$;$:$K:o=|$7$^$9!#\e(B
 
@@ -5098,10 +5249,10 @@ Non-nil \e$B$K$9$k$H!"\e(B@file{~/.elmo/expired-log}\e$B$K\e(B expire \e$B$N<B9T7k2L$
 Non-nil \e$B$N>l9g!"\e(Bexpire \e$B$K$h$j%a%C%;!<%8$r%j%U%!%$%k$7$?>l9g!"4{FI>pJs$r\e(B
 \e$B%j%U%!%$%k@h$N%U%)%k%@$KEA$($k$h$&$K$7$^$9!#\e(B
 
-\e$B$?$@$7!"%j%U%!%$%k@h$N%U%)%k%@$r\e(B Wanderlust\e$B>e$+$iFI$^$J$$$H!"\e(B
+\e$B$?$@$7!"%j%U%!%$%k@h$N%U%)%k%@$r\e(B Wanderlust \e$B>e$+$iFI$^$J$$$H!"\e(B
 @file{~/.elmo/}\e$B0J2<$K$"$k\e(B @file{seen} \e$B%U%!%$%k$,Bg$-$/$J$C$F$$$/$N$G!"\e(B
 \e$B%"!<%+%$%V%U%)%k%@$J$I$KC1$KJ]B8$7$F$*$/$@$1$J$i\e(B
-@code{nil} \e$B$K@_Dj$7$F$*$/$H$h$$$G$7$g$&!#\e(B@code{nil} \e$B$K@_Dj$7$F$b!"\e(B
+@code{nil} \e$B$K@_Dj$7$F$*$/$HNI$$$G$7$g$&!#\e(B@code{nil} \e$B$K@_Dj$7$F$b!"\e(B
 \e$B%j%U%!%$%k$7$?%"!<%+%$%V%U%)%k%@$rFI$`$H$-$K?75,%a%C%;!<%807$$$5$l$k$@$1$G!"\e(B
 expire \e$B$J$I$NF0:n$K$O1F6A$O$"$j$^$;$s!#\e(B
 
@@ -5165,7 +5316,7 @@ expire \e$B$J$I$NF0:n$K$O1F6A$O$"$j$^$;$s!#\e(B
 \e$B$9$k$@$1$K$J$j$^$9!#\e(B
 
 \e$B%G%U%)%k%H$G$O%3%T!<@h$N%"!<%+%$%V%U%)%k%@$O\e(B
-@code{wl-expire-archive-get-folder-func} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
+@code{wl-expire-archive-get-folder-function} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
 prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!"\e(B
 \e$B;XDj$7$?%U%)%k%@$K%3%T!<$9$k$3$H$,$G$-$^$9!#\e(B
 
@@ -5179,7 +5330,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 
 @itemize @bullet
 @item @code{wl-expire-archive-files}
-@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-get-folder-function}
 @item @code{wl-expire-archive-folder-name-fmt}
 @item @code{wl-expire-archive-folder-type}
 @item @code{wl-expire-archive-folder-prefix}
@@ -5199,12 +5350,12 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 
 @noindent
 \e$B%"!<%+%$%V%U%)%k%@$K%3%T!<$9$k=hM}$r9T$&4X?t$r;XDj$7$^$9!#$3$N4X?t$K$O!"\e(B
-\e$B%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N\e(Bmsgdb\e$B>pJs!"$N\e(B3\e$B$D\e(B
+\e$B%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N\e(B msgdb \e$B>pJs!"$N\e(B3\e$B$D\e(B
 \e$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!#\e(B
 @end table
 
 
-@node Scoring, Customization, Expire and Archive, Top
+@node Scoring, Address Book, Expire and Archive, Top
 @chapter \e$B%9%3%"\e(B
 @cindex Scoring
 @c @cindex Kill File
@@ -5252,7 +5403,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 
 \e$B$^$?!"\e(B@code{wl-score-folder-alist} \e$B$N@_Dj$K4X$o$i$:\e(B
 \e$B%G%U%)%k%H$N%9%3%"%U%!%$%k\e(B @code{wl-score-default-file} (@file{all.SCORE})
\e$B$OI,$:FI$_9~$^$l$^$9\e(B(\e$B%U%!%$%k$,B8:_$7$F$$$J$/$F$b$+$^$$$^$;$s\e(B)\e$B!#\e(B
\e$B$OI,$:FI$_9~$^$l$^$9\e(B(\e$B%U%!%$%k$,B8:_$7$F$$$J$/$F$b9=$$$^$;$s\e(B)\e$B!#\e(B
 \e$B$7$?$,$C$F!">e5-Nc$N\e(B @samp{^-.*} \e$B$K%^%C%A$7$?%U%)%k%@$G$O\e(B 
 @file{news.SCORE}, @file{my.SCORE}, @file{all.SCORE} \e$B$N\e(B3\e$B$D$N%9%3%"%U%!%$%k\e(B
 \e$B$,FI$_9~$^$l$k$3$H$K$J$j$^$9!#\e(B
@@ -5267,9 +5418,9 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 @subsection \e$B%9%3%"%U%!%$%k$N:n@.\e(B
 
 \e$B$^$:%5%^%j%P%C%U%!$GE,Ev$J%a%C%;!<%8$K0\F0$7$F$+$i\e(B @kbd{L} \e$B$r%?%$%W$7$^\e(B
-\e$B$9!#$=$N8e%_%K%P%C%U%!$G$NF~NO$r5a$a$i$l$^$9$N$G!"$D$E$1$F\e(B @kbd{s},
+\e$B$9!#$=$N8e%_%K%P%C%U%!$G$NF~NO$r5a$a$i$l$^$9$N$G!"B3$1$F\e(B @kbd{s},
 @kbd{s}, @kbd{p} \e$B$H%?%$%W$7$F$_$F$/$@$5$$!#$9$k$H\e(B Subject \e$B$NJ8;zNs$,F~NO\e(B
-\e$B$5$l$F$$$k>uBV$K$J$j$^$9$N$G!"E,Ev$KJT=8$7$?$N$A\e(B @kbd{@key{RET}} \e$B$r2!$7$^$9!#\e(B
+\e$B$5$l$F$$$k>uBV$K$J$j$^$9$N$G!"E,Ev$KJT=8$7$?8e\e(B @kbd{@key{RET}} \e$B$r2!$7$^$9!#\e(B
 
 \e$B$3$l$G!"F~NO$7$?J8;zNs$HF1$8\e(B @samp{Subject:} \e$B$r;}$D%a%C%;!<%8$KBP$7$F%9%3%"\e(B 
 @minus{}1000 \e$B$,$D$1$i$l$k$h$&$K$J$j$^$9!#\e(B
@@ -5317,19 +5468,19 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 \e$B:FEY\e(B @kbd{C-u 200 L a} \e$B$G%9%3%"$,\e(B @minus{}200 \e$B$N\e(B @samp{from} \e$B%(%s%H%j$r:n@.$9$k$H!"\e(B
 \e$B%9%3%"$,\e(B @minus{}1200 \e$B$N%(%s%H%j$,\e(B1\e$B$D:n@.$5$l$k$3$H$K$J$j$^$9!#\e(B
 
-@subsubsection Thread\e$B%-!<$N:n@.\e(B
+@subsubsection Thread \e$B%-!<$N:n@.\e(B
 
 @code{wl-summary-increase-score} \e$B$+\e(B @code{wl-summary-lower-score} \e$B$G\e(B
 @samp{Thread}\e$B%-!<$r:n@.$9$k$H!";R%9%l%C%I$N\e(B @samp{Message-ID} \e$B$bA4$F\e(B
 \e$BDI2C$5$l$^$9!#\e(B
 
-@subsubsection Followup\e$B%-!<$N:n@.\e(B
+@subsubsection Followup \e$B%-!<$N:n@.\e(B
 
 @code{wl-summary-increase-score} \e$B$+\e(B @code{wl-summary-lower-score} \e$B$G\e(B
 @samp{Followup}\e$B%-!<$r:n@.$9$k$H!"%+!<%=%k>e$N%a%C%;!<%8$N\e(B
 @samp{Message-ID} \e$B$b\e(B @samp{References} \e$B%-!<$KDI2C$5$l$^$9!#\e(B
 \e$B$b$7!"\e(B@code{wl-score-auto-make-followup-entry} \e$B$,\e(B non-nil \e$B$G$"$l$P\e(B
-@code{wl-score-expiry-days} \e$B$G;XDj$7$?F|$K$A0JFb$NA4\e(Bfollowup\e$BBP>]$N%a%C%;!<\e(B
+@code{wl-score-expiry-days} \e$B$G;XDj$7$?F|$K$A0JFb$NA4\e(B followup \e$BBP>]$N%a%C%;!<\e(B
 \e$B%8$N\e(B @samp{Message-ID} \e$B$,DI2C$5$l$^$9!#\e(B
 
 @subsection \e$B%-!<%P%$%s%I\e(B
@@ -5691,14 +5842,136 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @end example
 
 
-@node Customization, Mailing List, Scoring, Top
+@node Address Book, Customization, Scoring, Top
+@chapter \e$B%"%I%l%9D"\e(B
+@cindex Address Book
+
+\e$B%"%I%l%9D"$rMxMQ$9$k$3$H$G!"%a!<%k%"%I%l%9$r4JC1$KF~NO$7$?$j!$\e(B
+\e$B%5%^%j$NI=<($K%Z%C%H%M!<%`$rMQ$$$k$3$H$,=PMh$^$9!#\e(B
+
+@menu
+* Mail Addresses::   \e$B%"%I%l%9D"$NDj5A\e(B
+* Address Manager::  \e$B%"%I%l%9%^%M!<%8%c\e(B
+@end menu
+
+@node Mail Addresses, Address Manager, Address Book, Address Book
+@section \e$B%"%I%l%9D"$NDj5A\e(B
+@cindex Address book Definition
+@cindex .addresses
+@cindex Alias, Address
+
+\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
+@file{~/.addresses} \e$B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<\e(B
+\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$J$*!"\e(B
+\e$B5/F0$7$?>uBV$G%5%^%j%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9$rDI2C\e(B/
+\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
+
+\e$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#\e(B
+
+@example
+@group
+#
+# @r{@samp{#} \e$B$G;O$^$k9T$O%3%a%s%H!#\e(B}
+# @r{\e$B6u9T$OL5;k!#\e(B}
+#
+# @var{\e$B%a!<%k%"%I%l%9\e(B}  "@var{\e$B$"$@L>\e(B}"  "@var{\e$BK\L>\e(B}"
+#
+teranisi@@gohome.org            "\e$B$F$i$K$7\e(B"      "\e$B;{@>M50l\e(B"
+foo@@bar.gohome.org             "Foo \e$B$5$s\e(B"      "John Foo"
+bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
+@end group
+@end example
+
+@noindent
+\e$B0l9T$,0l?MJ,$NDj5A$G$9!#\e(B
+
+\e$B<B:]$K$O\e(B(\e$B%G%U%)%k%H@_Dj$G$O\e(B)\e$B%5%^%jI=<($G\e(B@var{\e$B$"$@L>\e(B}\e$B!"%I%i%U%H:n@.;~$N%"\e(B
+\e$B%I%l%9>pJs$H$7$F\e(B@var{\e$BK\L>\e(B}\e$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,\e(B
+\e$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\e(B
+\e$BDj5A$r$d$jD>$9$N$,NI$$$G$7$g$&!#\e(B
+
+\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F$$$l$P!"\e(B
+\e$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
+
+\e$B$5$i$K!"JQ?t\e(B @code{wl-use-ldap} (\e$B=i4|@_Dj$O\e(B @code{nil}) \e$B$r\e(B non-nil \e$B$K@_\e(B
+\e$BDj$9$k$H!"\e(BLDAP \e$B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^\e(B
+\e$B$9!#\e(B
+
+LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
+@code{wl-ldap-base} \e$B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"\e(BLDAP \e$BBP1~$N\e(B XEmacs \e$B0J\e(B
+\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B @command{ldapsearch} \e$B$rMxMQ$7$^$9$N$G!"\e(B
+@command{ldapsearch} \e$B$X$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"\e(B
+\e$B$j$^$9!#\e(B
+
+@node Address Manager,  , Mail Addresses, Address Book
+@section \e$B%"%I%l%9%^%M!<%8%c\e(B
+@cindex Address Manager
+
+@kbd{C-c C-a} \e$B$H$9$k$H%"%I%l%9%^%M!<%8%c$r5/F0$5$l$^$9!#%"%I%l%9%^%M!<%8%c\e(B
+\e$B$G$O%"%I%l%9D"$NJT=8$r9T$&$3$H$,=PMh$k$N$K2C$($F!"%"%I%l%9%^%M!<%8%c$G;X\e(B
+\e$BDj$7$?%"%I%l%9$r%I%i%U%H%P%C%U%!$XA^F~$9$k$3$H$,$G$-$^$9!#\e(B
+
+@subsection \e$B%-!<%P%$%s%I\e(B
+
+@table @kbd
+@item t
+@kindex t (Address Manager)
+@findex wl-addrmgr-set-to
+@samp{To:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item c
+@kindex c (Address Manager)
+@findex wl-addrmgr-set-cc
+@samp{Cc:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item b
+@kindex b (Address Manager)
+@findex wl-addrmgr-set-bcc
+@samp{Bcc:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item u
+@kindex u (Address Manager)
+@findex wl-addrmgr-unmark
+\e$B%^!<%/$r<h$j>C$7$^$9!#\e(B
+
+@item x
+@kindex x (Address Manager)
+@findex wl-addrmgr-apply
+\e$B08@h%^!<%/$,$D$$$F$$$k>l9g!"$=$l$i$N%"%I%l%9$r%I%i%U%H%P%C%U%!$K\e(B
+\e$BH?1G$7$F%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#%I%i%U%H%P%C%U%!$,L5$$>l9g!"\e(B
+\e$B$=$l$i$rH?1G$7$F?75,$K%I%i%U%H%P%C%U%!$r3+$-$^$9!#\e(B
+\e$B08@h%^!<%/$,$D$$$F$$$J$$>l9g$OC1$K%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#\e(B
+
+@item q
+@kindex q (Address Manager)
+@findex wl-addrmgr-quit
+\e$B%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#\e(B
+
+@item a
+@kindex a (Address Manager)
+@findex wl-addrmgr-add
+\e$B%"%I%l%9D"$K?7$7$$9`L\$rDI2C$7$^$9!#\e(B
+
+@item d
+@kindex d (Address Manager)
+@findex wl-addrmgr-delete
+\e$B%"%I%l%9D"$N9`L\$r:o=|$7$^$9!#\e(B
+
+@item e
+@kindex e (Address Manager)
+@findex wl-addrmgr-edit
+\e$B%"%I%l%9D"$N9`L\$rJT=8$7$^$9!#\e(B
+@end table
+
+
+@node Customization, Mailing List, Address Book, Top
 @chapter Wanderlust \e$B$N%+%9%?%^%$%:\e(B
 @cindex Customization
 
 @menu
 * Living with other packages::  \e$B%Q%C%1!<%8$N$"$k@83h\e(B
 * Highlights::                  \e$B%O%$%i%$%H$N@_Dj\e(B
-* Biff::                        \e$B%a!<%k$NCe?.$r$7$i$;$k\e(B
+* Biff::                        \e$B%a!<%k$NCe?.$rCN$i$;$k\e(B
 * Advanced Settings::           \e$B%+%9%?%^%$%:!A1~MQJT!A\e(B
 * Customizable Valiables::      \e$B$=$NB>$N%+%9%?%^%$%:JQ?t0lMw\e(B
 * Hooks::                       \e$B%U%C%/\e(B
@@ -5715,8 +5988,11 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 * BBDB::                        BBDB
 * supercite::                   supercite.el
 * mu-cite::                     mu-cite.el
-* x-face-mule::                 x-face-mule.el
+* X-Face::                      x-face,bitmap-mule
 * dired-dd::                    dired-dd.el
+* MHC::                         MHC
+* Addrbook::                    Addrbook
+* mime-w3m::                    mime-w3m.el
 @end menu
 
 
@@ -5734,7 +6010,7 @@ OK \e$B$G$9!#\e(B
 @lisp
 @group
 (autoload 'wl-draft-send-with-imput-async "im-wl")
-(setq wl-draft-send-func 'wl-draft-send-with-imput-async)
+(setq wl-draft-send-function 'wl-draft-send-with-imput-async)
 @end group
 @end lisp
 
@@ -5762,20 +6038,23 @@ OK \e$B$G$9!#\e(B
 (setq signature-use-bbdb t)
 (setq bbdb-north-american-phone-numbers-p nil)
 ;; @r{\e$B%5%^%j$K\e(B bbdb \e$B$NL>A0$rI=<(\e(B} :-)\e$B!#\e(B
-(setq wl-summary-from-func 'bbdb-wl-from-func)
+(setq wl-summary-from-function 'bbdb-wl-from-func)
 ;; @r{\e$B<+F0E*$K\e(B ML \e$B%U%#!<%k%I$r2C$($k\e(B}
 (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook)
 (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0))))
 @end group
 @end lisp
 
+\e$B%I%i%U%H%P%C%U%!$G\e(B @kbd{M-@key{TAB}} \e$B$K$h$j\e(B BBDB \e$B$rMQ$$$?\e(B
+\e$B%"%I%l%9$NJd40$,$G$-$^$9!#\e(B
+
 
 @node supercite, mu-cite, BBDB, Living with other packages
 @subsection sc.el(supercite), sc-register.el
 @pindex sc
 @pindex supercite
 
-\e$B$U$D$&$N%a!<%i$HF1$8@_Dj$G\e(B OK \e$B$G$9!#0J2<$O!"@_Dj$N0lNc$G$9!#\e(B
+\e$BIaDL$N%a!<%i$HF1$8@_Dj$G\e(B OK \e$B$G$9!#0J2<$O!"@_Dj$N0lNc$G$9!#\e(B
 
 @lisp
 @group
@@ -5790,11 +6069,11 @@ OK \e$B$G$9!#\e(B
 @end lisp
 
 
-@node mu-cite, x-face-mule, supercite, Living with other packages
+@node mu-cite, X-Face, supercite, Living with other packages
 @subsection mu-cite.el
 @pindex mu-cite
 
-\e$B$U$D$&$N%a!<%i$HF1$8@_Dj$G\e(B OK \e$B$G$9!#0J2<$O@_Dj$N0lNc$G$9!#\e(B
+\e$BIaDL$N%a!<%i$HF1$8@_Dj$G\e(B OK \e$B$G$9!#0J2<$O@_Dj$N0lNc$G$9!#\e(B
 
 mu-cite 8.0\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 \e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
@@ -5816,56 +6095,72 @@ mu-cite 8.1\e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 @end group
 @end lisp
 
-@node x-face-mule, dired-dd, mu-cite, Living with other packages
-@subsection x-face-mule.el
-@pindex x-face-mule
-@pindex bitmap-mule
+@node X-Face, dired-dd, mu-cite, Living with other packages
+@subsection x-face
+@pindex x-face
 
-x-face-mule \e$B$N%P!<%8%g%s$K$h$C$F@_Dj$,0[$J$j$^$9!#\e(B
+\e$B0J2<$N$$$:$l$+$r%$%s%9%H!<%k$9$k$3$H$G!"\e(B \e$B%a%C%;!<%8%P%C%U%!$N\e(B
+@samp{X-Face:} \e$B%U%#!<%k%I$r%G%3!<%I$7$F!"2hA|$rI=<($9$k$3$H$,$G$-$^$9!#\e(B
 
-x-face-mule 0.19\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@menu
+* x-face-xmas::                       XEmacs \e$B$N>l9g\e(B
+* x-face-mule::                       Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B
+* x-face-e21::                        Emacs 21.x \e$B$N>l9g\e(B
+@end menu
+
+\e$B$^$?!"%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
+(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
+\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
+(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
+
+
+@node x-face-xmas, x-face-mule, X-Face, X-Face
+@subsubsection x-face-xmas (XEmacs \e$B$N>l9g\e(B)
+@pindex x-face-xmas
+
+x-face (@uref{ftp://jpl.org/pub/elisp/}) 1.3.6.13 \e$B0J9_$KIUB0$N\e(B
+@file{x-face-xmas.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
-      (function
-       (lambda (beg end)
-        (x-face-mule:x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-xmas-wl-display-x-face "x-face")
+(setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face)
 @end group
 @end lisp
 
-x-face-mule 0.20 \e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-mule, x-face-e21, x-face-xmas, X-Face
+@subsubsection x-face-mule (Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B)
+@pindex x-face-mule
+@pindex bitmap-mule
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0\e$B0J9_$K\e(B
+\e$BIUB0$N\e(B @file{x-face-mule.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
-      (function
-       (lambda (beg end)
-        (x-face-mule-x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-decode-message-header "x-face-mule")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
-\e$B$r$*;H$$$K$J$k>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-e21,  , x-face-mule, X-Face
+@subsubsection x-face-e21 (Emacs 21.x \e$B$N>l9g\e(B)
+@pindex x-face-e21
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) \e$B$H\e(B
+@file{x-face-e21.el} (@uref{ftp://jpl.org/pub/elisp/}) \e$B$r;H$&>l9g$O0J2<$N\e(B
+\e$B$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(autoload 'x-face-decode-message-header "x-face-mule")
-(setq wl-highlight-x-face-func 'x-face-decode-message-header)
+(require 'bitmap)
+(autoload 'x-face-decode-message-header "x-face-e21")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-\e$B%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
-(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
-\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
-(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
-
 
-@node dired-dd,  , x-face-mule, Living with other packages
+@node dired-dd, MHC, X-Face, Living with other packages
 @subsection dired-dd(Dired-DragDrop)
 @pindex Dired-DragDrop
 @pindex Dired-DD
@@ -5873,8 +6168,8 @@ bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
 
 dired-dd \e$B%Q%C%1!<%8$K4^$^$l$k\e(B @file{dired-dd-mime.el} \e$B$rAH$_9~$a$P!"\e(BGNU
 Emacs \e$B$GJT=8Cf$NAp9F%P%C%U%!$X\e(B dired \e$B$+$i%I%i%C%0\e(B&\e$B%I%m%C%W$9$k$@$1$G4JC1\e(B
-\e$B$K%^%k%A%Q!<%H$r:n@.$G$-$^$9\e(B(\e$B$b$C$H$b!"\e(BWanderlust \e$B@lMQ$G$O$J$/\e(B tm/SEMI 
-\e$BHFMQ$G$9$,\e(B)\e$B!#\e(B
+\e$B$K%^%k%A%Q!<%H$r:n@.$G$-$^$9\e(B(\e$B$b$C$H$b!"\e(BWanderlust \e$B@lMQ$G$O$J$/\e(B SEMI \e$BHFMQ\e(B
+\e$B$G$9$,\e(B)\e$B!#\e(B
 
 @lisp
 @group
@@ -5891,6 +6186,62 @@ Emacs \e$B$GJT=8Cf$NAp9F%P%C%U%!$X\e(B dired \e$B$+$i%I%i%C%0\e(B&\e$B%I%m%C%W$9$k$@$
 @end group
 @end lisp
 
+@node MHC, Addrbook, dired-dd, Living with other packages
+@subsection mhc.el
+@pindex MHC
+
+Message Harmonized Calendaring system
+(@uref{http://www.quickhack.net/mhc/})
+
+MHC \e$B$rMQ$$$k$H!"%a%C%;!<%8$r85$KM=DjI=$r:n$l$^$9!#\e(B
+
+mhc-0.25 \e$B$N>l9g!'\e(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 \e$B$N>l9g!'\e(B
+
+@lisp
+@group
+(autoload 'mhc-wl-setup "mhc-wl")
+(add-hook 'wl-init-hook 'mhc-wl-setup)
+@end group
+@end lisp
+
+@node Addrbook, mime-w3m, MHC, Living with other packages
+@subsection wl-addrbook.el
+@pindex Addrbook
+
+Addrbook of Mew
+(@uref{http://www.mew.org/})
+
+Mew \e$B$N\e(B Addrbook \e$B$r\e(B Wanderlust \e$B$G;HMQ$G$-$k$h$&$K$9$k$K$O!"\e(B
+@file{util/wl-addrbook.el} \e$B$H\e(B @file{util/wl-complete.el} \e$B$r\e(B 
+@code{load-path} \e$B$K$*$$$F!"0J2<$N$h$&$K@_Dj$7$^$9!#\e(B
+
+@lisp
+@group
+(require 'wl-addrbook)
+(wl-addrbook-setup)
+@end group
+@end lisp
+
+@node mime-w3m,  , Addrbook, Living with other packages
+@subsection mime-w3m.el
+@pindex mime-w3m
+
+emacs-w3m (@uref{http://emacs-w3m.namazu.org/}) \e$B$KIUB0$N\e(B
+@file{mime-w3m.el} \e$B$r;H$C$F!"%a%C%;!<%8$N\e(B html \e$B%Q!<%H$r\e(B
+\e$BI=<($5$;$k$3$H$,=PMh$^$9!#@_DjK!$O\e(B @file{mime-w3m.el} \e$B$N\e(B
+\e$B@hF,$N%3%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
+
 
 @node Highlights, Biff, Living with other packages, Customization
 @section \e$B%O%$%i%$%H$N@_Dj\e(B
@@ -5936,13 +6287,13 @@ Non-nil \e$B$J$i%I%i%U%H$*$h$S%a%C%;!<%8$NK\J8$b%O%$%i%$%H$NBP>]$H$7$^$9!#\e(B
 \e$BFsHVL\$K=EMW\e(B (@code{wl-highlight-message-important-header-contents2})\e$B$J!"\e(B
 \e$B$=$7$F=EMW$G$O$J$$\e(B (@code{wl-highlight-message-unimportant-header-contents})
 \e$B$3$H$rI=$9\e(B face \e$B$r$=$l$>$l$I$N%a%C%;!<%8%X%C%@$K3d$jEv$F$k$+$r@_Dj$7$^$9!#\e(B
-\e$BF1MM$K!"G$0U$N@55,I=8=$KBP$7$FG$0U$N\e(Bface\e$B$r3d$jEv$F$k$3$H$b$G$-$^$9!#\e(B
+\e$BF1MM$K!"G$0U$N@55,I=8=$KBP$7$FG$0U$N\e(B face \e$B$r3d$jEv$F$k$3$H$b$G$-$^$9!#\e(B
 
 @item wl-highlight-citation-prefix-regexp
 @vindex  wl-highlight-citation-prefix-regexp
 \e$B%I%i%U%H$*$h$S%a%C%;!<%8$NK\J8Fb$N0zMQ9T$r<($9@55,I=8=$r;XDj$7$^$9!#\e(B
 \e$B$3$N@55,I=8=$K%^%C%A$7$?K\J8$O!"\e(B
-(@code{wl-highlight-message-cited-text-*})\e$B$G;XDj$5$l$k\e(Bface\e$B$G%O%$%i%$%H$5$l$^$9!#\e(B
+(@code{wl-highlight-message-cited-text-*})\e$B$G;XDj$5$l$k\e(B face \e$B$G%O%$%i%$%H$5$l$^$9!#\e(B
 
 @item wl-highlight-highlight-citation-too
 @vindex wl-highlight-highlight-citation-too
@@ -6086,18 +6437,18 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 \e$B%5%^%j$G%9%l%C%I%H%C%W$G$O$J$$%a%C%;!<%89T$N\e(B face \e$B$G$9!#\e(B
 
 @item wl-highlight-folder-unknown-face
-\e$B%U%)%k%@%b!<%I$G!"$$$/$DL$F14|%a%C%;!<%8$,$"$k$+$o$+$i$J$$%U%)%k%@$N\e(B
+\e$B%U%)%k%@%b!<%I$G!"$$$/$DL$F14|%a%C%;!<%8$,$"$k$+J,$i$J$$%U%)%k%@$N\e(B
  face \e$B$G$9!#\e(B
 
 @item wl-highlight-folder-zero-face
 \e$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$J$$%U%)%k%@$N\e(B face \e$B$G$9!#\e(B
 
 @item wl-highlight-folder-few-face
-\e$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$9$3$7$"$k%U%)%k%@$N\e(B face \e$B$G$9!#\e(B
+\e$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,>/$7$"$k%U%)%k%@$N\e(B face \e$B$G$9!#\e(B
 
 @item wl-highlight-folder-many-face
 \e$B%U%)%k%@%b!<%I$G!"L$F14|%a%C%;!<%8$,$?$/$5$s$"$k%U%)%k%@$N\e(B face \e$B$G$9!#\e(B
-\e$B!V$9$3$7!W$H!V$?$/$5$s!W$N@Z$lL\$O!"\e(B
+\e$B!V>/$7!W$H!V$?$/$5$s!W$N@Z$lL\$O!"\e(B
 \e$BJQ?t\e(B @code{wl-folder-many-unsync-threshold} \e$B$G@_Dj$5$l$^$9!#\e(B
 
 @item wl-highlight-folder-unread-face
@@ -6152,6 +6503,15 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @vindex wl-biff-check-interval
 \e$B=i4|@_Dj$O\e(B 40 (\e$BC10L\e(B:\e$BIC\e(B)\e$B!#\e(B
 \e$B$3$NCM$4$H$K%a!<%kCe?.$N%A%'%C%/$r9T$J$$$^$9!#\e(B
+
+@item wl-biff-notify-hook
+@vindex wl-biff-notify-hook
+\e$B?7$7$$%a!<%k$,FO$$$?:]$K<B9T$5$l$k%U%C%/!#\e(B
+\e$BCe?.;~$K%S!<%W2;$rLD$i$9!J=i4|@_Dj!K$J$i0J2<$N$h$&$K@_Dj$7$^$9!#\e(B
+@lisp
+(setq wl-biff-notify-hook '(ding))
+@end lisp
+\e$B2;$rLD$i$7$?$j$7$J$$>l9g$O\e(B @code{nil} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 @end table
 
 
@@ -6167,10 +6527,14 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @node Draft for Reply, Thread Format, Advanced Settings, Advanced Settings
 @subsection \e$BJV;vMQ%I%i%U%H\e(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
 
 \e$B%a!<%j%s%0%j%9%H$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7\e(B
 \e$B$?$@$1$G855-;v$N\e(B @samp{Reply-To:} \e$B$K$"$k%"%I%l%9$r\e(B @samp{To:} \e$B$KMQ0U$7$F\e(B
-\e$B$[$7$$!"$H$$$&>l9g$O0J2<$N$h$&$K$7$?$i$h$$$G$7$g$&!#\e(B
+\e$BM_$7$$!"$H$$$&>l9g$O0J2<$N$h$&$K$7$?$iNI$$$G$7$g$&!#\e(B
 
 @lisp
 @group
@@ -6256,14 +6620,14 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @samp{X-Mailer:} \e$B%U%#!<%k%I$d\e(B @samp{User-Agent:} \e$B%U%#!<%k%I$K6E$j$?$$$H\e(B
 \e$B$$$&JQ$o$C$??M$O!"J8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F!"JQ?t\e(B 
-@code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
+@code{wl-generate-mailer-string-function} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @samp{User-Agent:} \e$B%U%#!<%k%I$rC;$/$7$?$$$N$G$"$l$P!"0J2<$N@_Dj$r$7$F$/\e(B
 \e$B$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (concat "User-Agent: "
@@ -6276,7 +6640,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @lisp
 @group
 (setq mime-edit-insert-user-agent-field nil)
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (format "X-Mailer: %s" (product-string-1 'wl-version)))))
@@ -6312,8 +6676,8 @@ Non-nil \e$B$J$i$P!"\e(BWanderlust \e$B=*N;;~$K3NG'$r9T$$$^$9!#\e(B
 
 @item wl-interactive-send
 @vindex wl-interactive-send
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$F$h$$$+$r3NG'$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
+Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$FNI$$$+$r3NG'$7$^$9!#\e(B
 
 @item wl-folder-sync-range-alist
 @vindex wl-folder-sync-range-alist
@@ -6359,7 +6723,7 @@ XEmacs \e$B$^$?$O\e(B Emacs 21 \e$B$GM-8z$G$9!#=i4|@_Dj$O$=$N\e(B Emacs \e$B$K0MB8$7$
 \e$B%A%'%C%/$7$?>l9g!"DL>o$O4J0WE*$JJ}K!$G%A%'%C%/$7$F$$$^$9\e(B(\e$B=hM}$OB.$$$,!"@53N$G$O$J$$\e(B)\e$B!#\e(B
 \e$B$3$NJQ?t$K%^%C%A$9$k%U%)%k%@$O87L)$K%A%'%C%/$7$^$9!#\e(B
 IMAP4 \e$B%U%)%k%@$KBP$9$k>r7o%U%#%k%?%U%)%k%@$N$h$&$J>l9g$K$O!"\e(B
-\e$B$3$NJQ?t$K%^%C%A$9$k$h$&@_Dj$9$k$H$h$$$G$7$g$&!#\e(B
+\e$B$3$NJQ?t$K%^%C%A$9$k$h$&@_Dj$9$k$HNI$$$G$7$g$&!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 
 @item wl-folder-use-server-diff
@@ -6546,7 +6910,7 @@ Non-nil \e$B$J$i!"\e(BNNTP \e$B$K$*$$$F\e(B \e$BAm5-;v?t$rD4$Y$k$?$a$K\e(B @samp{listg
 @vindex elmo-pop3-send-command-synchronously
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 Non-nil \e$B$J$i\e(B POP3 \e$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!#\e(B
-POP3 \e$B;2>H;~$K=hM}$,%O%s%0$9$k$h$&$J>l9g$O!"\e(B@code{t} \e$B$K$9$k$H$$$$$+$b$7$l$^$;$s!#\e(B
+POP3 \e$B;2>H;~$K=hM}$,%O%s%0$9$k$h$&$J>l9g$O!"\e(B@code{t} \e$B$K$9$k$HNI$$$+$b$7$l$^$;$s!#\e(B
 
 @item elmo-dop-flush-confirm
 @vindex elmo-dop-flush-confirm
@@ -6638,9 +7002,13 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
       7/11    killed message \e$B5!G=DI2C!#\e(B
       7/18    POP3 \e$B$r\e(B UIDL \e$BBP1~!#\e(B
       9/12    biff \e$B5!G=\e(B with \e$B:72eED$5$s!u;32,$5$s!#\e(B
+     10/17    expire-hide by \e$B2,ED$5$s!#\e(B
+     11/08    2.4.0 stable \e$B%j%j!<%9!#\e(B
+2001  7/04    2.6.0 stable \e$B%j%j!<%9!#\e(B
+      8/21    wl-addrmgr by \e$BKLK\$5$s!#\e(B
 @end example
 
-\e$B$/$o$7$$JQA+$O\e(B @file{ChangeLog} \e$B$r8fMw$/$@$5$$!#\e(B
+\e$B>\$7$$JQA+$O\e(B @file{ChangeLog} \e$B$r8fMw$/$@$5$$!#\e(B
 
 @section \e$BL>A0\e(B