# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1157533735 0
# Node ID b1e05ba6e2b17dc513ca22b029897a551ab25cf2
# Parent  65db3e72f64853dd0b29db962bb646c5292b8263
2006-09-06  Simon Josefsson  <jas@extundo.com>

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

diff -r 65db3e72f648 -r b1e05ba6e2b1 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Sep 06 06:41:40 2006 +0000
+++ b/lisp/ChangeLog	Wed Sep 06 09:08:55 2006 +0000
@@ -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 -r 65db3e72f648 -r b1e05ba6e2b1 lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Wed Sep 06 06:41:40 2006 +0000
+++ b/lisp/mail/smtpmail.el	Wed Sep 06 09:08:55 2006 +0000
@@ -176,7 +176,12 @@
 (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")