Synch with No Gnus (201011042013).
[elisp/gnus-doc-ja.git] / gnus-ja.texi
index bad9443..0be0e8a 100644 (file)
@@ -634,7 +634,7 @@ Select Methods
 
 * Server Buffer::               \e$B2>A[%5!<%P!<$r:n$C$FJT=8$9$k\e(B
 * Getting News::                USENET \e$B%K%e!<%9$r\e(B Gnus \e$B$GFI$`\e(B
-* Using @acronym{IMAP}::        @acronym{IMAP} \e$B$+$i%a!<%k$rFI$`\e(B
+* Using IMAP::                  @acronym{IMAP} \e$B$+$i%a!<%k$rFI$`\e(B
 * Getting Mail::                \e$B8D?ME*$J%a!<%k$r\e(B Gnus \e$B$GFI$`\e(B
 * Browsing the Web::            \e$BBgNL$N%&%'%V$N;q8;$+$i%a%C%;!<%8$r<hF@$9$k\e(B
 * Other Sources::               \e$B%G%#%l%/%H%j!<!"%U%!%$%k$rFI$`\e(B
@@ -802,7 +802,6 @@ Various
 * Compilation::                 Gnus \e$B$rB.$/$9$k$K$O\e(B
 * Mode Lines::                  \e$B%b!<%I9T$K>pJs$rI=<($9$k\e(B
 * Highlighting and Menus::      \e$B%P%C%U%!!<$rAGE($G?4CO$h$/8+$;$k\e(B
-* Buttons::                     \e$B$?$C$?==2s$?$?$$$?$@$1$Gg'>d1j$K$J$k\e(B!
 * Daemons::                     Gnus \e$B$O$"$J$?$NN"$G;E;v$r$9$k$3$H$,$G$-$k\e(B
 * Undo::                        \e$B$$$/$D$+$NF0:n$O85$KLa$9$3$H$,$G$-$k\e(B
 * Predicate Specifiers::        \e$B=R8l$r@_Dj$9$k\e(B
@@ -1033,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
@@ -2188,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
@@ -2373,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
@@ -3544,11 +3536,10 @@ kill \e$B$5$l$?%0%k!<%W$r$9$Y$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#
 @vindex gnus-browse-subscribe-newsgroup-method
 \e$B8=:_$N%0%k!<%W$rHs9XFI$K$7$^$9!#$H8@$&$h$j$O\e(B (\e$BLuCm\e(B: \e$B$3$N%3%^%s%I$O%H%0%k\e(B
 \e$B$J$N$G\e(B)\e$B!"$3$N>l9g$O9XFI$9$k$3$H$K$J$k$N$G$7$g$&$1$l\e(B
-\e$B$I\e(B (@code{gnus-browse-unsubscribe-current-group})\e$B!#\e(B
-@c TRANSLATEME
-You can affect the way the new group is entered into the Group buffer
-using the variable @code{gnus-browse-subscribe-newsgroup-method}.  See
-@pxref{Subscription Methods} for available options.
+\e$B$I\e(B (@code{gnus-browse-unsubscribe-current-group})\e$B!#?7$7$$%0%k!<%W$r%0%k!<\e(B
+\e$B%W%P%C%U%!!<$KJTF~$9$kJ}K!$r!"JQ\e(B
+\e$B?t\e(B @code{gnus-browse-subscribe-newsgroup-method} \e$B$r;H$C$F@)8f$9$k$3$H$,\e(B
+\e$B$G$-$^$9!#MxMQ$G$-$k%*%W%7%g%s$K$D$$$F$O\e(B: @xref{Subscription Methods}.
 
 @item l
 @itemx q
@@ -4494,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
 
@@ -5116,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}
@@ -6049,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
@@ -9237,6 +9213,14 @@ MTA \e$B$,%/%*!<%H$7$?2DG=@-$,$"$j$^$9!#%G%#%U%)%k%HCM$O\e(B @code{t} \e$B$G$9!#\e(B
 \e$B$O\e(B @code{gnus-article-banner-alist} \e$B$N@55,I=8=$KBP1~$7$?B>$N%7%s%\%k$N$$\e(B
 \e$B$:$l$+$G$"$k$3$H$,$G$-$^$9!#\e(B
 
+\e$BNc$($P\e(B:
+
+@lisp
+(setq gnus-article-banner-alist
+      ((googleGroups .
+       "^\n*--~--~---------\\(.+\n\\)+")))
+@end lisp
+
 \e$B%0%k!<%W$K$+$+$o$i$:!"5-;v$NAw?.<T\e(B
 \e$B$,\e(B @code{gnus-article-address-banner-alist} \e$B$G@_Dj$5$l$F$$$kFCDj$N%a!<%k\e(B
 \e$B%"%I%l%9$r;}$C$F$$$k$H$-$@$1!"9-9p$N$h$&$J$b$N$r1#$9$3$H$,$G$-$^$9!#\e(B
@@ -9548,16 +9532,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 gnus-article-html
+@item shr
+Gnus \e$B$N4J0W\e(B html \e$BIA2h4o\e(B (shr) \e$B$r;H$$$^$9!#\e(B
+
+@item gnus-w3m
 w3m \e$B$r;H$C$F\e(B Gnus \e$B$KIA2h$5$;$^$9!#\e(B
 
 @item w3
@@ -9580,10 +9564,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
@@ -10535,16 +10515,14 @@ Gnus \e$B8GM-$G$O$J$$$1$l$I!"Lr$KN)$D$+$b$7$l$J$$J8;z%;%C%H$K4X$9$kB>$NHk7m\e(B:
 \e$B%U%!!<$r0u:~$9$kD>A0$K<B9T$5$l$^$9!#B>$K\e(B Muttprint \e$B$r;H$C$F0u:~$9$k$3$H\e(B
 \e$B$b$G$-$^$9\e(B (@pxref{Saving Articles})\e$B!#\e(B
 
-@c TRANSLATEME
 @item A C
 @vindex gnus-fetch-partial-articles
 @findex gnus-summary-show-complete-article
-If @code{gnus-fetch-partial-articles} is non-@code{nil}, Gnus will
-fetch partial articles, if the backend it fetches them from supports
-it.  Currently only @code{nnimap} does.  If you're looking at a
-partial article, and want to see the complete article instead, then
-the @kbd{A C} command (@code{gnus-summary-show-complete-article}) will
-do so.
+\e$B$b$7\e(B @code{<backend>-fetch-partial-articles} \e$B$,\e(B @code{nil} \e$B0J30$NCM$@$C\e(B
+\e$B$?$i!"%P%C%/%(%s%I$,%5%]!<%H$7$F$$$l$P\e(B Gnus \e$B$O5-;v$NItJ,$r<h$j9~$_$^$9!#\e(B
+\e$B:#$N$H$3$m\e(B @code{nnimap} \e$B$@$1$,9T$J$$$^$9!#$b$75-;v$NItJ,$r8+$F$$$k$H$-\e(B
+\e$B$K!"$=$&$G$O$J$/40A4$J5-;v$r8+$kI,MW$,$"$k$J$i$P!"\e(B@kbd{A C} \e$B%3%^%s\e(B
+\e$B%I\e(B (@code{gnus-summary-show-complete-article}) \e$B$,$=$&$7$^$9!#\e(B
 @end table
 
 @node Summary Sorting
@@ -10718,8 +10696,13 @@ Gnus \e$B$O$9$G$K<hF@$7$F$"$k%X%C%@!<$?$A$NCf$G\e(B @code{Message-ID} \e$B$rC5$7$^$
 \e$B$"$^$jM%2m$JJ}K!$G$d$C$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B@code{nnmbox},
 @code{nnbabyl}, @code{nnmaildir} \e$B$*$h$S\e(B @code{nnml} \e$B$,$I$N%0%k!<%W$+$i$G\e(B
 \e$B$b5-;v$rA\:w$G$-$k$N$KBP$7$F!"\e(B@code{nnfolder} \e$B$H\e(B @code{nnimap} \e$B$O8=:_$N\e(B
-\e$B%0%k!<%W$KEj9F$5$l$?5-;v$7$+C5$9$3$H$,$G$-$^$;$s!#\e(B(\e$B$=$NB>$N$b$N$O;~4V$,\e(B
-\e$B$+$+$j$9$.$^$9!#\e(B) @code{nnmh} \e$B$G$O$^$C$?$/IT2DG=$G$9!#\e(B
+\e$B%0%k!<%W$KEj9F$5$l$?5-;v$7$+C5$9$3$H$,$G$-$^$;$s!#\e(B@code{nnmh} \e$B$G$O$^$C$?\e(B
+\e$B$/IT2DG=$G$9!#\e(B
+
+\e$B9,$$$K$bFCJL$J%P%C%/%(%s%I$G$"$k\e(B @code{nnregistry} \e$B$O!"$I$s$J%0%k!<%W$K\e(B
+\e$B$"$k5-;v$G$b%P%C%/%(%s%I$K4X78L5$/8+$D$1=P$9$3$H$,$G$-$^$9!#\e(B
+@xref{Registry Article Refer Method, @code{Message-ID} \e$B$K4p$E$$$F%l%8%9\e(B
+\e$B%H%j!<$G5-;v$r<hF@$9$k\e(B}.
 
 @node Alternative Approaches
 @section \e$BBeBX<jCJ\e(B
@@ -11317,6 +11300,7 @@ Gnus \e$B$O\e(B @code{Message-ID} \e$B$rIU$1BX$($F\e(B (\e$BI=<($N$?$a$@$1$K\e(B) \e$B$
 @node Summary Group Information
 @subsection \e$B35N,%0%k!<%W>pJs\e(B
 
+@table @kbd
 @item H d
 @kindex H d (\e$B35N,\e(B)
 @findex gnus-summary-describe-group
@@ -12223,19 +12207,26 @@ emacs-mime-ja, The Emacs MIME Manual}, \e$B$r;2>H$7$F$/$@$5$$!#$3$N>O$O%G%#\e(B
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 \e$B$b$7$3$l$,\e(B @code{gnus-article-html} \e$B$K@_Dj$5$l$F$$$k$H!"\e(B
-Gnus \e$B$O\e(B @code{curl} \e$B$H\e(B @code{w3m} \e$B$rMxMQ$9$k$=$NAH$_9~$_5!G=$r;H$$$^$9!#\e(B
+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
 
 @item gnus-html-cache-directory
 @vindex gnus-html-cache-directory
@@ -12607,6 +12598,11 @@ Gnus \e$B$O%5!<%P!<$+$i$=$N5-;v$r<h$C$F$3$h$&$H$7$^\e(B
 \e$BMQ$7$^$9\e(B (\e$B$3$l$O%G%#%U%)%k%H$G$9\e(B)\e$B!#\e(B@code{nil} \e$B$G$"$l$P!"3F%0%k!<%WKh$N8G\e(B
 \e$BM-$N5-;v%P%C%U%!!<$r;}$D$h$&$K$J$j$^$9!#\e(B
 
+@item gnus-widen-article-window
+@cindex gnus-widen-article-window
+\e$B$b$7\e(B @code{nil} \e$B$G$J$+$C$?$i\e(B @kbd{h} \e$B%3%^%s%I$G5-;v$rA*$V$H$-$K5-;v%&%#\e(B
+\e$B%s%I%&$r%U%l!<%`A4BN$r@j$a$k$h$&$K3HBg$7$^$9!#\e(B
+
 @vindex gnus-article-decode-hook
 @item gnus-article-decode-hook
 @cindex @acronym{MIME}
@@ -13212,13 +13208,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
@@ -13478,7 +13474,7 @@ Message Manual}, \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 @menu
 * Server Buffer::               \e$B2>A[%5!<%P!<$r:n$C$FJT=8$9$k\e(B
 * Getting News::                USENET \e$B%K%e!<%9$r\e(B Gnus \e$B$GFI$`\e(B
-* Using @acronym{IMAP}::        @acronym{IMAP} \e$B$+$i%a!<%k$rFI$`\e(B
+* Using IMAP::                  @acronym{IMAP} \e$B$+$i%a!<%k$rFI$`\e(B
 * Getting Mail::                \e$B8D?ME*$J%a!<%k$r\e(B Gnus \e$B$GFI$`\e(B
 * Browsing the Web::            \e$BBgNL$N%&%'%V$N;q8;$+$i%a%C%;!<%8$r<hF@$9$k\e(B
 * Other Sources::               \e$B%G%#%l%/%H%j!<!"%U%!%$%k$rFI$`\e(B
@@ -13891,14 +13887,13 @@ Message Manual}, \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 Gnus \e$B$,@\B3$r5qH]$5$l$?$9$Y$F$N%5!<%P!<$N!"$9$Y$F$N0u$r>C5n$7\e(B
 \e$B$^$9\e(B (@code{gnus-server-remove-denials})\e$B!#\e(B
 
-@c TRANSLATEME
 @item c
 @kindex c (\e$B%5!<%P!<\e(B)
 @findex gnus-server-copy-server
-Copy a server and give it a new name
-(@code{gnus-server-copy-server}).  This can be useful if you have a
-complex method definition, and want to use the same definition towards
-a different (physical) server.
+\e$B%5!<%P!<$r%3%T!<$7$F?7$7$$L>A0$rIU$1$^\e(B
+\e$B$9\e(B (@code{gnus-server-copy-server})\e$B!#$3$l$O!"J#;($J@\B3J}K!$NDj5A$,$9$G\e(B
+\e$B$K$"$C$F!"$=$l$HF1$8Dj5A$r0[$J$k\e(B (\e$BJ*M}\e(B) \e$B%5!<%P!<$N$?$a$K;H$&I,MW$,$"$k>l\e(B
+\e$B9g$KLrN)$D$O$:$G$9!#\e(B
 
 @item L
 @kindex L (\e$B%5!<%P!<\e(B)
@@ -14167,6 +14162,11 @@ default force yes
 
 \e$B$9$Y$F$N%5!<%P!<$,?d>)\e(B ID \e$B$r%5%]!<%H$7$F$$$k$o$1$G$O$J$$$3$H$KCm0U$7$F$/\e(B
 \e$B$@$5$$!#$3$l$ONc$($P\e(B INN 2.3.0 \e$B0J>e$GF0:n$7$^$9!#\e(B
+
+@item nntp-server-list-active-group
+\e$B$b$7\e(B @code{nil} \e$B$@$C$?$i\e(B @samp{LIST ACTIVE} \e$B$NBe$o$j$K>o\e(B
+\e$B$K\e(B @samp{GROUP} \e$B$r;H$$$^$9!#$3$l$OIaDLCY$$$N$G$9$,!"8m$C$F\e(B active \e$B%U%!%$\e(B
+\e$B%k$rIQHK$K99?7$7$J$$$h$&$K@_Dj$5$l$F$$$k%5!<%P!<$G$O=u$1$K$J$k$O$:$G$9!#\e(B
 @end table
 
 @menu
@@ -14544,119 +14544,131 @@ A \e$B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<\e(B
 \e$B$G!"$=$3$G<B9T$7$^$9!#\e(B
 @end table
 
-@c TRANSLATEME
-@node Using @acronym{IMAP}
-@section Using @acronym{IMAP}
+@node Using IMAP
+@section IMAP \e$B$r;H$&\e(B
 @cindex imap
 
-The most popular mail backend is probably @code{nnimap}, which
-provides access to @acronym{IMAP} servers.  @acronym{IMAP} servers
-store mail remotely, so the client doesn't store anything locally.
-This means that it's a convenient choice when you're reading your mail
-from different locations, or with different user agents.
+\e$B$*$=$i$/:G$b?M5$$,$"$k%a!<%k!&%P%C%/%(%s%I$O\e(B @code{nnimap} \e$B$G$9!#$=$l\e(B
+\e$B$O\e(B @acronym{IMAP} \e$B%5!<%P!<$K@\B3$7$^$9!#\e(B@acronym{IMAP} \e$B%5!<%P!<$O%a!<%k\e(B
+\e$B$r%5!<%P!<$K3JG<$9$k$N$G!"%/%i%$%"%s%H$O2?$b%m!<%+%k$K3JG<$7$^$;$s!#$b$7!"\e(B
+\e$B$$$m$$$m$J>l=j$+$i!"$^$?$O$$$m$$$m$J%f!<%6!<!&%(!<%8%'%s%H$G%a!<%k$rFI$s\e(B
+\e$B$G$$$k$N$G$"$l$P!"$=$l$OJXMx$JA*Br$@$H8@$($^$9!#\e(B
 
 @menu
-* Connecting to an @acronym{IMAP} Server::     Getting started with @acronym{IMAP}.
-* Customizing the @acronym{IMAP} Connection::  Variables for @acronym{IMAP} connection.
-* Client-Side @acronym{IMAP} Splitting::       Put mail in the correct mail box.
+* Connecting to an IMAP Server::     @acronym{IMAP} \e$B$r;O$a$k\e(B
+* Customizing the IMAP Connection::  @acronym{IMAP} \e$B@\B3$N$?$a$NJQ?t\e(B
+* Client-Side IMAP Splitting::       \e$B@5$7$$%a!<%k%\%C%/%9$K%a!<%k$rCV$/\e(B
 @end menu
 
+@node Connecting to an IMAP Server
+@subsection IMAP \e$B%5!<%P!<$K@\B3$9$k\e(B
 
-@node Connecting to an @acronym{IMAP} Server
-@subsection Connecting to an @acronym{IMAP} Server
-
-Connecting to an @acronym{IMAP} can be very easy.  Type @kbd{B} in the
-group buffer, or (if your primary interest is reading email), say
-something like:
+@acronym{IMAP} \e$B%5!<%P!<$X$N@\B3$O$H$F$b4JC1$J$O$:$G$9!#%0%k!<%W%P%C%U%!!<\e(B
+\e$B$G\e(B @kbd{B} \e$B$rC!$/$+!"$^$?$O\e(B (\e$B$b$7$"$J$?$NBh0l$N4X?4;v$,%a!<%k$rFI$`$3$H\e(B
+\e$B$G$"$k$J$i\e(B) \e$B0J2<$N$h$&$J$3$H$r$7$F$/$@$5$$\e(B:
 
 @example
 (setq gnus-select-method
       '(nnimap "imap.gmail.com"))
 @end example
 
-You'll be prompted for a user name and password.  If you grow tired of
-that, then add the following to your @file{~/.authinfo} file:
+\e$B%f!<%6!<L>$H%Q%9%o!<%I$r?R$M$i$l$^$9!#$=$l$KK0$-$?$J$i!"0J2<$N$b$N\e(B
+\e$B$r\e(B @file{~/.authinfo} \e$B%U%!%$%k$K2C$($F$/$@$5$$\e(B:
 
 @example
 machine imap.gmail.com login <username> password <password> port imap
 @end example
 
-That should basically be it for most users.
-
+\e$B$[$H$s$I$N%f!<%6!<$K$O!"$=$l$@$1$GNI$$$O$:$G$9!#\e(B
 
-@node Customizing the @acronym{IMAP} Connection
-@subsection Customizing the @acronym{IMAP} Connection
+@node Customizing the IMAP Connection
+@subsection IMAP \e$B@\B3$r%+%9%?%^%$%:$9$k\e(B
 
-Here's an example method that's more complex:
+\e$B$b$C$HJ#;($J@\B3J}K!$NNc\e(B:
 
 @example
 (nnimap "imap.gmail.com"
         (nnimap-inbox "INBOX")
-        (nnimap-split-methods ,nnmail-split-methods)
+        (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
 @item nnimap-address
-The address of the server, like @samp{imap.gmail.com}.
+\e$B%5!<%P!<$N%"%I%l%9$G$9!#\e(B@samp{imap.gmail.com} \e$B$N$h$&$J$b$N!#\e(B
 
 @item nnimap-server-port
-If the server uses a non-standard port, that can be specified here.  A
-typical port would be @samp{imap} or @samp{imaps}.
+\e$B%5!<%P!<$N%]!<%H$,I8=`$H$O0[$J$k$J$i!"$3$3$G@_Dj$G$-$^$9!#BeI=E*$J%]!<%H\e(B
+\e$B$O\e(B @code{"imap"} \e$B$"$k$$$O\e(B @code{"imaps"} \e$B$G$7$g$&!#\e(B
 
 @item nnimap-stream
-How @code{nnimap} should connect to the server.  Possible values are:
+@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 ssl
-This is the default, and this uses standard
-@acronym{TLS}/@acronym{SSL} connection.
+\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
 
 @item network
-Non-encrypted and unsafe straight socket connection.
+\e$B0E9f2=$5$l$J$$$N$G0BA4$G$O$J$$!"%9%H%l!<%H$J%=%1%C%H@\B3$G$9!#\e(B
 
 @item starttls
-Encrypted @acronym{STARTTLS} over the normal @acronym{IMAP} port.
+\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
+\e$B$9!#\e(B
 
 @item shell
-If you need to tunnel via other systems to connect to the server, you
-can use this option, and customize @code{nnimap-shell-program} to be
-what you need.
-
+\e$B$b$7%5!<%P!<$K@\B3$9$k$?$a$KB>$N%[%9%H$r%H%s%M%k$9$kI,MW$,$"$k$J$i!"$3$N\e(B
+\e$B%*%W%7%g%s$r;H$C$F\e(B @code{nnimap-shell-program} \e$B$rI,MW$K1~$8$F%+%9%?%^%$\e(B
+\e$B%:$9$k$3$H$,$G$-$^$9!#\e(B
 @end table
 
 @item nnimap-authenticator
-Some @acronym{IMAP} servers allow anonymous logins.  In that case,
-this should be set to @code{anonymous}.
+\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$rL\O?$+$i:o=|$7$^$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
-Virtually all @code{IMAP} server support fast streaming of data.  If
-you have problems connecting to the server, try setting this to @code{nil}.
+\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
+\e$B$r\e(B @code{nil} \e$B$K@_Dj$7$F$_$F$/$@$5$$!#\e(B
 
+@item nnimap-fetch-partial-articles
+\e$B$b$7\e(B @code{nil} \e$B0J30$NCM$@$C$?$i!"%5!<%P!<$+$i5-;v$NItJ,$r<h$j9~$_$^$9!#\e(B
+\e$B$b$7J8;zNs$,@_Dj$5$l$F$$$?$i!"$=$l$O@55,I=8=$G$"$k$H2r<a$5$l!"$=$N%?%$%W\e(B
+\e$B$,9gCW$9$kItJ,$,<h$j9~$^$l$^$9!#Nc$($P\e(B @samp{"text/"} \e$B>l9g$O$9$Y$F$N%F%-\e(B
+\e$B%9%H7?$NItJ,$r<h$j9~$_$^$9$,!";D$j$O%5!<%P!<$KCV$$$?$^$^$K$J$j$^$9!#\e(B
 @end table
 
+@node Client-Side IMAP Splitting
+@subsection \e$B%/%i%$%"%s%HB&$G$N\e(B IMAP \e$BJ,3d\e(B
 
-@node Client-Side @acronym{IMAP} Splitting
-@subsection Client-Side @acronym{IMAP} Splitting
+\e$BB?$/$N?M!9$,!"%a!<%k$r\e(B @acronym{IMAP} \e$B%5!<%P!<>e$N$=$l$>$l$N%a!<%k%\%C%/\e(B
+\e$B%9$KJB$S49$(\e(B/\e$BJ,3d$9$k$3$H$r9%$_$^$9!#$=$&$9$l$P!"$5$[$I4X?4$,L5$$%a!<%k\e(B
+\e$B$r%@%&%s%m!<%I$9$kI,MW$,$"$j$^$;$s!#\e(B
 
-Many people prefer to do the sorting/splitting of mail into their mail
-boxes on the @acronym{IMAP} server.  That way they don't have to
-download the mail they're not all that interested in.
-
-If you do want to do client-side mail splitting, then the following
-variables are relevant:
+\e$B$b$7%/%i%$%"%s%HB&$G%a!<%kJ,3d$r$9$kI,MW$,$"$k$N$J$i!"4XO"$9$kJQ?t$O<!$N\e(B
+\e$BDL$j$G$9\e(B:
 
 @table @code
 @item nnimap-inbox
-This is the @acronym{IMAP} mail box that will be scanned for new mail.
+\e$B?7Ce%a!<%k$,D4$Y$i$l$k\e(B @acronym{IMAP} \e$B%a!<%k%\%C%/%9$G$9!#\e(B
 
 @item nnimap-split-methods
-Uses the same syntax as @code{nnmail-split-methods} (@pxref{Splitting
-Mail}).
+@code{nnmail-split-methods} \e$B$HF1$89=J8$r;H$$$^$9\e(B (@pxref{Splitting
+Mail})\e$B!#$?$@$7\e(B @code{default} \e$B$H$$$&%7%s%\%k$G$"$k>l9g$ONc30$G!"\e(B
+@code{nnmail-split-methods} \e$B$NCM$r;H$$$^$9!#\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
@@ -14848,6 +14860,9 @@ Splitting}.
 \e$B%k%a%C%;!<%8$r$,9T$/$Y$-$@$HH=CG$9$k%0%k!<%WL>$N%j%9%H$rJV$5$J$1$l$P$J$j\e(B
 \e$B$^$;$s!#\e(B
 
+\e$B$3$NJQ?t$OFC5i%a!<%kJ,3d$G$"$C$F$bNI$$$G$9!#9=J8$K$D$$$F$O\e(B @xref{Fancy
+Mail Splitting}.
+
 \e$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"F~$C$FMh$?5$$NFG$JL5<B$N%X%C%@!<$rMpK=$K07$C\e(B
 \e$B$F$bNI$$$3$H$KCm0U$7$F$/$@$5$$!#$=$l$i$O$9$Y$F\e(B @code{Lines} \e$B%X%C%@!<$rDI\e(B
 \e$B2C$7$^$9!#$$$/$D$+$O\e(B @code{X-Gnus-Group} \e$B%X%C%@!<$r2C$($^$9!#$?$$$F$$$N\e(B
@@ -15253,7 +15268,7 @@ Maildir \e$B%a!<%k%=!<%9$NNc$r$U$?$D\e(B:
 \e$B%H%3%k$H$7$F$O\e(B (\e$B$9$J$o$A\e(B @code{nnimap} \e$B$G\e(B) \e$B;H$$$?$/$J$$$H$-$O!"\e(BGnus \e$B$G\e(B
 \e$B$O\e(B @acronym{POP} \e$B%5!<%P!<$HF1MM$K07$C$F!";XDj$5$l$?\e(B @acronym{IMAP} \e$B%a!<\e(B
 \e$B%k%\%C%/%9$+$i5-;v$r<hF@$9$k$3$H$,$G$-$^$9!#>\$7$/\e(B
-\e$B$O\e(B @ref{Using @acronym{IMAP}} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+\e$B$O\e(B @ref{Using IMAP} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 \e$B%-!<%o!<%I\e(B:
 
@@ -15343,43 +15358,6 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
       :fetchflag "\\Seen")
 @end lisp
 
-@item webmail
-@uref{http://www.hotmail.com/}, @uref{http://webmail.netscape.com/},
-@uref{http://www.netaddress.com/}, @uref{http://www.yahoo.com/} \e$B$J$I$N%&%'\e(B
-\e$B%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
-
-\e$BCm\e(B: \e$B%&%'%V%a!<%k$O%/%C%-!<$KBg$-$/0MB8$7$^$9!#\e(Burl "4.0pre.46" \e$B$r;H$&>l9g\e(B
-\e$B$O\e(B "one-line-cookie" \e$B%Q%C%A$rEv$F$kI,MW$,$"$j$^$9!#\e(B
-
-\e$B7Y9p\e(B: \e$B%a!<%k$,<:$o$l$k$+$b$7$l$^$;$s!#L5J]>Z$G$9!#\e(B
-
-\e$B%-!<%o!<%I\e(B:
-
-@table @code
-@item :subtype
-\e$B%&%'%V%a!<%k%5!<%P!<$N7?$G$9!#%G%#%U%)%k%H$O\e(B @code{hotmail} \e$B$G$9!#B>$N8u\e(B
-\e$BJd$K$O\e(B @code{netscape}, @code{netaddress}, @code{my-deja} \e$B$,$"$j$^$9!#\e(B
-
-@item :user
-\e$B%&%'%V%a!<%k%5!<%P!<$KEO$9MxMQ<TL>$G$9!#%G%#%U%)%k%H$O%m%0%$%sL>$G$9!#\e(B
-
-@item :password
-\e$B%&%'%V%a!<%k%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$7$J$$>l9g$O!"MxMQ<T$OF~NO\e(B
-\e$B$9$k$3$H$rB%$5$l$^$9!#\e(B
-
-@item :dontexpunge
-@code{nil} \e$B$G$J$+$C$?$i!"L$FI$N5-;v$@$1$r<hF@$7!"$+$D<hF@8e$K$=$l$i$r$4\e(B
-\e$B$_H"$N%U%)%k%@!<$K0\F0$7$^$;$s!#\e(B
-@end table
-
-\e$B%&%'%V%a!<%k$N%=!<%9$NNc$G$9\e(B:
-
-@lisp
-(webmail :subtype 'hotmail
-         :user "user-name"
-         :password "secret")
-@end lisp
-
 @item group
 \e$B<B:]$N%a!<%k%=!<%9$H$7$F\e(B @code{mail-source} \e$B%0%k!<%W%Q%i%a!<%?!<$G@_Dj$5\e(B
 \e$B$l$F$$$k$b$N$r;H$$$^$9!#\e(B@xref{Group Parameters}.
@@ -15723,7 +15701,7 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 \e$B%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#!<$,%@%&%s%m!<%I$5$l$J$$$3$H$K\e(B
 \e$BCm0U$7$F$/$@$5$$!#$=$l$r$9$k$?$a$K\e(B
 \e$B$O\e(B @code{nnimap-split-download-body} \e$B$r\e(B @code{t} \e$B$K@_Dj$9$kI,MW$,$"$j$^\e(B
-\e$B$9\e(B (@pxref{Client-Side @acronym{IMAP} Splitting})\e$B!#\e(B
+\e$B$9\e(B (@pxref{Client-Side IMAP Splitting})\e$B!#\e(B
 
 @item (! @var{func} @var{split})
 \e$BJ,3d$,%j%9%H$G:G=i$NMWAG$,\e(B @code{!} \e$B$@$C$?$i!"\e(B@var{split} \e$B$,<B9T$5$l!"\e(B
@@ -17210,9 +17188,8 @@ Rand MH \e$B%a!<%k1\Mw%7%9%F%`$O\e(B UNIX \e$B%7%9%F%`$K$+$J$jD9$$4VB8:_$7$F$$$^$9!
 \e$B$?\e(B @code{nnmaildir} \e$B$O\e(B @code{nnml} \e$B$N\e(B overview \e$B$KAjEv$9$k%U%!%$%k$r5-;v\e(B
 \e$B$4$H$K0l$D3JG<$9$k$N$G!"\e(B@code{nnml} \e$B$NLsFsG\$NNL$N\e(B i\e$B%N!<%I$r;H$$$^$9!#\e(B
 (@code{df -i} \e$B$r;H$C$F\e(B i\e$B%N!<%I$N3d$jEv$F$,$I$l$[$I$?$/$5$s$"$k$+$rD4$Y$F\e(B
-\e$B$/$@$5$$!#\e(B) \e$B$=$N$?$a$KCY$/$J$C$?$jB?$/$N>l=j$r<h$C$F$7$^$&$h$&$J$i$P!"\e(B
-@uref{http://www.namesys.com/, ReiserFS} \e$B$dB>$NHs%V%m%C%/9=B$$N%U%!%$%k\e(B
-\e$B%7%9%F%`$X$NE>49$r8!F$$7$F$/$@$5$$!#\e(B
+\e$B$/$@$5$$!#\e(B) \e$B$=$N$?$a$KCY$/$J$C$?$jB?$/$N>l=j$r<h$C$F$7$^$&$h$&$J$i$P!"B>\e(B
+\e$B$NHs%V%m%C%/9=B$$N%U%!%$%k%7%9%F%`$X$NE>49$r8!F$$7$F$/$@$5$$!#\e(B
 
 maildir \e$B$O<u?.G[Aw$N$?$a$N%m%C%/$rI,MW$H$7$J$$$N$G!"$"$J$?$,%0%k!<%W$H$7\e(B
 \e$B$F;H$C$F$$$k\e(B maildir \e$B$O!"G[Aw$5$l$F$-$?%a!<%k$rD>@\<u$1<h$k$?$a\e(B
@@ -17509,15 +17486,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
@@ -17768,6 +17736,10 @@ Netscape \e$B$N%a!<%k%\%C%/%9!#\e(B
 @item lanl-gov-announce
 \e$B%m%9%"%i%b%99qN)8&5f=j\e(B (LANL) Gov Announce \e$B$+$i$NH/I=%a%C%;!<%8!#\e(B
 
+@cindex git commit messages
+@item git
+@code{git} \e$B$G\e(B commit \e$B$7$?$3$H$rEA$($k%a%C%;!<%8!#\e(B
+
 @cindex forwarded messages
 @item rfc822-forward
 RFC822 \e$B$GE>Aw$5$l$?%a%C%;!<%8!#\e(B
@@ -21438,7 +21410,6 @@ Gnus \e$B$O0lF|$K0l2s%9%3%"$r8:?j$5$;$h$&$H$7$^$9!#Nc$($P\e(B Gnus \e$B$r;MF|4VAv$i
 * Compilation::                 Gnus \e$B$rB.$/$9$k$K$O\e(B
 * Mode Lines::                  \e$B%b!<%I9T$K>pJs$rI=<($9$k\e(B
 * Highlighting and Menus::      \e$B%P%C%U%!!<$rAGE($G?4CO$h$/8+$;$k\e(B
-* Buttons::                     \e$B$?$C$?==2s$?$?$$$?$@$1$Gg'>d1j$K$J$k\e(B!
 * Daemons::                     Gnus \e$B$O$"$J$?$NN"$G;E;v$r$9$k$3$H$,$G$-$k\e(B
 * Undo::                        \e$B$$$/$D$+$NF0:n$O85$KLa$9$3$H$,$G$-$k\e(B
 * Predicate Specifiers::        \e$B=R8l$r@_Dj$9$k\e(B
@@ -21888,8 +21859,7 @@ Gnus \e$B$ODL>o$[$H$s$I$N%P%C%U%!!<$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?\e(B
 \e$B$i$$$N6u4V$rM?$($i$l$k$Y$-$+$r8=$7$^$9!#$3$l$O$3$NJQ?t$NH4?h$G$9\e(B:
 
 @lisp
-((group (vertical 1.0 (group 1.0 point)
-                      (if gnus-carpal (group-carpal 4))))
+((group (vertical 1.0 (group 1.0 point)))
  (article (vertical 1.0 (summary 0.25 point)
                         (article 1.0))))
 @end lisp
@@ -21927,7 +21897,6 @@ Gnus \e$B$ODL>o$[$H$s$I$N%P%C%U%!!<$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?\e(B
 @lisp
 (article (vertical 1.0 (group 4)
                        (summary 0.25 point)
-                       (if gnus-carpal (summary-carpal 4))
                        (article 1.0)))
 @end lisp
 
@@ -21938,20 +21907,16 @@ Gnus \e$B$ODL>o$[$H$s$I$N%P%C%U%!!<$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?\e(B
 \e$B$b$7!VJ,3d!W$,\e(B @code{eval} (\e$BI>2A\e(B) \e$B$5$l$k$b$N$N$h$&$K8+$($k$H$-$O\e(B (\e$B@53N$K\e(B
 \e$B8@$&$H\e(B---\e$BJ,3d$N\e(B @code{car} \e$B$,4X?t$+86;O4X?t\e(B (subr) \e$B$G$"$k$H$-$O\e(B)\e$B!"$3$NJ,\e(B
 \e$B3d$O\e(B @code{eval} \e$B$5$l$^$9!#7k2L$,\e(B @code{nil} \e$B$G$J$$$J$i!"$=$l$OJ,3d$H$7\e(B
-\e$B$FMQ$$$i$l$^$9!#$3$l$O!"\e(B@code{gnus-carpal} \e$B$,\e(B @code{nil} \e$B$G$"$l$P;0$D$N\e(B
-\e$B%P%C%U%!!<$,!"\e(B@code{gnus-carpal} \e$B$,\e(B @code{nil} \e$B$G$J$$$J$i!";M$D$N%P%C%U%!!<\e(B
-\e$B$,B8:_$9$k$3$H$K$J$k$H$$$&$3$H$G$9!#\e(B
+\e$B$FMQ$$$i$l$^$9!#\e(B
 
 \e$B$^$@J#;($G$O$J$$$G$9$C$F\e(B? \e$B$=$l$G$O!"Bg$-$5$H$7$F$3$l$r;n$7$F$_$F$/$@$5$$\e(B:
 
 @lisp
 (article (horizontal 1.0
              (vertical 0.5
-                 (group 1.0)
-                 (gnus-carpal 4))
+                 (group 1.0))
              (vertical 1.0
                  (summary 0.25 point)
-                 (summary-carpal 4)
                  (article 1.0))))
 @end lisp
 
@@ -22311,60 +22276,6 @@ Gnus \e$B$O$3$l$i$N%P%$%H%3%s%Q%$%k$5$l$?;XDj$r\e(B @file{.newsrc.eld} \e$B%U%!%$%k
 \e$B%9%3%"%b!<%I\e(B (score mode) \e$B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#\e(B
 @end table
 
-@node Buttons
-@section \e$B%\%?%s\e(B
-@cindex buttons
-@cindex mouse
-@cindex click
-
-\e$B:G?7N.9T$N%^%&%9\e(B @dfn{mouse} \e$BAuCV$,!"6a$4$m$G$O$A$c$s$H$7$?A`:nK!$r3X$S\e(B
-\e$B$?$,$i$J$$<c<T$d$+$C$3$$$$$3$I$b$?$A$N4V$GBg?M5$$G$9!#$=$l$G$O;d$,\e(B Tops
-20 \e$B%7%9%F%`>e$G\e(B Emacs \e$B$r;H$C$F$$$?:"$N!"\e(B'89 \e$BG/$N2F$r;W$$5/$3$7$F$_$^$7$g\e(B
-\e$B$&!#\e(B300 \e$B?M$NMxMQ<T$,!"0l$D$N%^%7%s>e$G!"$_$s$J$,\e(B Simula \e$B%3%s%Q%$%i$rAv$i\e(B
-\e$B$;$F$$$^$7$?!#$"$"!"$P$+$P$+$7$$\e(B!
-
-\e$B$[$s$H$&$K!#\e(B
-
-@vindex gnus-carpal
-\e$B$5$F!"\e(B@code{gnus-carpal} \e$B$r\e(B @code{t} \e$B$K@_Dj$9$k$3$H$K$h$C$F!"%/%j%C%/$9\e(B
-\e$B$k$@$1$G2?$G$b$G$-$k%\%?%s$@$i$1$N%P%C%U%!!<$r\e(B Gnus \e$B$KI=<($5$;$k$3$H$,$G\e(B
-\e$B$-$^$9!#$H$C$F$b4JC1$G$9!"$[$s$H$&$K!#;X05NEK!$N@h@8$K65$($F$"$2$F$/$@$5\e(B
-\e$B$$\e(B (\e$BLuCm\e(B: carpal \e$B$H$O<j<s$N9|$N$3$H\e(B)\e$B!#\e(B
-
-@table @code
-@item gnus-carpal-mode-hook
-@vindex gnus-carpal-mode-hook
-\e$B$9$Y$F$N<j<s%b!<%I%P%C%U%!!<$G<B9T$9$k%U%C%/$G$9!#\e(B
-
-@item gnus-carpal-button-face
-@vindex gnus-carpal-button-face
-\e$B%\%?%s$K;H$o$l$k%U%'!<%9$G$9!#\e(B
-
-@item gnus-carpal-header-face
-@vindex gnus-carpal-header-face
-\e$B<j<s%P%C%U%!!<$N%X%C%@!<$G;HMQ$5$l$k%U%'!<%9$G$9!#\e(B
-
-@item gnus-carpal-group-buffer-buttons
-@vindex gnus-carpal-group-buffer-buttons
-\e$B%0%k!<%W%P%C%U%!!<$N%\%?%s$G$9!#\e(B
-
-@item gnus-carpal-summary-buffer-buttons
-@vindex gnus-carpal-summary-buffer-buttons
-\e$B35N,%P%C%U%!!<$N%\%?%s$G$9!#\e(B
-
-@item gnus-carpal-server-buffer-buttons
-@vindex gnus-carpal-server-buffer-buttons
-\e$B%5!<%P!<%P%C%U%!!<$N%\%?%s$G$9!#\e(B
-
-@item gnus-carpal-browse-buffer-buttons
-@vindex gnus-carpal-browse-buffer-buttons
-\e$B1\Mw%P%C%U%!!<$N%\%?%s$G$9!#\e(B
-@end table
-
-\e$B$9$Y$F$N\e(B @code{buttons} \e$BJQ?t$O%j%9%H$G$9!#$3$l$i$N%j%9%H$NMWAG$O!"\e(B
-\e$B$=$N\e(B @code{car} \e$B$N9`$,I=<($5$l$kJ8$r4^$s$G$$$F!"$=$N\e(B @code{cdr} \e$B$N9`$,4X\e(B
-\e$B?t%7%s%\%k$K$J$C$F$$$k\e(B cons \e$B%;%k$+!"$b$7$/$O$?$@$NJ8;zNs$N$I$A$i$+$G$9!#\e(B
-
 @node Daemons
 @section \e$B%G!<%b%s\e(B
 @cindex demons
@@ -22893,7 +22804,6 @@ Picon \e$B$N%U%!%$%kL>$H$7$F;n$7$F$_$k=g$KJB$Y$i$l$?3HD%;R$N%j%9%H$G$9!#%G%#\e(B
 \e$BDL$=$l$i$O$"$^$jLLGr$$$b$N$G$O$"$j$^$;$s!#\e(B
 @end table
 
-@c TRANSLATEME
 @node Gravatars
 @subsection Gravatars
 
@@ -22903,34 +22813,37 @@ Picon \e$B$N%U%!%$%kL>$H$7$F;n$7$F$_$k=g$KJB$Y$i$l$?3HD%;R$N%j%9%H$G$9!#%G%#\e(B
 @end iflatex
 @end iftex
 
-A gravatar is an image registered to an e-mail address.
+Gravatar \e$B$O$=$l$>$l$NEE;R%a!<%k%"%I%l%9$KBP1~$7$FEPO?$5$l$?2hA|$G$9!#\e(B
 
-You can submit yours on-line at @uref{http://www.gravatar.com}.
+\e$B$"$J$?$N$b$N$r\e(B @uref{http://www.gravatar.com} \e$B$K%*%s%i%$%s$GCV$/$3$H$,$G\e(B
+\e$B$-$^$9!#\e(B
 
-The following variables offer control over how things are displayed.
+\e$B0J2<$NJQ?t$O!"$=$l$i$,$I$N$h$&$KI=<($5$l$k$+$N@)8f$rDs6!$7$^$9!#\e(B
 
 @table @code
-
 @item gnus-gravatar-size
 @vindex gnus-gravatar-size
-The size in pixels of gravatars. Gravatars are always square, so one
-number for the size is enough.
+Gravatars \e$B$N2hAG$N%5%$%:!#\e(BGravatars \e$B$O>o$K@5J}7A$J$N$G!"%5%$%:$N;XDj$K$O\e(B
+\e$BC10l$N?tCM$G==J,$G$9!#\e(B
 
-@item gnus-gravatar-relief
-@vindex gnus-gravatar-relief
-If non-nil, adds a shadow rectangle around the image. The value,
-relief, specifies the width of the shadow lines, in pixels. If relief
-is negative, shadows are drawn so that the image appears as a pressed
-button; otherwise, it appears as an unpressed button.
+@item gnus-gravatar-properties
+@vindex gnus-gravatar-properties
+Gravatar \e$B2hA|$KE,MQ$9$kB0@-$N%j%9%H$G$9!#\e(B
 
+@item gnus-gravatar-too-ugly
+@vindex gnus-gravatar-too-ugly
+\e$BI=<($5$l$k$Y$-$G$O$J$$%"%P%?!<$N!";}$A<g$?$A$N%a!<%k%"%I%l%9$^$?$OL>A0$K\e(B
+\e$B9gCW$9$k@55,I=8=!"$^$?$O\e(B @code{nil}\e$B!#%G%#%U%)%k%H\e(B
+\e$B$G\e(B @code{gnus-article-x-face-too-ugly} \e$B$NCM$K$J$j$^$9\e(B (@pxref{X-Face})\e$B!#\e(B
 @end table
 
-If you want to see them in the From field, set:
+\e$B$=$l$i$r\e(B From \e$B%U%#!<%k%I$G8+$?$$$J$i!"$3$&$7$F$/$@$5$$\e(B:
+
 @lisp
 (setq gnus-treat-from-gravatar 'head)
 @end lisp
 
-If you want to see them in the Cc and To fields, set:
+\e$B$b$7$=$l$i$r\e(B Cc \e$B$H\e(B To \e$B%U%#!<%k%I$G8+$?$$$J$i!"$3$&$G$9\e(B:
 
 @lisp
 (setq gnus-treat-mail-gravatar 'head)
@@ -23270,7 +23183,7 @@ Spam \e$B$rHr$1$k$?$a$NA0>O$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(B
 Nnimap \e$B%P%C%/%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#!<$,%@%&%s%m!<%I\e(B
 \e$B$5$l$J$$$3$H$KCm0U$7$F$/$@$5$$!#$=$l$r$9$k$?$a$K\e(B
 \e$B$O\e(B @code{nnimap-split-download-body} \e$B$r\e(B @code{t} \e$B$K@_Dj$9$kI,MW$,$"$j$^\e(B
-\e$B$9\e(B (@pxref{Client-Side @acronym{IMAP} Splitting})\e$B!#\e(B
+\e$B$9\e(B (@pxref{Client-Side IMAP Splitting})\e$B!#\e(B
 
 \e$B0J>e$,$3$l$K4X$9$k$3$H$G$9!#$"$k<o$N\e(B spam \e$B$O$I$&$7$F$bAGDL$j$7$F$7$^$$$,\e(B
 \e$B$A$J$N$G!"\e(Bspam \e$B$rFI$`$O$a$K$J$C$?$H$-$K8F$V$?$a$N5$$NMx$$$?4X?t$,I,MW$G\e(B
@@ -23463,12 +23376,14 @@ Spam \e$B_I2a4o$,\e(B spam \e$B%a%C%;!<%8$K0u$rIU$1$=$3$J$C$?$i!"%0%k!<%W$rH4$1=P$k
 \e$B$,$=$l$K0u$rIU$1$F$bNI$$$G$7$g$&!#\e(B
 
 @table @kbd
-@item M-d
+@item $
+@itemx M-d
 @itemx M s x
 @itemx S x
-@kindex M-d
-@kindex S x
-@kindex M s x
+@kindex $ (\e$B35N,\e(B)
+@kindex M-d (\e$B35N,\e(B)
+@kindex S x (\e$B35N,\e(B)
+@kindex M s x (\e$B35N,\e(B)
 @findex gnus-summary-mark-as-spam
 \e$B8=:_$N5-;v$K\e(B spam \e$B0u$rIU$1$F!"\e(B@samp{$} \e$B0u$rI=<($7$^\e(B
 \e$B$9\e(B (@code{gnus-summary-mark-as-spam})\e$B!#\e(B
@@ -23561,7 +23476,7 @@ IMAP \e$B$NMxMQ<T$X$NCm0U\e(B: spam \e$B%P%C%/%(%s%I$H$7\e(B
 \e$B%a%C%;!<%8$NK\J8$b<h$j9~$`$3$H$r;X<($9$k$3$H$,$G$-$^$9!#$=$l\e(B
 \e$B$O\e(B @acronym{IMAP} \e$B$rCY$/$7$F$7$^$&$N$G!"%G%#%U%)%k%H$G$O@_Dj$5$l$^$;$s!#\e(B
 \e$B$=$7$F!"MxMQ<T$KBe$o$C$F$=$l$r9T$J$&$3$H$O!"E,@Z$JH=CG$G$O$"$j$^$;$s!#\e(B
-@xref{Client-Side @acronym{IMAP} Splitting}.
+@xref{Client-Side IMAP Splitting}.
 
 @code{spam-use-*} \e$BJQ?t$r;H$C$F!"\e(B@code{spam-split} \e$B$,;H$&0l$D0J>e\e(B
 \e$B$N\e(B spam \e$B%P%C%/%(%s%I$r@_Dj$7$J$1$l$P$J$j$^$;$s!#\e(B@xref{Spam Back Ends}.
@@ -23856,8 +23771,9 @@ From Ted Zlatanov <tzz@@lifelogs.com>.
  spam-move-spam-nonspam-groups-only nil
  spam-mark-only-unseen-as-spam t
  spam-mark-ham-unread-before-move-from-spam-group t
- nnimap-split-rule 'nnimap-split-fancy
  ;; @r{\e$B$"$J$?$N@_Dj$KDI2C$9$kA0$K!"$3$l$,2?$r$9$k$+M}2r$;$h\e(B!}
+ ;; @r{nnimap \e$BMQ$K$?$V$s\e(B nnimap-split-methods \e$B$r@_Dj$9$kI,MW$"$j!#\e(B}
+ ;; @r{\e$B%^%K%e%"%k;2>H!#\e(B}
  nnimap-split-fancy '(|
                       ;; @r{References \e$B$r?F$^$GC)$C$F$=$l$i$N%0%k!<%W\e(B}
                       ;; @r{\e$B$rF~$l$k!#\e(B}
@@ -24512,8 +24428,9 @@ Source Specifiers} \e$B$+$iAv$i$;$k$3$H$G$9!#$3$NJ}K!$K$O!"MxMQ<T\e(B
 @example
 (setq spam-use-spamoracle t
       spam-split-group "Junk"
+      ;; @r{nnimap \e$BMQ$K$?$V$s\e(B nnimap-split-methods \e$B$r@_Dj$9$kI,MW$"$j!#\e(B}
+      ;; @r{\e$B%^%K%e%"%k;2>H!#\e(B}
       nnimap-split-inbox '("INBOX")
-      nnimap-split-rule 'nnimap-split-fancy
       nnimap-split-fancy '(| (: spam-split) "INBOX"))
 @end example
 
@@ -25032,6 +24949,13 @@ Gnus \e$B%l%8%9%H%j!<$O5-;v$N\e(B Message-ID \e$B$r85$K$9$Y$F$N%P%C%/%(%s%I$r2#CGE*
 \e$BBj$HAw?.<T$r;H$&$3$H$,$G$-$^$9!#$3$l$K$O$$$/$D$+$N$d$jJ}$,$"$j$^$9!#\e(B
 
 @item
+ID \e$B$K4p$E$$$F%a%C%;!<%8$r>H2q$9$k\e(B
+
+@code{gnus-summary-refer-parent-article} \e$B$N$h$&$J%3%^%s%I$O!">H2q$9$k5-\e(B
+\e$B;v$K9T$/$9$k$?$a$K!"$=$N%a%C%;!<%8$,$"$k%0%k!<%W$K$+$+$o$i$:!"%l%8%9%H%j!<\e(B
+\e$B$rMxMQ$9$k$3$H$,$G$-$^$9!#\e(B
+
+@item
 \e$BFH<+$N%U%i%0$H%-!<%o!<%I$r5-O?$9$k\e(B
 
 \e$B%l%8%9%H%j!<$O5-;v$N$?$a$NFH<+$N%U%i%0$H%-!<%o!<%I$r5-O?$9$k$3$H$,$G$-$^\e(B
@@ -25050,6 +24974,7 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
 @menu
 * Setup::
 * Fancy splitting to parent::   \e$B?F$X$NFC5iJ,3d\e(B
+* Registry Article Refer Method:: @code{Message-ID} \e$B$K4p$E$$$F%l%8%9%H%j!<$G5-;v$r<hF@$9$k\e(B
 * Store custom flags and keywords:: \e$BFH<+$N%U%i%0$H%-!<%o!<%I$N5-O?\e(B
 * Store arbitrary data::        \e$BG$0U$N%G!<%?$N5-O?\e(B
 @end menu
@@ -25125,6 +25050,40 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
 Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
 @end defvar
 
+@node Registry Article Refer Method
+@subsection @code{Message-ID} \e$B$K4p$E$$$F%l%8%9%H%j!<$G5-;v$r<hF@$9$k\e(B
+
+\e$B%l%8%9%H%j!<$O!"$=$l$>$l$N\e(B @code{Message-ID} \e$B$N5-;v$,B8:_$9$k%0%k!<%W$r\e(B
+\e$BCN$C$F$$$^$9!#$3$l$O!V5-;v$r;2>H$9$kJ}K!!W$9$J$o$A!V$"$k\e(B Message-ID \e$B$N5-\e(B
+\e$B;v$r;2>H$9$kJ}K!$r\e(B Gnus \e$B$K;X<($9$k$b$N!W$rA}6/$9$k$?$a$K$F$3F~$l$9$k$3$H\e(B
+\e$B$,$G$-$^$9!#\e(B@xref{Finding the Parent}.
+
+@vindex nnregistry
+@vindex gnus-refer-article-method
+@code{nnregistry} \e$B;2>HJ}K!$O$^$5$K$=$l$r$7$^$9!#$=$l$K$O!"5-;v$,$=$l$,$"\e(B
+\e$B$k%0%k!<%W$K$+$+$o$i$:8+$D$+$k$+$b$7$l$J$$$H$$$&FCD9$,$"$j$^$9\e(B---\e$B$b$7$=\e(B
+\e$B$N\e(B @code{Message-ID} \e$B$r%l%8%9%H%j!<$,CN$C$F$$$l$P!#$=$l$O!"0J2<$NJ}?K$K\e(B
+\e$B1h$C$F!"$"$k$b$N$G5/F0%U%!%$%k$rA}Bg$9$k$3$H$K$h$j2DG=$K$J$k$O$:$G$9\e(B:
+
+@example
+;; \e$B%l%8%9%H%j!<$r;H$C$F5-;v$r;2>H$9$k>l9g$KNI9%$J%R%C%HN($rF@$k$?$a\e(B
+;; \e$B$K$O!"==J,$J%(%s%H%j!<$r0];}$9$k$h$&$K$7$F$/$@$5$$!#5-;v$,$I$3$K\e(B
+;; \e$B$"$k$+$r\e(B Gnus \e$B$KCN$i$;$k$?$a$K!"D9$$%0%k!<%WL>$r;HMQ$7$F$/$@$5$$!#\e(B
+(setq gnus-registry-max-entries 2500
+      gnus-registry-use-long-group-names t)
+
+(gnus-registry-initialize)
+
+(setq gnus-refer-article-method
+      '(current
+        (nnregistry)
+        (nnweb "gmane" (nnweb-type gmane))))
+@end example
+
+\e$B>e5-$NNc$O!":G=i$O8=:_$N%0%k!<%W$NCf$G!"$"$k$$$O%l%8%9%H%j!<$r;H$C$F!"$=\e(B
+\e$B$7$F$=$l$i$9$Y$F$,<:GT$7$?$i\e(B Gmane \e$B$r;H$C$F5-;v$rC5$9$3$H$r\e(B Gnus \e$B$K;X<(\e(B
+\e$B$7$^$9!#\e(B
+
 @node Fancy splitting to parent
 @subsection \e$B?F$X$NFC5iJ,3d\e(B
 
@@ -25820,10 +25779,9 @@ ding \e$B%a!<%j%s%0%j%9%H$H\e(B Gnus \e$B%K%e!<%9%0%k!<%W$K$*$1$k5DO@$O!"=c?h$K8x=0
 \e$BG_ED@/?.\e(B---\e$B85$N\e(B @sc{gnus} \e$B$r=q$$$??M$G$9!#\e(B
 
 @item
-Shenghuo Zhu---uudecode.el, mm-uu.el, rfc1843.el, webmail.el,
-nnwarchive, \e$B$=$l$K0lHLE*$J%P%0=$@5!"?7$7$$5!G=$J$I$O$b$H$h\e(B
-\e$B$j\e(B @acronym{MIME} \e$B$HB>$N7A<0$N%(%s%3!<%I\e(B/\e$B%G%3!<%I$K4XO"$9$k$[$s$H$&$KB?\e(B
-\e$B$/$N$b$N!#\e(B
+Shenghuo Zhu---uudecode.el, mm-uu.el, rfc1843.el, nnwarchive, \e$B$=$l$K0lHL\e(B
+\e$BE*$J%P%0=$@5!"?7$7$$5!G=$J$I$O$b$H$h$j\e(B @acronym{MIME} \e$B$HB>$N7A<0$N%(%s%3!<\e(B
+\e$B%I\e(B/\e$B%G%3!<%I$K4XO"$9$k$[$s$H$&$KB?$/$N$b$N!#\e(B
 
 @item
 Per Abrahamsen---custom\e$B!"%9%3%"!"%O%$%i%$%H$H\e(B @sc{soup} \e$B%3!<%I\e(B (\e$BB>$NB?$/\e(B
@@ -26252,10 +26210,6 @@ Buttons})\e$B!#\e(B
 @item
 Gnus \e$B$N%&%#%s%I%&$H%U%l!<%`$N@_Dj$G$?$/$5$s$NJQ$J$3$H$r$G$-$k$h$&$K$J$j\e(B
 \e$B$^$7$?\e(B (@pxref{Window Layout})\e$B!#\e(B
-
-@item
-\e$B%-!<%\!<%I$r;H$&Be$o$j$K!"%\%?%s$r%/%j%C%/$G$-$k$h$&$K$J$j$^$7\e(B
-\e$B$?\e(B (@pxref{Buttons})\e$B!#\e(B
 @end itemize
 
 @node September Gnus
@@ -29646,11 +29600,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