Synch to No Gnus 200406020940.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edac8e2..3efacd2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mail-source.el (mail-source-directory): Fix doc-string.
+
 2004-05-29  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * assistant.el (assistant-render-text, assistant-eval): add :set

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 22cdd44..6656ffd 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -252,7 +252,7 @@ If non-nil, this maildrop will be checked periodically for new mail."
   :type 'file)
 
 (defcustom mail-source-directory message-directory
-  "Directory where files (if any) will be stored."
+  "Directory where incoming mail source files (if any) will be stored."
   :group 'mail-source
   :type 'directory)
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 9ad1f8d..11fb5c0 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Mail Source Customization): Clarify
+       `mail-source-directory'.
+
 2004-05-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-faq.texi: Untabify.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index ecabfc3..dc8d5b1 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13132,9 +13132,10 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 
 @item mail-source-directory
 @vindex mail-source-directory
-\e$B%U%!%$%k$,\e(B (\e$B$b$7$"$l$P\e(B) \e$BJ]B8$5$l$k%G%#%l%/%H%j!<$G$9!#=i4|CM\e(B
-\e$B$O\e(B @file{~/Mail/} \e$B$G$9!#8=;~E@$G$O!"$3$l$,;H$o$l$kM#0l$N$b$N$OA0$NJQ?t\e(B
-\e$B$,\e(B @code{nil} \e$B$G$"$C$?>l9g!"F~$C$F$-$?%U%!%$%k$,J]B8$5$l$k>l=j$N;XDj$G$9!#\e(B
+\e$BF~$C$F$-$?%a!<%k%=!<%9$N%U%!%$%k$,\e(B (\e$B$b$7$"$l$P\e(B) \e$BJ]B8$5$l$k%G%#%l%/%H%j!<\e(B
+\e$B$G$9!#=i4|CM$O\e(B @file{~/Mail/} \e$B$G$9!#8=;~E@$G$O!"$3$l$,;H$o$l$kM#0l$N$b$N\e(B
+\e$B$OJQ?t\e(B @code{mail-source-delete-incoming} \e$B$,\e(B @code{nil} \e$B$^$?$O?t;z$G$"$C\e(B
+\e$B$?>l9g!"F~$C$F$-$?%U%!%$%k$,J]B8$5$l$k>l=j$N;XDj$G$9!#\e(B
 
 @item mail-source-incoming-file-prefix
 @vindex mail-source-incoming-file-prefix

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8fdc0a1..03cbbed 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13899,10 +13899,10 @@ If non-@code{nil}, ignore errors when reading mail from a mail source.
 
 @item mail-source-directory
 @vindex mail-source-directory
-Directory where files (if any) will be stored.  The default is
-@file{~/Mail/}.  At present, the only thing this is used for is to say
-where the incoming files will be stored if the previous variable is
-@code{nil}.
+Directory where incoming mail source files (if any) will be stored.  The
+default is @file{~/Mail/}.  At present, the only thing this is used for
+is to say where the incoming files will be stored if the variable
+@code{mail-source-delete-incoming} is @code{nil} or a number.
 
 @item mail-source-incoming-file-prefix
 @vindex mail-source-incoming-file-prefix