update stream-type specification

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index fffde7e..e12a4d6 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -879,7 +879,7 @@ default \e$BCM\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-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$BJQ?t\e(B @code{elmo-nntp-default-stream-type} \e$B$NCM$,\e(B @code{ssl} \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
 
 \e$BNc\e(B:
@@ -1286,7 +1286,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-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$BJQ?t\e(B @code{elmo-pop3-default-stream-type} \e$B$NCM$,\e(B @code{ssl} \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
@@ -4488,7 +4488,7 @@ POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%]!<%HHV9f$G$9!#\e(B
 \e$B@_Dj$7$F$$$J$$>l9g$O\e(B  @code{elmo-pop3-default-port} \e$B$r;H$$$^$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} 
+@code{ssl} \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$rD%$j$^$9!#@_Dj$7$F$$$J\e(B
 \e$B$$>l9g$O\e(B @code{elmo-pop3-default-stream-type} \e$B$r;H$$$^$9!#\e(B
 @end table
@@ -4898,7 +4898,7 @@ 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-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-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{ssl} \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$rD%$j$^$9!#\e(B
 
 @item wl-nntp-posting-function
@@ -4954,6 +4954,7 @@ POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#\e(B
 \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-pop3-default-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
+@code{ssl} \e$B$J$i\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$rD%$j$^$9!#\e(B
 
 @item wl-draft-queue-save-variables

diff --git a/doc/wl.texi b/doc/wl.texi
index c5cfc29..e2bdcc2 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -847,7 +847,7 @@ default:
 
 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
+@code{elmo-nntp-default-stream-type} is @code{ssl} 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
@@ -1262,7 +1262,7 @@ 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-pop3-default-stream-type}, you don't have to put
+@code{ssl} 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-pop3-default-stream-type} is @code{starttls}, STARTTLS will be the
@@ -4502,7 +4502,7 @@ The POP port number for POP-before-SMTP authentication.
 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
+If @code{ssl}, POP connection is established using SSL.  If
 @code{starttls}, STARTTLS (RFC2595) connection will be established.  If
 unset, @code{elmo-pop3-default-stream-type} is used.
 @end table
@@ -4929,7 +4929,7 @@ 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-nntp-default-stream-type} is evaluated.  If non-nil,
+If @code{nil}, @code{elmo-nntp-default-stream-type} is evaluated.  If @code{ssl},
 SSL is used for news submission.  If @code{starttls}, STARTTLS (RFC2595)
 connection will be established.
 
@@ -4985,8 +4985,9 @@ This is the POP port number for POP-before-SMTP.  If it is @code{nil},
 @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-pop3-default-stream-type} is used.  If @code{starttls},
-STARTTLS (RFC2595) connection will be established.
+@code{nil}, @code{elmo-pop3-default-stream-type} is used.  If @code{ssl},
+SSL is used.  If @code{starttls}, STARTTLS (RFC2595) connection will be
+established.
 
 @item wl-draft-queue-save-variables
 @vindex wl-draft-queue-save-variables