Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 97-100)

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

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

   - Update from CVS

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

2 files changed, 6 insertions, 3 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 732c18c980d..5b096844f37 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,10 +1,13 @@
+2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)
+
+	* message.texi (MIME): Replace mml-attach with mml-attach-file.
+
 2007-08-22  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi (Adding hyperlink types): New section.
 	(Embedded LaTeX): Chapter updated because of LaTeX export.
 	(LaTeX export): New section.
 	(Using links out): New section.
-	
 
 2007-08-22  Glenn Morris  <rgm@gnu.org>
 
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