Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1431

4 files changed, 17 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0e83e083383..63d67c66599 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.texi (Sending Variables): Fixed variable documentation to
+        avoid the "y/n" wording.
+
 2008-09-24  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * message.texi (Sending Variables): Added `message-confirm-send' doc.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 353089da264..705b3612483 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2225,7 +2225,7 @@ if @code{nil} let the mailer mail back a message to report errors.
 
 @item message-confirm-send
 @vindex message-confirm-send
-If non-@code{nil} display a y/n prompt before actually sending the
+When non-@code{nil}, Gnus will ask for confirmation when sending a
 message.
 
 @end table
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e53a6a52452..1e66d688a23 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.el (message-confirm-send): Fixed variable documentation to
+        avoid the "y/n" wording.
+
+2008-09-25  Francis Litterio <flitterio@gmail.com>  (tiny change)
+
+        * message.el (message-set-auto-save-file-name): Save to a different
+        filename so multiple messages (especially drafts) can be recovered.
+
 2008-09-24  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * message.el (message-confirm-send): Add appropriate version.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3ec15d00831..ad91868fa7a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -442,7 +442,7 @@ nil means let mailer mail back a message to report errors."
   :type 'boolean)
 
 (defcustom message-confirm-send nil
-  "Non-nil means when sending a message ask for y/n confirmation."
+  "When non-nil, ask for confirmation when sending a message."
   :group 'message-sending
   :group 'message-mail
   :version "22.3" ;; No Gnus