* emacs-mime.texi (Display Customization): Reword image/.* stuff.

* gnus.texi (Oort Gnus): Add note about `gnus-load'.
(MIME Commands): Fix mm-discouraged-alternatives.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 15f69e1..307032f 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * emacs-mime.texi (Display Customization): Reword image/.* stuff.
+
+       * gnus.texi (Oort Gnus): Add note about `gnus-load'.
+       (MIME Commands): Fix mm-discouraged-alternatives.
+
 2006-03-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-news.el, gnus-news.texi: Update copyright.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 59dec91..aec5e2b 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -341,13 +341,14 @@ you could say something like:
       (remove "text/html" mm-automatic-display))
 @end lisp
 
-Adding @code{"image/.*"} might also be useful.  Spammers use it as the
-prefered part of @samp{multipart/alternative} messages, and you might
+Adding @code{"image/.*"} might also be useful.  Spammers use images as
+the prefered part of @samp{multipart/alternative} messages, so you might
 not notice there are other parts.  See also
-@code{gnus-buttonized-mime-types} (@pxref{MIME Commands, ,MIME Commands,
-gnus, Gnus Manual}), to which adding @code{"multipart/alternative"}
-enables you to choose manually one of two types those mails include.
-For example, you can set those variables like:
+@code{gnus-buttonized-mime-types}, @ref{MIME Commands, ,MIME Commands,
+gnus, Gnus Manual}.  After adding @code{"multipart/alternative"} to
+@code{gnus-buttonized-mime-types} you can choose manually which
+alternative you'd like to view.  For example, you can set those
+variables like:
 
 @lisp
 (setq gnus-buttonized-mime-types

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5108465..6ed1cd1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9499,10 +9499,10 @@ Display "multipart/alternative" parts as "multipart/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 @code{nil}.
+@code{mm-discouraged-alternatives}, images or other material inside a
+"multipart/related" part might be overlooked when this variable is
+@code{nil}.  @ref{Display Customization, Display Customization, ,
+emacs-mime, Emacs-Mime Manual}.
 
 @vindex gnus-mime-display-multipart-as-mixed
 @item gnus-mime-display-multipart-as-mixed
@@ -26908,6 +26908,8 @@ groups.
 A new file from Raymond Scholz @email{rscholz@@zonix.de} for deuglifying
 broken Outlook (Express) articles.
 
+@c FIXME: `gnus-load' is mentioned in README, which is not included in
+@c CVS.  We should find a better place for this item.
 @item
 @code{(require 'gnus-load)}