(mail-archive-file-name, mail-default-headers): Doc fixes.

(mail-mailing-lists): Remove leading `*' from defcustom doc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2cc17a3c65a9bc838929a71f127e915adb0df3e..93f0d34abaa20e69e84f20fa1e4274dc940f1f77 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-10  Glenn Morris  <rgm@gnu.org>
 
+       * mail/sendmail.el (mail-archive-file-name, mail-default-headers):
+       Doc fixes.
+       (mail-mailing-lists): Remove leading `*' from defcustom doc.
+
        * simple.el (compose-mail): Doc fix.
 
 2009-03-10  Alexander Becher  <alexander.becher@capgemini-sdm.com>  (tiny change)

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 587b129cb92f6d04b347b3680ba8c7871bef6e82..4542d262ec02abad6b065a2860d1fccb1a68df45 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -183,7 +183,8 @@ This is used by the default mail-sending commands.  See also
 ;;;###autoload
 (defcustom mail-archive-file-name nil
   "Name of file to write all outgoing messages in, or nil for none.
-This can be an inbox file or an Rmail file."
+This is normally an mbox file, but for backwards compatibility may also
+be a Babyl file."
   :type '(choice file (const nil))
   :group 'sendmail)
 
@@ -422,11 +423,12 @@ This directory is used for auto-save files of mail buffers."
 ;;;###autoload
 (defcustom mail-default-headers nil
   "A string containing header lines, to be inserted in outgoing messages.
-It is inserted before you edit the message,
-so you can edit or delete these lines."
+It can contain newlines, and should end in one.  It is inserted
+before you edit the message, so you can edit or delete the lines."
   :type '(choice (const nil) string)
   :group 'sendmail)
 
+;; FIXME no need for autoload
 ;;;###autoload
 (defcustom mail-bury-selects-summary t
   "If non-nil, try to show Rmail summary buffer after returning from mail.
@@ -436,6 +438,7 @@ is non-nil."
   :type 'boolean
   :group 'sendmail)
 
+;; FIXME no need for autoload
 ;;;###autoload
 (defcustom mail-send-nonascii 'mime
   "Specify whether to allow sending non-ASCII characters in mail.
@@ -812,9 +815,8 @@ Prefix arg means don't delete this window."
   :group 'sendmail)
 
 ;;;###autoload
-(defcustom mail-mailing-lists nil "\
-*List of mailing list addresses the user is subscribed to.
-
+(defcustom mail-mailing-lists nil
+"List of mailing list addresses the user is subscribed to.
 The variable is used to trigger insertion of the \"Mail-Followup-To\"
 header when sending a message to a mailing list."
   :type '(repeat string)