Synch with No Gnus (201012021544).
[elisp/gnus-doc-ja.git] / gnus-ja.texi
index c2485dc..d485080 100644 (file)
@@ -1032,22 +1032,6 @@ Gnus \e$B$O\e(B @code{gnus-nntpserver-file} (\e$B@_Dj$5$l$F$$$J$$>l9g\e(B
 \e$B$9!#$b$7$=$l$b<:GT$7$?$J$i!"\e(BGnus \e$B$O\e(B Emacs \e$B$,F0:n$7$F$$$k%5!<%P!<\e(B
 \e$B$r\e(B @acronym{NNTP} \e$B%5!<%P!<$H$7$F;H$*$&$H$7$^$9!#?oJ,$JEv$F?dNL$G$9$1$I$M!#\e(B
 
-@vindex gnus-nntp-server
-@code{gnus-nntp-server} \e$B$,@_Dj$5$l$F$$$k$H!"$3$NJQ?t\e(B
-\e$B$O\e(B @code{gnus-select-method} \e$B$h$j$bM%@h$5$l$^$9!#$G$9$+\e(B
-\e$B$i\e(B @code{gnus-nntp-server} \e$B$O\e(B @code{nil} \e$B$K@_Dj$9$k$Y$-$G!"$=$l$,%G%#%U%)\e(B
-\e$B%k%H$G$9!#\e(B
-
-@vindex gnus-secondary-servers
-@vindex gnus-nntp-server
-Gnus \e$B$K\e(B @acronym{NNTP} \e$B%5!<%P!<$NL>A0$rBPOCE*$K;XDj$9$k$3$H$b$G$-$^$9!#\e(B
-@code{gnus} \e$B$K?tCM$G$J$$@\F,0z?t$rEO$9$H\e(B (\e$BNc\e(B: @kbd{C-u M-x gnus})\e$B!"\e(B
-Gnus \e$B$O\e(B @code{gnus-secondary-servers} \e$B%j%9%H\e(B (\e$B$b$7B8:_$9$k$J$i$P\e(B) \e$B$+$i%5!<\e(B
-\e$B%P!<$rA*$V$3$H$,$G$-$k$h$&$K$7$^$9!#$?$@C1$K@\B3$7$?$$$H;W$C$?%5!<%P!<$N\e(B
-\e$BL>A0$rBG$D$3$H$b$G$-$^$9!#\e(B(\e$B$3$l$O\e(B @code{gnus-nntp-server} \e$B$r@_Dj$7!"$3$l\e(B
-\e$B$O8e$N\e(B Emacs \e$B$N%;%C%7%g%s$G\e(B @kbd{M-x gnus} \e$B$H$9$k$H!"\e(BGnus \e$B$OF1$8%5!<%P!<\e(B
-\e$B$K@\B3$7$h$&$H$9$k$H$$$&$3$H$G$9!#\e(B)
-
 @findex gnus-group-browse-foreign-server
 @kindex B (\e$B%0%k!<%W\e(B)
 \e$B$7$+$7!"IaCJF|>oE*$K$O0l$D$N\e(B @acronym{NNTP} \e$B%5!<%P!<$r;H$$!"0c$C$?%5!<%P!<\e(B
@@ -2187,6 +2171,13 @@ Generation Commands})\e$B!#\e(B
 @section \e$B9XFI@)8f%3%^%s%I\e(B
 @cindex subscription
 
+\e$B0J2<$N%3%^%s%I72$O!"%0%k!<%W%P%C%U%!!<$G\e(B (\e$B$=$l$>$l$N%0%k!<%W$r\e(B) \e$B9VFI$9$k\e(B
+\e$B$+$I$&$+$N4IM}$r$G$-$k$h$&$K$7$^$9!#$b$7$?$/$5$s$N%0%k!<%W$r9VFI$7$?$$$N\e(B
+\e$B$G$"$l$P\e(B @ref{Server Buffer} \e$B$K9T$C$F!"$=$3$G\e(B @kbd{RET} \e$B$+\e(B @kbd{SPC} \e$B$r\e(B
+\e$B;H$C$F%5!<%P!<$rA*$VJ}$,$*$=$i$/$b$C$HJXMx$+$b$7$l$^$;$s!#$=$N\e(B
+\e$B8e\e(B @ref{Browse Foreign Server} \e$B$GNs5s$7$F$$$k%3%^%s%I$,!"<j85$G;H$($k$h\e(B
+\e$B$&$K$J$j$^$9!#\e(B
+
 @table @kbd
 @item S t
 @itemx u
@@ -2372,7 +2363,9 @@ Gnus \e$B$O%l%Y%k\e(B 1 \e$B$+$i\e(B @code{gnus-level-subscribed} (\e$B$3$NCM$r4^$`\e(
 
 @vindex gnus-group-default-list-level
 \e$B%G%#%U%)%k%H$G$O\e(B @code{gnus-group-default-list-level} \e$B$HF1$8$+$=$l$h$j>.\e(B
-\e$B$5$$%l%Y%k$N%0%k!<%W$,!"%0%k!<%W%P%C%U%!!<$K0lMwI=<($5$l$^$9!#\e(B
+\e$B$5$$%l%Y%k$N%0%k!<%W$,!"%0%k!<%W%P%C%U%!!<$K0lMwI=<($5$l$^$9!#$3$NJQ?t$O\e(B
+\e$B4X?t$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g!"4X?t$,8F$P$l$F$=$N7k2L$,CM$H$7$F;H$o\e(B
+\e$B$l$^$9!#\e(B
 
 @vindex gnus-group-list-inactive-groups
 @code{gnus-group-list-inactive-groups} \e$B$,\e(B @code{nil} \e$B0J30$G$"$l$P!"L$FI\e(B
@@ -4492,7 +4485,10 @@ Mairix \e$B$,$=$N8!:w7k2L$r3JG<$9$k\e(B @strong{\e$B%P%C%/%(%s%I!&%5!<%P!<\e(B} \e$B$
 \e$BG<$5$l$k%a!<%k$N$?$a$K$O!"$"$J$?$,%a!<%k$r3JG<$7$F$$$k4{B8$N%5!<%P!<$K$9\e(B
 \e$B$l$PNI$$$G$7$g$&!#$7$+$7\e(B @code{nnmairix} \e$B@lMQ$K!"Nc$($P?7$7\e(B
 \e$B$$\e(B @code{nnmaildir} \e$B$^$?$O\e(B @code{nnml} \e$B%5!<%P!<$rBhFs$N\e(B (secondary) \e$BA*Br\e(B
-\e$BJ}K!$K2C$($k$3$H$b$G$-$^$9\e(B (@pxref{Finding the News})\e$B!#\e(B
+\e$BJ}K!$K2C$($k$3$H$b$G$-$^$9\e(B (@pxref{Finding the News})\e$B!#$b$7$^$5$KBhFs\e(B
+\e$B$N\e(B @code{nnml} \e$B%5!<%P!<$r\e(B mairix \e$BMQ$K;H$C$F$$$k$N$G$"$l$P!"%5!<%P!<JQ\e(B
+\e$B?t\e(B @code{nnml-get-new-mail} \e$B$r3N<B$K\e(B @code{nil} \e$B$K@_Dj$7$F$/$@$5$$!#$5$b\e(B
+\e$B$J$$$H%a!<%k$r<:$&$3$H$K$J$j$+$M$^$;$s\e(B (@pxref{nnmairix caveats})\e$B!#\e(B
 Mairix \e$B$r\e(B @acronym{IMAP} \e$B%5!<%P!<>e$G1s3VF0:n$5$;$?$$$N$J$i$P!"$=$3$G$=\e(B
 \e$B$l$KBP1~$9$k\e(B @code{nnimap} \e$B%5!<%P!<$rA*$P$J$1$l$P$J$j$^$;$s!#\e(B
 
@@ -5114,25 +5110,6 @@ Gnus \e$B$O\e(B @acronym{FAQ} \e$B$r\e(B @code{gnus-group-faq-directory} \e$B$+$i<hF@
 Gnus \e$B$O\e(B @code{gnus-group-faq-directory} \e$B$NCM$r$9$Y$F!"0l$D0l$D%*!<%W%s$7\e(B
 \e$B$F$_$h$&$H$7$^$9!#\e(B
 
-@item H C
-@kindex H C (\e$B%0%k!<%W\e(B)
-@findex gnus-group-fetch-control
-@vindex gnus-group-fetch-control-use-browse-url
-@cindex control message
-\e$B$=$N%0%k!<%W$N%3%s%H%m!<%k%a%C%;!<%8$r\e(B @code{ftp.isc.org} \e$B$N5-O?8K$+$i<h\e(B
-\e$BF@$7$^$9\e(B (@code{gnus-group-fetch-control})\e$B!#@\F,0z?t$,M?$($i$l$k$H%0%k!<\e(B
-\e$B%WL>$r?R$M$^$9!#\e(B
-
-@code{gnus-group-fetch-control-use-browse-url} \e$B$,Hs\e(B-@code{nil} \e$B$@$C$?$i!"\e(B
-Gnus \e$B$O\e(B @code{browse-url} \e$B$r;H$C$F%3%s%H%m!<%k%a%C%;!<%8$r3+$-$^$9!#$=$&\e(B
-\e$B$G$J$$>l9g$O\e(B @code{ange-ftp} \e$B$r;H$C$F<hF@$5$l!"0l;~%0%k!<%W$KI=<($5$l$^\e(B
-\e$B$9!#\e(B
-
-\e$B%3%s%H%m!<%k%a%C%;!<%8$O05=L$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#$3$N%3%^%s\e(B
-\e$B%I$r;H$&$K$O\e(B @code{auto-compression-mode} \e$B$r\e(B on \e$B$K$7$F$*$/I,MW$,$"$j$^\e(B
-\e$B$9\e(B (@pxref{Compressed Files, ,Compressed Files, emacs, The Emacs
-Editor})\e$B!#\e(B
-
 @item H d
 @itemx C-c C-d
 @c @icon{gnus-group-describe-group}
@@ -6047,8 +6024,9 @@ Summary Buffer} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 @findex gnus-summary-show-article
 @vindex gnus-summary-show-article-charset-alist
 \e$B8=:_$N5-;v$r\e(B (\e$B:F\e(B) \e$B<hF@$7$^$9!#$b$7@\F,0z?t$,M?$($i$l$k$H!"8=:_$N5-;v$r<h\e(B
-\e$BF@$7$^$9$,!"5-;v$r%H%j!<%H%a%s%H$9$k4X?t$O<B9T$7$^$;$s!#$3$l$O!"%5!<%P!<\e(B
-\e$B$+$iMh$?$^$^$N!X@8$N!Y5-;v$r$b$?$i$7$^$9!#\e(B
+\e$BF@$7$^$9$,!"5-;v$r%H%j!<%H%a%s%H$9$k4X?t$O<B9T$7$^$;$s!#$b$7@\F,0z?t\e(B
+\e$B$,\e(B 2\e$B2sM?$($i$l$k$H\e(B (\e$B$D$^$j\e(B @kbd{C-u C-u g'})\e$B!"%5!<%P!<$+$iMh$?$^$^$N40A4\e(B
+\e$B$J!X@8$N!Y5-;v$rI=<($7$^$9!#\e(B
 
 @cindex charset, view article with different charset
 \e$B@\F,0z?t$rM?$($k$H!"<jF0$GJ8;z%;%C%H$NA`:n$r9T$J$&$3$H$,$G$-$^$9!#\e(B
@@ -9440,6 +9418,17 @@ Sm*rtq**t*s \e$B$O$b$C$HB?$/$N0zMQJ8;z$rDs6!$9$k$?$a$K!"%^"#"#"#%="#"#$,>!<j\e(B
 \e$B9f\e(B (") \e$B$J$I$,$"$k$Y$-$H$3$m$K\e(B @code{\222} \e$B$d\e(B @code{\264} \e$B$N$h$&$J$b$N$,\e(B
 \e$B8+$($F$7$^$C$?$i!"@vBu$7$F$_$F$/$@$5$$!#\e(B
 
+@item W U
+@kindex W U (\e$B35N,\e(B)
+@findex gnus-article-treat-non-ascii
+@cindex Unicode
+@cindex Non-@acronym{ASCII}
+\e$BB?$/$NHs\e(B-@acronym{ASCII} \e$BJ8;z$r$=$l$i$HEy2A$J\e(B @acronym{ASCII} \e$BJ8;z$KJQ49\e(B
+\e$B$7$^$9\e(B (@code{gnus-article-treat-non-ascii})\e$B!#$3$l$O!"%U%)%s%H$K@)8B$,$"$C\e(B
+\e$B$F!"%"%/%;%s%HJ8;z$d!V?J$s$G$$$k!W6gFIE@$J$I$rI=<($7$J$$C<Kv$G$O!"$?$$$F\e(B
+\e$B$$$N>l9g$KLrN)$A$^$9!#Nc$($P\e(B @samp{\e$B"d\e(B} \e$B$+$i\e(B @samp{>>} \e$B$X$NJQ49$J$I$r9T$J\e(B
+\e$B$$$^$9!#\e(B
+
 @item W Y f
 @kindex W Y f (\e$B35N,\e(B)
 @findex gnus-article-outlook-deuglify-article
@@ -9554,19 +9543,16 @@ URL \e$B$K4^$^$l$k2~9T$r:o=|$7$^$9!#$$$/$D$+$N%a%$%i!<$O!"9T$rC;$/$9$k$?$a$K\e(B
 Article}) \e$B$GDj5A$5$l$F$$$kJ8;z%;%C%H$,;H$o$l$^$9!#\e(B(\e$BLuCm\e(B: \e$B<B<AE*$K$O!VJ8\e(B
 \e$B;z%;%C%H!W$G$O$J$/$F\e(B @code{coding-system} \e$B$G$9!#\e(B)
 
-@vindex gnus-article-wash-function
 \e$B%G%#%U%)%k%H$G$O\e(B @acronym{HTML} \e$B$NJQ49$K\e(B @code{mm-text-html-renderer}
 (@pxref{Display Customization, ,\e$BI=<($N%+%9%?%^%$%:\e(B, emacs-mime-ja, The
-Emacs MIME Manual}) \e$B$G@_Dj$5$l$?4X?t$r;H$$$^$9$,!"JQ\e(B
-\e$B?t\e(B @code{gnus-article-wash-function} \e$B$,@_Dj$5$l$F$$$k$H!"5-;v$N@vBu$G$O\e(B
-\e$B$=$l$,M%@h$5$l$^$9!#;H$&$3$H$,$G$-$k!"$"$i$+$8$aMQ0U$5$l$?4X?t$O0J2<$NDL\e(B
-\e$B$j$G$9\e(B:
+Emacs MIME Manual}) \e$B$G@_Dj$5$l$?4X?t$r;H$$$^$9!#;H$&$3$H$,$G$-$k!"$"$i$+\e(B
+\e$B$8$aMQ0U$5$l$?4X?t$O0J2<$NDL$j$G$9\e(B:
 
 @table @code
-@item mm-shr
+@item shr
 Gnus \e$B$N4J0W\e(B html \e$BIA2h4o\e(B (shr) \e$B$r;H$$$^$9!#\e(B
 
-@item gnus-article-html
+@item gnus-w3m
 w3m \e$B$r;H$C$F\e(B Gnus \e$B$KIA2h$5$;$^$9!#\e(B
 
 @item w3
@@ -9589,10 +9575,6 @@ html2text (\e$B%7%s%W%k$J\e(B @acronym{HTML} \e$B%3%s%P!<%?!<$G!"\e(BGnus \e$B$K4^$^$
 \e$B$9\e(B) \e$B$r;H$$$^$9!#\e(B
 @end table
 
-\e$BLuCm\e(B: \e$BNc$($P\e(B @code{mm-text-html-renderer} \e$B$r\e(B @code{w3m} \e$B$J$I$K@_Dj$7$F$"$C\e(B
-\e$B$F@5$7$/F0:n$9$k$N$J$i$P!"\e(B@code{gnus-article-wash-function} \e$B$O%G%#%U%)%k\e(B
-\e$B%H$N\e(B @code{nil} \e$B$N$^$^$K$7$F$*$$$F9=$$$^$;$s!#\e(B
-
 @item W b
 @kindex W b (\e$B35N,\e(B)
 @findex gnus-article-add-buttons
@@ -12240,15 +12222,23 @@ Gnus \e$B$O\e(B @code{w3m} \e$B$rMxMQ$9$k$=$NAH$_9~$_5!G=$r;H$$$^$9!#\e(B
 
 @item gnus-blocked-images
 @vindex gnus-blocked-images
-@acronym{URL} \e$B$,$3$N@55,I=8=$K9gCW$9$k2hA|$O<hF@$bI=<($b$5$l$^$;$s!#Nc$(\e(B
-\e$B$P\e(B ``ads'' \e$B$H$$$&J8;zNs$r$=$l$i$NFb$K;}$D$9$Y$F$N\e(B @acronym{URL} \e$B$rAK;_$9\e(B
-\e$B$k$K$O!"0J2<$N$h$&$K$7$F$/$@$5$$\e(B:
+@acronym{URL} \e$B$,$3$N@55,I=8=$K9gCW$9$k30It2hA|$O<hF@$bI=<($b$5$l$^$;$s!#\e(B
+\e$BNc$($P\e(B ``ads'' \e$B$H$$$&J8;zNs$r$=$l$i$NFb$K;}$D$9$Y$F$N\e(B @acronym{URL} \e$B$rAK\e(B
+\e$B;_$9$k$K$O!"0J2<$N$h$&$K$7$F$/$@$5$$\e(B:
 
 @lisp
 (setq gnus-blocked-images "ads")
 @end lisp
 
-\e$B%G%#%U%)%k%H$G$O$9$Y$F$N30It$+$i$N2hA|$rAK;_$7$^$9!#\e(B
+\e$B$3$l$OI>2A$5$l$k$Y$-4X?t$G$b9=$$$^$;$s!#$=$N>l9g!"$=$l$O%0%k!<%WL>$r%Q%i\e(B
+\e$B%a!<%?!<$H$7$F8F$P$l$^$9!#%G%#%U%)%k%HCM\e(B
+\e$B$O\e(B @code{gnus-block-private-groups} \e$B$G!"%K%e!<%9%0%k!<%W$N5-;v$G$O$J$$$I\e(B
+\e$B$s$J$b$N$KBP$7$F$b\e(B @samp{"."} \e$B$rJV$7$^$9!#$3$l$O%a!<%k$rFI$`$H$-$K30It2h\e(B
+\e$BA|$r<hF@$7$J$$$H$$$&$3$H$G!"$=$l$K$h$C$F$"$J$?$,%a!<%k$rFI$s$@$+$I$&$+$r\e(B
+\e$BDI@W$9$k$?$a$KC/$b\e(B web bugs (\e$BLuCm\e(B: \e$B%$%s%?!<%M%C%H%f!<%6$rDI@W$9$k$?$a$N\e(B
+\e$B%D!<%k\e(B) \e$B$NN`$r;H$($J$$$h$&$K$7$^$9!#\e(B
+
+@code{gnus-inhibit-images} \e$B$b;2>H$7$F$/$@$5$$\e(B (@pxref{Misc Article})\e$B!#\e(B
 
 @item gnus-html-cache-directory
 @vindex gnus-html-cache-directory
@@ -12717,6 +12707,15 @@ Gnus \e$B$O%5!<%P!<$+$i$=$N5-;v$r<h$C$F$3$h$&$H$7$^\e(B
 \e$B>H$7$F$/$@$5$$!#$3$l$K\e(B
 \e$B$O\e(B @uref{http://www.gnu.org/software/libidn/, GNU Libidn} \e$B$,I,MW$G!"$3$N\e(B
 \e$BJQ?t$O$=$l$r%$%s%9%H!<%k$7$F$"$k>l9g$@$1M-8z$K$J$j$^$9!#\e(B
+
+@vindex gnus-inhibit-images
+@item gnus-inhibit-images
+\e$B$b$7\e(B @code{nil} \e$B$G$J$1$l$P!"5-;v$N%\%G%#!<$G$N2hA|$N%$%s%i%$%sI=<($r6X;_\e(B
+\e$B$7$^$9!#$3$l$O\e(B @acronym{MIME} \e$B%Q!<%H$H$7$F5-;v$K$"$k2hA|!"$*$h\e(B
+\e$B$S\e(B @code{mm-text-html-renderer} (@pxref{Display Customization, ,\e$BI=<($N%+\e(B
+\e$B%9%?%^%$%:\e(B, emacs-mime-ja, The Emacs MIME Manual}) \e$B$,\e(B @code{shr} \e$B$^$?\e(B
+\e$B$O\e(B @code{gnus-w3m} \e$B$G$"$k>l9g$KI=<($5$l$?\e(B @acronym{HTML} \e$B5-;v$N2hA|$KBP\e(B
+\e$B$7$FM-8z$G$9!#\e(B
 @end table
 
 @node Composing Messages
@@ -13122,23 +13121,6 @@ Lisp \e$B%U%)!<%`$N%j%9%H!#$=$l$>$l$N%U%)!<%`$,I>2A$5$l!":G=i$KJV$C$F$-\e(B
 \e$B$3$l$OJ]4I$r$7$J$$$h$&$K$7$^$9!#\e(B
 
 @table @code
-@item gnus-outgoing-message-group
-@vindex gnus-outgoing-message-group
-\e$B$9$Y$F$N30$K$$$/%a%C%;!<%8$O$3$N%0%k!<%W$KF~$l$i$l$^$9!#$b$7$9$Y$F$N30$K\e(B
-\e$B9T$/%a!<%k$H5-;v$r\e(B @samp{nnml:archive} \e$B%0%k!<%W$KJ]4I$7$?$$$N$G$"$l$P!"\e(B
-\e$B$3$NJQ?t$r$=$NCM$K@_Dj$7$F$/$@$5$$!#$3$NJQ?t$O%0%k!<%WL>$N%j%9%H$G$"$k$3\e(B
-\e$B$H$b$G$-$^$9!#\e(B
-
-\e$B$b$7$=$l$>$l$N%a%C%;!<%8$r$I$N%0%k!<%W$KF~$l$k$+$r$b$C$H@)8f$7$?$$$N$G$"\e(B
-\e$B$l$P!"$3$NJQ?t$r8=:_$N%K%e!<%9%0%k!<%WL>$rD4$Y$F!"E,@Z$J%0%k!<%WL>\e(B (\e$B$b$7\e(B
-\e$B$/$OL>A0$N%j%9%H\e(B) \e$B$rJV$94X?t$K@_Dj$9$k$3$H$,$G$-$^$9!#\e(B
-
-\e$B$3$NJQ?t$O\e(B @code{gnus-message-archive-group} \e$B$NBe$o$j$K;H$&$3$H$,$G$-$^\e(B
-\e$B$9$,!"8e<T$NJ}$,9%$^$7$$J}K!$G$9!#\e(B
-
-(\e$BLuCm\e(B:\e$B!V8e<T!W$H$O\e(B @code{gnus-message-archive-group} \e$B$N$3$H!#A0<T$h$j;M%v\e(B
-\e$B7nCY$l$F!"\e(B1996\e$BG/\e(B1\e$B7n$K?7@_$5$l$^$7$?!#\e(B)
-
 @item gnus-gcc-mark-as-read
 @vindex gnus-gcc-mark-as-read
 \e$B$b$7Hs\e(B-@code{nil} \e$B$J$i!"\e(B@code{Gcc} \e$B$N5-;v$K4{FI$N0u$rIU$1$^$9!#\e(B
@@ -13230,13 +13212,13 @@ Lisp \e$B%U%)!<%`$N%j%9%H!#$=$l$>$l$N%U%)!<%`$,I>2A$5$l!":G=i$KJV$C$F$-\e(B
 \e$B$,\e(B @code{nil} \e$B$@$C$?$i!"$=$N%X%C%@!<L>$O:o=|$5$l$^$9!#$b$7B0@-L>\e(B
 \e$B$,\e(B @code{eval} \e$B$@$C$?$i$=$NMM<0$,I>2A$5$l!"7k2L$O<N$F$i$l$^$9!#\e(B
 
-\e$BB0@-CM$OJ8;zNs\e(B (\e$B$=$N$^$^;H$o$l$^$9\e(B)\e$B!"0z?t$NL5$$4X?t\e(B (\e$BJV$jCM$,;H$o$l$^$9\e(B)\e$B!"\e(B
-\e$BJQ?t\e(B (\e$B$=$NCM$,;H$o$l$^$9\e(B) \e$B$^$?$O%j%9%H\e(B (\e$B$=$l$O\e(B @code{\e$BI>2A\e(B} \e$B$5$l$F!"JV$j\e(B
-\e$BCM$,;H$o$l$^$9\e(B) \e$B$G$"$k$3$H$,$G$-$^$9!#4X?t$H\e(B S\e$B<0\e(B (sexp) \e$B$O%;%C%H%"%C%W$5\e(B
-\e$B$l$D$D$"$k%a%C%;!<%8%P%C%U%!!<$G8F$P$l$k$+I>2A$5$l$^$9!#8=:_$N5-;v$N%X%C\e(B
-\e$B%@!<72$OJQ?t\e(B @code{message-reply-headers} \e$B$+$iF@$i$l$^$9!#$3$l$O\e(B number
-subject from date id references chars lines xref extra \e$B$N3F%X%C%@!<$+$i\e(B
-\e$B@.$k%Y%/%H%k$G$9!#\e(B
+\e$BB0@-CM$OJ8;zNs!"0z?t$NL5$$4X?t\e(B (\e$BJV$jCM$,;H$o$l$^$9\e(B)\e$B!"JQ?t\e(B (\e$B$=$NCM$,;H$o\e(B
+\e$B$l$^$9\e(B) \e$B$^$?$O%j%9%H\e(B (\e$B$=$l$O\e(B @code{\e$BI>2A\e(B} \e$B$5$l$F!"JV$jCM$,;H$o$l$^$9\e(B) \e$B$G\e(B
+\e$B$"$k$3$H$,$G$-$^$9!#4X?t$H\e(B S\e$B<0\e(B (sexp) \e$B$O%;%C%H%"%C%W$5$l$D$D$"$k%a%C%;!<\e(B
+\e$B%8%P%C%U%!!<$G8F$P$l$k$+I>2A$5$l$^$9!#8=:_$N5-;v$N%X%C%@!<72$OJQ\e(B
+\e$B?t\e(B @code{message-reply-headers} \e$B$+$iF@$i$l$^$9!#$3$l$O\e(B number subject
+from date id references chars lines xref extra \e$B$N3F%X%C%@!<$+$i@.$k%Y%/\e(B
+\e$B%H%k$G$9!#\e(B
 
 @vindex message-reply-headers
 \e$B:n@.$7$h$&$H$7$F$$$k%a%C%;!<%8$,%K%e!<%95-;v$+%a!<%k%a%C%;!<%8$G$"$k$+$r\e(B
@@ -13613,6 +13595,11 @@ Message Manual}, \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 @findex gnus-server-edit-server
 \e$B%5!<%P!<$rJT=8$7$^$9\e(B (@code{gnus-server-edit-server})\e$B!#\e(B
 
+@item S
+@kindex S (\e$B%5!<%P!<\e(B)
+@findex gnus-server-show-server
+\e$B%5!<%P!<$NDj5A$rI=<($7$^$9\e(B (@code{gnus-server-show-server})\e$B!#\e(B
+
 @item SPACE
 @kindex SPACE (\e$B%5!<%P!<\e(B)
 @findex gnus-server-read-server
@@ -14209,7 +14196,9 @@ default force yes
 @table @code
 @findex nntp-open-network-stream
 @item nntp-open-network-stream
-\e$B$3$l$O%G%#%U%)%k%H$G!"C1=c$K1s3V%7%9%F%`$N2?$i$+$N%]!<%H$K@\B3$7$^$9!#\e(B
+\e$B$3$l$O%G%#%U%)%k%H$G!"C1=c$K1s3V%7%9%F%`$N%]!<%H$b$7$/$OJL$N$b$N$K@\B3$7\e(B
+\e$B$^$9!#$b$7\e(B Emacs \e$B$H%5!<%P!<$NN>J}$,%5%]!<%H$7$F$$$l$P!"$=$N@\B3$O<+F0E*\e(B
+\e$B$K0E9f2=$5$l$?\e(B @acronym{STARTTLS} \e$B@\B3$K>:3J$5$l$^$9!#\e(B
 
 @findex nntp-open-tls-stream
 @item nntp-open-tls-stream
@@ -14613,9 +14602,7 @@ machine imap.gmail.com login <username> password <password> port imap
         (nnimap-inbox "INBOX")
         (nnimap-split-methods default)
         (nnimap-expunge t)
-        (nnimap-stream ssl)
-        (nnir-search-engine imap)
-        (nnimap-expunge-inbox t))
+        (nnimap-stream ssl))
 @end example
 
 @table @code
@@ -14630,11 +14617,17 @@ machine imap.gmail.com login <username> password <password> port imap
 @code{nnimap} \e$B$,$I$&$d$C$F%5!<%P!<$K@\B3$9$k$+$r;XDj$7$^$9!#;H$($kCM$O\e(B:
 
 @table @code
+@item undecided
+\e$B$3$l$,%G%#%U%)%k%H$G$9!#:G=i$K\e(B @code{ssl} \e$B@_Dj$r!"<!$K\e(B @code{network} \e$B@_\e(B
+\e$BDj$r;n$7$^$9!#\e(B
+
 @item ssl
-\e$B$3$l$O%G%#%U%)%k%H$G!"I8=`$N\e(B @acronym{TLS}/@acronym{SSL} \e$B@\B3$r;H$$$^$9!#\e(B
+\e$BI8=`$N\e(B @acronym{TLS}/@acronym{SSL} \e$B@\B3$r;H$$$^$9!#\e(B
 
 @item network
-\e$B0E9f2=$5$l$J$$$N$G0BA4$G$O$J$$!"%9%H%l!<%H$J%=%1%C%H@\B3$G$9!#\e(B
+\e$B0E9f2=$5$l$J$$$N$G0BA4$G$O$J$$!"%9%H%l!<%H$J%=%1%C%H@\B3$G$9!#$7$+$7!"$b\e(B
+\e$B$7\e(B Emacs \e$B$H%5!<%P!<$NN>J}$,%5%]!<%H$7$F$$$l$P!"0E9f2=$5$l\e(B
+\e$B$?\e(B @acronym{STARTTLS} \e$B@\B3$K>:3J$7$^$9!#\e(B
 
 @item starttls
 \e$B@55,$N\e(B @acronym{IMAP} \e$B%]!<%H>e$G0E9f2=$5$l$?\e(B @acronym{STARTTLS} \e$B$r;H$$$^\e(B
@@ -14650,6 +14643,11 @@ machine imap.gmail.com login <username> password <password> port imap
 \e$B$$$/$D$+$N\e(B @acronym{IMAP} \e$B%5!<%P!<$OF?L>%m%0%$%s$r5vMF$7$F$$$^$9!#$=$N>l\e(B
 \e$B9g!"$3$l$r\e(B @code{anonymous} \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#\e(B
 
+@item nnimap-expunge
+\e$B$b$7\e(B @code{nil} \e$B$G$J$1$l$P!"5-;v$r>C5n$7$?8e$G$=$l$i$r1J5W$K<h$j=|$-$^$9!#\e(B
+\e$B$3$l$O%5!<%P!<$K\e(B UID EXPUNGE \e$B$N5!G=$,$"$l$P>o$K<B9T$5$l$^$9$,!"%G%#%U%)\e(B
+\e$B%k%H$G$O%5!<%P!<$K$=$N%3%^%s%I$,L5$1$l$P<B9T$7$^$;$s!#\e(B
+
 @item nnimap-streaming
 \e$B;v<B>e$9$Y$F$N\e(B @acronym{IMAP} \e$B%5!<%P!<$O%G!<%?$N9bB.%9%H%j!<%_%s%0$r%5%]!<\e(B
 \e$B%H$7$F$$$^$9!#$b$7%5!<%P!<$X$N@\B3$KLdBj$,$"$k$N$J$i!"$3$l\e(B
@@ -14683,6 +14681,11 @@ Mail})\e$B!#$?$@$7\e(B @code{default} \e$B$H$$$&%7%s%\%k$G$"$k>l9g$ONc30$G!"\e(B
 
 @item nnimap-split-fancy
 @code{nnmail-split-fancy} \e$B$HF1$89=J8$r;H$$$^$9!#\e(B
+
+@item nnimap-unsplittable-articles
+\e$BJ,3d$r9T$J$C$F$$$k$H$-$KL5;k$9$Y$-%U%i%0$N%7%s%\%k$N%j%9%H!#$9$J$o$A!"$=\e(B
+\e$B$l$i$N%U%i%0$r$b$C$F$$$k5-;v$O!"J,3d$r9T$J$&BP>]$H$7$F9MN8$5$l$J$$$H$$$&\e(B
+\e$B$3$H$G$9!#%G%#%U%k%H$O\e(B @samp{(%Deleted %Seen)} \e$B$G$9!#\e(B
 @end table
 
 @node Getting Mail
@@ -17500,15 +17503,6 @@ 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$B$i\e(B feed \e$B$rFI$_$^$9!#\e(B@code{nnrss-generate-download-script} \e$B%3%^%s%I$r;H$&\e(B
 \e$B$3$H$K$h$C$F!"\e(B@command{wget} \e$B$r;H$C$?%@%&%s%m!<%I!&%9%/%j%W%H$r:n$k$3$H\e(B
 \e$B$,$G$-$^$9!#\e(B
-
-@item nnrss-wash-html-in-text-plain-parts
-@code{nil} \e$B$G$O$J$$CM$K$9$k$H\e(B @code{nnrss} \e$B$O\e(B @samp{text/plain} \e$B%Q!<%H$K\e(B
-\e$B$"$k%F%-%9%H$r\e(B @acronym{HTML} \e$B$H$7$FIA2h$7$^$9!#%F%-%9%H$NIA2h$K\e(B
-\e$B$O\e(B @code{mm-text-html-renderer} \e$BJQ?t\e(B (@pxref{Display Customization,
-,\e$BI=<($N%+%9%?%^%$%:\e(B, emacs-mime-ja, The Emacs MIME Manual}) \e$B$GDj5A$5$l$?\e(B
-\e$B4X?t$,;H$o$l$^$9!#\e(B@code{nil} \e$B$@$C$?$i\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9\e(B)\e$B!"%F%-%9%H\e(B
-\e$B$OC1$K@^$jJV$5$l$k$@$1$G$9!#$b$7\e(B @samp{text/html} \e$B%Q!<%H$r8+$k$N$,9%$_$J\e(B
-\e$B$i$P!"\e(B@code{nil} \e$B$N$^$^$K$7$F$*$$$F$/$@$5$$!#\e(B
 @end table
 
 \e$B35N,%P%C%U%!!<$K@bL@$rI=<($5$;$?$$$J$i$P!"0J2<$N%3!<%I$,Lr$KN)$D$G$7$g$&!#\e(B
@@ -29623,11 +29617,11 @@ Gnus \e$B$O\e(B Emacs Lisp \e$B$K$h$C$F=q$+$l$F$$$F!"%$%s%?!<%W%j%?!<$G<B9T$5$l$k$?
 \e$B$H$$$&$3$H$G$9!#\e(B
 
 \e$B0lJ}!"%^%K%e%"%k\e(B
-\e$B$,!V\e(B@code{gnus-nntp-server} \e$B$r\e(B @samp{nntp.ifi.uio.no} \e$B$K@_Dj$7$J$5$$!W$H\e(B
-\e$B8@$C$?$J$i!"$=$l$O\e(B
+\e$B$,!V\e(B@code{gnus-nntp-server-file} \e$B$r\e(B @file{/etc/nntpserver} \e$B$K@_Dj$7$J$5\e(B
+\e$B$$!W$H8@$C$?$J$i!"$=$l$O\e(B
 
 @lisp
-(setq gnus-nntp-server "nntp.ifi.uio.no")
+(setq gnus-nntp-server-file "/etc/nntpserver")
 @end lisp
 
 \e$B$H$$$&$3$H$G$9!#\e(B