Fixed.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index f049256..dfdef5f 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5,7 +5,7 @@
 @c @documentlanguage ja
 @c %**end of header
 @c Wanderlust \e$B$N\e(B texinfo
-@set Time-stamp: <2000-06-15 19:55:00 kaoru>
+@set Time-stamp: <2000-06-16 01:21:37 kaoru>
 @set version 2.3.0
 @synindex pg cp
 @finalout
@@ -323,15 +323,18 @@ ftp://opaopa.org/pub/mirror/elisp/wl/
 @end example
 
 @subsection SSL (Secure Socket Layer)\e$B$NMxMQ\e(B
+@cindex SSL
+@pindex OpenSSL
+@pindex starttls
 
 Wanderlust \e$B$G$O!"\e(BSMTP, IMAP, NNTP, POP \e$B$N%3%M%/%7%g%s$K$*$$$F!"\e(B
 SSL (Secure Socket Layer) \e$B$rMQ$$$k$3$H$,$G$-$^$9!#\e(B
-SSL \e$B$NMxMQ7ABV$K$O\e(B2\e$B<oN`$"$j!"%3%M%/%7%g%s$HF1;~$K\e(B
-SSL negotiation \e$B$r;O$a$k$b$N$H!"\e(B starttls command \e$B$N8e$K!"\e(B
-SSL negotiation \e$B$r;O$a$k$b$N$,$"$j$^$9!#\e(B
+SSL \e$B$NMxMQ7ABV$K$O\e(B2\e$B<oN`$"$j!"\e(B
+\e$B%3%M%/%7%g%s$HF1;~$K\e(B SSL negotiation \e$B$r;O$a$k$b$N$H!"\e(B
+starttls command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N$,$"$j$^$9!#\e(B
 \e$BDL>o$N\e(B SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils} \e$B%G%#%l%/%H%j$K$"$k\e(B
 @file{ssl.el} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B
-\e$B$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B openssl \e$B$K%Q%9$,DL$C$F$$$kI,MW$,$"$j$^$9!#\e(B
+\e$B$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @file{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\e(B
 \e$B$9$kI,MW$,$"$j$^$9!#\e(B
 starttls \e$B%Q%C%1!<%8$O0J2<$N>l=j$+$iF~<j$G$-$^$9!#\e(B
@@ -451,8 +454,8 @@ wl, elmo \e$B$N%G%#%l%/%H%j$K\e(B load-path \e$B$,@_Dj$5$l$F$$$l$P5/F0$9$k$3$H$,$G$
 @file{.emacs} \e$B$K0J2<$N@_Dj$r$9$k$H5/F0$G$-$^$9!#\e(B
 
 @lisp
-(add-to-list 'load-path "~/work/wl-(@var{version})")
-(add-to-list 'load-path "~/work/wl-(@var{version})/elmo")
+(add-to-list 'load-path "~/work/wl-@var{version}/wl")
+(add-to-list 'load-path "~/work/wl-@var{version}/elmo")
 @end lisp
 
 @subsection \e$B%^%K%e%"%k$K$D$$$F\e(B
@@ -506,13 +509,13 @@ Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
 
-;; @r{\e$B%"%$%3%s$rCV$/%G%#%l%/%H%j\e(B (XEmacs \e$B$N$_\e(B)\e$B!#=i4|@_Dj$O\e(B nil\e$B!#\e(B}
+;; @r{\e$B%"%$%3%s$rCV$/%G%#%l%/%H%j\e(B (XEmacs \e$B$N$_\e(B)\e$B!#=i4|@_Dj$O\e(B @code{nil}\e$B!#\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)}
 (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 "localhost"\e$B!#\e(B}
+;; @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")
-;; @r{\e$B%K%e!<%9Ej9FMQ$N\e(B NNTP \e$B%5!<%P!#\e(B \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B}
+;; @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")
 @end lisp
 
@@ -741,14 +744,14 @@ default \e$BCM\e(B:
 \e$B%$%"%&%)!<%k$r1[$($J$1$l$P$J$i$J$$>l9g$G$b\e(B @samp{foo%imap@@geteway} \e$B$N$h\e(B
 \e$B$&$K;XDj$G$-$^$9!#\e(B
 
-\e$B%U%)%k%@L>$N:G8e$K\e(B '!' \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'!!' \e$B$@$H!"\e(BSTARTTLS\e$B$K$h$j\e(B
+\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(B
 SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-imap4-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B'!' \e$B$rIU$1\e(B
-\e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B '!!' \e$B$r0UL#$7$^$9!#\e(B
+\e$BJQ?t\e(B @code{elmo-default-imap4-ssl} \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'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 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(Bopenssl\e$B$K%Q%9$,DL$C$F$$$k\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!#\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)
@@ -770,6 +773,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
 @end example
 
 @subsection \e$BF|K\8l%a!<%k%\%C%/%9L>$N07$$\e(B(Modified UTF7)
+@cindex Modified UTF7
+@cindex UTF7
+@cindex UTF8
+@pindex Mule-UCS
+@pindex ucs-conv
 
 \e$B;HMQ$7$F$$$k\e(B Emacs \e$B$,%f%K%3!<%I$KBP1~$7$F$*$j!$$+$D!"JQ?t\e(B 
 @code{elmo-imap4-use-modified-utf7} \e$B$K\e(B non-nil \e$B$NCM$r@_Dj$7$F$$$k>l9g\e(B(\e$B%G\e(B
@@ -826,12 +834,12 @@ default \e$BCM\e(B:
              \e$B=i4|@_Dj$O\e(B 119\e$B!#\e(B
 
 \e$B%f!<%6L>$,\e(B non-nil \e$B$N>l9g$O\e(BAUTHINFO\e$B$K$h$kG'>Z$r9T$J$$$^$9!#\e(B
-\e$B%U%)%k%@L>$N:G8e$K\e(B '!' \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-'!!' \e$B$@$H!"\e(BSTARTTLS\e$B$K$h$j\e(BSSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-nntp-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B'!' \e$B$rIU$1\e(B
-\e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B '!!' \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 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(Bopenssl\e$B$K%Q%9$,DL$C$F$$$k\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(BSSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
+\e$BJQ?t\e(B @code{elmo-default-nntp-ssl} \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'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!#\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)
@@ -1151,7 +1159,7 @@ 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:
 \e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-user} \e$B$NCM!#\e(B
-              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B USER \e$B$+!"\e(BLOGNAME \e$B$+!"\e(B(user-login-name) \e$B$NJV$jCM!#\e(B
+              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @code{USER} \e$B$+!"\e(B@code{LOGNAME} \e$B$+!"\e(B(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$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
@@ -1175,11 +1183,11 @@ http://www.cs.indiana.edu/elisp/w3/docs.html
 
 \e$B$^$?$O!"\e(BLCD archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
 
-\e$B%U%)%k%@L>$N:G8e$K\e(B '!' \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-pop-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B'!' \e$B$rIU$1\e(B
-\e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B '!!' \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 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(Bopenssl\e$B$K%Q%9$,DL$C$F$$$k\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-pop-ssl} \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'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!#\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)
@@ -1196,7 +1204,7 @@ 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
 @example
 \e$B=q<0\e(B: '*' '\e$B%U%)%k%@\e(B' [',' '\e$B%U%)%k%@\e(B'] ... [',' '\e$B%U%)%k%@\e(B']
 
-'*' \e$B$N8e$K\e(B \e$B%U%)%k%@\e(B,\e$B%U%)%k%@\e(B,@dots{},\e$B%U%)%k%@\e(B \e$B$N$h$&$K\e(B ',' (\e$B%3%s%^\e(B)\e$B$G6h@Z$C$F\e(B
+@samp{*} \e$B$N8e$K\e(B \e$B%U%)%k%@\e(B,\e$B%U%)%k%@\e(B,@dots{},\e$B%U%)%k%@\e(B \e$B$N$h$&$K\e(B ',' (\e$B%3%s%^\e(B)\e$B$G6h@Z$C$F\e(B
 \e$B0l$D$K8+$($k$h$&$K$7$?$$%U%)%k%@72$r;XDj$7$^$9!#\e(B
 
 \e$BNc\e(B:
@@ -1206,7 +1214,6 @@ 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
 
   *+inbox,-fj.rec.tv,%inbox
   -> +inbox, -fj.rec.tv, %inbox \e$B$,0l$D$N%U%)%k%@$H$7$F8+$($k!#\e(B
-
 @end example
 
 
@@ -1604,7 +1611,7 @@ Wanderlust \e$B$N%5!<%P!&%]!<%HJL$N%*%U%i%$%s\e(B/\e$B%*%s%i%$%s$rJQ99$7$^$9!#\e(B
 @table @code
 @item wl-folders-file
 @vindex wl-folders-file
-\e$B=i4|@_Dj$O\e(B "~/.folders"\e$B!#\e(B
+\e$B=i4|@_Dj$O\e(B @file{~/.folders}\e$B!#\e(B
 \e$B9XFI$9$k%U%)%k%@$r5-=R$9$k%U%!%$%k$NL>A0$G$9!#\e(B
 
 @item wl-folder-info-save
@@ -3479,7 +3486,7 @@ nil \e$B$J$i$P$=$N\e(B Field \e$B$r:o=|$7$^$9!#\e(B
         ))
 @end lisp
 
-\e$B$3$N$h$&$K%X%C%@$N@55,I=8=$NBe$o$j$K\e(B "default" \e$B$d\e(B "report" \e$B$N$h$&$K3F\e(B
+\e$B$3$N$h$&$K%X%C%@$N@55,I=8=$NBe$o$j$K\e(B @samp{default} \e$B$d\e(B @samp{report} \e$B$N$h$&$K3F\e(B
 \e$BMWAG$NL>A0\e(B(\e$B%F%s%W%l!<%HL>\e(B)\e$B$r$D$1$k$@$1$G$9!#\e(B
 \e$B3FMWAG$NDj5A$O\e(B @code{wl-draft-config-alist} \e$B$HF1$8$G$"$k$N$G!"\e(B
 (a)\e$B$N$h$&$KJL$N%F%s%W%l!<%H$r8F$V$3$H$b2DG=$G$9!#\e(B
@@ -3504,7 +3511,7 @@ nil \e$B$J$i$P$=$N\e(B Field \e$B$r:o=|$7$^$9!#\e(B
 @end example
 
 @noindent
-\e$B$H=q$/$3$H$G\e(B "default" \e$B$N%F%s%W%l!<%H$rE,MQ$9$k$3$H$,$G$-$^$9!#\e(B
+\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
 @cindex POP-before-SMTP
@@ -4073,12 +4080,12 @@ hosta \e$B$N\e(B nntp \e$B8~$1$K\e(B 1 \e$B$D\e(B(3\e$BHV\e(B)\e$B$N%a%C%;!<%8$,$"$j!"\e(B
 dop queue \e$B$K$O\e(B @samp{%inbox} \e$B$NA`:n$,\e(B1\e$B$D$H!"\e(B
 @samp{%#mh/wl} \e$B$NA`:n$,\e(B2\e$B$D$"$k$3$H$r<($7$F$$$^$9!#\e(B
 
-\e$B$3$N%b!<%I$G\e(B2\e$B9TL\$K$"$k\e(B (wl-plugged) \e$B$rJQ99$9$k$H!"\e(Bwl-plugged \e$BJQ?t$,JQ99$5\e(B
+\e$B$3$N%b!<%I$G\e(B2\e$B9TL\$K$"$k\e(B (wl-plugged) \e$B$rJQ99$9$k$H!"\e(B@code{wl-plugged} \e$BJQ?t$,JQ99$5\e(B
 \e$B$l!"$3$l$K$h$j%b!<%I%i%$%s$N\e(B indicator \e$B$HA4BN$N\e(B \e$B%]!<%H\e(B plug \e$B>uBV$,\e(B 
 ON/OFF \e$B$5$l$^$9!#\e(B
 \e$B$^$?!"3F%5!<%P$d%]!<%H$N\e(B plug \e$B>uBV$rJQ99$9$k$H!"\e(B
 @code{elmo-plugged-condition} (\e$B8e=R\e(B)\e$B$N@_Dj$H3F%]!<%H$N\e(B plug \e$B>uBV$K$h$j\e(B 2\e$B9TL\$N\e(B 
-wl-plugged \e$B$,JQ2=$7$^$9!#\e(B
+(wl-plugged) \e$B$,JQ2=$7$^$9!#\e(B
 
 @section \e$B5/F0;~$N%*%U%i%$%s>uBV@_Dj\e(B
 
@@ -4113,7 +4120,7 @@ wl-plugged \e$B$,JQ2=$7$^$9!#\e(B
 
 @item wl-queue-folder
 @vindex wl-queue-folder
-\e$B=i4|@_Dj$O\e(B "+queue"\e$B!#Aw?.%-%e!<$N%a%C%;!<%8$,N/$k%U%)%k%@!#\e(B
+\e$B=i4|@_Dj$O\e(B @samp{+queue}\e$B!#Aw?.%-%e!<$N%a%C%;!<%8$,N/$k%U%)%k%@!#\e(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
@@ -4128,7 +4135,7 @@ Non-nil \e$B$J$i%*%U%i%$%s=hM}$r<B9T$7$^$9!#\e(B
 
 @item elmo-lost+found-folder
 @vindex elmo-lost+found-folder
-\e$B=i4|@_Dj$O\e(B "+lost+found"\e$B!#%*%U%i%$%s!&%j%U%!%$%k\e(B/\e$B%3%T!<$N%-%e!<=hM}$G\e(B
+\e$B=i4|@_Dj$O\e(B @samp{+lost+found}\e$B!#%*%U%i%$%s!&%j%U%!%$%k\e(B/\e$B%3%T!<$N%-%e!<=hM}$G\e(B
 \e$B%a%C%;!<%8$NDI2C$K<:GT$7$?$H$-$K%a%C%;!<%8$rB`Hr$5$;$k%U%)%k%@$G$9!#\e(B
 
 @item elmo-plugged-condition
@@ -5473,13 +5480,13 @@ Non-nil \e$B$J$i%U%)%k%@%b!<%I!"%5%^%j%b!<%I$J$I$G\e(B
 
 @item wl-highlight-message-important-header-contents2
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$JItJ,$N\e(B face \e$B$=$N#2$G$9!#\e(B
-\e$B%G%U%)%k%H$G$O!"\e(BFrom \e$B$H\e(B To \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
+\e$B%G%U%)%k%H$G$O!"\e(B@samp{From} \e$B$H\e(B @samp{To} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
 \e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
  \e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
 @item wl-highlight-message-unimportant-header-contents
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$G$O$J$$ItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B%G%U%)%k%H$G$O!"\e(BX- \e$B$G;O$^$k%X%C%@$H\e(B User-Agent \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
+\e$B%G%U%)%k%H$G$O!"\e(B@samp{X-} \e$B$G;O$^$k%X%C%@$H\e(B @samp{User-Agent} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
 \e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
  \e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
@@ -5590,8 +5597,8 @@ Non-nil \e$B$J$i%U%)%k%@%b!<%I!"%5%^%j%b!<%I$J$I$G\e(B
 @subsection \e$BJV;vMQ%I%i%U%H\e(B
 
 Mailng List \e$B$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7$?$@$1$G\e(B
-\e$B855-;v$N\e(B Reply-To \e$B$K$"$k%"%I%l%9$r\e(B To \e$B$KMQ0U$7$F$[$7$$!"$H$$$&>l9g$O!"\e(B
-\e$B0J2<$N$h$&$K$7$?$i$h$$$G$7$g$&!#\e(B
+\e$B855-;v$N\e(B @samp{Reply-To} \e$B$K$"$k%"%I%l%9$r\e(B @samp{To} \e$B$KMQ0U$7$F$[$7$$!"\e(B
+\e$B$H$$$&>l9g$O0J2<$N$h$&$K$7$?$i$h$$$G$7$g$&!#\e(B
 
 @lisp
 (setq wl-draft-reply-without-argument-list
@@ -5602,8 +5609,8 @@ Mailng List \e$B$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7$?$@
 @end lisp
 
 @noindent
-("X-ML-Name" \e$B%U%#!<%k%I5Z$S\e(B "Reply-To" \e$B%U%#!<%k%I$NN>J}$,855-;v$K\e(B
-\e$BB8:_$9$k>l9g$@$1\e(B To: \e$B$K855-;vCf$N\e(B Reply-To: \e$B%U%#!<%k%I$,=`Hw$5$l$^$9!#\e(B)
+(@samp{X-ML-Name} \e$B%U%#!<%k%I5Z$S\e(B @samp{Reply-To} \e$B%U%#!<%k%I$NN>J}$,855-;v$K\e(B
+\e$BB8:_$9$k>l9g$@$1!"\e(B@samp{To:} \e$B$K855-;vCf$N\e(B @samp{Reply-To} \e$B%U%#!<%k%I$,=`Hw$5$l$^$9!#\e(B)
 
 @c @noindent
 @c (\e$B:G8e$N9T$N0UL#$O!"\e(BTo: \e$B$K855-;vCf$N\e(B From \e$B%U%#!<%k%I$,!"\e(BCc: \e$B$K855-;v$N\e(B 
@@ -5655,7 +5662,7 @@ Mailng List \e$B$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7$?$@
 @node User-Agent Header,  , Thread Format, Advanced Settings
 @subsection User-Agent
 
- X-Mailer \e$B%U%#!<%k%I$d\e(B User-Agent \e$B%U%#!<%k%I$K6E$j$?$$$H$$$&\e(B
+@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$BJQ$o$C$?$R$H$O!"E,Ev$KJ8;zNs$r\e(B insert \e$B$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F\e(B
 @code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
@@ -5678,16 +5685,16 @@ Mailng List \e$B$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7$?$@
 @table @code
 @item wl-default-folder
 @vindex wl-default-folder
-\e$B=i4|@_Dj$O\e(B "%inbox"\e$B!#%U%)%k%@0\F0;~$J$I$N%G%U%)%k%HCM$H$J$j$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @samp{%inbox}\e$B!#%U%)%k%@0\F0;~$J$I$N%G%U%)%k%HCM$H$J$j$^$9!#\e(B
 
 @item wl-draft-folder
 @vindex wl-draft-folder
-\e$B=i4|@_Dj$O\e(B "+draft"\e$B!#%I%i%U%H$r%;!<%V$9$k%U%)%k%@$G$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @samp{+draft}\e$B!#%I%i%U%H$r%;!<%V$9$k%U%)%k%@$G$9!#\e(B
 localdir \e$B%U%)%k%@$G$"$kI,MW$,$"$j$^$9!#\e(B
 
 @item wl-trash-folder
 @vindex wl-trash-folder
-\e$B=i4|@_Dj$O\e(B "+trash"\e$B!#%4%_H"%U%)%k%@$G$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @samp{+trash}\e$B!#%4%_H"%U%)%k%@$G$9!#\e(B
 \e$B$3$NCM$rJQ99$7$?$H$-$O\e(B Wanderlust \e$B$r:F5/F0$9$k$3$H$r$*4+$a$7$^$9!#\e(B
 
 @item wl-interactive-exit
@@ -5794,8 +5801,7 @@ list \e$B$J$i$P!"\e(Blist \e$B$K@_Dj$5$l$?A4$F$N%U%)%k%@$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 '(("^-alt\\.chinese" . big5)
   ("^-relcom\\." . koi8-r)
   ("^-tw\\." . big5)
-  ("^-han\\." . euc-kr)
-  )
+  ("^-han\\." . euc-kr))
 @end lisp
 
 \e$B%U%)%k%@L>$N@55,I=8=$H\e(B MIME charset \e$B$NO"A[%j%9%H$G$9!#\e(B
@@ -5836,7 +5842,7 @@ refile mark \e$B$r$D$1$k:]!"%a%C%;!<%8$r0\F0$9$k$+%3%T!<$9$k$+$r;XDj$7$^$9!#\e(B
 
 @item wl-x-face-file
 @vindex wl-x-face-file
-\e$B=i4|@_Dj$O\e(B "~/.xface"\e$B!#\e(B
+\e$B=i4|@_Dj$O\e(B @file{~/.xface}\e$B!#\e(B
 Encode \e$B:Q$_$N\e(B X-Face \e$BJ8;zNs$rFbMF$H$9$k%U%!%$%kL>$G$9!#\e(B
 @xref{x-face-mule}.
 
@@ -5852,7 +5858,7 @@ Non-nil \e$B$J$i$P\e(B dbm \e$B$r;H$C$F\e(B Message-ID \e$B$N4IM}$r9T$J$$$^$9!#\e(B
 
 @item elmo-passwd-alist-file-name
 @vindex  elmo-passwd-alist-file-name
-\e$B=i4|@_Dj$O\e(B "passwd"\e$B!#\e(B
+\e$B=i4|@_Dj$O\e(B @file{passwd}\e$B!#\e(B
 \e$B%Q%9%o!<%I$r%;!<%V$7$F$*$/%U%!%$%k$NL>A0$G$9!#\e(B
 \e$B%3%^%s%I\e(B @code{elmo-passwd-alist-save} \e$B$r<B9T$9$k$H$3$N%U%!%$%k$K8=:_@_Dj\e(B
 \e$B$5$l$F$$$k%Q%9%o!<%I$,%;!<%V$5$l$^$9!#\e(B

diff --git a/doc/wl.texi b/doc/wl.texi
index 874c046..ea3a172 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -1,11 +1,11 @@
-\input texinfo @c -*-texinfo -*- coding: iso-2022-jp -*-
+\input texinfo @c -*-texinfo -*-
 @c %**start of header
 @setfilename wl.info
 @settitle Wanderlust -- Yet Another Message Interface On Emacsen --
 @c @documentlanguage en
 @c %**end of header
 @c texinfo of Wanderlust
-@set Time-stamp: <2000-06-15 19:55:00 kaoru>
+@set Time-stamp: <2000-06-16 01:21:37 kaoru>
 @set version 2.3.0
 @synindex pg cp
 @finalout
@@ -296,6 +296,9 @@ Extract the obtained package to your working directory:
 @end example
 
 @subsection To use SSL (Secure Socket Layer)
+@cindex SSL
+@pindex OpenSSL
+@pindex starttls
 
 SSL (Secure Socket Layer) can be used for 
 SMTP, IMAP, NNTP and POP connections in Wanderlust.
@@ -339,7 +342,7 @@ Then, please execute following commands.
 @end example
 
 Destination directory is auto-probed if you leave @code{LISPDIR}
-in @file{Makefile} as is. (That is, leave it as NONE)
+in @file{Makefile} as is. (That is, leave it as @samp{NONE})
 
 If you are using an Emacs variant which does not merge specified directory
 to load-path (e.g. Mule 2.3 based on Emacs 19.28), 
@@ -351,8 +354,8 @@ Cannot open load file: mime-setup
 
 @noindent
 In this case, either add destination directories of custom, apel, flim and semi
-to environmental variable EMACSLOADPATH, or define load-path in @file{WL-CFG}
-in extracted directory.
+to environmental variable @code{EMACSLOADPATH}, or define load-path in
+@file{WL-CFG} in extracted directory.
 
 If you want to use BBDB, then the necessary modules are byte-compiled and
 installed when BBDB directory is added to load-path.
@@ -424,8 +427,8 @@ if package is extracted in @file{~/work}, Wanderlust can be invoked with
 following setting in @file{.emacs}.
 
 @lisp
-(add-to-list 'load-path "~/work/wl-(@var{version})")
-(add-to-list 'load-path "~/work/wl-(@var{version})/elmo")
+(add-to-list 'load-path "~/work/wl-@var{version}/wl")
+(add-to-list 'load-path "~/work/wl-@var{version}/elmo")
 @end lisp
 
 @node Minimal Settings, Mail Addresses, Install, Start Me Up
@@ -452,21 +455,21 @@ of environmental variables which begins with @code{elmo-} and @code{wl-}.
 The minimal requirement for settings is as the following.
 
 @lisp
-;; The setting to use SEMI/tm
+;; @r{The setting to use SEMI/tm}
 (load "mime-setup")
 
-;; autoload configuration
-;; (These are not required if Wanderlust is installed as XEmacs package)
+;; @r{autoload configuration}
+;; @r{(These are not required if Wanderlust is installed as XEmacs package)}
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
 
-;; Directory where icons are placed (XEmacs Only). Default value is nil.
-;; (This is not required if Wanderlust is installed as XEmacs package)
+;; @r{Directory where icons are placed (XEmacs Only). Default value is @code{nil}.}
+;; @r{(This is not required if Wanderlust is installed as XEmacs package)}
 (setq wl-icon-dir "~/work/wl/etc")
 
-;; SMTP server for mail posting. Default: "localhost"
+;; @r{SMTP server for mail posting. Default: @code{nil}}
 (setq wl-smtp-posting-server "your.smtp.server.com")
-;; NNTP server for news posting. Default: "localhost"
+;; @r{NNTP server for news posting. Default: @code{nil}}
 (setq wl-nntp-posting-server "your.nntp.server.com")
 @end lisp
 
@@ -703,9 +706,9 @@ For example, you can specify a folder as @samp{foo%imap@@geteway} even
 if you have to go through a firewall.
 
 SSL (Secure Socket Layer) connection will be used if a folder name
-ends with '!'. Or, if the value of @code{elmo-default-imap4-ssl} is non-nil,
+ends with @samp{!}. Or, if the value of @code{elmo-default-imap4-ssl} is non-nil,
 SSL will be the default connection.
-If a folder name ends with '!!', STARTTLS connection will be established.
+If a folder name ends with @samp{!!}, STARTTLS connection will be established.
 if the value of @code{elmo-default-imap4-ssl} is 'starttls,
 STARTTLS will be the default connection.
 
@@ -727,6 +730,11 @@ Example: %inbox     -> IMAP mailbox "inbox"
 @end example
 
 @subsection International mailbox names (Modified UTF7)
+@cindex Modified UTF7
+@cindex UTF7
+@cindex UTF8
+@pindex Mule-UCS
+@pindex ucs-conv
 
 You can use international mailbox names in 'IMAP mailbox' part, if you
 are using Emacs which can treat unicode and
@@ -787,8 +795,8 @@ port      -> The value of @code{elmo-default-nntp-port}.
 
 AUTHINFO is used as authentication method if the username is non-nil.
 SSL will be default method if @code{elmo-default-nntp-ssl} is non-nil even
-if the folder name doesn't end with '!'
-If a folder name ends with '!!', STARTTLS connection will be established.
+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-ssl} is 'starttls,
 STARTTLS will be the default connection.
 
@@ -1101,8 +1109,8 @@ as authenticate-type.
 
 default:
 username   -> The value of @code{elmo-default-pop3-user}.
-              Initial setting is `USER' environment variable or
-             `LOGNAME' environment variable or return value of
+              Initial setting is @code{USER} environment variable or
+             @code{LOGNAME} environment variable or return value of
              (user-login-name).
 authenticate-type -> The value of @code{elmo-default-pop3-authenticate-type}.
               Initial setting is "user".
@@ -1126,11 +1134,11 @@ http://www.cs.indiana.edu/elisp/w3/docs.html
 
 or LCD archive (GPL2).
 
-If the last character of the folder name is '!', Wanderlust connects to
+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-pop-ssl}, you don't have to put '!' in the
+value to @code{elmo-default-pop-ssl}, you don't have to put @samp{!} in the
 end of the folder name to use SSL. 
-If a folder name ends with '!!', STARTTLS connection will be established.
+If a folder name ends with @samp{!!}, STARTTLS connection will be established.
 if the value of @code{elmo-default-pop-ssl} is 'starttls,
 STARTTLS will be the default connection.
 
@@ -1147,7 +1155,7 @@ multiple folders virtually.
 @example
 Format: '*' 'folder' [',' 'folder'] ... [',' 'folder']
 
-After '*' character, specify multiple folders you want to collect 
+After @samp{*} character, specify multiple folders you want to collect 
 separated by ',' like folder1,folder2,@dots{},folderN.
 
 Example:
@@ -1157,7 +1165,6 @@ Example:
 
   *+inbox,-fj.rec.tv,%inbox
   -> +inbox, -fj.rec.tv and %inbox are treated as one folder.
-
 @end example
 
 
@@ -1557,7 +1564,7 @@ Start Wanderlust's plug-status manager.
 @table @code
 @item wl-folders-file
 @vindex wl-folders-file
-The initial setting is "~/.folders".
+The initial setting is @file{~/.folders}.
 Subscribed folders are described (saved) in this file.
 
 @item wl-folder-info-save
@@ -3478,7 +3485,7 @@ The format of @code{wl-template-alist} is almost the same as
 @end lisp
 
 As you can see, the only difference is item (template) names such as
-"default" and "report", instead of a regexp of header.
+@samp{default} and @samp{report}, instead of a regexp of header.
 Because definition of each item is the same as
 @code{wl-draft-config-alist}, you can call another template, like (a).
 
@@ -3498,7 +3505,7 @@ If @code{wl-template-visible-select} is nil, you should type the name of
 the template in the mini buffer.
 
 As shown in the example in @code{wl-draft-config-alist}, you can select
-"default" template by writing:
+@samp{default} template by writing:
 
 @example
 (template . "default")
@@ -4084,7 +4091,7 @@ hosta, and in the dop queue there are one for @samp{%inbox} and two for
 If you change (wl-plugged) in the second line, the variable
 @code{wl-plugged} is changed, so that the mode line indicator and
 plugged states of all ports are affected.
-If you change plugged states of any servers or ports, wl-plugged in the
+If you change plugged states of any servers or ports, (wl-plugged) in the
 second line is affected depending on @code{elmo-plugged-condition}
 settings and the plugged state of each port.
 
@@ -4122,7 +4129,7 @@ the beginning.
 
 @item wl-queue-folder
 @vindex wl-queue-folder
-The initial setting is "+queue".
+The initial setting is @samp{+queue}.
 This is the folder in which messages in the transmission queue are
 accumulated.
 
@@ -4141,7 +4148,7 @@ If non-nil, off-line operations are carried out.
 
 @item elmo-lost+found-folder
 @vindex elmo-lost+found-folder
-The initial setting is "+lost+found".
+The initial setting is @samp{+lost+found}.
 This is the folder to which messages are saved when they fails to be
 appended while the off-line re-file/copy queue is processed.
 
@@ -5512,13 +5519,13 @@ You can change its value by editing
 
 @item wl-highlight-message-important-header-contents2
 The face for secondly important parts of message headers.
-Per default, this face is used for bodies of From and To fields.
+Per default, this face is used for bodies of @samp{From} and @samp{To} fields.
 You can change its value by editing
 @code{wl-highlight-message-header-alist}.
 
 @item wl-highlight-message-unimportant-header-contents
 The face for unimportant parts of message headers.
-Per default, this face is used for bodies of X- fields User-Agent fields.
+Per default, this face is used for bodies of @samp{X-} fields @samp{User-Agent} fields.
 You can change its value by editing
 @code{wl-highlight-message-header-alist}.
 
@@ -5527,7 +5534,7 @@ The face for headers of quoted messages.
 
 @item wl-highlight-message-cited-text-*
 The face for texts of quoted messages.
-The last "*" is a single figure so that 10 different colors can be used
+The last @samp{*} is a single figure so that 10 different colors can be used
 according to citation levels.
 
 @item wl-highlight-message-signature
@@ -5647,8 +5654,8 @@ following settings:
 @end lisp
 
 @noindent
-(Only if there are both of "X-ML-Name" and "Reply-To" fields in the
-original message, Reply-To: field in the original is copied to To:
+(Only if there are both of @samp{X-ML-Name} and @samp{Reply-To} fields in the
+original message, @samp{Reply-To} field in the original is copied to @samp{To:}
 field.)
 
 @node Thread Format, User-Agent Header, Draft for Reply, Advanced Settings
@@ -5696,9 +5703,9 @@ If you do not want to see branches, do the following:
 @node User-Agent Header,  , Thread Format, Advanced Settings
 @subsection User-Agent
 
-If you are eccentric enough to elaborate X-Mailer or User-Agent fields,
-define a function that inserts appropriate strings as you like, and set
-it to @code{wl-generate-mailer-string-func}.
+If you are eccentric enough to elaborate @samp{X-Mailer} or @samp{User-Agent}
+fields, define a function that inserts appropriate strings as you like,
+and set it to @code{wl-generate-mailer-string-func}.
 
 The following is an example.
 
@@ -5718,17 +5725,17 @@ Customizable variables that have not been described yet:
 @table @code
 @item wl-default-folder
 @vindex wl-default-folder
-The initial setting is "%inbox".  This is the default value for moving to
+The initial setting is @samp{%inbox}.  This is the default value for moving to
 a folder and the like.
 
 @item wl-draft-folder
 @vindex wl-draft-folder
-The initial setting is "+draft".  It is the folder to which drafts are
+The initial setting is @samp{+draft}.  It is the folder to which drafts are
 saved.  It must be a localdir folder.
 
 @item wl-trash-folder
 @vindex wl-trash-folder
-The initial setting is "+trash".  It is the wastebasket folder.
+The initial setting is @samp{+trash}.  It is the wastebasket folder.
 If you changed this variable, you had better restart Wanderlust.
 
 @item wl-interactive-exit
@@ -5842,8 +5849,7 @@ The initial setting is the list shown below:
 '(("^-alt\\.chinese" . big5)
   ("^-relcom\\." . koi8-r)
   ("^-tw\\." . big5)
-  ("^-han\\." . euc-kr)
-  )
+  ("^-han\\." . euc-kr))
 @end lisp
 
 This is an associative list of regular expressions of folder names and
@@ -5885,7 +5891,7 @@ Each item in the list is a cons cell of a folder and copy or move.
 
 @item wl-x-face-file
 @vindex wl-x-face-file
-The initial setting is "~/.xface".
+The initial setting is @file{~/.xface}.
 The name of the file that contains encoded X-Face strings.
 @xref{x-face-mule}.
 
@@ -5900,8 +5906,8 @@ XEmacs (t for XEmacs with dbm).
 If non-nil, Message-ID is controlled by dbm.
 
 @item elmo-passwd-alist-file-name
-@vindex  elmo-passwd-alist-file-name
-The initial setting is "passwd".
+@vindex elmo-passwd-alist-file-name
+The initial setting is @file{passwd}.
 This is the name of the file in which passwords are saved.
 @code{elmo-passwd-alist-save} saves current passwords to the file.