Synch to No Gnus 200405101754.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ce2d608..af8ab52 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (MIME Commands): Added
+       gnus-mime-display-multipart-as-mixed,
+       gnus-mime-display-multipart-alternative-as-mixed,
+       gnus-mime-display-multipart-related-as-mixed.
+
 2004-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (SpamAssassin backend): Add it to the detailmenu.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index d62d626..498628e 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -8909,8 +8909,8 @@ gnus \e$B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-\e(B
 \e$B$9\e(B (@code{gnus-article-babel})\e$B!#\e(B
 @end table
 
-@c node `MIME Commands' and node `Charsets' is stripped, which is
-@c pGnus specific.
+@c The node `MIME Commands' and the node `Charsets' are stripped, which
+@c are Gnus specific.
 
 @node Article Commands
 @section \e$B5-;vL?Na\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 3574a13..d7f18b1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9385,6 +9385,26 @@ Here's an example function the does the latter:
 @item gnus-mime-multipart-functions
 Alist of @acronym{MIME} multipart types and functions to handle them.
 
+@vindex gnus-mime-display-multipart-alternative-as-mixed
+@item gnus-mime-display-multipart-alternative-as-mixed
+Display "multipart/alternative" parts as "multipart/mixed".
+
+@vindex gnus-mime-display-multipart-related-as-mixed
+@item gnus-mime-display-multipart-related-as-mixed
+Display "multipart/related" parts as "multipart/mixed".
+
+If displaying "text/html" is discouraged, see
+@code{mm-discouraged-alternatives} in @ref{Display Customization,
+Display Customization, , emacs-mime, Emacs-Mime Manual}.  Images or
+other material inside a "multipart/related" part might be overlooked
+when this variable is nil.
+
+@vindex gnus-mime-display-multipart-as-mixed
+@item gnus-mime-display-multipart-as-mixed
+Display "multipart" parts as "multipart/mixed".  If t, it overrides nil
+values of @code{gnus-mime-display-multipart-alternative-as-mixed} and
+@code{gnus-mime-display-multipart-related-as-mixed}.
+
 @vindex mm-file-name-rewrite-functions
 @item mm-file-name-rewrite-functions
 List of functions used for rewriting file names of @acronym{MIME} parts.