Synch to No Gnus 200601060557.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index c25ef93..a0fb572 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Group Parameters): Fix description.
+       (RSS): Addition.
+
 2005-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Summary Post Commands): Fix function bound to `S O p'.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index dad8e71..3d193bb 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -3094,10 +3094,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}.
@@ -15657,6 +15657,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)
 
@@ -15679,6 +15680,15 @@ 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\e(B @samp{text/plain} \e$B$+\e(B @samp{text/html} \e$B$N5-;v\e(B
+\e$B$r:n$j$^$9!#$I$A$i$r:n$k$+$O\e(B @code{mime-preview-condition} \e$BJQ?t$NCM$K$h$C\e(B
+\e$B$F7h$^$j$^$9!#$b$7\e(B @uref{http://emacs-w3m.namazu.org/, emacs-w3m} \e$B$K4^$^\e(B
+\e$B$l$F$$$k\e(B @code{mime-w3m} \e$B%b%8%e!<\e(B
+\e$B%k\e(B (@pxref{SEMI MUAs, ,@acronym{SEMI} MUA \e$B$G\e(B HTML \e$B%a!<%k$rFI$`\e(B,
+emacs-w3m-ja, Emacs-w3m-ja}) \e$B$r;H$C$F$$$k$N$J$i$P!"\e(B@samp{text/html} \e$B$N5-\e(B
+\e$B;v$r:n$k$h$&$K!"<+F0E*$K\e(B @code{mime-preview-condition} \e$BJQ?t$,@_Dj$5$l$k\e(B
+\e$B$G$7$g$&!#\e(B
+
 @node Customizing W3
 @subsection W3 \e$B$N%+%9%?%^%$%:\e(B
 @cindex W3

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 684ff39..d7b8928 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -3126,9 +3126,9 @@ always in a case-insensitive manner.
 
 You can define different sorting to different groups via
 @code{gnus-parameters}.  Here is an example to sort an @acronym{NNTP}
-group by subject and an @acronym{RSS} group by reverse date to see the
-latest news at the top.  In this example, the first group is the Debian
-daily news group @code{gmane.linux.debian.user.news} from
+group by reverse date to see the latest news at the top and an
+@acronym{RSS} group by subject.  In this example, the first group is the
+Debian daily news group @code{gmane.linux.debian.user.news} from
 news.gmane.org.  The @acronym{RSS} group corresponds to the Debian
 weekly news RSS feed
 @url{http://packages.debian.org/unstable/newpkg_main.en.rdf},
@@ -16190,6 +16190,7 @@ the summary buffer.
 
 The following code may be useful to open an nnrss url directly from the
 summary buffer.
+
 @lisp
 (require 'browse-url)
 
@@ -16212,6 +16213,33 @@ summary buffer.
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
+The @code{nnrss} back end generates @samp{multipart/alternative}
+@acronym{MIME} articles in which each contains a @samp{text/plain} part
+and a @samp{text/html} part.  Even if you have added @code{"text/html"}
+to the @code{mm-discouraged-alternatives} variable (@pxref{Display
+Customization, ,Display Customization, emacs-mime, The Emacs MIME
+Manual}) since you don't want to see @acronym{HTML} parts, it might be
+more useful especially in @code{nnrss} groups to display
+@samp{text/html} parts.  Here's an example of setting
+@code{mm-discouraged-alternatives} as a group parameter (@pxref{Group
+Parameters}) in order to display @samp{text/html} parts only in
+@code{nnrss} groups:
+
+@lisp
+;; @r{Set the default value of @code{mm-discouraged-alternatives}.}
+(eval-after-load "gnus-sum"
+  '(add-to-list
+    'gnus-newsgroup-variables
+    '(mm-discouraged-alternatives
+      . '("text/html" "image/.*"))))
+
+;; @r{Display @samp{text/html} parts in @code{nnrss} groups.}
+(add-to-list
+ 'gnus-parameters
+ '("\\`nnrss:" (mm-discouraged-alternatives nil)))
+@end lisp
+
+
 @node Customizing W3
 @subsection Customizing W3
 @cindex W3