Synch up with main trunk.

[elisp/wanderlust.git] / doc / wl.texi

diff --git a/doc/wl.texi b/doc/wl.texi
index 807d13d..f10259d 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -1619,7 +1619,7 @@ If you want to copy messages from POP server and view them, specify the
 folder as follows:
 
 @example
-|&username@@popserver|+inbox
+|&username@@popserver|:+inbox
 @end example
 
 where messages will be kept on the server.
@@ -2408,6 +2408,12 @@ The initial setting is @code{nil}.
 If non-nil, negative value is displayed when the message is deleted.  If
 @code{sync}, folder is synchronized when the message is deleted.  If
 @code{nil}, message deletion is ignored.
+
+@item wl-fldmgr-add-complete-with-current-folder-list
+@vindex wl-fldmgr-add-complete-with-current-folder-list
+The initial setting is @code{nil}.
+Non-nil means call @code{elmo-folder-list-subfolders} and get completion
+candidate for @code{wl-fldmgr-add}.
 @end table
 
 @subsection Miscellanea
@@ -2562,8 +2568,8 @@ It is important message.  You can put @samp{$} mark by typing @kbd{$}
 key (if already exists, the mark is deleted).  It is convenient to put
 this mark on the messages to remember (If you want to remember to write
 a reply for the message, for example) because this mark remains after
-you exited Emacs.  Messages with the @samp{$} mark remains in the folder
-even the message itself is deleted in the actual folder.
+you exited Emacs.  Messages with the @samp{$} mark can be reviewed in the
+@{'mark} folder even the message itself is deleted in the actual folder.
 
 @item None
 If the message is read and cached (or local message),there are no
@@ -4039,6 +4045,9 @@ In the cdr part of a cons, not only a variable but also an elisp
 expression can be specified as is.  If the car part is a header field
 and the cdr part is @code{nil}, the field will be deleted.
 
+If you want to use name of parent folder, you can refer the buffer local
+variable @code{wl-draft-parent-folder}.
+
 See the next example as well:
 
 @lisp
@@ -4297,6 +4306,14 @@ Selects a template.
 Enter Address Manager.
 @xref{Address Manager}.
 (@code{wl-addrmgr})
+
+@item C-c C-d
+@kindex C-c C-d (Draft)
+@findex wl-draft-elide-region
+Elide the text between point and mark (@code{wl-draft-elide-region}).
+The text is killed and replaced with the contents of the variable
+@code{wl-draft-elide-ellipsis}.  The default value is to use an ellipsis
+(@samp{[...]}).
 @end table
 
 @section Customizable Variables
@@ -5091,9 +5108,10 @@ can specify function-specific arguments after the name of the
 @code{wl-summary-expire-reserve-marks}, be careful in writing your own
 function.
 
-These are three standard functions; they moves messages to an archive
+These are four standard functions; three of them move messages to an archive
 folder in the specified way.  This means old messages can be compressed
 and saved in a file, being deleted from the original folder.
+The last one divides messages to some MH folders.
 
 @table @code
 @item wl-expire-archive-number1
@@ -5143,7 +5161,7 @@ For example, a message dated December 1998 is re-filed to
 @code{$folder-199812;zip}.  The name of the archiving folders except the
 date part are determined in the same way as
 @code{wl-expire-archive-number1}.
-@end table
+
 
 You can set the first argument to these three standard functions to non-nil
 in @code{wl-expire-alist} so as to retain message numbers in the folder.
@@ -5155,6 +5173,11 @@ For example, it can be specified just after the name of the function:
 
 If you omit the argument, consecutive numbers from 1 are assigned for
 each archiving folder.
+
+@item wl-expire-localdir-date
+divedes messages depending on its date (year and month) to MH folders
+e.g. to @samp{+ml/wl/1999_11/}, @samp{+ml/wl/1999_12/}.
+@end table
 @end table
 
 @subsection Treatment for Important or Unread Messages
@@ -5557,7 +5580,7 @@ scores are defined, corresponding to folder names.
 @end lisp
 
 If paths to the score files are omitted, the directory specified in the
-variable @code{wl-score-files-dir} is assumed.
+variable @code{wl-score-files-directory} is assumed.
 
 No matter what you write in @code{wl-score-folder-alist}, the default
 score file @code{wl-score-default-file} (@file{all.SCORE}) is always
@@ -5791,8 +5814,8 @@ Messages with these marks are scored.
 The initial setting is t.
 If non-nil, scoring is enabled.
 
-@item wl-score-files-dir
-@vindex wl-score-files-dir
+@item wl-score-files-directory
+@vindex wl-score-files-directory
 The initial setting is @file{~/.elmo/}.
 The default directory for score files.