summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-02-14 22:15:26 -0500
committerGlenn Morris <rgm@gnu.org>2012-02-14 22:15:26 -0500
commit9f26dc243268eddc252287ef1918970bf580e946 (patch)
treee6611f9aa34055e078937fce0845db5d83a3bd69 /lisp/mail
parentf15bcb40f492d3b43a38447ba312fca35ce58ba2 (diff)
downloademacs-9f26dc243268eddc252287ef1918970bf580e946.tar.gz
Try to document smtp changes
* doc/emacs/sending.texi (Mail Sending): smtpmail-auth-credentials was removed. * doc/misc/smtpmail.texi (Emacs Speaks SMTP): General update for 24.1. (Encryption): New chapter, split out from previous. * lisp/mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type): Doc fixes. * etc/NEWS: Related edits.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/smtpmail.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index bbd8d7ce1ef..3233cff2768 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -86,7 +86,8 @@ The default value would be \"smtp\" or 25."
:group 'smtpmail)
(defcustom smtpmail-smtp-user nil
- "User name to use when looking up credentials."
+ "User name to use when looking up credentials in the authinfo file.
+If non-nil, only consider credentials for the specified user."
:version "24.1"
:type '(choice (const nil) string)
:group 'smtpmail)
@@ -99,11 +100,10 @@ don't define this value."
:group 'smtpmail)
(defcustom smtpmail-stream-type nil
- "Connection type SMTP connections.
-This may be either nil (possibly upgraded to STARTTLS if
-possible), or `starttls' (refuse to send if STARTTLS isn't
-available), or `plain' (never use STARTTLS), or `ssl' (to use
-TLS/SSL)."
+ "Type of SMTP connections to use.
+This may be either nil (possibly upgraded to STARTTLS if possible),
+or `starttls' (refuse to send if STARTTLS isn't available), or `plain'
+\(never use STARTTLS), or `ssl' (to use TLS/SSL)."
:version "24.1"
:group 'smtpmail
:type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)