Synch to No Gnus 200510070454.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 3bff609..98f1659 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Maildir): Clarify expire-age and expire-group.
+
 2005-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-news.texi: Mention that the Lisp files are now installed in

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9247fc3..42eab67 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -15291,8 +15291,9 @@ An integer specifying the minimum age, in seconds, of an article
 before it will be expired, or the symbol @code{never} to specify that
 articles should never be expired.  If this parameter is not set,
 @code{nnmaildir} falls back to the usual
-@code{nnmail-expiry-wait}(@code{-function}) variables (overrideable by
-the @code{expiry-wait}(@code{-function}) group parameters.  If you
+@code{nnmail-expiry-wait}(@code{-function}) variables (the
+@code{expiry-wait} group parameter overrides @code{nnmail-expiry-wait}
+and makes @code{nnmail-expiry-wait-function} ineffective).  If you
 wanted a value of 3 days, you could use something like @code{[(* 3 24
 60 60)]}; @code{nnmaildir} will evaluate the form and use the result.
 An article's age is measured starting from the article file's
@@ -15315,8 +15316,8 @@ the parameter belongs to, then the article is not expired at all.  If
 you use the vector form, the first element is evaluated once for each
 article.  So that form can refer to
 @code{nnmaildir-article-file-name}, etc., to decide where to put the
-article.  @emph{If this parameter is not set, @code{nnmaildir} does
-not fall back to the @code{expiry-target} group parameter or the
+article.  @emph{Even if this parameter is not set, @code{nnmaildir}
+does not fall back to the @code{expiry-target} group parameter or the
 @code{nnmail-expiry-target} variable.}
 
 @item read-only