2006-09-06 Simon Josefsson <jas@extundo.com>

	* mail/smtpmail.el (smtpmail-starttls-credentials): Doc fix.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0fb52b352c..4a2dfbb0b0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-06  Simon Josefsson  <jas@extundo.com>
+
+        * mail/smtpmail.el (smtpmail-starttls-credentials): Doc fix.
+
 2006-09-06  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-var-list-children-regexp)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index ff38cd25ff8..3fc0477a0a0 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -176,7 +176,12 @@ looks like `user@realm'."
 (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
   "Specify STARTTLS keys and certificates for servers.
 This is a list of four-element list with `servername' (a string),
-`port' (an integer), `key' (a filename) and `certificate' (a filename)."
+`port' (an integer), `key' (a filename) and `certificate' (a
+filename).
+If you do not have a certificate/key pair, leave the `key' and
+`certificate' fields as `nil'.  A key/certificate pair is only
+needed if you want to use X.509 client authenticated
+connections."
   :type '(repeat (list (string  :tag "Server")
                        (integer :tag "Port")
                        (file    :tag "Key")