Synch to No Gnus 200601060557.

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 7f7f68d..d96ed68 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -3071,10 +3071,10 @@ nntp+news.gnus.org:gmane.text.docbook.apps
 \e$BJL$7$J$$$h$&$K$7$?$$$J$i!"$=$l$r\e(B @code{t} \e$B$K@_Dj$7$F2<$5$$!#\e(B
 
 @code{gnus-parameters} \e$B$r2p$9$k$3$H$K$h$C$F!"%0%k!<%W$K$h$C$F0[$J$kJB$Y\e(B
-\e$BBX$($rDj5A$9$k$3$H$,$G$-$^$9!#$3$l$O!"\e(B@acronym{NNTP} \e$B$G$OI=Bj$G!"\e(B
-@acronym{RSS} \e$B%0%k!<%W$G$O:G?7$N%K%e!<%9$,@hF,$K$J$k$h$&$KF|IU$G!"$=$l$>\e(B
-\e$B$lJB$YBX$($r9T$J$&Nc$G$9!#$3$NNc$N:G=i$N%0%k!<%W$O!"\e(Bnews.gmane.org \e$B$+$i\e(B
-\e$B<hF@$9$k\e(B Debian \e$B$N%G%$%j!<%K%e!<%9$G$9!#\e(B@acronym{RSS} \e$B%0%k!<%W\e(B
+\e$BBX$($rDj5A$9$k$3$H$,$G$-$^$9!#$3$l$O!"\e(B@acronym{NNTP} \e$B%0%k!<%W$G$O:G?7$N\e(B
+\e$B%K%e!<%9$,@hF,$K$J$k$h$&$KF|IU$G!"\e(B@acronym{RSS} \e$B%0%k!<%W$G$OI=Bj$G!"$=$l\e(B
+\e$B$>$lJB$YBX$($r9T$J$&Nc$G$9!#$3$NNc$N:G=i$N%0%k!<%W$O!"\e(Bnews.gmane.org \e$B$+\e(B
+\e$B$i<hF@$9$k\e(B Debian \e$B$N%G%$%j!<%K%e!<%9$G$9!#\e(B@acronym{RSS} \e$B%0%k!<%W\e(B
 \e$B$O\e(B RSS \e$B%U%#!<%I$GG[?.$5$l$F$$$k\e(B Debian \e$B$N%&%#!<%/%j!<%K%e!<\e(B
 \e$B%9\e(B @url{http://packages.debian.org/unstable/newpkg_main.en.rdf} \e$B$KBP1~$7\e(B
 \e$B$^$9!#\e(B@xref{RSS}.
@@ -16026,6 +16026,7 @@ Language) \e$B$G%m!<%I\e(B/\e$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
 
 \e$B0J2<$N%3!<%I$O!"35N,%P%C%U%!!<$+$iD>@\\e(B nnrss \e$B$N\e(B url \e$B$r%*!<%W%s$9$k$N$KJX\e(B
 \e$BMx$+$b$7$l$^$;$s!#\e(B
+
 @lisp
 (require 'browse-url)
 
@@ -16048,6 +16049,32 @@ Language) \e$B$G%m!<%I\e(B/\e$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
+@code{nnrss} \e$B%P%C%/%(%s%I$O!"$=$l$>$l$,\e(B @samp{text/plain} \e$B%Q!<%H\e(B
+\e$B$H\e(B @samp{text/html} \e$B%Q!<%H$r4^$s$G$$\e(B
+\e$B$k\e(B @samp{multipart/alternative} \e$B7?$N\e(B @acronym{MIME} \e$B5-;v$r:n$j$^$9!#\e(B
+\e$B$"$J$?$,\e(B @acronym{HTML} \e$B%Q!<%H$r8+$?$/$J$$$?$a\e(B
+\e$B$K\e(B @code{"text/html"} \e$B$r\e(B @code{mm-discouraged-alternatives} \e$BJQ\e(B
+\e$B?t\e(B (@pxref{Display Customization, ,\e$BI=<($N%+%9%?%^%$%:\e(B, emacs-mime-ja,
+The Emacs MIME Manual}) \e$B$K2C$($F$$$?$H$7$F$b!"FC$K\e(B @code{nnrss} \e$B%0%k!<%W\e(B
+\e$B$G$O\e(B @samp{text/html} \e$B$rI=<($9$kJ}$,JXMx$+$b$7$l$^$;$s!#0J2<\e(B
+\e$B$O\e(B @code{nnrss} \e$B%0%k!<%W$G$@$1$O\e(B @samp{text/html} \e$B%Q!<%H$rI=<($9$k$?$a$K!"\e(B
+\e$B%0%k!<%W%Q%i%a!<%?!<$H$7$F\e(B @code{mm-discouraged-alternatives} \e$B$r@_Dj$9$k\e(B
+\e$BNc$G$9\e(B:
+
+@lisp
+;; @r{@code{mm-discouraged-alternatives} \e$B$N%G%#%U%)%k%HCM$r@_Dj!#\e(B}
+(eval-after-load "gnus-sum"
+  '(add-to-list
+    'gnus-newsgroup-variables
+    '(mm-discouraged-alternatives
+      . '("text/html" "image/.*"))))
+
+;; @r{@code{nnrss} \e$B%0%k!<%W$G$O\e(B @samp{text/html} \e$B%Q!<%H$rI=<(!#\e(B}
+(add-to-list
+ 'gnus-parameters
+ '("\\`nnrss:" (mm-discouraged-alternatives nil)))
+@end lisp
+
 @node Customizing W3
 @subsection W3 \e$B$N%+%9%?%^%$%:\e(B
 @cindex W3