Update Folders chapter. Added Shimbun and Namazu section (empty).
authorkaoru <kaoru>
Wed, 12 Sep 2001 15:32:15 +0000 (15:32 +0000)
committerkaoru <kaoru>
Wed, 12 Sep 2001 15:32:15 +0000 (15:32 +0000)
Fixed elmo-default-* -> elmo-*-default.

doc/wl-ja.texi
doc/wl.texi

index 81773b4..bb22a28 100644 (file)
@@ -684,6 +684,8 @@ Internal \e$B$N\e(B 11 \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
@@ -693,8 +695,9 @@ Internal \e$B$N\e(B 11 \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
 
@@ -715,47 +718,48 @@ RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$
            @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
 
-(1.14.0 \e$B$h$j0JA0$N%P!<%8%g%s$N\e(B FLIM \e$B$G\e(B 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(B1.14.0 \e$B0J9_$N%P!<%8%g%s$N\e(B FLIM \e$B$G$"$l$P!"K\%Q%C%1!<%8$N\e(B @file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$O$"$j$^$;$s!#\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$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-default-imap4-server} \e$B$NCM!#\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-default-imap4-port} \e$B$NCM!#\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%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
-;; \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-default-imap4-server "imap4.example.org")
+@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 
+\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
-;; \e$BNc\e(B: SSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k\e(B
-(setq elmo-default-imap4-stream-type 'ssl) 
+@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
@@ -765,8 +769,8 @@ default \e$BCM\e(B:
 \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B @code{nil})\e$B!#\e(B
 
 @lisp
-;; \e$BNc\e(B: \e$B@8%Q%9%o!<%I$GG'>Z\e(B
-(setq elmo-default-imap4-authenticate-type 'clear) 
+;; @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:
@@ -831,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
@@ -849,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(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
@@ -878,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
 
@@ -911,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
 
@@ -951,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
@@ -1211,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
@@ -1235,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
 
@@ -1262,7 +1269,7 @@ 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$"
 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
@@ -1270,10 +1277,31 @@ archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\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
+
+
+@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
+
+
+@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
 
@@ -1307,10 +1335,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
 
@@ -1449,8 +1478,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
@@ -1493,10 +1522,11 @@ lastyear  ->  \e$B5nG/$N:#F|\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
 
@@ -3478,11 +3508,11 @@ 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;XDj$,2DG=$G$9!#\e(B
@@ -3909,29 +3939,29 @@ 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(B POP \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
+\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(B POP \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
+\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(B POP \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}
+\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(B POP \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
+\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(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-default-pop3-stream-type} \e$B$,;H$o$l$^$9!#\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>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
 
@@ -4264,25 +4294,25 @@ SMTP \e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
 @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(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
@@ -4290,31 +4320,31 @@ Non-nil \e$B$J$i%K%e!<%9Ej9F;~$K\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
 @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(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-default-pop3-user}\e$B$rMxMQ$7$^$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(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-default-pop3-server}\e$B$rMxMQ$7$^$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(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-default-pop3-authenticate}\e$B$rMxMQ$7$^$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(B POP \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
+@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
+\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
index e8eec63..098f5bc 100644 (file)
@@ -312,10 +312,8 @@ There are two ways to use SSL. One is to start SSL negotiation just
 after the connection establishment (generic way). The other one is to
 start SSL negotiation by invoking STARTTLS command in the each session.
 
-To use the formal SSL (generic SSL), you must install @file{ssl.el} in
-the @file{utils} directory. OpenSSL command @command{openssl} is also
-required to use @file{ssl.el}. You must set @env{PATH} to the directory
-that OpenSSL commands are installed.
+To use the formal SSL (generic SSL), you must set @env{PATH} to the
+directory that OpenSSL commands are installed.
 
 To use the latter SSL(STARTTLS), you must install starttls package in
 addition to above. 
@@ -652,24 +650,27 @@ IMAP, NNTP, LocalDir(MH), Maildir, News Spool, Archive, POP, Multi, Filter,
 Pipe and Internal folder types.
 
 @menu
-* IMAP Folder::              @samp{%} -- IMAP folder
-* NNTP Folder::              @samp{-} -- NNTP folder
-* MH Folder::                @samp{+} -- MH folder
-* Maildir Folder::           @samp{.} -- Maildir folder
-* News Spool Folder::        @samp{=} -- News spool folder
-* Archive Folder::           @samp{$} -- Archive folder
-* POP Folder::               @samp{&} -- POP folder
-* Multi Folder::             @samp{*} -- Multi folder
-* Filter Folder::            @samp{/} -- Filter folder
-* Pipe Folder::              @samp{|} -- Pipe folder
-* Internal Folder::          @samp{'} -- Internal folder
+* IMAP Folder::                 @samp{%} -- IMAP folder
+* NNTP Folder::                 @samp{-} -- NNTP folder
+* MH Folder::                   @samp{+} -- MH folder
+* Maildir Folder::              @samp{.} -- Maildir folder
+* News Spool Folder::           @samp{=} -- News spool folder
+* Archive Folder::              @samp{$} -- Archive folder
+* POP Folder::                  @samp{&} -- POP folder
+* Shimbun Folder::              @samp{@@} -- Shimbun Folder
+* Namazu Folder::               @samp{[} -- Namazu Folder
+* Multi Folder::                @samp{*} -- Multi folder
+* Filter Folder::               @samp{/} -- Filter folder
+* Pipe Folder::                 @samp{|} -- Pipe folder
+* Internal Folder::             @samp{'} -- Internal folder
 @end menu
 
 
 @node IMAP Folder, NNTP Folder, Folders, Folders
 @section IMAP Folder
-@cindex IMAP Folder
 @cindex @samp{%}
+@cindex IMAP Folder
+@cindex Folder, IMAP
 @cindex RFC 2060
 @cindex IMAP4rev1
 
@@ -686,44 +687,47 @@ Format:
 You can specify @code{login} (encoded password transmission),
 @code{cram-md5} (CRAM-MD5 authentication), @code{digest-md5} (DIGEST-MD5
 authentication) or @code{clear} (or @code{nil}, plain password
-transmission) as @var{authenticate-type}.  (To use CRAM-MD5 or
-DIGEST-MD5 authentication, you must install @file{utils/sasl} package if FLIM version is earlier than 1.14.0. If FLIM version is 1.14.0 or later, you need not install @file{utils/sasl})
+transmission) as @var{authenticate-type}.
 
 default:
 
 @example
-@var{username}  -> The value of @code{elmo-default-imap4-user}.
+@var{username}  -> The value of @code{elmo-imap4-default-user}.
              Initial setting is @env{USER} environment variable or
              @env{LOGNAME} environment variable or return value of
              @code{(user-login-name)}.
-@var{authenticate-type} -> The value of @code{elmo-default-imap4-authenticate-type}.
+@var{authenticate-type} -> The value of @code{elmo-imap4-default-authenticate-type}.
              Initial setting is "auth".
-@var{hostname}  -> The value of @code{elmo-default-imap4-server}.
+@var{hostname}  -> The value of @code{elmo-imap4-default-server}.
              Initial setting is "localhost".
-@var{port} -> The value of @code{elmo-default-imap4-port}.
+@var{port} -> The value of @code{elmo-imap4-default-port}.
              Initial setting is 143.
 @end example
 
 You can omit the @var{hostname} from folder names if you set
-@code{elmo-default-imap4-server} as your main IMAP server.
+@code{elmo-imap4-default-server} as your main IMAP server.
 For example, you can specify a folder as @samp{foo%imap@@gateway} even
 if you have to go through a firewall.
 
 @lisp
-;; Example: imap4.exaple.org as main IMAP server
-(setq elmo-default-imap4-server "imap4.example.org")
+@group
+;; @r{Example: imap4.exaple.org as main IMAP server}
+(setq elmo-imap4-default-server "imap4.example.org")
+@end group
 @end lisp
 
 SSL (Secure Socket Layer) connection will be used if a folder name ends
-with @samp{!}. Or, if the value of @code{elmo-default-imap4-stream-type}
+with @samp{!}. Or, if the value of @code{elmo-imap4-default-stream-type}
 is @code{ssl}, SSL will be the default connection.  If a folder name
 ends with @samp{!!}, STARTTLS connection will be established.  If the
-value of @code{elmo-default-imap4-stream-type} is @code{starttls},
+value of @code{elmo-imap4-default-stream-type} is @code{starttls},
 STARTTLS will be the default connection.
 
 @lisp
-;; Example: Use SSL connection
-(setq elmo-default-imap4-stream-type 'ssl)
+@group
+;; @r{Example: Use SSL connection}
+(setq elmo-imap4-default-stream-type 'ssl)
+@end group
 @end lisp
 
 If you specify @code{login}, @code{cram-md5} or @code{digest-md5} as
@@ -735,8 +739,10 @@ authentication will fall back to @code{clear} without confirmation
 (default value is @code{nil}).
 
 @lisp
-;; Example: password in raw format
-(setq elmo-default-imap4-authenticate-type 'clear)
+@group
+;; @r{Example: password in raw format}
+(setq elmo-imap4-default-authenticate-type 'clear)
+@end group
 @end lisp
 
 Example:
@@ -803,10 +809,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 Folder
-@cindex NNTP Folder
 @cindex @samp{-}
+@cindex NNTP Folder
+@cindex Folder, NNTP
+@cindex Folder, News
+@cindex NetNews
+@cindex News
+@cindex Newsgroup
+@cindex RFC 977
 
 A folder to access USENET news via NNTP protocol (RFC 977).
 One newsgroup is treated as a folder.
@@ -821,20 +834,21 @@ Format:
 
 default:
 @example
-@var{hostname}  -> The value of @code{elmo-default-nntp-server}.
+@var{hostname}  -> The value of @code{elmo-nntp-default-server}.
              Initial setting is @samp{localhost}.
-@var{username}  -> The value of @code{elmo-default-nntp-user}. 
+@var{username}  -> The value of @code{elmo-nntp-default-user}. 
              Initial setting is @code{nil}.
-@var{port}      -> The value of @code{elmo-default-nntp-port}.
+@var{port}      -> The value of @code{elmo-nntp-default-port}.
              Initial setting is 119.
 @end example
 
-AUTHINFO is used as authentication method if the @var{username} is non-nil.
-SSL will be default method if @code{elmo-default-nntp-stream-type} is non-nil even
-if the folder name doesn't end with @samp{!}.
-If a folder name ends with @samp{!!}, STARTTLS connection will be established.
-if the value of @code{elmo-default-nntp-stream-type} is @code{starttls},
-STARTTLS will be the default connection.
+AUTHINFO is used as authentication method if the @var{username} is
+non-nil.  SSL will be default method if
+@code{elmo-nntp-default-stream-type} is non-nil even if the folder name
+doesn't end with @samp{!}.  If a folder name ends with @samp{!!},
+STARTTLS connection will be established.  if the value of
+@code{elmo-nntp-default-stream-type} is @code{starttls}, STARTTLS will
+be the default connection.
 
 Example:
 
@@ -845,10 +859,12 @@ Example:
 @end group
 @end example
 
+
 @node MH Folder, Maildir Folder, NNTP Folder, Folders
 @section MH Folder
-@cindex MH Folder
 @cindex @samp{+}
+@cindex MH Folder
+@cindex Folder, MH
 @pindex MH
 
 A folder to access MH format mail (1 file is 1 mail).
@@ -876,11 +892,13 @@ Example:
 @end group
 @end example
 
+
 @node Maildir Folder, News Spool Folder, MH Folder, Folders
 @section Maildir Folder
-@cindex Maildir Folder
 @cindex @samp{.}
+@cindex Maildir Folder
 @pindex Maildir
+@pindex qmail
 
 A folder to access to Maildir format (1 file is 1 mail).
 
@@ -917,8 +935,8 @@ Example:
 
 @node News Spool Folder, Archive Folder, Maildir Folder, Folders
 @section News Spool Folder
-@cindex News spool Folder
 @cindex @samp{=}
+@cindex News spool Folder
 @pindex gnspool
 
 This folder handles locally saved news articles which are proposed by
@@ -947,8 +965,8 @@ Example:
 
 @node Archive Folder, POP Folder, News Spool Folder, Folders
 @section Archive Folder
-@cindex Archive Folder
 @cindex @samp{$}
+@cindex Archive Folder
 @c @pindex ange-ftp
 
 This method can handle archive files, which are compressed by utilities
@@ -1179,10 +1197,11 @@ if the archiver has `actions' to receive target file information from
 standard input (@code{rm-pipe}, @code{mv-pipe}, @code{cat-headers} action).
 @end table
 
-@node POP Folder, Multi Folder, Archive Folder, Folders
+
+@node POP Folder, Shimbun Folder, Archive Folder, Folders
 @section POP Folder
-@cindex POP Folder
 @cindex @samp{&}
+@cindex POP Folder
 @cindex RFC 1939
 @cindex POP3
 @cindex APOP
@@ -1203,15 +1222,15 @@ as @var{authenticate-type}.
 
 default:
 @example
-@var{username}   -> The value of @code{elmo-default-pop3-user}.
+@var{username}   -> The value of @code{elmo-pop3-default-user}.
               Initial setting is @env{USER} environment variable or
              @env{LOGNAME} environment variable or return value of
              @code{(user-login-name)}.
-@var{authenticate-type} -> The value of @code{elmo-default-pop3-authenticate-type}.
+@var{authenticate-type} -> The value of @code{elmo-pop3-default-authenticate-type}.
               Initial setting is @samp{user}.
-@var{hostname}   -> The value of @code{elmo-default-pop3-server}.
+@var{hostname}   -> The value of @code{elmo-pop3-default-server}.
               Initial setting is @samp{localhost}.
-@var{port}       -> The value of @code{elmo-default-pop3-port}.
+@var{port}       -> The value of @code{elmo-pop3-default-port}.
               Initial setting is 110.
 @end example
 
@@ -1233,16 +1252,37 @@ To use apop as an @var{authenticate-type}, @file{md5.el} is needed
 
 If the last character of the folder name is @samp{!}, Wanderlust
 connects to the POP server via SSL (Secure Socket Layer).  If you set
-non-nil value to @code{elmo-default-pop3-stream-type}, you don't have to put
+non-nil value to @code{elmo-pop3-default-stream-type}, you don't have to put
 @samp{!} in the end of the folder name to use SSL. If a folder name ends
 with @samp{!!}, STARTTLS connection will be established.  if the value
-of @code{elmo-default-pop3-stream-type} is @code{starttls}, STARTTLS will be the
+of @code{elmo-pop3-default-stream-type} is @code{starttls}, STARTTLS will be the
 default connection.
 
-@node Multi Folder, Filter Folder, POP Folder, Folders
+
+@node Shimbun Folder, Namazu Folder, POP Folder, Folders
+@section Shimbun Folder
+@cindex @samp{@@}
+@cindex Shimbun Folder
+@cindex Folder, Shimbun
+@cindex Folder, Web
+@pindex w3m
+@pindex emacs-w3m
+
+
+@node Namazu Folder, Multi Folder, Shimbun Folder, Folders
+@section Namazu Folder
+@cindex @samp{[}
+@cindex Namazu Folder
+@cindex Folder, Namazu
+@cindex Folder, Text Search
+@pindex Namazu
+@pindex nmz
+
+
+@node Multi Folder, Filter Folder, Namazu Folder, Folders
 @section Multi Folder
-@cindex Multi Folder
 @cindex @samp{*}
+@cindex Multi Folder
 @cindex Folder, Multiple
 @cindex Folder, Marge
 
@@ -1277,10 +1317,11 @@ Example:
 
 @node Filter Folder, Pipe Folder, Multi Folder, Folders
 @section Filter Folder
-@cindex Filter Folder
 @cindex @samp{/}
+@cindex Filter Folder
 @cindex Folder, Filtering
 @cindex Folder, Virtual
+@cindex Folder, Conditional
 
 A folder to access to a folder which collects all messages that 
 satisfy a condition virtually.
@@ -1416,8 +1457,8 @@ Advanced example:
 
 @node Pipe Folder, Internal Folder, Filter Folder, Folders
 @section Pipe Folder
-@cindex Pipe Folder
 @cindex @samp{|}
+@cindex Pipe Folder
 @cindex Get Message
 @cindex Download Message
 @cindex Incorporate Message
@@ -1458,9 +1499,11 @@ After messages are moved, a hook @code{elmo-pipe-drained-hook} is called.
 
 @node Internal Folder,  , Pipe Folder, Folders
 @section Internal folder
-@cindex Internal Folder
 @cindex @samp{'}
+@cindex Internal Folder
 @cindex Folder, @samp{$} mark
+@cindex Cache
+@c @cindex Folder, Null
 
 A folder to access to internal messages of Wanderlust.
 
@@ -3479,9 +3522,9 @@ The initial setting is @code{confirm}.
 
 If non-nil and @code{wl-summary-jump-to-msg-by-message-id} failed, call
 @code{wl-summary-jump-to-msg-by-message-id-via-nntp} and search message
-from the NNTP server @code{elmo-default-nntp-server}.  The value of
-@code{elmo-default-nntp-user}, @code{elmo-default-nntp-port},
-@code{elmo-default-nntp-stream-type} are used.
+from the NNTP server @code{elmo-nntp-default-server}.  The value of
+@code{elmo-nntp-default-user}, @code{elmo-nntp-default-port},
+@code{elmo-nntp-default-stream-type} are used.
 
 If @code{confirm}, server name can be specified. You can specify NNTP
 folder format like @samp{-:username@@servername:119!}.
@@ -3923,28 +3966,28 @@ Configure the following variables if you need.
 @table @code
 @item wl-pop-before-smtp-user
 The POP user name for POP-before-SMTP authentication.
-If unset, @code{elmo-default-pop3-user} is used.
+If unset, @code{elmo-pop3-default-user} is used.
 
 @item wl-pop-before-smtp-server
 The POP server name for POP-before-SMTP authentication.
-If unset, @code{elmo-default-pop3-server} is used.
+If unset, @code{elmo-pop3-default-server} is used.
 
 @item wl-pop-before-smtp-authenticate-type
 The POP authentication method for POP-before-SMTP authentication.
-If unset, @code{elmo-default-pop3-authenticate-type} is used.
+If unset, @code{elmo-pop3-default-authenticate-type} is used.
 
 @item wl-pop-before-smtp-port
 The POP port number for POP-before-SMTP authentication.
-If unset, @code{elmo-default-pop3-port} is used.
+If unset, @code{elmo-pop3-default-port} is used.
 
 @item wl-pop-before-smtp-stream-type
 If non-nil, POP connection is established using SSL.  If
 @code{starttls}, STARTTLS (RFC2595) connection will be established.  If
-unset, @code{elmo-default-pop3-stream-type} is used.
+unset, @code{elmo-pop3-default-stream-type} is used.
 @end table
 
 If variables for POP-before-SMTP (@code{wl-pop-before-smtp-*}) are 
-unset, settings for POP folders (@code{elmo-default-pop3-*}) are
+unset, settings for POP folders (@code{elmo-pop3-default-*}) are
 used.
 Therefore, if SMTP server and POP server are actually the same, and if
 POP folder per default (such as @samp{&}) is available, no settings are
@@ -4302,25 +4345,25 @@ If it is @code{starttls}, STARTTLS (RFC2595) is used.
 @vindex wl-nntp-posting-server
 The initial setting is @code{nil}.
 This is the NNTP server name used for news submission.
-If @code{nil}, @code{elmo-default-nntp-server} is used.
+If @code{nil}, @code{elmo-nntp-default-server} is used.
 
 @item wl-nntp-posting-user
 @vindex wl-nntp-posting-user
 The initial setting is @code{nil}.
 This is the user name for AUTHINFO authentication on news submission.
-If @code{nil}, @code{elmo-default-nntp-user} is used.
+If @code{nil}, @code{elmo-nntp-default-user} is used.
 If it is still @code{nil}, AUTHINFO authentication will not be carried out.
 
 @item wl-nntp-posting-port
 @vindex wl-nntp-posting-port
 The initial setting is @code{nil}.
 This is the port number of the NNTP server used for news submission.
-If @code{nil}, @code{elmo-default-nntp-server} is used.
+If @code{nil}, @code{elmo-nntp-default-server} is used.
 
 @item wl-nntp-posting-stream-type
 @vindex wl-nntp-posting-stream-type
 The initial setting is @code{nil}.
-If @code{nil}, @code{elmo-default-nntp-stream-type} is evaluated.  If non-nil,
+If @code{nil}, @code{elmo-nntp-default-stream-type} is evaluated.  If non-nil,
 SSL is used for news submission.  If @code{starttls}, STARTTLS (RFC2595)
 connection will be established.
 
@@ -4328,31 +4371,31 @@ connection will be established.
 @vindex wl-pop-before-smtp-user
 The initial setting is @code{nil}.
 This is the POP user name for POP-before-SMTP.
-If it is @code{nil}, @code{elmo-default-pop3-user} is used.
+If it is @code{nil}, @code{elmo-pop3-default-user} is used.
 
 @item wl-pop-before-smtp-server
 @vindex wl-pop-before-smtp-server
 The initial setting is @code{nil}.
 This is the POP server name for POP-before-SMTP.
-If it is @code{nil}, @code{elmo-default-pop3-server} is used.
+If it is @code{nil}, @code{elmo-pop3-default-server} is used.
 
 @item wl-pop-before-smtp-authenticate-type
 @vindex wl-pop-before-smtp-authenticate-type
 The initial setting is @code{nil}.
 This is the authentication method for POP-before-SMTP authentication.
-If it is @code{nil}, @code{elmo-default-pop3-authenticate} is used.
+If it is @code{nil}, @code{elmo-pop3-default-authenticate} is used.
 
 @item wl-pop-before-smtp-port
 @vindex wl-pop-before-smtp-port
 The initial setting is @code{nil}.
 This is the POP port number for POP-before-SMTP.  If it is @code{nil},
-@code{elmo-default-pop3-port} is used.
+@code{elmo-pop3-default-port} is used.
 
 @item wl-pop-before-smtp-stream-type
 @vindex wl-pop-before-smtp-stream-type
 The initial setting is @code{nil}.
 This flag controls the use of SSL for POP-before-SMTP.  If it is
-@code{nil}, @code{elmo-default-pop3-stream-type} is used.  If @code{starttls},
+@code{nil}, @code{elmo-pop3-default-stream-type} is used.  If @code{starttls},
 STARTTLS (RFC2595) connection will be established.
 
 @item wl-draft-queue-save-variables