Synch with main trunk.

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 5b405a6..0b5b903 100644 (file)
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,10 +3,10 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2001-02-02.17}
+\def\texinfoversion{2001-03-28.08}
 %
-% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
-% Free Software Foundation, Inc.
+% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+%               2000, 01 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -932,7 +932,7 @@ where each line of input produces a line of output.}
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
-  \def\pdfmkdest#1{\pdfdest name{#1@} xyz}
+  \def\pdfmkdest#1{\pdfdest name{#1} xyz}
   \def\pdfmkpgn#1{#1@}
   \let\linkcolor = \Blue  % was Cyan, but that seems light?
   \def\endlink{\Black\pdfendlink}
@@ -5848,7 +5848,8 @@ width0pt\relax} \fi
     \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
     \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
     \begingroup
-      \catcode`\^^M = 5 % in case we're inside an example
+      \catcode`\^^M = 5     % in case we're inside an example
+      \normalturnoffactive  % allow _ et al. in names
       % If the image is by itself, center it.
       \ifvmode
         \nobreak\bigskip

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 115ea72..22c4ad8 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage ja
 @documentencoding iso-2022-jp
-@set VERSION 2.5.8
+@include version.texi
 @synindex pg cp
 @finalout
 
@@ -776,9 +776,9 @@ 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 'login\e$B!#\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=i4|@_Dj$O\e(B "localhost"\e$B!#\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=i4|@_Dj$O\e(B 143\e$B!#\e(B
 @end example
@@ -788,11 +788,21 @@ default \e$BCM\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")
+@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
+@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) 
+@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
@@ -806,6 +816,11 @@ 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
 @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
+;; \e$BNc\e(B: \e$B@8%Q%9%o!<%I$GG'>Z\e(B
+(setq elmo-default-imap4-authenticate-type 'clear) 
+@end lisp
+
 \e$BNc\e(B:
 
 @example
@@ -2514,7 +2529,6 @@ 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(
 @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)
@@ -4218,8 +4232,9 @@ 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
+non-nil\e$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#\e(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
@@ -5784,8 +5799,6 @@ OK \e$B$G$9!#\e(B
 ;; @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))))
-;; @r{\e$B<+F0<}=8$9$k%U%)%k%@$N@55,I=8=\e(B}
-(setq bbdb-wl-folder-regexp "^%\\|^-")
 @end group
 @end lisp
 

diff --git a/doc/wl.texi b/doc/wl.texi
index 0ce09ba..c6f233f 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage en
 @documentencoding us-ascii
-@set VERSION 2.5.8
+@include version.texi
 @synindex pg cp
 @finalout
 
@@ -762,12 +762,22 @@ You can omit the @var{hostname} from folder names if you set
 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")
+@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}
-is non-nil, 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}, STARTTLS
-will be the default connection.
+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},
+STARTTLS will be the default connection.
+
+@lisp
+;; Example: Use SSL connection
+(setq elmo-default-imap4-stream-type 'ssl)
+@end lisp
 
 If you specify @code{login}, @code{cram-md5} or @code{digest-md5} as
 authentication method, the password is sent in encoded form. But, if
@@ -777,6 +787,11 @@ after confirmation to user. If @code{elmo-imap4-force-login} is non-nil,
 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)
+@end lisp
+
 Example:
 
 @example
@@ -4253,8 +4268,8 @@ sent off-line.
 
 @item wl-draft-use-cache
 @vindex wl-draft-use-cache
-The initial setting is @code{t}.
-If non-nil, cache the message which is sent.
+The initial setting is @code{nil}. If the value is non-nil and
+@code{wl-insert-message-id} is non-nil, cache the message which is sent.
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
@@ -5850,8 +5865,6 @@ byte-compiled and installed.
 ;; @r{automatically add mailing list fields}
 (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook)
 (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0))))
-;; @r{folder regexp for auto collection}
-(setq bbdb-wl-folder-regexp "^%\\|^-")
 @end group
 @end lisp