Merge from emacs--devo--0

[gnus] / contrib / README

diff --git a/contrib/README b/contrib/README
index 2b33fa5..f4ccaf1 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -40,6 +40,15 @@ nnir.el
 
 one-line-cookie.diff
 
+sendmail.el
+smtpmail.el
+
+       Copies of the corresponding files from the Emacs lisp/mail/
+       directory, to provide features (occasionally) needed by Gnus which
+       may not be provided by the versions of these files in older Emacs
+       distributions.  XEmacs users should NOT use this, since it doesn't
+       work.  See the XEmacs mail-lib module instead.
+
 ssl.el
 
         Obsolete interface to OpenSSL.  Completely replaced by
@@ -69,5 +78,6 @@ vcard.el
 
 xml.el
 
-       This is used for parsing RSS feeds.  Part of Emacs 21.3 and
-       later.
+       This is used for parsing RSS feeds.  Part of Emacs 21.3 and later.
+       Note that the version of this file in the Gnus contrib/ directory is
+       out of date with respect to the version in the Emacs tree.