Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 427-429, 431, 446)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141)

   - Merge from emacs--devo--0

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

diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el
index ff38cd2..3fc0477 100644 (file)
--- a/contrib/smtpmail.el
+++ b/contrib/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")

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 50b978e..e52c7ed 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -865,13 +865,12 @@
        key id too (for decryption).
        (pgg-gpg-sign-region): Likewise.
 
-2003-11-09  Simon Josefsson  <jas@extundo.com>
+2003-11-09  Satyaki Das  <satyakid@stanford.edu>
 
        * pgg-gpg.el (pgg-gpg-all-secret-keys): New variable.
        (pgg-gpg-lookup-all-secret-keys): New function.
        (pgg-gpg-select-matching-key): Likewise.
-       (pgg-gpg-decrypt-region): Use new functions.  From Satyaki Das
-       <satyakid@stanford.edu>.
+       (pgg-gpg-decrypt-region): Use new functions.  
 
 2003-11-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -4511,7 +4510,6 @@
        * spam.el: Fix typo.
 
 2003-03-01  Satyaki Das  <satyaki@theforce.stanford.edu>
-       (Trivial patch.)
 
        * pgg-gpg.el (pgg-gpg-process-region): Insert process status into
        errors-buffer. This produces a nicer error message in case of
@@ -5036,8 +5034,9 @@
        * gnus-sum.el (gnus-summary-select-article): Remove blink removal
        code that only worked under Emacs.
 
-       * pgg-gpg.el (pgg-gpg-process-region): Don't blink.  From Satyaki
-       Das <satyaki@chicory.stanford.edu>.
+2003-02-08  Satyaki Das  <satyaki@chicory.stanford.edu>
+       
+       * pgg-gpg.el (pgg-gpg-process-region): Don't blink.
 
 2003-02-08  Jesper Harder  <harder@ifa.au.dk>