Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-276

lisp/gnus/ChangeLog

+2008-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-disassociate-draft): Revert 2008-03-18 change.
+
 2008-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-button-alist): Exclude newline in RFC2396-compliant

lisp/gnus/message.el

@@ -5827,7 +5827,7 @@ are not included."
   "Disassociate the message buffer from the drafts directory."
   (when message-draft-article
     (nndraft-request-expire-articles
-     (list message-draft-article) "nndraft:drafts" nil t)))
+     (list message-draft-article) "drafts" nil t)))
 
 (defun message-insert-headers ()
   "Generate the headers for the article."

man/ChangeLog

+2008-06-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-faq.texi: Generate.  Change node names to "FAQ N-M".
+
+	* gnus-faq.texi: Generate from gnus-faq.xml (sourceforge.net).
+
+2008-06-15  Frank Schmitt  <ich@frank-schmitt.net>
+
+	* gnus-faq.texi ([5.12]): Add entry about message-kill-buffer-on-exit.
+	Fix a typo.
+
+2008-06-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Mail Source Customization): Correct values of
+	 `mail-source-delete-incoming'.  Reported by Tassilo Horn.
+	(Oort Gnus): Fix version comment for mml-dnd-protocol-alist.
+
 2008-05-10  Eli Zaretskii  <eliz@gnu.org>
 
 	* msdog.texi (Windows Files): Update the documentation of

man/gnus.texi

@@ -14097,8 +14097,8 @@ files.  If a positive number, delete files older than number of days
 (the deletion will only happen when receiving new mail).  You may also
 set @code{mail-source-delete-incoming} to @code{nil} and call
 @code{mail-source-delete-old-incoming} from a hook or interactively.
-@code{mail-source-delete-incoming} defaults to @code{2} in alpha Gnusae
-and @code{10} in released Gnusae.  @xref{Gnus Development}.
+@code{mail-source-delete-incoming} defaults to @code{10} in alpha Gnusae
+and @code{2} in released Gnusae.  @xref{Gnus Development}.
 @item mail-source-delete-old-incoming-confirm
 @vindex mail-source-delete-old-incoming-confirm
@@ -27240,7 +27240,7 @@ controls this.
 @item You can now drag and drop attachments to the Message buffer.
 See @code{mml-dnd-protocol-alist} and @code{mml-dnd-attach-options}.
 @xref{MIME, ,MIME, message, Message Manual}.
-@c New in 5.10.9 / 5.11 (Emacs 21.1)
+@c New in 5.10.9 / 5.11 (Emacs 22.1)
 @item @code{auto-fill-mode} is enabled by default in Message mode.
 See @code{message-fill-column}.  @xref{Various Message Variables, ,