Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

2007-08-23  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mml.el (mml-generate-mime): Make sure it uses multibyte temp buffer.
   (mml-generate-mime-1): Don't encode body if it is specified to be in
   raw form; don't make buffer be unibyte when inserting multibyte string.

2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)

   * man/message.texi (MIME): Replace mml-attach with mml-attach-file.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-100

2 files changed, 6 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index a9719d6d454..04ccb80f6e0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)
+
+        * message.texi (MIME): Replace mml-attach with mml-attach-file.
+
 2007-08-27  Richard Stallman  <rms@gnu.org>
 
         * emacs.texi (Top): Clarify menu item for Glossary.
diff --git a/man/message.texi b/man/message.texi
index eef4d77205a..2bca4b046e5 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -821,11 +821,11 @@ doesn't have to do anything to make the @acronym{MIME} happen---Message will
 automatically add the @code{Content-Type} and
 @code{Content-Transfer-Encoding} headers.
 
-@findex mml-attach
+@findex mml-attach-file
 @kindex C-c C-a
 The most typical thing users want to use the multipart things in
 @acronym{MIME} for is to add ``attachments'' to mail they send out.
-This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach}),
+This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach-file}),
 which will prompt for a file name and a @acronym{MIME} type.
 
 @vindex mml-dnd-protocol-alist