Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 806, 811-812, 823)

   - Merge from emacs--rel--22
   - Update from CVS

 * emacs--rel--22  (patch 54, 58, 69)

   - Merge from gnus--rel--5.10

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

   - Merge from emacs--devo--0

2007-07-13  Eli Zaretskii  <eliz@gnu.org>

   * texi/emacs-mime.texi: Add @documentencoding directive.

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

diff --git a/texi/ChangeLog b/texi/ChangeLog
index eaecf66..676f67e 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -2,6 +2,10 @@
 
        * gnus.texi (RSS): Document nnrss-ignore-article-fields.
 
+2007-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs-mime.texi: Add @documentencoding directive.
+
 2007-07-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Splitting Mail): Fix description of

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 276c7c0..bb99051 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -32,6 +32,9 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
+@c Node ``Interface Functions'' uses Latin-1 characters
+@documentencoding ISO-8859-1
+
 @dircategory Emacs
 @direntry
 * Emacs MIME: (emacs-mime).   Emacs MIME de/composition library.