* doc/wl-ja.texi (IMAP Folder): Modify for the new auth type.

* doc/wl.texi (IMAP Folder): Ditto.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 3c4c2fe..b049258 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -772,13 +772,14 @@ RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$
 @end example
 
 @example
-@var{\e$BG'>ZK!\e(B}\e$B$K$O\e(B "auth" (\e$B%(%s%3!<%I$7$F%Q%9%o!<%I$rAw?.\e(B)\e$B$+\e(B
-           "cram-md5" (cram-md5\e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
-           "login" (\e$B@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
+@var{\e$BG'>ZK!\e(B}\e$B$K$O\e(B 'login (\e$B%(%s%3!<%I$7$F%Q%9%o!<%I$rAw?.\e(B)\e$B$+\e(B
+           'cram-md5 (CRAM-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
+           'digest-md5 (DIGEST-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
+           'plain (\e$B$^$?$O\e(B 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$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$k\e(B
-\e$BI,MW$,$"$j$^$9!#\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(B)
 
 default \e$BCM\e(B:
 
@@ -787,7 +788,7 @@ default \e$BCM\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 "auth"\e$B!#\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
@@ -810,11 +811,11 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$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$BG'>ZK!$H$7$F!"\e(B"auth" \e$B$b$7$/$O\e(B "cram-md5" \e$B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r\e(B
-\e$B%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,%Q%9%o!<%I$r%(%s%3!<%I$7$F\e(B
-\e$B<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N$N$A!"\e(B"login" (\e$B@8%Q%9%o!<%I$rAw$k\e(B) 
+\e$BG'>ZK!$H$7$F!"\e(B'login\e$B!"\e(B'cram-md5 \e$B$b$7$/$O\e(B 'digest-md5 \e$B$r;XDj$7$?>l9g!"\e(B
+\e$B%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,%Q%9%o!<%I$r%(%s\e(B
+\e$B%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N$N$A!"\e(B'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!"\e(B
-\e$B3NG'L5$7$K\e(B "login" \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B nil)\e$B!#\e(B
+\e$B3NG'L5$7$K\e(B 'plain \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B nil)\e$B!#\e(B
 
 \e$BNc\e(B:
 
@@ -824,9 +825,9 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 %#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/login@@server1
+%inbox:hoge/plain@@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("login"\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('plain \e$B$G\e(B)
                \e$B%"%/%;%9!#\e(B
 @end group
 @end example

diff --git a/doc/wl.texi b/doc/wl.texi
index 9d1eddd..9d3166b 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -749,9 +749,10 @@ Format:
 @end example
 
 You can specify
-"auth" (encoded password transmission), "cram-md5" (cram-md5 authentication)
-or "login" (plain password transmission) as @var{authenticate-type}.
-(To use cram-md5 authentication, you must install @file{utils/sasl} package.)
+'login (encoded password transmission), 'cram-md5 (CRAM-MD5
+authentication), 'digest-md5 (DIGEST-MD5 authentication) or 'plain (or
+nil, plain password transmission) as @var{authenticate-type}.
+(To use CRAM-MD5 or DIGEST-MD5 authentication, you must install @file{utils/sasl} package.)
 
 default:
 
@@ -780,12 +781,12 @@ 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.
 
-If you specify "auth" or "cram-md5" as authentication method, the password
-is sent in encoded form. But, if your server is unable to receive an encoded
-password, authentication will fall back to "login" (that is, sending password
-in raw format) after confirmation to user. If @code{elmo-imap4-force-login}
-is non-nil, authentication will fall back to "login" without confirmation
-(default value is nil).
+If you specify 'login, 'cram-md5 or 'digest-md5 as authentication
+method, the password is sent in encoded form. But, if your server is
+unable to receive an encoded password, authentication will fall back to
+'plain (that is, sending password in raw format) after confirmation to
+user. If @code{elmo-imap4-force-login} is non-nil, authentication will
+fall back to 'plain without confirmation (default value is nil).
 
 Example:
 
@@ -798,7 +799,7 @@ Example:
 %inbox:hoge/login@@server1
             -> server1's IMAP mailbox "inbox"
                of user "hoge", with plain password authentication
-               ("login").
+               ('plain).
 @end group
 @end example