* gnus-vers.el (gnus-revision-number): Increment to 02.
[elisp/gnus.git-] / texi / gnus-ja.texi
index 246ccb5..d0333ae 100644 (file)
@@ -435,8 +435,8 @@ Gnus \e$B$r;H$&$3$H$K$h$C$F\e(B Emacs \e$B$G%K%e!<%9\e(B (news) \e$B$r\e(B (\e$B$=$l$K%
 mbox \e$B%U%!%$%k$J$I$N$"$i$f$k6K0-$J<jCJ$r6n;H$7$F<j$KF~$l$k$3$H$,$G$-$^$9!#\e(B
 \e$B1?;n$7$r$7$F$_$h$&$H;W$&$J$i$P!"A4$F$rF1;~$KMQ$$$k$3$H$b$G$-$^$9!#\e(B
 
-T-gnus \e$B$O\e(B SEMI API \e$B$K4p$E$/\e(B MIME \e$B5!G=$rDs6!$7$^$9!#$=$&$$$&Lu$G!"\e(B
-T-gnus \e$B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C\e(B
+T-gnus \e$B$O\e(B @sc{semi} API \e$B$K4p$E$/\e(B @sc{mime} \e$B5!G=$rDs6!$7$^$9!#$=$&$$$&Lu\e(B
+\e$B$G!"\e(BT-gnus \e$B$OBg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C\e(B
 \e$B$HJQ$o$C$?5-;v$rFI$`8"Mx$rMJ8n$7$^$9!#\e(BT-gnus \e$B$O\e(B MULE API \e$B$K4p$E$/9q:]2=!&\e(B
 \e$BCO0h2=!"$*$h$S!"B?;z2=5!G=$rDs6!$7$^$9!#$h$C$F!"\e(BT-gnus \e$B$O$5$^$6$^$J8@8l\e(B
 \e$B7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O\e(B Unicode Next Generation \e$B$r$*BT\e(B
@@ -712,7 +712,8 @@ Article Buffer
 Composing Messages
 
 * Mail::                        \e$B%a!<%k$HJVEz\e(B
-* Posting Server::              \e$B$I$N%5!<%P!<$rDL$7$FEj9F$9$k$Y$-$+\e(B?
+* Posting Server::              \e$B$I$N%5!<%P!<$rDL$7$F%K%e!<%9$rEj9F$^$?$O\e(B
+                                \e$B%a!<%k$rAw?.$9$k$Y$-$+\e(B?
 * Mail and Post::               \e$BF1;~$K%a!<%k$r=P$7JVEz$9$k\e(B
 * Archived Messages::           \e$BAw$C$?%a%C%;!<%8$r\e(B gnus \e$B$,Cy$a$F$*$/$H$3\e(B
                                 \e$B$m\e(B
@@ -730,7 +731,7 @@ Select Methods
 * Getting Mail::                \e$B8D?ME*$J%a!<%k$r\e(B gnus \e$B$GFI$`\e(B
 * Browsing the Web::            \e$B2a>j$J%&%'%V$N;q8;$+$i%a%C%;!<%8$r<hF@$9\e(B
                                 \e$B$k\e(B
-* IMAP::                        Gnus \e$B$r\e(B IMAP \e$B$N%/%i%$%"%s%H$H$7$F;H$&\e(B
+* IMAP::                        gnus \e$B$r\e(B @sc{imap} \e$B$N%/%i%$%"%s%H$H$7$F;H$&\e(B
 * Other Sources::               \e$B%G%#%l%/%H%j!<!"%U%!%$%k!"\e(BSOUP \e$B%Q%1%C%H\e(B
                                 \e$B$rFI$`\e(B
 * Combined Groups::             \e$BJ#?t$N%0%k!<%W$r0l$D$N%0%k!<%W$K7k9g$9$k\e(B
@@ -766,8 +767,8 @@ Getting Mail
 * Mail Sources::                Gnus \e$B$K$I$3$+$i%a!<%k$r<h$C$F$/$k$+$rCN\e(B
                                 \e$B$i$;$k\e(B
 * Mail Back End Variables::     \e$B%a!<%k$N07$$$r%+%9%?%^%$%:$9$k$?$a$NJQ?t\e(B
-* Fancy Mail Splitting::        Gnus \e$B$OF~$C$FMh$?%a!<%k$NLS$N$h$&$JJ,N%\e(B
-                                \e$B$r$9$k$3$H$,$G$-$k\e(B
+* Fancy Mail Splitting::        Gnus \e$B$OF~$C$FMh$?%a!<%k$r!"?H$NLS$N$h$@\e(B
+                                \e$B$D$h$&$JJ,3d$r$9$k$3$H$,$G$-$k\e(B
 * Group Mail Splitting::        \e$B%a!<%kJ,3d$r6nF0$9$k$?$a$K%0%k!<%W%+%9%?\e(B
                                 \e$B%^%$%:$r;H$&\e(B
 * Incorporating Old Mail::      \e$B$"$J$?$,;}$C$F$$$k8E$$%a!<%k$r$I$&$9$k$+\e(B?
@@ -804,7 +805,7 @@ Browsing the Web
 * Web Archive::                 \e$B%&%'%V$KJ]4I$5$l$?%a!<%j%s%0%j%9%H$rFI$`\e(B
 * Web Newspaper::               \e$B%&%'%V$KJ]4I$5$l$??7J9$rFI$`\e(B
 * RSS::                         RDF Site Summary \e$B$rFI$`\e(B
-* Customizing w3::              Gnus \e$B$+$i\e(B Emacs/w3 \e$B$rA`:n$9$k\e(B
+* Customizing w3::              Gnus \e$B$+$i\e(B Emacs/W3 \e$B$rA`:n$9$k\e(B
 
 @sc{imap}
 
@@ -969,6 +970,12 @@ Picons
 * Picon Useless Configuration::  \e$B$=$NB>$N$V$C2u$7$?$j$R$M$C$?$j$$$8$C$?\e(B
                                 \e$B$jM7$s$@$j$9$kJQ?t\e(B
 
+Thwarting Email Spam
+
+* Anti-Spam Basics::            \e$B$?$/$5$s$N\e(B spam \e$B$r8:$i$94JC1$JJ}K!\e(B
+* SpamAssassin::                Spam \e$BBP:v%D!<%k$N;H$$J}\e(B
+* Hashcash::                    CPU \e$B;~4V$rHq$d$7$F\e(B spam \e$BB`<#$9$k\e(B
+
 Appendices
 
 * XEmacs::                      XEmacs \e$B$G%$%s%9%H!<%k$9$k$?$a$NMW7o\e(B
@@ -1260,6 +1267,12 @@ Gnus \e$B$O!"?.Mj$G$-$k%W%m%0%i%`$N0l$D$H$7$F!"%5!<%P!<$H@\B3$G$-$J$$$H$-$O\e(B
 \e$B$b$A$m$s!"%9%l!<%V%U%!%$%k$+$i$N>pJs$OIaDL$N\e(B (\e$B$9$J$o$A!"%^%9%?!<$N\e(B) \e$B%U%!\e(B
 \e$B%$%k$h$j$bM%@h$5$l$^$9!#\e(B
 
+\e$B%9%l!<%V$r5/F0$9$k$H$-$K$b$7%^%9%?!<$N\e(B @code{.newsrc*} \e$B%U%!%$%k72$,%;!<\e(B
+\e$B%V$5$l$F$$$J$+$C$?$i!"<+F0J]B8$5$l$?%U%!%$%k$rFI$`$+$I$&$+$r?R$M$i$l$k$+\e(B
+\e$B$b$7$l$^$;$s!#\e(B"yes" \e$B$HEz$($k$H!"%^%9%?!<$K%;!<%V$5$l$F$$$J$$JQ99$O%9%l!<\e(B
+\e$B%V$KH?1G$5$l$^$;$s!#\e(B"no" \e$B$HEz$($k$H!"%^%9%?!<$GFI$^$l$?$$$/$D$+$N5-;v$,!"\e(B
+\e$B%9%l!<%V$G$OL$FI$G$"$k$H8+$J$5$l$k$+$b$7$l$^$;$s!#\e(B
+
 @node Fetching a Group
 @section \e$B%0%k!<%W$r<hF@$9$k\e(B
 @cindex fetching a group
@@ -1442,9 +1455,10 @@ options -n !alt.all !rec.all sci.all
 \e$BM>J,$J$b$N$G$9!#$7$+$7!";d$O$3$NFs$D$,$"$C$?J}$,NI$$$H;W$$$^$7$?!#$b$&0l\e(B
 \e$BJ}$NJQ?t$O%f!<%6$,$$$8$/$k$N$K;H$o$l$k$N$KBP$7$F!"$3$NJQ?t$O$$$/$D$+$N4p\e(B
 \e$BK\E*$J5,B'$r@_Dj$9$k$?$a$N$b$N$G$9!#=i4|@_Dj$G$O$3$NJQ?t$O%a!<%k%P%C%/%(\e(B
-\e$B%s%I\e(B (@code{nnml}, @code{nnbabyl}, @code{nnfolder}, @code{nnmbox}@ \e$B$H\e(B
-@code{nnmh}) \e$B$+$i$G$-$kA4$F$N?7$7$$%0%k!<%W$r9XFI$9$k$h$&$K$J$C$F$$$^$9!#\e(B
-\e$B$=$l$,7y$G$"$l$P!"$3$NJQ?t$r\e(B @code{nil} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
+\e$B%s%I\e(B (@code{nnml}, @code{nnbabyl}, @code{nnfolder}, @code{nnmbox},
+@code{nnmh} \e$B$*$h$S\e(B @code{nnmaildir}) \e$B$+$i$G$-$kA4$F$N?7$7$$%0%k!<%W$r9X\e(B
+\e$BFI$9$k$h$&$K$J$C$F$$$^$9!#$=$l$,7y$G$"$l$P!"$3$NJQ?t$r\e(B @code{nil} \e$B$K@_Dj\e(B
+\e$B$7$F$/$@$5$$!#\e(B
 
 \e$B$3$N@55,I=8=$K9gCW$9$k?7$7$$%0%k!<%W\e(B
 \e$B$O\e(B @code{gnus-subscribe-options-newsgroup-method} \e$B$r;H$C$F9XFI$5$l$^$9!#\e(B
@@ -1889,7 +1903,7 @@ Gnus \e$B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$K<B9T$5$l$k%U%C%/$G$9!#\e(B
 @item t
 \e$B?dDjA45-;v?t\e(B (\e$B$3$l$O<B:]$O\e(B @var{max-number} - @var{min-number} + 1)\e$B!#\e(B
 
-Gnus \e$B$,$3$N?dDj$r;H$&$N$O!"\e(BNNTP \e$B%W%m%H%3%k$OG=N($NNI\e(B
+gnus \e$B$,$3$N?dDj$r;H$&$N$O!"\e(B@sc{nntp} \e$B%W%m%H%3%k$OG=N($NNI\e(B
 \e$B$$\e(B @var{max-number} \e$B$H\e(B @var{min-number} \e$B$X$N%"%/%;%9$rDs6!$9$k$b$N$N!"K\\e(B
 \e$BEv$NL$FI5-;v$N?t$rF@$k$K$OI,$:$7$bG=N(E*$G$O$J$$$+$i$G$9!#%R%9%F%j%C%/$J\e(B
 \e$B%l!<%:%s\e(B (\e$BLuCm\e(B: \e$BNr;KE*$JM}M3$N%b%8$j$+\e(B?) \e$B$K$h$j!"%a!<%k%P%C%/%(%s%I$K$*\e(B
@@ -2001,22 +2015,22 @@ Gnus \e$B$O\e(B @code{gnus-user-format-function-}@samp{X} \e$B4X?t$r8F$S=P$7$^$9!#$
 (cond (window-system
        (setq custom-background-mode 'light)
        (defface my-group-face-1
-        '((t (:foreground "Red" :bold t))) "First group face")
+         '((t (:foreground "Red" :bold t))) "First group face")
        (defface my-group-face-2
-        '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face")
+         '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face")
        (defface my-group-face-3
-        '((t (:foreground "Green4" :bold t))) "Third group face")
+         '((t (:foreground "Green4" :bold t))) "Third group face")
        (defface my-group-face-4
-        '((t (:foreground "SteelBlue" :bold t))) "Fourth group face")
+         '((t (:foreground "SteelBlue" :bold t))) "Fourth group face")
        (defface my-group-face-5
-        '((t (:foreground "Blue" :bold t))) "Fifth group face")))
+         '((t (:foreground "Blue" :bold t))) "Fifth group face")))
 
 (setq gnus-group-highlight
       '(((> unread 200) . my-group-face-1)
-       ((and (< level 3) (zerop unread)) . my-group-face-2)
-       ((< level 3) . my-group-face-3)
-       ((zerop unread) . my-group-face-4)
-       (t . my-group-face-5)))
+        ((and (< level 3) (zerop unread)) . my-group-face-2)
+        ((< level 3) . my-group-face-3)
+        ((zerop unread) . my-group-face-4)
+        (t . my-group-face-5)))
 @end lisp
 
 @pxref{Faces and Fonts} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
@@ -2660,20 +2674,19 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 @item G w
 @kindex G w (\e$B%0%k!<%W\e(B)
 @findex gnus-group-make-web-group
-@cindex DejaNews
-@cindex Alta Vista
-@cindex InReference
+@cindex Google
 @cindex nnweb
+@cindex gmane
 \e$B%&%'%V8!:w7k2L$r$b$H$K0l;~E*$J%0%k!<%W$r:n@.$7$^\e(B
 \e$B$9\e(B (@code{gnus-group-make-web-group})\e$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($k$H!"\e(B
-\e$B0l;~E*$G$O$J$/8GDj$7$?%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$G8!:w5!4X$N<o\e(B
-\e$BN`\e(B (search engine type) \e$B$H8!:wJ8;zNs$rF~NO$7$^$9!#M-8z$J8!:w5!4X$N<oN`$K\e(B
-\e$B$O\e(B @code{dejanews}, @code{altavista}, @code{reference} \e$B$,$"$j$^$9!#\e(B
+\e$B0l;~E*$G$O$J$/8GDj$7$?%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$G8!:w%(%s%8%s$N<o\e(B
+\e$BN`\e(B (search engine type) \e$B$H8!:wJ8;zNs$rF~NO$7$^$9!#M-8z$J8!:w%(%s%8%s$N<o\e(B
+\e$BN`$K$O\e(B @code{google}, @code{dejanews}, @code{gmane} \e$B$,$"$j$^$9!#\e(B
 @xref{Web Searches}.
 
-\e$B$b$7!"\e(B@code{dejanews} \e$B8!:w5!4X$rMQ$$$k>l9g$K$O!"\e(B
-@samp{~g alt.sysadmin.recovery shaving} \e$B$N$h$&$J9gCW$9$kJ8;zNs$rMQ$$$k$3\e(B
-\e$B$H$K$h$C$F!"8!:wBP>]$rFCDj$N%0%k!<%W$K8BDj$9$k$3$H$,2DG=$G$9!#\e(B
+\e$B$b$7!"\e(B@code{google} \e$B8!:w%(%s%8%s$rMQ$$$k>l9g$K$O!"\e(B
+@samp{shaving group:alt.sysadmin.recovery} \e$B$N$h$&$J9gCW$9$kJ8;zNs$rMQ$$\e(B
+\e$B$k$3$H$K$h$C$F!"8!:wBP>]$rFCDj$N%0%k!<%W$K8BDj$9$k$3$H$,2DG=$G$9!#\e(B
 
 @item G DEL
 @kindex G DEL (\e$B%0%k!<%W\e(B)
@@ -2784,13 +2797,15 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 
 @code{gnus-parameter-to-list-alist} \e$B$b;2>H$7$F2<$5$$!#\e(B
 
+@anchor{subscribed}
 @item subscribed
 @cindex subscribed
 \e$B$b$7$3$N%Q%i%a!<%?$,\e(B @code{t} \e$B$K@_Dj$5$l$F$$$k$H!"\e(Bgnus \e$B$O$"$J$?$,$3$N%0\e(B
 \e$B%k!<%W$r\e(B to-address \e$B$H\e(B to-list \e$B%Q%i%a!<%?$N%"%I%l%9$G9XFI$7$F$$$k%a!<%j\e(B
 \e$B%s%0%j%9%H$G$"$k$H2r<a$7$^$9!#$3$N>pJs$r\e(B gnus \e$B$KM?$($k$3$H$O!"$"$J$?$,$=\e(B
-\e$B$l$i$N%a!<%j%s%0%j%9%H$KEj9F$9$k$H$-$K!"@5$7$$\e(B Mail-Followup-To \e$B%X%C%@!<\e(B
-\e$B$r@8@.$9$kLr$KN)$A$^$9!#\e(B
+\e$B$l$i$N%a!<%j%s%0%j%9%H$KEj9F$9$k$H$-$K@5$7$$\e(B Mail-Followup-To \e$B%X%C%@!<$r\e(B
+\e$B@8@.$9$k$?$a$N\e(B (\e$B$[$s$N\e(B) \e$BBh0lJb$G$9!#MxMQ$G$-$k\e(B MFT \e$BBP1~5!G=$r40A4$K07$&\e(B
+\e$B$K$O!"$3$3\e(B @pxref{(message)Mailing Lists} \e$B$r8+$F2<$5$$!#\e(B
 
 @code{gnus-find-subscribed-addresses} \e$B$b;2>H$7$F2<$5$$!#$3$N4X?t$O$3$N%0\e(B
 \e$B%k!<%W%Q%i%a!<%?$rD>@\$K;H$$$^$9!#\e(B
@@ -2827,7 +2842,9 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 \e$B$7\e(B @code{(gcc-self . none)} \e$B$,$"$l$P!"\e(B@code{Gcc:} \e$BMs$O@8@.$5$l$:!"\e(B
 @code{(gcc-self . "string")} \e$B$,$"$l$P$3$NJ8;zNs$O$=$N$^$^\e(B @code{gcc} \e$BMs\e(B
 \e$B$KA^F~$5$l$^$9!#$3$N%Q%i%a!<%?$O0J2<$G@bL@$9$kA4$F$N\e(B @code{Gcc} \e$B$N=i4|5,\e(B
-\e$BB'$h$j$bM%@h$5$l$^$9\e(B (@pxref{Archived Messages})\e$B!#\e(B
+\e$BB'$h$j$bM%@h$5$l$^$9\e(B (@pxref{Archived Messages})\e$B!#7Y9p\e(B:: @code{nntp} \e$B%5!<\e(B
+\e$B%P!<$J$I$N%0%k!<%W$G\e(B @code{(gcc-self . t)} \e$B$r@_Dj$9$k$H%(%i!<$r0z$-5/$3\e(B
+\e$B$7$^$9!#$J$<$J$i\e(B @code{nntp} \e$B%5!<%P!<$O5-;v$r<u$1F~$l$^$;$s$+$i!#\e(B
 
 @item auto-expire
 @cindex auto-expire
@@ -2895,8 +2912,8 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 \e$B$$$/$D$+Nc$r5s$2$^$9\e(B:
 
 @table @code
-@item [read]
-\e$B4{FI$N5-;v$@$1$rI=<($7$^$9!#\e(B
+@item [unread]
+\e$BL$FI$N5-;v$@$1$rI=<($7$^$9!#\e(B
 
 @item [not expire]
 \e$B4|8B@Z$l>C5n2DG=$J5-;v0J30$N$9$Y$F$rI=<($7$^$9!#\e(B
@@ -2905,10 +2922,11 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 \e$B4|8B@Z$l>C5n2DG=$H$9$G$KJV?.$7$?5-;v0J30$N$9$Y$F$rI=<($7$^$9!#\e(B
 @end table
 
-\e$BMxMQ$G$-$k1i;;;R$O\e(B @code{not}\e$B!"\e(B@code{and} \e$B$*$h$S\e(B @code{or} \e$B$G$9!#=R8l\e(B
-\e$B$O\e(B @code{read}\e$B!"\e(B@code{dormant}\e$B!"\e(B@code{expire}\e$B!"\e(B@code{reply}\e$B!"\e(B
-@code{killed}\e$B!"\e(B@code{bookmark}\e$B!"\e(B@code{score}\e$B!"\e(B@code{save}\e$B!"\e(B@code{cache}\e$B!"\e(B
-@code{forward}\e$B!"\e(B@code{seen} \e$B$*$h$S\e(B @code{recent} \e$B$r4^$_$^$9!#\e(B
+\e$BMxMQ$G$-$k1i;;;R$O\e(B @code{not}, @code{and} \e$B$*$h$S\e(B @code{or} \e$B$G$9!#=R8l\e(B
+\e$B$O\e(B @code{tick}, @code{unsend}, @code{undownload}, @code{unread},
+@code{dormant}, @code{expire}, @code{reply}, @code{killed},
+@code{bookmark}, @code{score}, @code{save}, @code{cache}, @code{forward},
+@code{unseen} \e$B$*$h$S\e(B @code{recent} \e$B$r4^$_$^$9!#\e(B
 @end table
 
 @code{display} \e$B%Q%i%a!<%?$O!"35N,%P%C%U%!$r;XDj$7$?0lIt$NAH$@$1$K@)8B$9\e(B
@@ -2982,9 +3000,9 @@ Sieve \e$B$N\e(B @samp{IF} \e$B@)8f9=B$BN$,:n$i$l$^$9!#\e(B
 \e$B$k\e(B (@pxref{Sieve Commands}) \e$B$H$-$K!"0J2<$N\e(B Sieve \e$B%3!<%I$,:n$i$l$^$9\e(B:
 
 @example
-  if address \"sender\" \"sieve-admin@@extundo.com\" @{
-          fileinto \"INBOX.list.sieve\";
-  @}
+if address \"sender\" \"sieve-admin@@extundo.com\" @{
+        fileinto \"INBOX.list.sieve\";
+@}
 @end example
 
 Sieve \e$B8@8l$O\e(B RFC 3028 \e$B$G=R$Y$i$l$F$$$^$9!#\e(B@xref{Top, , Top, sieve, Emacs
@@ -2998,6 +3016,15 @@ Sieve}\e$B!#\e(B
 @code{gnus-show-threads} \e$B$O!"$=$N35N,%P%C%U%!$NCf$N%m!<%+%kJQ?t$K$J$j!"\e(B
 form \e$B$N\e(B @code{nil} \e$B$O$=$3$GI>2A$5$l$^$9!#\e(B
 
+@vindex gnus-list-identifiers
+\e$B$3$N5!G=$NMQES$N0l$D$O!"5-;v$NBjL>Ms$+$i%a!<%j%s%0%j%9%H$NI8<1%?%0$r$O$.\e(B
+\e$B<h$k$3$H$G$9!#$b$7%K%e!<%9%0%k!<\e(B
+\e$B%W\e(B @samp{nntp+news.gnus.org:gmane.text.docbook.apps} \e$B$,!"$9$Y$F$N5-;v$N\e(B
+\e$BBjL>$K\e(B @samp{DOC-BOOK-APPS:} \e$B$H$$$&%?%0$r;}$C$F$$$k$J$i$P!"$=$N%0%k!<%W\e(B
+\e$B$N%0%k!<%W%Q%i%a!<%?$K\e(B @code{(gnus-list-identifiers "DOCBOOK-APPS:")} \e$B$r\e(B
+\e$BF~$l$k$3$H$K$h$C$F!"$=$N%0%k!<%W$N35N,%P%C%U%!$KI=<($5$l$k5-;v$NBjL>$+$i\e(B
+\e$B%?%0$r$O$.<h$k$3$H$,$G$-$^$9!#\e(B
+
 \e$B$3$l$O$b$7I,MW$G$"$l$P!"%0%k!<%WKh$N%U%C%/4X?t$H$7$F$b;HMQ$G$-$^$9!#$b$7\e(B
 \e$B$"$k%0%k!<%W$KF~$C$?$H$-$K%S!<%W2;$rLD$i$7$?$1$l$P!"$=$N%0%k!<%W$N%Q%i%a!<\e(B
 \e$B%?$K\e(B @code{(dummy-variable (ding))} \e$B$_$?$$$J$b$N$r=q$$$F$*$/$3$H$b$G$-$^\e(B
@@ -3266,39 +3293,44 @@ kill \e$B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#@\
 @item G P a
 @kindex G P a (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-alphabet
-\e$B%0%k!<%W$r!"%0%k!<%WL>$N%"%k%U%!%Y%C%H=g$GJB$YBX$($^\e(B
+\e$B%0%k!<%W$r%0%k!<%WL>$N%"%k%U%!%Y%C%H=g$GJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-alphabet})\e$B!#\e(B
 
 @item G P u
 @kindex G P u (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-unread
-\e$B%0%k!<%W$r!"L$FI5-;v$N?t$GJB$YBX$($^\e(B
+\e$B%0%k!<%W$rL$FI5-;v$N?t$GJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-unread})\e$B!#\e(B
 
 @item G P l
 @kindex G P l (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-level
-\e$B%0%k!<%W$r!"%0%k!<%W%l%Y%k$GJB$YBX$($^\e(B
+\e$B%0%k!<%W$r%0%k!<%W%l%Y%k$GJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-level})\e$B!#\e(B
 
 @item G P v
 @kindex G P v (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-score
-\e$B%0%k!<%W$r!"%0%k!<%W$N%9%3%"$GJB$YBX$($^\e(B
+\e$B%0%k!<%W$r%0%k!<%W$N%9%3%"$GJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-score})\e$B!#\e(B
 @xref{Group Score}.
 
 @item G P r
 @kindex G P r (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-rank
-\e$B%0%k!<%W$r!"%0%k!<%W$N%i%s%/$GJB$YBX$($^\e(B
+\e$B%0%k!<%W$r%0%k!<%W$N%i%s%/$GJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-rank})\e$B!#\e(B@xref{Group Score}.
 
 @item G P m
 @kindex G P m (\e$B%0%k!<%W\e(B)
 @findex gnus-group-sort-selected-groups-by-method
-\e$B%0%k!<%W$r!"%P%C%/%(%s%I$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^\e(B
+\e$B%0%k!<%W$r%P%C%/%(%s%I$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-group-sort-selected-groups-by-method})\e$B!#\e(B
+
+@item G P s
+@kindex G P s (\e$B%0%k!<%W\e(B)
+@findex gnus-group-sort-selected-groups
+\e$B%0%k!<%W$r\e(B @code{gnus-group-sort-function} \e$B$K=>$C$FJB$YBX$($^$9!#\e(B
 @end table
 
 \e$B:G8e$K!"\e(B@kbd{C-k} \e$B$H\e(B @kbd{C-y} \e$B$r;H$C$F!"<jF0$G%0%k!<%W$r$"$A$3$A$K0\F0\e(B
@@ -3809,10 +3841,17 @@ Gnus \e$B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^\e(B
 @findex gnus-topic-sort-groups-by-server
 \e$B8=:_$N%H%T%C%/$r%5!<%P!<$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-topic-sort-groups-by-server})\e$B!#\e(B
+
+@item T S s
+@kindex T S s (\e$B%H%T%C%/\e(B)
+@findex gnus-topic-sort-groups
+\e$B8=:_$N%H%T%C%/$r!"JQ?t\e(B @code{gnus-group-sort-function} \e$B$GM?$($i$l$k4X?t\e(B
+\e$B$K=>$C$FJB$YBX$($^$9\e(B (@code{gnus-topic-sort-groups})\e$B!#\e(B
 @end table
 
-\e$B%0%k!<%W$N%=!<%H$K$D$$$F$N$5$i$J$k>pJs$O\e(B @xref{Sorting Groups} \e$B$r;2>H$7\e(B
-\e$B$F$/$@$5$$!#\e(B
+\e$B@\F,0z?t$,M?$($i$l$?$i!"$3$l$i$9$Y$F$N%3%^%s%I$O5U=g$NJB$YBX$($r9T$J$$$^\e(B
+\e$B$9!#%0%k!<%W$N%=!<%H$K$D$$$F$N$5$i$J$k>pJs$O\e(B @xref{Sorting Groups} \e$B$r;2\e(B
+\e$B>H$7$F$/$@$5$$!#\e(B
 
 @node Topic Topology
 @subsection \e$B%H%T%C%/$N0LAj9=B$\e(B
@@ -4250,8 +4289,8 @@ address "sender" "owner-ding@@hpc.uh.edu")} \e$B$O!"\e(B
 
 @example
 if address "sender" "owner-ding@@hpc.uh.edu" @{
-       fileinto "INBOX.ding";
-       stop;
+        fileinto "INBOX.ding";
+        stop;
 @}
 @end example
 
@@ -4391,7 +4430,7 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$B$^$8$-$3$H$G$9!#4X?t\e(B @code{gnus-goto-colon} \e$B$r!"$"$J$?$,9%$-$J%+!<%=%k$N\e(B
 \e$BF0$-$K$J$k$h$&$K!"?7$?$K=q$1$PNI$$$N$G$9!#\e(B) @xref{Positioning Point}\e$B!#\e(B
 
-\e$B=i4|CM$NJ8;zNs$O\e(B @samp{%U%R%z%I%(%[%4L: %-23,23n%]%) %s\n} \e$B$G$9!#\e(B
+\e$B=i4|CM$NJ8;zNs$O\e(B @samp{%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n} \e$B$G$9!#\e(B
 
 \e$B0J2<$NMM<0;X<(J8;z$H3HD%MM<0;X<($r;H$&$3$H$,$G$-$^$9\e(B:
 
@@ -4555,7 +4594,8 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 @vindex nnmail-extra-headers
 \e$B4XO"$7$?JQ?t$O\e(B @code{nnmail-extra-headers} \e$B$G!"\e(Boverview (@sc{nov}) \e$B%U%!\e(B
 \e$B%$%k$K$$$DDI2C$N%X%C%@!<$r4^$a$k$+$r@)8f$7$^$9!#8E$$\e(B overview \e$B%U%!%$%k$,\e(B
-\e$B$"$l$P!"$3$NJQ?t$rJQ99$7$?8e$K$O:F@8@.$9$kI,MW$,$"$j$^$9!#\e(B
+\e$B$"$k>l9g$O!"$3$NJQ?t$rJQ99$7$?8e$K%5!<%P!<%P%C%U%!$K\e(B `^' \e$B$GF~$C$FE,@Z$J\e(B
+\e$B%a!<%k%5!<%P!<\e(B (\e$BNc$($P\e(B nnml) \e$B$G\e(B `g' \e$B$r2!$7!":F@8@.$9$kI,MW$,$"$j$^$9!#\e(B
 
 @vindex gnus-summary-line-format
 gnus \e$B$K!"\e(B@code{gnus-summary-line-format} \e$BJQ?t$N\e(B @code{%n} \e$B;EMM\e(B
@@ -4577,15 +4617,19 @@ gnus \e$B$K!"\e(B@code{gnus-summary-line-format} \e$BJQ?t$N\e(B @code{%n} \e$B;EMM\e(B
 (\e$B>e5-$NCM$O\e(B gnus \e$B$N%G%#%U%)%k%HCM$G$9!#$"$J$?$NLr$KN)$D$h$&$KJQ$($F2<$5\e(B
 \e$B$$!#\e(B)
 
-\e$B$5$F!"$3$l$O:n@.$5$l$k\e(B @sc{nov} \e$B%U%!%$%k$rA`:n$G$-$k%a!<%k%0%k!<%W$G$O$?\e(B
-\e$B$$$F$$$N>l9gLrN)$A$^$9!#$7$+$7!"0J2<$N$b$N$r\e(B @file{overview.fmt} \e$B%U%!%$\e(B
-\e$B%k$N:G8e$KDI2C$9$k$h$&$K\e(B nntp \e$B4IM}<T$r@bF@$9$k$3$H$,$G$-$l$P\e(B:
+\e$B%K%e!<%94IM}?M!"$^$?$O%K%e!<%94IM}?M$r@bF@$7$F%5%]!<%H$NDI2C$r$7$F$b$i$*\e(B
+\e$B$&$H;W$C$F$$$k%f!<%6!<$N$_$J$5$s$X$N$4Cm0U\e(B:
+
+\e$B>e5-$N$3$H$O!":n@.$5$l$k\e(B @sc{nov} \e$B%U%!%$%k$rA`:n$G$-$k%a!<%k%0%k!<%W$G$O\e(B
+\e$B$?$$$F$$$N>l9gLrN)$A$^$9!#$7$+$7!"4IM}?M$r@bF@$7$F\e(B (\e$BFC$K\e(B INN \e$B$NIaDL$N<B\e(B
+\e$BAu$K$*$$$F\e(B) \e$B0J2<$N$b$N$r\e(B
 
 @example
 Newsgroups:full
 @end example
 
-\e$B%a!<%k%0%k!<%W$G$NDI2C%X%C%@!<$N$h$&$K$=$l$r;H$&$3$H$,$G$-$^$9!#\e(B
+@file{overview.fmt} \e$B%U%!%$%k$N:G8e$KDI2C$7$F$b$&$i$&$3$H$,$G$-$l$P!"%a!<\e(B
+\e$B%k%0%k!<%W$G$NDI2C%X%C%@!<$N$h$&$K$=$l$r;H$&$3$H$,$G$-$^$9!#\e(B
 
 @node Summary Buffer Mode Line
 @subsection \e$B35N,%P%C%U%!$N%b!<%I9T\e(B
@@ -5098,7 +5142,7 @@ gnus \e$B$O$=$N%a!<%k$r<hF@$7$F!"$=$l$N%X%C%@!<$N@:L)D4::$,$G$-$k$h$&$K2hLL\e(B
 @code{\e$B%]%9%H%^%9%?!<\e(B} (postmaster) \e$B$G$b$"$j!"\e(B@code{\e$B%k!<%H\e(B} \e$B$K\e(B @code{\e$B%]%9\e(B
 \e$B%H%^%9%?!<\e(B} \e$B$X$N%a!<%k$r<u$1<h$C$?>l9g$O!"$=$l\e(B
 \e$B$r\e(B @code{\e$B%]%9%H%^%9%?!<\e(B} \e$B$K$b:FAw$7$?$$$H;W$&$G$7$g\e(B
-\e$B$&!#\e(BOrdnung mu\e,A_\e(B sein!)
+\e$B$&!#\e(BOrdnung muss sein!)
 
 \e$B$3$NL?Na$O%W%m%;%9\e(B/\e$B@\F,0z?t$N=,47$K=>$$$^$9\e(B (@pxref{Process/Prefix})\e$B!#\e(B
 
@@ -5532,6 +5576,7 @@ gnus \e$B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s\e(B) \e$B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 \e$BJVEz$r$7$?$+!"%U%)%m!<%"%C%W$r$7$?\e(B (\e$BNc$($P!"Ez$($?\e(B) \e$B5-;v$O$9$Y$FFs7eL\\e(B
 \e$B$K\e(B @samp{A} \e$B$N0u$,$D$-$^$9\e(B (@code{gnus-replied-mark})\e$B!#\e(B
 
+@item
 @vindex gnus-forwarded-mark
 \e$BE>Aw$7$?5-;v$O$9$Y$FFs7eL\$K\e(B @samp{F} \e$B$N0u$,$D$-$^\e(B
 \e$B$9\e(B (@code{gnus-forwarded-mark})\e$B!#\e(B
@@ -5549,7 +5594,7 @@ gnus \e$B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s\e(B) \e$B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @vindex gnus-recent-mark
 \e$B$=$N%0%k!<%W$G\e(B ``\e$B:G6a\e(B'' (``recently'') \e$BFO$$$?5-;v$OFs7eL\$K\e(B @samp{N} \e$B$N\e(B
 \e$B$N0u$,$D$-$^$9\e(B (@code{gnus-recent-mark})\e$B!#$?$$$F$$$N%P%C%/%(%s%I$O$3$N0u\e(B
-\e$B$r%5%]!<%H$;$:!"$=$N>l9g$OI=<($5$l$^$;$s!#\e(B
+\e$B$r%5%]!<%H$;$:!"$=$N>l9g$OC1$KI=<($5$l$^$;$s!#\e(B
 
 @item
 @vindex gnus-unseen-mark
@@ -5945,9 +5990,9 @@ gnus \e$B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s\e(B) \e$B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 
 @item / p
 @kindex / p (\e$B35N,\e(B)
-@findex gnus-summary-limit-to-display-parameter
+@findex gnus-summary-limit-to-display-predicate
 \e$B35N,%P%C%U%!$r\e(B @code{display} \e$B%0%k!<%W%Q%i%a!<%?$N=R8l$rK~B-$5$;$k$h$&$K\e(B
-\e$B@)8B$7$^$9\e(B (@code{gnus-summary-limit-to-display-parameter})\e$B!#$3$N=R8l$K\e(B
+\e$B@)8B$7$^$9\e(B (@code{gnus-summary-limit-to-display-predicate})\e$B!#$3$N=R8l$K\e(B
 \e$B4X$9$k>\:Y$O\e(B @pxref{Group Parameters} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item / E
@@ -6205,6 +6250,10 @@ Gnus \e$B$O<B:]$K$O$I$N5-;v$b?F$K$O$;$:!"C1$K:G=i$N8I;y$r=|$$$F$9$Y$F$N8I;y\e(B
 @item gnus-simplify-whitespace
 @findex gnus-simplify-whitespace
 \e$BM>J,$J6uGr\e(B (whitespace) \e$B$r<h$j=|$-$^$9!#\e(B
+
+@item gnus-simplify-all-whitespace
+@findex gnus-simplify-all-whitespace
+\e$B$9$Y$F$N6uGr\e(B (whitespace) \e$B$r<h$j=|$-$^$9!#\e(B
 @end table
 
 \e$B$b$A$m$s!"$"$J$?<+?H$N4X?t$r=q$/$3$H$b$G$-$^$9!#\e(B
@@ -6259,9 +6308,9 @@ Gnus \e$B$O\e(B @code{Subject} \e$BMs$r8+$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O!"
 \e$B$,$G$-$^$9!#$b$7?t;z$K@_Dj$7$?$H$-$O!"$=$l$h$jB?$$DI2C$N%X%C%@!<$O<hF@$5\e(B
 \e$B$l$^$;$s!#$I$A$i$N>l9g$G$b!"8E$$%X%C%@!<$N<hF@$,F0:n$9$k$N$O!";H$C$F$$$k\e(B
 \e$B%P%C%/%(%s%I\e(B(back end) \e$B$,\e(B overview \e$B%U%!%$%k$r;H$C$F$$$k$+$I$&$+$G$9!=!=\e(B
-\e$B$3$l$OIaDL$O\e(B @code{nntp}, @code{nnspool} \e$B$H\e(B @code{nnml} \e$B$G$9!#%9%l%C%I$N\e(B
-\e$B%k!<%H$,%5!<%P!<$K$h$C$F4|8B@Z$l:o=|$5$l$?$H$-$O!"\e(Bgnus \e$B$O$I$&$7$h$&$b$J\e(B
-\e$B$$$3$H$r3P$($F$*$$$F$/$@$5$$!#\e(B
+\e$B$3$l$OIaDL$O\e(B @code{nntp}, @code{nnspool}, @code{nnml} \e$B$*$h\e(B
+\e$B$S\e(B @code{nnmaildir}\e$B$G$9!#%9%l%C%I$N%k!<%H$,%5!<%P!<$K$h$C$F4|8B@Z$l:o=|\e(B
+\e$B$5$l$?$H$-$O!"\e(Bgnus \e$B$O$I$&$7$h$&$b$J$$$3$H$r3P$($F$*$$$F$/$@$5$$!#\e(B
 
 \e$B$3$NJQ?t$O\e(B @code{invisible} \e$B$K@_Dj$9$k$3$H$b$G$-$^$9!#$3$l$O;k3PE*$J8z2L\e(B
 \e$B$O2?$b$"$j$^$;$s$,!"L?Na\e(B @kbd{A T} \e$B$r$h$/;H$&$N$G$"$l$PLr$KN)$D$G$7$g\e(B
@@ -6307,6 +6356,21 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 \e$B$3$l$,\e(B @code{nil} \e$B$G$J$$$H!"$9$Y$F$N%9%l%C%I$O35N,%P%C%U%!$,@8@.$5$l$?$H\e(B
 \e$B$-$K1#$l$^$9!#\e(B
 
+\e$B$3$l$O=R8l;X<(;R$G$"$k$3$H$b$G$-$^$9\e(B (@pxref{Predicate Specifiers})\e$B!#Mx\e(B
+\e$BMQ$G$-$k=R8l\e(B
+\e$B$O\e(B @code{gnus-article-unread-p} \e$B$H\e(B @code{gnus-article-unseen-p} \e$B$G$9!#\e(B
+
+\e$B$3$l$ONc$G$9\e(B:
+
+@lisp
+(setq gnus-thread-hide-subtree
+      '(or gnus-article-unread-p
+           gnus-article-unseen-p))
+@end lisp
+
+(\e$B$3$l$O$+$J$j$P$+$2$?Nc$G$9!#$J$<$J$i$9$Y$F$N$^$@FI$^$l$?$3$H$,L5$$5-;v\e(B
+\e$B$OL$FI$G$b$"$k$+$i$J$N$G$9$,!"<g;]$O5b$_<h$C$F2<$5$$!#\e(B)
+
 @item gnus-thread-expunge-below
 @vindex gnus-thread-expunge-below
 \e$B$3$N?t;z$h$j>/$J$$Am9gE*%9%3%"\e(B (@code{gnus-thread-score-function}) \e$B$r;}\e(B
@@ -6331,7 +6395,7 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 
 @item gnus-sort-gathered-threads-function
 @vindex gnus-sort-gathered-threads-function
-\e$B$H$-$I$-!"FC$K%a!<%j%s%0%j%9%H$G!"<j85$K%a!<%k$,E~Ce$9$k=gHV$OI,$:$7%a!<\e(B
+\e$B$H$-$I$-!"FC$K%a!<%j%s%0%j%9%H$G!"<j85$K%a!<%k$,E~Ce$9$k=gHV$OI,$:$7$b%a!<\e(B
 \e$B%j%s%0%j%9%H$KE~Ce$7$?=gHV$HF1$8$G$OL5$$$3$H$,$"$j$^$9!#=>$C$F!"I{%9%l%C\e(B
 \e$B%I$r=i4|@_Dj$N\e(B @code{gnus-thread-sort-by-number} \e$B$GJB$S49$($k$H!"1~Ez$N\e(B
 \e$BJ}$,$=$l$,1~Ez$7$F$$$k5-;v$h$j@h$K8=$l$k$3$H$,$"$j$^$9!#%0%k!<%W%Q%i%a!<\e(B
@@ -6462,8 +6526,8 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @table @kbd
 @item T n
 @kindex T n (\e$B35N,\e(B)
-@itemx C-M-n
-@kindex C-M-n (\e$B35N,\e(B)
+@itemx C-M-f
+@kindex C-M-f (\e$B35N,\e(B)
 @itemx M-down
 @kindex M-down (\e$B35N,\e(B)
 @findex gnus-summary-next-thread
@@ -6471,8 +6535,8 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 
 @item T p
 @kindex T p (\e$B35N,\e(B)
-@itemx C-M-p
-@kindex C-M-p (\e$B35N,\e(B)
+@itemx C-M-b
+@kindex C-M-b (\e$B35N,\e(B)
 @itemx M-up
 @kindex M-up (\e$B35N,\e(B)
 @findex gnus-summary-prev-thread
@@ -6514,6 +6578,7 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @findex gnus-thread-sort-by-subject
 @findex gnus-thread-sort-by-author
 @findex gnus-thread-sort-by-number
+@findex gnus-thread-sort-by-random
 @vindex gnus-thread-sort-functions
 @findex gnus-thread-sort-by-most-recent-thread
 \e$B$b$7%9%l%C%I$N35N,I=<($r;H$C$F$$$k$N$G$"$l$P!"\e(B
@@ -6521,12 +6586,13 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 \e$B$H$,$G$-$^$9!#$=$l$O!"C1FH$N4X?t!"4X?t$N%j%9%H!"4X?t$H\e(B @code{(\e$B4X?t$G$J$$\e(B
 \e$B$b$N\e(B)} \e$B$NMWAG$G$"$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H$G$O!"JB$SBX$($O5-;vHV9f\e(B
 \e$B$K$h$C$F$J$5$l$^$9!#4{$K:n$i$l$F$$$kJB$SBX$(=R8l4X?t\e(B
-\e$B$O\e(B @code{gnus-thread-sort-by-number}\e$B!"\e(B@code{gnus-thread-sort-by-author}\e$B!"\e(B
-@code{gnus-thread-sort-by-subject}\e$B!"\e(B@code{gnus-thread-sort-by-date}\e$B!"\e(B
-@code{gnus-thread-sort-by-score}\e$B!"\e(B
-@code{gnus-thread-sort-by-most-recent-number}\e$B!"\e(B
-@code{gnus-thread-sort-by-most-recent-date} \e$B$*$h$S\e(B
-@code{gnus-thread-sort-by-total-score} \e$B$G$9!#\e(B
+\e$B$O\e(B @code{gnus-thread-sort-by-number}, @code{gnus-thread-sort-by-author},
+@code{gnus-thread-sort-by-subject}, @code{gnus-thread-sort-by-date},
+@code{gnus-thread-sort-by-score},
+@code{gnus-thread-sort-by-most-recent-number},
+@code{gnus-thread-sort-by-most-recent-date},
+@code{gnus-thread-sort-by-random} \e$B$*$h\e(B
+\e$B$S\e(B @code{gnus-thread-sort-by-total-score} \e$B$G$9!#\e(B
 
 \e$B3F4X?t$OFs$D$N%9%l%C%I$r$H$j!":G=i$N%9%l%C%I$,B>$N%9%l%C%I$h$j@h$KJB$SBX\e(B
 \e$B$($i$l$k$Y$-$G$"$l$P!"\e(B@code{nil} \e$B$G$J$$CM$r$+$($7$^$9!#IaDL!"JB$SBX$($O\e(B
@@ -6571,13 +6637,17 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @findex gnus-article-sort-by-score
 @findex gnus-article-sort-by-subject
 @findex gnus-article-sort-by-author
+@findex gnus-article-sort-by-random
 @findex gnus-article-sort-by-number
 \e$B2?$+4qL/$JM}M3$J$I$G%9%l%C%II=<($r;H$C$F$$$J$$$N$J$i!"JQ\e(B
 \e$B?t\e(B @code{gnus-article-sort-functions} \e$B$r$$$8$/$kI,MW$,$"$j$^$9!#$3$l\e(B
 \e$B$O\e(B @code{gnus-thread-sort-functions} \e$B$HHs>o$K;w$F$$$^$9$,!"5-;v$NHf3S$K\e(B
 \e$B$O>/!90c$C$?4X?t$r;H$$$^$9!#;HMQ2DG=$JJB$SBX$(=R8l4X?t\e(B
-\e$B$O\e(B @code{gnus-article-sort-by-number}, @code{gnus-article-sort-by-author}, @code{gnus-article-sort-by-subject}, @code{gnus-article-sort-by-date} \e$B$*\e(B
-\e$B$h$S\e(B @code{gnus-article-sort-by-score} \e$B$G$9!#\e(B
+\e$B$O\e(B @code{gnus-article-sort-by-number},
+@code{gnus-article-sort-by-author},
+@code{gnus-article-sort-by-subject}, @code{gnus-article-sort-by-date},
+@code{gnus-article-sort-by-random} \e$B$*$h\e(B
+\e$B$S\e(B @code{gnus-article-sort-by-score} \e$B$G$9!#\e(B
 
 \e$B%9%l%C%I$r;H$C$F$$$J$$I=Bj$N35N,I=<($rJB$SBX$($?$$$N$G$"$l$P!"<!$N$h$&$J\e(B
 \e$B$3$H$r$9$k$3$H$,$G$-$^$9\e(B:
@@ -6736,7 +6806,7 @@ Gnus \e$B$O$"$J$?$,FI$`$G$"$m$&5-;v$h$j$b$?$/$5$s$N5-;v$r<hF@$7$^$9!#$3$l$O\e(B
 \e$B$NL5$$;v$G$9!#$"$J$?$,FsG\$NMFNL$r;H$&;v$,NI$$$H46$8$J$$8B$j$O!#\e(B
 
 \e$B%-%c%C%7%e$r@)8B$9$k$?$a$K!"\e(B@code{gnus-cacheable-groups} \e$B$r\e(B \e$B$r%-%c%C%7%e\e(B
-\e$B$9$k%0%k!<%W$NO"A[%j%9%H!"Nc$($P\e(B @samp{^nntp}\e$B!"$H$9$k$+!"@55,I=\e(B
+\e$B$9$k%0%k!<%W$NO"A[%j%9%H!"Nc$($P\e(B @samp{^nntp} \e$B$H$9$k$+!"@55,I=\e(B
 \e$B8=\e(B @code{gnus-uncacheable-groups} \e$B$rNc$($P!"\e(B@samp{^nnml} \e$B$K@_Dj$7$F2<$5\e(B
 \e$B$$!#N>J}$NJQ?t$N=i4|CM$O\e(B @code{nil} \e$B$G$9!#$b$7%0%k!<%W$,N>J}$N@55,I=8=$K\e(B
 \e$B9gCW$9$k$H!"$=$N%0%k!<%W$O%-%c%C%7%e$5$l$^$;$s!#\e(B
@@ -6828,6 +6898,10 @@ Gnus \e$B$O$?$/$5$s$NJ}K!$G5-;v$rJ]B8$9$k;v$,$G$-$^$9!#0J2<$N$b$N$OHs>o$KN(\e(B
 \e$B$k\e(B) \e$B$K$D$$$F$O\e(B@code{gnus-uu} \e$B$r;H$&$N$,NI$$$G$7$g\e(B
 \e$B$&\e(B (@pxref{Decoding Articles})\e$B!#\e(B
 
+\e$B$3$3$K:\$C$F$$$k%3%^%s%I$OBP>]$,%U%!%$%k$G$9!#%0%k!<%W$KJ]B8$7$?$$>l9g\e(B
+\e$B$O\e(B @kbd{B c} (@code{gnus-summary-copy-article}) \e$B%3%^%s%I$r;2>H$7$F2<$5\e(B
+\e$B$$\e(B (@pxref{Mail Group Commands})\e$B!#\e(B
+
 @vindex gnus-save-all-headers
 @code{gnus-save-all-headers} \e$B$,\e(B @code{nil} \e$B$G$J$$$H!"\e(Bgnus \e$B$O5-;v$rJ]B8$9\e(B
 \e$B$kA0$KK>$^$7$/$J$$%X%C%@!<$r>C5n$7$^$;$s!#\e(B
@@ -7675,8 +7749,8 @@ Fonts})\e$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"\e(Bgnus \e$B$O$=$l$
 
 @item W W h
 @kindex W W h (\e$B35N,\e(B)
-@findex gnus-article-toggle-headers
-\e$B%X%C%@!<$r1#$7$^$9\e(B (@code{gnus-article-toggle-headers})\e$B!#\e(B
+@findex gnus-article-hide-headers
+\e$B%X%C%@!<$r1#$7$^$9\e(B (@code{gnus-article-hide-headers})\e$B!#\e(B
 @xref{Hiding Headers}.
 
 @item W W b
@@ -7752,7 +7826,7 @@ Fonts})\e$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"\e(Bgnus \e$B$O$=$l$
 \e$B$O\e(B @code{banner} \e$B%0%k!<%W%Q%i%a!<%?\e(B (@pxref{Group Parameters}) \e$B$r%P%J!<\e(B
 \e$B$r<h$j=|$-$?$$%0%k!<%W$KDI2C$7$^$9!#%Q%i%a!<%?$O!">C5n$5$l$k%F%-%9%H$K9g\e(B
 \e$BCW$9$k@55,I=8=$H$7$F2r<a$5$l$kJ8;zNs$+!"\e(B(\e$B:G8e$N\e(B) \e$B=pL>$,>C5n$5$l$k$H$$$&\e(B
-\e$B0UL#$G$"$k%7%s%\%k\e(B @code{signature}\e$B!"$^$?\e(B
+\e$B0UL#$G$"$k%7%s%\%k\e(B @code{signature} \e$B$^$?\e(B
 \e$B$O\e(B @code{gnus-article-banner-alist} \e$B$N@55,I=8=$KBP1~$7$?%7%s%\%k$G$"$k$3\e(B
 \e$B$H$,$G$-$^$9!#\e(B
 
@@ -7872,15 +7946,15 @@ gnus \e$B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-\e(B
 @item t
 @kindex W t (\e$B35N,\e(B)
 @kindex t (\e$B35N,\e(B)
-@findex gnus-article-toggle-headers
+@findex gnus-summary-toggle-header
 \e$B5-;v%P%C%U%!$K$9$Y$F$N%X%C%@!<$rI=<($9$k$+$I$&$+$r@Z$jBX$($^\e(B
-\e$B$9\e(B (@code{gnus-article-toggle-headers})\e$B!#\e(B
+\e$B$9\e(B (@code{gnus-summary-toggle-header})\e$B!#\e(B
 
 @item W v
 @kindex W v (\e$B35N,\e(B)
-@findex gnus-summary-verbose-header
+@findex gnus-summary-verbose-headers
 \e$B5-;v%P%C%U%!$K$9$Y$F$N%X%C%@!<$r1J1s$KI=<($9$k$+$I$&$+$r@Z$jBX$($^\e(B
-\e$B$9\e(B (@code{gnus-summary-verbose-header})\e$B!#\e(B
+\e$B$9\e(B (@code{gnus-summary-verbose-headers})\e$B!#\e(B
 
 @item W m
 @kindex W m (\e$B35N,\e(B)
@@ -7909,6 +7983,13 @@ Sm*rtq**t*s \e$B$O$b$C$HB?$/$N0zMQJ8;z$rDs6!$9$k$?$a$K!"%^"#"#"#%="#"#$,>!<j\e(B
 \e$B$,$"$k$Y$-$H$3$m$K\e(B @code{\222} \e$B$d\e(B @code{\264} \e$B$N$h$&$J$b$N$,8+$($F$7$^$C\e(B
 \e$B$?$i!"@vBu$7$F$_$F2<$5$$!#\e(B
 
+@item W k
+@kindex W k (\e$B35N,\e(B)
+@findex gnus-article-outlook-deuglify-article
+@cindex Outlook Express
+\e$B2u$l$?\e(B Outlook (Express) \e$B$N5-;v$r\e(B deuglify \e$B$7$F:FI=<($7$^\e(B
+\e$B$9\e(B (@code{gnus-article-outlook-deuglify-article})\e$B!#\e(B
+
 @item W w
 @kindex W w (\e$B35N,\e(B)
 @findex gnus-article-fill-cited-article
@@ -7952,7 +8033,7 @@ CRLF \e$B$NAH\e(B (\e$B$9$J$o$A!"9T$N:G8e$N\e(B @samp{^M}) \e$B$r\e(B LF \e$B$KJQ49$7$^
 @c @findex gnus-article-de-base64-unreadable
 @c Treat base64 (@code{gnus-article-de-base64-unreadable}).
 @c Base64 is one common @sc{mime} encoding employed when sending non-ASCII
-@c (i. e., 8-bit) articles.  Note that the this is usually done
+@c (i. e., 8-bit) articles.  Note that this is usually done
 @c automatically by Gnus if the message in question has a
 @c @code{Content-Transfer-Encoding} header that says that this encoding has
 @c been done.
@@ -7965,14 +8046,48 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 \e$B$K;H$o$l$k0lHLE*$JId9f$G$9!#$3$l$O\e(B @samp{~@{<:Ky2;S@{#,NpJ)l6HK!#~@}} \e$B$N\e(B
 \e$B$h$&$JE57?E*$JJ8;zNs$r:n$j$^$9!#\e(B
 
-@c @item W h
-@c @kindex W h (Summary)
-@c @findex gnus-article-wash-html
-@c Treat HTML (@code{gnus-article-wash-html}).
-@c Note that the this is usually done automatically by Gnus if the message
-@c in question has a @code{Content-Type} header that says that this type
-@c has been done.
-@c If a prefix is given, a charset will be asked for.
+@item W u
+@kindex W u (Summary)
+@findex gnus-article-unsplit-urls
+URL \e$B$K4^$^$l$k2~9T$r:o=|$7$^$9!#$$$/$D$+$N%a%$%i!<$O!"9T$rC;$/$9$k$?$a$K\e(B
+\e$B=P$F$$$/%a!<%k$K2~9T$rA^F~$7$^$9$,!"$3$l$OD9$$\e(B URL \e$B$rJ#?t$N9T$KJ,3d$7$F\e(B
+\e$B$7$^$$$^$9!#2~9T$r:o=|$9$k$3$H$K$h$C$F!"$=$l$i$N\e(B URL \e$B$rI|5l$5$;$^\e(B
+\e$B$9\e(B (@code{gnus-article-unsplit-urls})\e$B!#\e(B
+
+@item W h
+@kindex W h (\e$B35N,\e(B)
+@findex gnus-article-wash-html
+@sc{html} \e$B$r=hM}$7$^$9!#Ev3:%a%C%;!<%8$,\e(B @sc{html} \e$B$G$"$k$3$H$r<(\e(B
+\e$B$9\e(B @code{Content-Type} \e$B%X%C%@!<$r;}$C$F$$$?$J$i$P!"$=$l$O\e(B gnus \e$B$K$h$C$F\e(B
+\e$B<+F0E*$K9T$J$o$l$k$3$H$KCm0U$7$F2<$5$$!#\e(B
+
+\e$B@\F,<-$,M?$($i$l$k$H!"2?$NJ8;z=89g\e(B (charset) \e$B$H$7$F07$&$+$r?R$M$i$l$^$9!#\e(B
+
+@vindex gnus-article-wash-function
+\e$B%G%#%U%)%k%H$G$O\e(B @sc{html} \e$B$NJQ49$K\e(B @code{mm-inline-text-html-renderer}
+(@pxref{Customization, , , emacs-mime}) \e$B$G@_Dj$5$l$?4X?t$r;H$$$^$9$,!"$3\e(B
+\e$B$l$OJQ?t\e(B @code{gnus-article-wash-function} \e$B$G@)8f$5$l$^$9!#;H$&$3$H$,$G\e(B
+\e$B$-$k!"$"$i$+$8$aMQ0U$5$l$?4X?t$O0J2<$NDL$j$G$9!#\e(B
+
+@table @code
+@item w3
+Emacs/W3 \e$B$r;H$$$^$9!#\e(B
+
+@item w3m
+emacs-w3m \e$B$r;H$$$^$9\e(B (\e$B>\$7$/$O\e(B @uref{http://emacs-w3m.namazu.org/} \e$B$r;2\e(B
+\e$B>H$7$F2<$5$$\e(B)\e$B!#\e(B
+
+@item links
+Links \e$B$r;H$$$^\e(B
+\e$B$9\e(B (@uref{http://artax.karlin.mff.cuni.cz/~mikulas/links/} \e$B$r;2>H\e(B)\e$B!#\e(B
+
+@item lynx
+Lynx \e$B$r;H$$$^$9\e(B (@uref{http://lynx.browser.org/} \e$B$r;2>H\e(B)\e$B!#\e(B
+
+@item html2text
+html2text (\e$B%7%s%W%k$J\e(B @sc{html} \e$B%3%s%P!<%?!<!"\e(Bgnus \e$B$K4^$^$l$F$$$k\e(B) \e$B$r;H\e(B
+\e$B$$$^$9!#\e(B
+@end table
 
 @item W b
 @kindex W b (\e$B35N,\e(B)
@@ -8001,14 +8116,14 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 @c @item W s
 @c @kindex W s (Summary)
 @c @findex gnus-summary-force-verify-and-decrypt
-@c Verify a signed (PGP, PGP/MIME or S/MIME) message
+@c Verify a signed (PGP, @sc{pgp/mime} or @sc{s/mime}) message
 @c (@code{gnus-summary-force-verify-and-decrypt}). @xref{Security}.
 
 @item W W H
 @kindex W W H (\e$B35N,\e(B)
-@findex gnus-article-strip-headers-from-body
+@findex gnus-article-strip-headers-in-body
 \e$B5-;v$NK\BN$N@hF,$+$i\e(B @code{X-No-Archive} \e$B%X%C%@!<$N$h$&$J%X%C%@!<$r<h$j\e(B
-\e$B=|$-$^$9\e(B (@code{gnus-article-strip-headers-from-body})\e$B!#\e(B
+\e$B=|$-$^$9\e(B (@code{gnus-article-strip-headers-in-body})\e$B!#\e(B
 
 @item W E l
 @kindex W E l (\e$B35N,\e(B)
@@ -8077,6 +8192,12 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 @findex gnus-article-treat-fold-header
 \e$B$9$Y$F$N%a%C%;!<%8%X%C%@!<$r@^$jJV$7$^\e(B
 \e$B$9\e(B (@code{gnus-article-treat-fold-headers})\e$B!#\e(B
+
+@item W E w
+@kindex W E w (\e$B35N,\e(B)
+@findex gnus-article-remove-leading-whitespace
+\e$B$9$Y$F$N%X%C%@!<$+$iM>7W$J6uGr$r<h$j=|$-$^\e(B
+\e$B$9\e(B (@code{gnus-article-remove-leading-whitespace})\e$B!#\e(B
 @end table
 
 @node Article Buttons
@@ -8105,7 +8226,8 @@ Gnus \e$B$O%G%#%U%)%k%H$GFCDj$NI8=`$N;2>H$K\e(B@dfn{\e$B%\%?%s\e(B}\e$B$rIU$1$^$9\e(B:
 @item regexp
 \e$B$3$N@55,I=8=\e(B (regexp) \e$B$K9gCW$9$k$9$Y$F$NJ8$O30It;2>H$G$"$k$H$_$J$5$l$^$9!#\e(B
 \e$B$3$l$OKd$a9~$^$l$?\e(B URL \e$B$K9gCW$9$kE57?E*$J@55,I=8=$G\e(B
-\e$B$9\e(B @samp{<URL:\\([^\n\r>]*\\)>}\e$B!#\e(B
+\e$B$9\e(B @samp{<URL:\\([^\n\r>]*\\)>}\e$B!#$3$l$O$^$?@55,I=8=$NCM$r;}$DJQ?t$G$"$C\e(B
+\e$B$F$b$h$/!"M-MQ$JJQ?t$H$7$F\e(B @code{gnus-button-url-regexp} \e$B$,$"$j$^$9!#\e(B
 
 @item button-par
 Gnus \e$B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^\e(B
@@ -8291,7 +8413,7 @@ gnus \e$B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-\e(B
 @findex gnus-treat-newsgroups-picon
 \e$B$9$Y$F$N%K%e!<%9%X%C%@!<\e(B (\e$B$9$J$o\e(B
 \e$B$A\e(B @code{Newsgroups} \e$B$H\e(B @code{Followup-To}) \e$B$r\e(B Picon \e$B2=$7$^\e(B
-\e$B$9\e(B (@code{gnus-treat-from-picon})\e$B!#\e(B
+\e$B$9\e(B (@code{gnus-treat-newsgroups-picon})\e$B!#\e(B
 
 @item W D D
 @kindex W D D (\e$B35N,\e(B)
@@ -8423,13 +8545,18 @@ gnus \e$B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-\e(B
 @item C-c C-s C-c
 @kindex C-c C-s C-c (\e$B35N,\e(B)
 @findex gnus-summary-sort-by-chars
-\e$B5-;v$ND9$5$GJB$S49$($^$9\e(B (@code{gnus-summary-sort-by-chars})\e$B!#\e(B
+\e$B5-;v$ND9$5$GJB$SBX$($^$9\e(B (@code{gnus-summary-sort-by-chars})\e$B!#\e(B
 
 @item C-c C-s C-i
 @kindex C-c C-s C-i (\e$B35N,\e(B)
 @findex gnus-summary-sort-by-score
 \e$B%9%3%"$K$h$C$FJB$SBX$($^$9\e(B (@code{gnus-summary-sort-by-score})\e$B!#\e(B
 
+@item C-c C-s C-r
+@kindex C-c C-s C-r (Summary)
+@findex gnus-summary-sort-by-random
+\e$B%i%s%@%`$KJB$SBX$($^$9\e(B (@code{gnus-summary-sort-by-random})\e$B!#\e(B
+
 @item C-c C-s C-o
 @kindex C-c C-s C-o (\e$B35N,\e(B)
 @findex gnus-summary-sort-by-original
@@ -8520,20 +8647,22 @@ gnus \e$B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-\e(B
 \e$B$"$k$3$H$b$G$-$^$9!#8e<T$O!"8=:_$NA*BrJ}K!$r;H$&$H$$$&0UL#$G$9!#%j%9%H$N\e(B
 \e$B>l9g$O!"\e(Bgnus \e$B$O9g$&$b$N$rH/8+$9$k$^$G%j%9%H$NA4$F$NJ}K!$r;n$7$^$9!#\e(B
 
-\e$B$3$l$O8=:_$NJ}K!$r;n$7$F!"$=$l$,<:GT$7$?>l9g$K$O\e(B Deja \e$B$K?V$/@_Dj$NNc$G$9\e(B:
+\e$B$3$l$O8=:_$NJ}K!$r;n$7$F!"$=$l$,<:GT$7$?>l9g$K$O\e(B Google \e$B$K?V$/@_Dj$NNc$G\e(B
+\e$B$9\e(B:
 
 @lisp
 (setq gnus-refer-article-method
       '(current
-        (nnweb "refer" (nnweb-type dejanews))))
+        (nnweb "refer" (nnweb-type google))))
 @end lisp
 
 \e$B$[$H$s$I$N%a!<%k%P%C%/%(%s%I$O\e(B @code{Message-ID} \e$B$G$N<hF@$,2DG=$G$9$,!"\e(B
-\e$B$"$^$jM%2m$JJ}K!$G$d$C$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B
-@code{nnmbox} \e$B$H\e(B @code{nnbabyl} \e$B$O$I$N%0%k!<%W$+$i$N5-;v$b0LCV$rF@$k$3$H\e(B
-\e$B$,$G$-$^$9$,!"\e(B@code{nnml}, @code{nnfolder} \e$B$*$h$S\e(B @code{nnimap} \e$B$O8=:_$N\e(B
-\e$B%0%k!<%W$KEj9F$7$?5-;v$N0LCV$7$+F@$k;v$,$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$OA4$/IT2DG=$G$9!#\e(B
+\e$B$"$^$jM%2m$JJ}K!$G$d$C$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B@code{nnmbox},
+@code{nnbabyl} \e$B$*$h$S\e(B @code{nnmaildir} \e$B$O$I$N%0%k!<%W$+$i$N5-;v$b0LCV$r\e(B
+\e$BF@$k$3$H$,$G$-$^$9$,!"\e(B@code{nnml}, @code{nnfolder} \e$B$*$h\e(B
+\e$B$S\e(B @code{nnimap} \e$B$O8=:_$N%0%k!<%W$KEj9F$7$?5-;v$N0LCV$7$+F@$k;v$,$G$-$^\e(B
+\e$B$;$s!#\e(B(\e$B$=$NB>$N$b$N$O;~4V$,$+$+$j$9$.$^$9!#\e(B) @code{nnmh} \e$B$G$OA4$/IT2DG=\e(B
+\e$B$G$9!#\e(B
 
 @node Alternative Approaches
 @section \e$BBeBX<jCJ\e(B
@@ -8831,7 +8960,7 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 @findex gnus-summary-move-article
 @vindex gnus-preserve-marks
 \e$B$"$k%a!<%k%0%k!<%W$+$iJL$N$H$3$m$X5-;v$r0\F0$7$^\e(B
-\e$B$9\e(B (@code{gnus-summary-move-article})\e$B!#\e(B@var{gnus-preserve-marks} \e$B$NCM\e(B
+\e$B$9\e(B (@code{gnus-summary-move-article})\e$B!#\e(B@code{gnus-preserve-marks} \e$B$NCM\e(B
 \e$B$,\e(B nil \e$B$G$O$J$$$J$i$P\e(B (\e$B$3$l$,=i4|CM$G$9$,\e(B)\e$B!"%^!<%/$OJ]B8$5$l$^$9!#\e(B
 
 @item B c
@@ -8840,7 +8969,7 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 @findex gnus-summary-copy-article
 @c @icon{gnus-summary-mail-copy}
 \e$B$"$k%0%k!<%W\e(B (\e$B%a!<%k%0%k!<%W$dB>$N$b$N\e(B) \e$B$+$i%a!<%k%0%k!<%W$K5-;v$rJ#@=$7\e(B
-\e$B$^$9\e(B (@code{gnus-summary-copy-article})\e$B!#\e(B@var{gnus-preserve-marks} \e$B$NCM\e(B
+\e$B$^$9\e(B (@code{gnus-summary-copy-article})\e$B!#\e(B@code{gnus-preserve-marks} \e$B$NCM\e(B
 \e$B$,\e(B nil \e$B$G$O$J$$$J$i$P\e(B (\e$B$3$l$,=i4|CM$G$9$,\e(B)\e$B!"%^!<%/$OJ]B8$5$l$^$9!#\e(B
 
 @item B B
@@ -8858,6 +8987,13 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 \e$B$9\e(B (@code{gnus-summary-import-article})\e$B!#$"$J$?$O%U%!%$%kL>$H!"\e(B
 @code{From} \e$BMs$H\e(B @code{Subject} \e$BMs$NF~NO$rB%$5$l$^$9!#\e(B
 
+@item B I
+@kindex B I (\e$B35N,\e(B)
+@findex gnus-summary-create-article
+\e$B6u$N5-;v$r8=:_$N%a!<%k%0%k!<%W$K:n$j$^\e(B
+\e$B$9\e(B (@code{gnus-summary-create-article})\e$B!#\e(B@code{From} \e$B%X%C%@!<\e(B
+\e$B$H\e(B @code{Subject} \e$B%X%C%@!<$NFbMF$r?R$M$i$l$^$9!#\e(B
+
 @item B r
 @kindex B r (\e$B35N,\e(B)
 @findex gnus-summary-respool-article
@@ -8865,8 +9001,8 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 @code{gnus-summary-respool-default-method} \e$B$,:F%9%W!<%k$9$k$H$-$N%G%#%U%)\e(B
 \e$B%k%H$NA*BrJ}K!$H$7$F;HMQ$5$l$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G\e(B @code{nil} \e$B$G!"\e(B
 \e$B$3$l$O8=:_$N%0%k!<%W$NA*BrJ}K!$,Be$o$j$K;H$o$l$k$H$$$&;v$G$9!#\e(B
-@var{gnus-preserve-marks} \e$B$NCM$,\e(B nil \e$B$G$O$J$$$J$i$P\e(B (\e$B$3$l$,=i4|CM$G$9$,\e(B)\e$B!"\e(B
-\e$B%^!<%/$OJ]B8$5$l$^$9!#\e(B
+@code{gnus-preserve-marks} \e$B$NCM$,\e(B nil \e$B$G$O$J$$$J$i$P\e(B (\e$B$3$l$,=i4|CM$G$9\e(B
+\e$B$,\e(B)\e$B!"%^!<%/$OJ]B8$5$l$^$9!#\e(B
 
 @item B w
 @itemx e
@@ -8874,10 +9010,12 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 @kindex e (\e$B35N,\e(B)
 @findex gnus-summary-edit-article
 @kindex C-c C-c (\e$B5-;v\e(B)
+@findex gnus-summary-edit-article-done
 \e$B8=:_$N5-;v$rJT=8$7$^$9\e(B (@code{gnus-summary-edit-article})\e$B!#JT=8$r=*N;$7\e(B
-\e$B$FJQ99$r1J1s$K$9$k$?$a$K!"\e(B@kbd{C-c C-c} \e$B$rBG$A$^$9!#$b$7L?\e(B
-\e$BNa\e(B @kbd{C-c C-c} \e$B$K?tCM@\F,0z?t$rM?$($k$H!"\e(Bgnus \e$B$O5-;v$r:F%O%$%i%$%H$7$^\e(B
-\e$B$;$s!#\e(B
+\e$B$FJQ99$r1J1s$K$9$k$?$a\e(B
+\e$B$K\e(B @kbd{C-c C-c} (@code{gnus-summary-edit-article-done}) \e$B$rBG$A$^$9!#$b\e(B
+\e$B$7L?Na\e(B @kbd{C-c C-c} \e$B$K?tCM@\F,0z?t$rM?$($k$H!"\e(Bgnus \e$B$O5-;v$r:F%O%$%i%$%H\e(B
+\e$B$7$^$;$s!#\e(B
 
 @item B q
 @kindex B q (\e$B35N,\e(B)
@@ -8905,6 +9043,14 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 \e$B8+$7$J$+$C$?$H$7$F$b!"$=$l$O$H$K$+$/Ej9F$5$l$F$$$k$+$b$7$l$^$;$s!=!=%a!<\e(B
 \e$B%k$NEAC#$O%K%e!<%9$NEAC#$h$j$b$:$C$HB.$/!"%K%e!<%9$NJ#@=$,$^$@E~Ce$7$F$$\e(B
 \e$B$J$$$@$1$+$b$7$l$J$$$N$G$9!#\e(B
+
+@c @item K E
+@c @kindex K E (Summary)
+@c @findex gnus-article-encrypt-body
+@c @vindex gnus-article-encrypt-protocol
+@c Encrypt the body of an article (@code{gnus-article-encrypt-body}).
+@c The body is encrypted with the encryption protocol specified by the
+@c variable @code{gnus-article-encrypt-protocol}.
 @end table
 
 @vindex gnus-move-split-methods
@@ -8994,9 +9140,9 @@ Gnus \e$B$,F1$8\e(B @code{Message-ID} \e$B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$
 
 @lisp
 (setq gnus-newsgroup-variables
-      '(message-use-followup-to
-        (gnus-visible-headers
-         . "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:")))
+     '(message-use-followup-to
+       (gnus-visible-headers .
+         "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:")))
 @end lisp
 @end table
 
@@ -9391,8 +9537,8 @@ Gnus \e$B$K$$$D$G$b@5$7$$\e(B @code{Xref} \e$B$r<hF@$9$k$h$&$K$5$;$?$$$N$G$"$l$P!"\e
 @section Security
 
 Gnus is able to verify signed messages or decrypt encrypted messages.
-The formats that are supported are PGP, PGP/MIME and S/MIME, however
-you need some external programs to get things to work:
+The formats that are supported are PGP, @sc{pgp/mime} and @sc{s/mime},
+however you need some external programs to get things to work:
 
 @enumerate
 @item
@@ -9400,7 +9546,7 @@ To handle PGP messages, you have to install mailcrypt or gpg.el as
 well as a OpenPGP implementation (such as GnuPG).
 
 @item
-To handle S/MIME message, you need to install OpenSSL.  OpenSSL 0.9.6
+To handle @sc{s/mime} message, you need to install OpenSSL.  OpenSSL 0.9.6
 or newer is recommended.
 
 @end enumerate
@@ -9426,10 +9572,12 @@ protocols. Otherwise, ask user.
 @node Mailing List
 @section \e$B%a!<%j%s%0%j%9%H\e(B
 
+@kindex A M (\e$B35N,\e(B)
+@findex gnus-mailing-list-insinuate
 Gnus \e$B$O\e(B RFC 2369 \e$B$G4{Dj$5$l$?3F<o$N%a!<%j%s%0%j%9%H$G;H$o$l$k%U%#!<%k%I\e(B
 \e$B$rM}2r$7$^$9!#$3$l$rM-8z$K$9$k$K$O\e(B `to-list' \e$B%0%k!<%W%Q%i%a!<\e(B
-\e$B%?\e(B (@pxref{Group Parameters}) \e$B$rDI2C$7$F!"35N,%P%C%U%!$G\e(B @kbd{A M} \e$B$r;H\e(B
-\e$B$&$+\e(B
+\e$B%?\e(B (@pxref{Group Parameters}) \e$B$rDI2C$7$F!"35N,%P%C%U%!\e(B
+\e$B$G\e(B @kbd{A M} (@code{gnus-mailing-list-insinuate}) \e$B$r;H$&$+\e(B
 
 @lisp
 (add-hook 'gnus-summary-mode-hook 'turn-on-gnus-mailing-list-mode)
@@ -9597,7 +9745,7 @@ Gnus \e$B$O%X%C%@!<$NJB$YBX$(\e(B(sort)\e$B$b9T$$$^$9\e(B (\e$B$3$l$O%G%#%U%)%k%H$G9T
 @code{To} \e$BMs$,0l$D$h$j$bB?$1$l$P!"$=$l$i$rA4$F>C5n$7$^$9!#\e(B
 @end table
 
-\e$B$3$l$i$N;0$D$NMWAG$rF~$l$?$1$l$P!"$3$s$JIw$K$J$j$^$9!#\e(B
+\e$B$3$l$i$N;0$D$NMWAG$rF~$l$?$1$l$P!"$3$s$JIw$K$J$j$^$9\e(B:
 
 @lisp
 (setq gnus-boring-article-headers
@@ -9622,19 +9770,16 @@ Gnus \e$B$O%X%C%@!<$NJB$YBX$(\e(B(sort)\e$B$b9T$$$^$9\e(B (\e$B$3$l$O%G%#%U%)%k%H$G9T
 
 @vindex gnus-show-mime
 @vindex gnus-article-display-method-for-mime
-@vindex gnus-strict-mime
 @findex gnus-article-display-mime-message
 Gnus \e$B$O\e(B @code{gnus-article-display-method-for-mime} \e$B$K5-;v$r2!$7IU$1$k$3\e(B
 \e$B$H$G\e(B @sc{mime} \e$B$r07$$$^$9!#$3$N=i4|CM\e(B
 \e$B$O\e(B @code{gnus-article-display-mime-message} \e$B$G$9!#$3$N4X?t\e(B
-\e$B$O\e(B SEMI MIME-View \e$B%W%m%0%i%`$r8F$S=P$7$F<B:]$N=hM}$r9T$$$^$9!#\e(B
-SEMI MIME-View \e$B$K4X$9$k>\$7$$>pJs$O!"%^%K%e%"%k$r;2>H$7$F$/$@$5$$\e(B (\e$B$^$@\e(B
-\e$B$J$$$1$I\e(B (;_;))\e$B!#\e(B
+\e$B$O\e(B @sc{semi} MIME-View \e$B%W%m%0%i%`$r8F$S=P$7$F<B:]$N=hM}$r9T$$$^$9!#\e(B
+@sc{semi} MIME-View \e$B$K4X$9$k>\$7$$>pJs$O!"%^%K%e%"%k$r;2>H$7$F$/$@$5\e(B
+\e$B$$\e(B (\e$B$^$@$J$$$1$I\e(B (;_;))\e$B!#\e(B
 
 @sc{mime} \e$B$r>o$K;HMQ$7$?$1$l$P!"\e(B
-@code{gnus-show-mime} \e$B$r\e(B @code{t} \e$B$K@_Dj$7$F$/$@$5$$!#$7$+$7!"\e(B
-@code{gnus-strict-mime} \e$B$,\e(B @code{nil} \e$B0J30$G$"$l$P!"\e(B@sc{mime} \e$B=hM}$O5-;v\e(B
-\e$BCf$K\e(B @sc{mime} \e$B%X%C%@!<$,$"$k$H$-$N$_;HMQ$5$l$^$9!#\e(B
+@code{gnus-show-mime} \e$B$r\e(B @code{t} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 @code{gnus-show-mime} \e$B$r@_Dj$7$F$$$k$H!"1?$,0-$$$H5-;v%P%C%U%!$K$O8N>c$7\e(B
 \e$B$?$h$&$J2hLL$,8+$($k$3$H$b$"$k$G$7$g$&!#$3$l$OHr$1$h$&$,$"$j$^$;$s!#\e(B
 
@@ -9742,6 +9887,8 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @item gnus-treat-strip-pem (t, last, integer)
 @item gnus-treat-strip-pgp (t, last, integer)
 @item gnus-treat-strip-trailing-blank-lines (t, last, integer)
+@item gnus-treat-unsplit-urls (t, integer)
+@item gnus-treat-decode-article-as-default-mime-charset (t, integer)
 
 @xref{Article Washing}.
 
@@ -9799,8 +9946,9 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @item gnus-treat-unfold-headers (head)
 @item gnus-treat-fold-headers (head)
 @item gnus-treat-fold-newsgroups (head)
+@item gnus-treat-leading-whitespace (head)
 
-@item gnus-treat-decode-article-as-default-mime-charset
+@xref{Article Header}.
 @end table
 
 @vindex gnus-part-display-hook
@@ -9992,7 +10140,8 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 
 @menu
 * Mail::                        \e$B%a!<%k$HJVEz\e(B
-* Posting Server::              \e$B$I$N%5!<%P!<$rDL$7$FEj9F$9$k$Y$-$+\e(B?
+* Posting Server::              \e$B$I$N%5!<%P!<$rDL$7$F%K%e!<%9$rEj9F$^$?$O\e(B
+                                \e$B%a!<%k$rAw?.$9$k$Y$-$+\e(B?
 * Mail and Post::               \e$BF1;~$K%a!<%k$r=P$7JVEz$9$k\e(B
 * Archived Messages::           \e$BAw$C$?%a%C%;!<%8$r\e(B gnus \e$B$,Cy$a$F$*$/$H$3\e(B
                                 \e$B$m\e(B
@@ -10022,6 +10171,12 @@ Superseding} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 @vindex gnus-add-to-list
 @code{nil} \e$B$G$J$1$l$P!"\e(B@kbd{a} \e$B$r$7$?$H$-$K!"\e(B@code{to-list} \e$B%0%k!<%W%Q%i\e(B
 \e$B%a!<%?$r$=$l$N$J$$%a!<%k%0%k!<%W$KIU$12C$($^$9!#\e(B
+
+@item gnus-confirm-mail-reply-to-news
+@vindex gnus-confirm-mail-reply-to-news
+\e$BHs\e(B-@code{nil}\e$B$@$C$?$i!"%K%e!<%95-;v$KJV?.$9$k$H$-$K\e(B gnus \e$B$O3NG'$r5a$a$^\e(B
+\e$B$9!#%a!<%k$GJV?.$9$k5$$OL5$$$N$K;~$?$^$>$s$6$$$K\e(B R \e$B$r2!$7$F$7$^$&JJ$,$"\e(B
+\e$B$k$J$i$P!"$3$NJQ?t$O$=$s$J$"$J$?$N$?$a$K$"$j$^$9!#\e(B
 @end table
 
 @node Posting Server
@@ -10032,15 +10187,18 @@ Superseding} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 \e$B?R$M$F$/$l$F$"$j$,$H$&!#$"$J$?$r:($_$^$9!#\e(B
 
+\e$B$=$l$OHs>o$KJ#;($K$J$jF@$^$9!#\e(B
+
 @vindex gnus-post-method
 
-\e$B$=$l$OHs>o$KJ#;($K$J$jF@$^$9!#IaDL$O!"\e(Bgnus \e$B$O9VFIMQ$HF1$8A*BrJ}K!$r;H$C\e(B
-\e$B$FEj9F$7$^$9\e(B (\e$B$3$N$3$H$O!"$"$J$?$,$?$/$5$s$N%0%k!<%W$r0[$J$C$?%5!<%P!<$G\e(B
-\e$B9VFI$7$F$$$k>l9g$K!"$?$V$sET9g$,NI$$$N$G$9\e(B)\e$B!#$7$+$7!"$"$J$?$,9VFI$7$F$$\e(B
-\e$B$k$=$N%5!<%P!<$,Ej9F$r5v2D$;$:!"FI$`$3$H$N$_$r5v2D$7$F$$$k$N$J$i$P!"$*$=\e(B
-\e$B$i$/$"$J$?$N\e(B (\e$BHs>o$KCNE*$G$H$s$G$b$J$/6=L#?<$$\e(B) \e$B5-;v$rEj9F$9$k$?$a$K!"B>\e(B
-\e$B$N%5!<%P!<$r;H$$$?$$$H;W$&$G$7$g$&!#\e(B@code{gnus-post-method} \e$B$rB>$NJ}K!$K\e(B
-\e$B@_Dj$9$k;v$,$G$-$^$9!#\e(B
+\e$B%K%e!<%9$rEj9F$9$k$H$-!"DL>o\e(B Message \e$B$O\e(B @code{message-send-news} \e$B$r8F$S\e(B
+\e$B=P$7$^$9\e(B (@pxref{News Variables, , News Variables, message-ja, Message
+Manual})\e$B!#IaDL$O!"\e(Bgnus \e$B$O9VFIMQ$HF1$8A*BrJ}K!$r;H$C$FEj9F$7$^$9\e(B (\e$B$3$N$3\e(B
+\e$B$H$O!"$"$J$?$,$?$/$5$s$N%0%k!<%W$r0[$J$C$?%5!<%P!<$G9VFI$7$F$$$k>l9g$K!"\e(B
+\e$B$?$V$sET9g$,NI$$$N$G$9\e(B)\e$B!#$7$+$7!"$"$J$?$,9VFI$7$F$$$k$=$N%5!<%P!<$,Ej9F\e(B
+\e$B$r5v2D$;$:!"FI$`$3$H$N$_$r5v2D$7$F$$$k$N$J$i$P!"$*$=$i$/$"$J$?$N\e(B (\e$BHs>o$K\e(B
+\e$BCNE*$G$H$s$G$b$J$/6=L#?<$$\e(B) \e$B5-;v$rEj9F$9$k$?$a$K!"B>$N%5!<%P!<$r;H$$$?$$\e(B
+\e$B$H;W$&$G$7$g$&!#\e(B@code{gnus-post-method} \e$B$rB>$NJ}K!$K@_Dj$9$k;v$,$G$-$^$9!#\e(B
 
 @lisp
 (setq gnus-post-method '(nnspool ""))
@@ -10060,6 +10218,27 @@ gnus \e$B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#\e(B
 \e$B:G8e$K!"$"$J$?$,$$$D$G$b4pK\$NA*BrJ}K!$r;H$C$FEj9F$7$?$$$N$J$i$P!"$3$NJQ\e(B
 \e$B?t$r\e(B @code{native} \e$B$K$7$F2<$5$$!#\e(B
 
+\e$B%a!<%k$rAw?.$9$k$H$-$K!"\e(BMessage \e$B$O\e(B @code{message-send-mail-function} \e$B$r\e(B
+\e$B8F$S=P$7$^$9!#%G%#%U%)%k%H$N4X\e(B
+\e$B?t\e(B @code{message-send-mail-with-sendmail} \e$B$O5-;v$r=gHVBT$A$KF~\e(B
+\e$B$l\e(B (queuing) \e$B$?$jAw?.$9$k$?$a$K!"%P%$%J%j!<$G\e(B @code{sendmail} \e$B$K%Q%$%W$7\e(B
+\e$B$^$9!#%m!<%+%k%7%9%F%`$,\e(B @code{sendmail} \e$B$G%a!<%k$rAw?.$9$k$h$&$K@_Dj$5\e(B
+\e$B$l$F$$$J$/$F$b!"$"$J$?$,1s3V\e(B @sc{smtp} \e$B%5!<%P!<$K@\B3$9$k8"Mx$r;}$C$F$$\e(B
+\e$B$k$J$i$P!"\e(B
+@code{message-send-mail-function} \e$B$r\e(B @code{smtpmail-send-it} \e$B$K@_Dj$9$k\e(B
+\e$B$3$H$,$G$-$^$9!#\e(B@code{smtpmail} \e$B%Q%C%1!<%8$r;H$&$?$a$K@5$7$$@_Dj$,$J$5$l\e(B
+\e$B$F$$$k$+$I$&$+3NG'$7$F2<$5$$!#Nc$G$9\e(B:
+
+@lisp
+(setq message-send-mail-function 'smtpmail-send-it
+      smtpmail-default-smtp-server "YOUR SMTP HOST")
+@end lisp
+
+\e$BB>$N2DG=$J\e(B @code{message-send-mail-function} \e$B$NA*Br;h\e(B
+\e$B$O\e(B @code{message-send-mail-with-mh},
+@code{message-send-mail-with-qmail} \e$B$*$h$S\e(B @code{feedmail-send-it} \e$B$r4^\e(B
+\e$B$_$^$9!#\e(B
+
 @node Mail and Post
 @section \e$B%a!<%k$HEj9F\e(B
 
@@ -10097,13 +10276,13 @@ gnus \e$B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#\e(B
 
 @lisp
 (add-hook 'gnus-select-group-hook
-         (lambda ()
-           (cond
-            ((string-match
-              "^de\\." (gnus-group-real-name gnus-newsgroup-name))
-             (ispell-change-dictionary "deutsch"))
-            (t
-             (ispell-change-dictionary "english")))))
+          (lambda ()
+            (cond
+             ((string-match
+               "^de\\." (gnus-group-real-name gnus-newsgroup-name))
+              (ispell-change-dictionary "deutsch"))
+             (t
+              (ispell-change-dictionary "english")))))
 @end lisp
 
 \e$B$"$J$?$NI,MW$K1~$8$FJQ99$7$F2<$5$$!#\e(B
@@ -10120,6 +10299,10 @@ Gnus \e$B$O$"$J$?$,Aw$C$?%a!<%k$H%K%e!<%9$rCy$a$F$*$/$?$a$N$$$/$D$+$N0c$C$?\e(B
 \e$BJQ?t\e(B @code{gnus-message-archive-group} \e$B$O\e(B @code{nil} \e$B$K$J$k$Y$-$G!"$3$l\e(B
 \e$B$,%G%#%U%)%k%H$G$9!#\e(B
 
+\e$B$"$J$?$,FI$s$G6=L#$r;}$C$?%a%C%;!<%8$r%0%k!<%W$KJ]B8$9$k$K\e(B
+\e$B$O\e(B @kbd{B c} (@code{gnus-summary-copy-article}) \e$B%3%^%s%I$r;2>H$7$F2<$5\e(B
+\e$B$$\e(B (@pxref{Mail Group Commands})\e$B!#\e(B
+
 @vindex gnus-message-archive-method
 @code{gnus-message-archive-method} \e$B$OAw$C$?%a%C%;!<%8$rC_@Q$9$k$?$a$K$I\e(B
 \e$B$N;v<B>e$N%5!<%P!<$r\e(B gnus \e$B$,;H$&$Y$-$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O\e(B:
@@ -10215,7 +10398,7 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
       '((if (message-news-p)
             "misc-news"
           (concat "mail." (format-time-string
-                          "%Y-%m" (current-time))))))
+                           "%Y-%m" (current-time))))))
 @end lisp
 
 @c (XEmacs 19.13 \e$B$K$O\e(B @code{format-time-string} \e$B$O$"$j$^$;$s$N$G!"$=\e(B
@@ -10255,6 +10438,14 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\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
+
+@c @item gnus-gcc-externalize-attachments
+@c @vindex gnus-gcc-externalize-attachments
+@c If @code{nil}, attach files as normal parts in Gcc copies; if a regexp
+@c and matches the Gcc group name, attach files as external parts; if it is
+@c @code{all}, attach local files as external parts; if it is other
+@c non-@code{nil}, the behavior is the same as @code{all}, but it may be
+@c changed in the future.
 @end table
 
 @node Posting Styles
@@ -10277,7 +10468,7 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
 
 @lisp
 ((".*"
-   (signature "Peacs and happiness")
+   (signature "Peace and happiness")
    (organization "What me?"))
  ("^comp"
   (signature "Death to everybody"))
@@ -10296,17 +10487,19 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
 
 \e$B$=$l$>$l$NMM<0$N:G=i$NMWAG$O\e(B @code{\e$B9gCW\e(B} (match) \e$B$H8F$P$l$^$9!#$b$7$=$l\e(B
 \e$B$,J8;zNs$G$"$l$P!"\e(Bgnus \e$B$O$=$l$r%0%k!<%WL>$K@55,I=858=$H$7$F9gCWA`:n$r9T\e(B
-\e$B$$$^$9!#%7%s%\%k\e(B @code{header} \e$B$G$"$l$P!"\e(Bgnus \e$B$O85$N5-;v$NCf$+$i$=$N9gCW\e(B
-\e$B$NCf$N<!$NMWAG$K9gCW$9$k%X%C%@!<$rC5$7!"$=$l$r$=$N9gCW$N:G8e$N@55,I=858=\e(B
-\e$B$HHf3S$7$^$9!#$b$7$=$l$,4X?t$N%7%s%\%k$G$"$l$P!"$=$N4X?t$,0z?tL5$7$G8F$P\e(B
-\e$B$l$^$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,;2>H$5$l$^$9!#$=$l$,%j%9\e(B
-\e$B%H$G$"$l$P!"$=$N%j%9%H$,\e(B @code{\e$BI>2A\e(B} \e$B$5$l$^$9!#$I$N>l9g$G$b!"$3$l\e(B
-\e$B$,\e(B @code{nil}\e$B$G$J$$CM$r5"$;$P!"MM<0$O\e(B @code{\e$B9gCW$7$?\e(B} \e$B$H8@$$$^$9!#\e(B
+\e$B$$$^$9!#\e(B@code{(header \e$B9gCW\e(B \e$B@55,I=8=\e(B)} \e$B$H$$$&MM<0$G$"$l$P!"\e(Bgnus \e$B$O85$N5-\e(B
+\e$B;v$NCf$+$iL>A0$,9gCW$9$k%X%C%@!<$rC5$7!"$=$l$r@55,I=85$HHf3S$7$^$9!#9gCW\e(B
+\e$B$H@55,I=8=$OJ8;zNs$G$9!#$b$7$=$l$,4X?t$N%7%s%\%k$G$"$l$P!"$=$N4X?t$,0z?t\e(B
+\e$BL5$7$G8F$P$l$^$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,;2>H$5$l$^$9!#\e(B
+\e$B$=$l$,%j%9%H$G$"$l$P!"$=$N%j%9%H$,\e(B @code{\e$BI>2A\e(B} \e$B$5$l$^$9!#$I$N>l9g$G$b!"\e(B
+\e$B$3$l$,\e(B @code{nil}\e$B$G$J$$CM$r5"$;$P!"MM<0$O\e(B @code{\e$B9gCW$7$?\e(B} \e$B$H8@$$$^$9!#\e(B
 
 \e$B$=$l$>$l$NMM<0$OG$0U$NNL$N\e(B @dfn{\e$BB0@-\e(B} \e$B$r;}$D;v$,$G$-$^$9!#$=$l$>$l$NB0@-\e(B
 \e$B$O\e(B @code{(@var{name} @var{value})} \e$B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>\e(B
-\e$B$O!"\e(B@code{signature}, @code{signature-file}, @code{organization}, @code{address}, @code{name}, @code{body} \e$B$N\e(B
-\e$B$I$l$+$G$"$k;v$,$G$-$^$9!#B0@-L>$OJ8;zNs$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"\e(B
+\e$B$O!"\e(B@code{signature}, @code{signature-file}, @code{x-face-file},
+@code{address} (@code{user-mail-address} \e$B$r>e=q$-$9$k\e(B), @code{name}
+(@code{user-full-name} \e$B$r>e=q$-$9$k\e(B) \e$B$^$?$O\e(B @code{body} \e$B$N$I$l$+$G$"$k;v\e(B
+\e$B$,$G$-$^$9!#B0@-L>$OJ8;zNs$^$?$O%7%s%\%k$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"\e(B
 \e$B$3$l$O%X%C%@!<L>$H$7$F;H$o$l!"$=$NCM$,5-;v$N%X%C%@!<$KA^F~$5$l$^$9!#$b$7\e(B
 \e$BB0@-L>$,\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
@@ -10315,7 +10508,11 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\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;v$,$G$-$^$9!#4X?t$O%;%C%H%"%C%W$5$l$?%a%C%;!<%8%P%C\e(B
 \e$B%U%!$G8F$P$l\e(B (@code{eval} \e$B$5$l\e(B) \e$B$^$9!#8=:_$N5-;v$N%X%C%@!<$OJQ\e(B
-\e$B?t\e(B @code{message-reply-headers} \e$B$+$iF@$i$l$^$9!#\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$b$7!":n@.$7$h$&$H$7$F$$$k%a%C%;!<%8$,%K%e!<%95-;v$+%a!<%k%a%C%;!<%8$G$"\e(B
 \e$B$k$+$rD4$Y$?$$$H$-$O!"Fs$D$N4X\e(B
@@ -10336,13 +10533,17 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
          (organization "People's Front Against MWM"))
         ("^rec.humor"
          (signature my-funny-signature-randomizer))
-        ((equal (system-name) "gnarly")
+        ((equal (system-name) "gnarly")  ;; \e$BMM<0\e(B
          (signature my-quote-randomizer))
-        ((message-news-p)
+        (message-news-p        ;; \e$B4X?t%7%s%\%k\e(B
          (signature my-news-signature))
-        (header "to" "larsi.*org"
-                (Organization "Somewhere, Inc."))
-        ((posting-from-work-p)
+        (window-system         ;; \e$BJQ?t%7%s%\%k\e(B
+         ("X-Window-System" (format "%s" window-system)))
+        ;; Lars \e$B$5$s$KJV;v$r$9$k$H$-$O\e(B
+        ;; Organization \e$B%X%C%@!<$rIU$1$h$&!#\e(B
+        ((header "to" "larsi.*org")
+         (Organization "Somewhere, Inc."))
+        ((posting-from-work-p) ;; \e$B%f!<%6!<$,Dj5A$7$?4X?t\e(B
          (signature-file "~/.work-signature")
          (address "user@@bar.foo")
          (body "You are fired.\n\nSincerely, your boss.")
@@ -10455,55 +10656,68 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
 @cindex using smime
 
 Gnus can digitally sign and encrypt your messages, using vanilla PGP
-format or PGP/MIME or S/MIME.  For decoding such messages, see the
-@code{mm-verify-option} and @code{mm-decrypt-option} options
+format or @sc{pgp/mime} or @sc{s/mime}.  For decoding such messages,
+see the @code{mm-verify-option} and @code{mm-decrypt-option} options
 (@pxref{Security}).
 
 For PGP, Gnus supports two external libraries, @sc{gpg.el} and
-@sc{Mailcrypt}, you need to install at least one of them.  The S/MIME
-support in Gnus requires the external program OpenSSL.
+@sc{Mailcrypt}, you need to install at least one of them.  The
+@sc{s/mime} support in Gnus requires the external program OpenSSL.
+
+Often, you would like to sign replies to people who send you signed
+messages.  Even more often, you might want to encrypt messages which
+are in reply to encrypted messages.  Gnus offers
+@code{gnus-message-replysign} to enable the former, and
+@code{gnus-message-replyencrypt} for the latter.  In addition, setting
+@code{gnus-message-replysignencrypted} (on by default) will sign
+automatically encrypted messages.
 
-Instructing MML to perform security operations on a MIME part is done
-using the @code{C-c C-m s} key map for signing and the @code{C-c C-m
-c} key map for encryption, as follows.
+Instructing MML to perform security operations on a @sc{mime} part is
+done using the @kbd{C-c C-m s} key map for signing and the @kbd{C-c
+C-m c} key map for encryption, as follows.
 
 @table @kbd
 
 @item C-c C-m s s
 @kindex C-c C-m s s
-@findex mml-secure-sign-smime
+@findex mml-secure-message-sign-smime
 
-Digitally sign current MIME part using S/MIME.
+Digitally sign current message using @sc{s/mime}.
 
 @item C-c C-m s o
 @kindex C-c C-m s o
-@findex mml-secure-sign-pgp
+@findex mml-secure-message-sign-pgp
 
-Digitally sign current MIME part using PGP.
+Digitally sign current message using PGP.
 
 @item C-c C-m s p
 @kindex C-c C-m s p
-@findex mml-secure-sign-pgp
+@findex mml-secure-message-sign-pgp
 
-Digitally sign current MIME part using PGP/MIME.
+Digitally sign current message using @sc{pgp/mime}.
 
 @item C-c C-m c s
 @kindex C-c C-m c s
-@findex mml-secure-encrypt-smime
+@findex mml-secure-message-encrypt-smime
 
-Digitally encrypt current MIME part using S/MIME.
+Digitally encrypt current message using @sc{s/mime}.
 
 @item C-c C-m c o
 @kindex C-c C-m c o
-@findex mml-secure-encrypt-pgp
+@findex mml-secure-message-encrypt-pgp
 
-Digitally encrypt current MIME part using PGP.
+Digitally encrypt current message using PGP.
 
 @item C-c C-m c p
 @kindex C-c C-m c p
-@findex mml-secure-encrypt-pgpmime
+@findex mml-secure-message-encrypt-pgpmime
+
+Digitally encrypt current message using @sc{pgp/mime}.
 
-Digitally encrypt current MIME part using PGP/MIME.
+@item C-c C-m C-n
+@kindex C-c C-m C-n
+@findex mml-unsecure-message
+Remove security related MML tags from message.
 
 @end table
 
@@ -10547,7 +10761,7 @@ Also @xref{Security, ,Security, message, Message Manual}.
 * Getting Mail::                \e$B8D?ME*$J%a!<%k$r\e(B gnus \e$B$GFI$`\e(B
 * Browsing the Web::            \e$B2a>j$J%&%'%V$N;q8;$+$i%a%C%;!<%8$r<hF@$9\e(B
                                 \e$B$k\e(B
-* IMAP::                        Gnus \e$B$r\e(B IMAP \e$B$N%/%i%$%"%s%H$H$7$F;H$&\e(B
+* IMAP::                        gnus \e$B$r\e(B @sc{imap} \e$B$N%/%i%$%"%s%H$H$7$F;H$&\e(B
 * Other Sources::               \e$B%G%#%l%/%H%j!<!"%U%!%$%k!"\e(BSOUP \e$B%Q%1%C%H\e(B
                                 \e$B$rFI$`\e(B
 * Combined Groups::             \e$BJ#?t$N%0%k!<%W$r0l$D$N%0%k!<%W$K7k9g$9$k\e(B
@@ -10770,6 +10984,8 @@ Also @xref{Security, ,Security, message, Message Manual}.
       (nntp-via-rlogin-command "ssh")
 @end lisp
 
+@code{nntp-via-rlogin-command-switches} \e$B$b;2>H$7$F2<$5$$!#\e(B
+
 \e$B$b$7$"$J$?$,KIJI$NCf$K$$$?$H$7$F$b!"\e(B"runsocks" \e$B$N$h$&$J%i%C%Q!<%3%^%s%I\e(B
 \e$B$rDL$7$F30$N@$3&$rD>@\%"%/%;%9$G$-$k$N$J$i$P!"0J2<$N$h$&$K\e(B socks \e$B$rDL$7\e(B
 \e$B$F%K%e!<%9%5!<%P!<$H\e(B telnet \e$B@\B3$9$k$3$H$,$G$-$^$9\e(B:
@@ -10909,6 +11125,11 @@ Also @xref{Security, ,Security, message, Message Manual}.
 @findex gnus-server-remove-denials
 Gnus \e$B$,$I$l$+$N%5!<%P!<$+$i@\B35qH]$r<u$1$?$+$I$&$+$NA4$F$N0u$r>C5n$7$^\e(B
 \e$B$9\e(B (@code{gnus-server-remove-denials})\e$B!#\e(B
+
+@item L
+@kindex L (Server)
+@findex gnus-server-offline-server
+\e$B%5!<%P!<$N>uBV$r%*%U%i%$%s$K$7$^$9\e(B (@code{gnus-server-offline-server})\e$B!#\e(B
 @end table
 
 @node Getting News
@@ -10926,7 +11147,7 @@ Gnus \e$B$,$I$l$+$N%5!<%P!<$+$i@\B35qH]$r<u$1$?$+$I$&$+$NA4$F$N0u$r>C5n$7$^\e(B
 @end menu
 
 @node NNTP
-@subsection @sc{nntp}
+@subsection NNTP
 @cindex nntp
 
 @sc{nntp} \e$B%5!<%P!<$N30It%0%k!<%W$r9XFI$9$k$N$OHf3SE*4JC1$G$9!#C1\e(B
@@ -11169,7 +11390,7 @@ LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$
 @lisp
 (setq gnus-select-method
       '(nntp "news.somewhere.edu"
-            (nntp-list-options ("fj.*" "japan.*"))))
+             (nntp-list-options ("fj.*" "japan.*"))))
 @end lisp
 
 @item nntp-options-subscribe
@@ -11183,7 +11404,7 @@ LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$
 @lisp
 (setq gnus-select-method
       '(nntp "news.somewhere.edu"
-            (nntp-options-subscribe "^fj\\.\\|^japan\\.")))
+             (nntp-options-subscribe "^fj\\.\\|^japan\\.")))
 @end lisp
 
 @item nntp-options-not-subscribe
@@ -11197,7 +11418,7 @@ LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$
 @lisp
 (setq gnus-select-method
       '(nntp "news.somewhere.edu"
-            (nntp-options-not-subscribe "\\.binaries\\.")))
+             (nntp-options-not-subscribe "\\.binaries\\.")))
 @end lisp
 @end table
 
@@ -11283,6 +11504,15 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 @vindex nntp-via-rlogin-command
 \e$BCf4V$N%[%9%H$K%m%0%$%s$9$k$?$a$K;H$o$l$k%3%^%s%I$G$9!#%G%#%U%)%k%H\e(B
 \e$B$O\e(B @samp{rsh} \e$B$G$9$,!"\e(B@samp{ssh} \e$B$,?M5$$N$"$kBeBX<jCJ$G$9!#\e(B
+
+@item nntp-via-rlogin-command-switches
+@vindex nntp-via-rlogin-command-switches
+@code{nntp-via-rlogin-command} \e$B$N%3%^%s%I$N%9%$%C%A$H$7$F;H$o$l$kJ8;zNs\e(B
+\e$B$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#$b\e(B
+\e$B$7\e(B @samp{ssh} \e$B$r\e(B @code{nntp-via-rlogin-command} \e$B$NCM$H$7$F;H$&$J$i$P!"%G!<\e(B
+\e$B%?@\B3$r05=L$9$k$?$a$K\e(B @samp{("-C")} \e$B$r;H$&$3$H$,$G$-$^$9!#$"$k$$$O!"$b\e(B
+\e$B$7Cf4V$N%[%9%H$G\e(B telnet \e$B%3%^%s%I$,5?;wC<Kv$rI,MW$H$9$k$J$i$P!"$3$l\e(B
+\e$B$r\e(B @samp{("-t")} \e$B$^$?$O\e(B @samp{("-C" "-t")} \e$B$K$7$F2<$5$$!#\e(B
 @end table
 
 @item nntp-open-via-telnet-and-telnet
@@ -11459,8 +11689,8 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 * Mail Sources::                Gnus \e$B$K$I$3$+$i%a!<%k$r<h$C$F$/$k$+$rCN\e(B
                                 \e$B$i$;$k\e(B
 * Mail Back End Variables::     \e$B%a!<%k$N07$$$r%+%9%?%^%$%:$9$k$?$a$NJQ?t\e(B
-* Fancy Mail Splitting::        Gnus \e$B$OF~$C$FMh$?%a!<%k$NLS$N$h$&$JJ,N%\e(B
-                                \e$B$r$9$k$3$H$,$G$-$k\e(B
+* Fancy Mail Splitting::        Gnus \e$B$OF~$C$FMh$?%a!<%k$r!"?H$NLS$N$h$@\e(B
+                                \e$B$D$h$&$JJ,3d$r$9$k$3$H$,$G$-$k\e(B
 * Group Mail Splitting::        \e$B%a!<%kJ,3d$r6nF0$9$k$?$a$K%0%k!<%W%+%9%?\e(B
                                 \e$B%^%$%:$r;H$&\e(B
 * Incorporating Old Mail::      \e$B$"$J$?$,;}$C$F$$$k8E$$%a!<%k$r$I$&$9$k$+\e(B?
@@ -11499,11 +11729,11 @@ gnus \e$B$O$U$D$&F1$8<jK!$G$9$Y$F$N%0%k!<%W$r07$$$^$9!#$"$J$?$O$"$k%0%k!<\e(B
 \e$B$7$P$i$/%a!<%k$H%K%e!<%9$NN>J}$r;H$C$F$_$l$P!"5-;v$N<h$j07$$$K$D$$$FG[\e(B
 \e$BAw$N5!9=$,9T$J$&$3$H$O$o$:$+$G$"$k$3$H$K5$$,IU$-$^$9!#\e(B
 
-\e$BB?$/$N?M$?$A$OJ#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i$O\e(B SMTP \e$B$G\e(B
-\e$BG[Aw$5$l$k!"%a!<%k!"$G$9!#$=$l$i$N5-;v$r$H$F$bCm0U?<$/FI$s$G$$$k$K$b$+\e(B
-\e$B$+$o$i$:!"2?=54V$bJV;v$,L5$$$3$H$,$"$k$G$7$g$&!#;d$?$A$O$=$&$$$&5-;v$r\e(B
-\e$B%;!<%V$9$kI,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW$,@8$8$F$b!"$=\e(B
-\e$B$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#\e(B
+\e$BB?$/$N?M$?$A$OJ#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i\e(B
+\e$B$O\e(B @sc{smtp} \e$B$GG[Aw$5$l$k!"%a!<%k!"$G$9!#$=$l$i$N5-;v$r$H$F$bCm0U?<$/FI\e(B
+\e$B$s$G$$$k$K$b$+$+$o$i$:!"2?=54V$bJV;v$,L5$$$3$H$,$"$k$G$7$g$&!#;d$?$A$O$=\e(B
+\e$B$&$$$&5-;v$r%;!<%V$9$kI,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW$,@8\e(B
+\e$B$8$F$b!"$=$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#\e(B
 
 \e$B$"$k?M$?$A$O>.?M?t$KMxMQ$5$l$F$$$k%m!<%+%k%K%e!<%9%0%k!<%W$r9VFI$7$F$$\e(B
 \e$B$^$9!#$=$l$i$O\e(B @sc{nntp} \e$B$GG[Aw$5$l$k!"%K%e!<%9!"$G$9!#;d$?$A$O<+J,$N;E\e(B
@@ -11548,7 +11778,7 @@ Gnus \e$B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/\e(B
 
 \e$B:#$d!"<!$K\e(B gnus \e$B$r5/F0$7$?$H$-$K$O!"$3$N%P%C%/%(%s%I$O?7$7$$5-;v$r5a$a!"\e(B
 \e$B$=$l$O$"$J$?$N%9%W!<%k%U%!%$%k$+$iA4$F$N%a%C%;!<%8$r%G%#%l%/%H%j!<!"%G%#\e(B
-\e$B%U%)%k%H$G$O\e(B @code{~/Mail/}\e$B!"$K0\F0$7$^$9!#:n@.$5$l$??7$7$$%0%k!<\e(B
+\e$B%U%)%k%H$G$O\e(B @code{~/Mail/} \e$B$K0\F0$7$^$9!#:n@.$5$l$??7$7$$%0%k!<\e(B
 \e$B%W\e(B (@samp{mail.misc}) \e$B$,9XFI$5$l!"B>$N%0%k!<%W$HF1$8$h$&$KFI$`;v$,$G$-$^\e(B
 \e$B$9!#\e(B
 
@@ -11642,6 +11872,23 @@ nnmail-split-history} \e$B$r;H$&;v$,$G$-$^$9!#$3$l$+$i%9%W!<%k$7D>$=$&$H$9$k\e(B
 @code{gnus-summary-respool-trace} \e$B$H4XO"$9$kL?\e(B
 \e$BNa\e(B (@pxref{Mail Group Commands}) \e$B$r;H$&;v$,$G$-$^$9!#\e(B
 
+@vindex nnmail-split-header-length-limit
+@code{nnmail-split-header-length-limit} \e$B$N@)8B$h$jD9$$%X%C%@!<9T$O!"J,3d\e(B
+\e$B4X?t$N=hM}BP>]$+$i=|30$5$l$^$9!#\e(B
+
+@vindex nnmail-mail-splitting-charset
+@vindex nnmail-mail-splitting-decodes
+(\e$BLuCm\e(B: \e$B%*%j%8%J%k$N\e(B Gnus \e$B$H$O;EMM$,HyL/$K0[$J$k$3$H$KCm0U$7$F2<$5$$\e(B) \e$B%G%#\e(B
+\e$B%U%)%k%H$G$OJ,3d%3!<%I$O\e(B @sc{mime} \e$B%(%s%3!<%I$5$l$?%X%C%@!<$r%G%3!<%I$9\e(B
+\e$B$k$N$G!"Hs\e(B-ASCII \e$BJ8;zNs$K%^%C%A$5$;$k$3$H$,$G$-$^$9!#JQ\e(B
+\e$B?t\e(B @code{nnmail-mail-splitting-charset} \e$B$,\e(B @sc{mime} \e$BJ8;z=8\e(B
+\e$B9g\e(B (mime-charset) \e$B$G$"$C$?$i$=$l!"\e(B@sc{mime} \e$BJ8;z=89g$G$O$J$$\e(B
+\e$BHs\e(B-@code{nil} \e$B$JCM$@$C$?$i$=$N$H$-$N\e(B @code{default-mime-charset} \e$B$NCM$G!"\e(B
+(@sc{mime} \e$B%(%s%3!<%I$5$l$?$b$N$G$O$J$$\e(B) \e$BHs\e(B-ASCII \e$B%S%C%H%Q%?!<%s$b%G%3!<\e(B
+\e$B%I$7$^$9!#$3$NF0:n$O\e(B @code{nnmail-mail-splitting-decodes} \e$B$r\e(B nil \e$B$K$9$k\e(B
+\e$B$3$H$K$h$C$F40A4$K;_$a$k$3$H$,$G$-!"@8$N%X%C%@!<$N%G!<%?$r85$K5-;v$K%^%C\e(B
+\e$B%A$5$;$?$$>l9g$K$OM-8z$G$7$g$&!#\e(B
+
 Gnus \e$B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$kA4$F$N5!2q$rDs\e(B
 \e$B6!$7$^$9!#Nc$($P!"$"$J$?$N>e;J$+$i$/$kA4$F$N%a!<%k$r4^$s$@%0%k!<%W$r:n$C\e(B
 \e$B$?$H$7$^$7$g$&!#$=$l$+$i!"6vH/E*$K$=$N%0%k!<%W$N9XFI<h$j;_$a$,5/$3$C$?$H\e(B
@@ -11844,6 +12091,26 @@ POP \e$B%5!<%P!<$+$i%a!<%k$r<hF@$9$k$?$a$K;H$&4X?t$G$9!#$=$N4X?t$O0l$D$N%Q%i\e(B
 @item :authentication
 \e$B$3$l$O\e(B @code{password} \e$B$+%7%s%\%k\e(B @code{apop} \e$B$G!"$I$NG'>ZJ}<0$r;H$&$+$r\e(B
 \e$B7h$a$k$b$N$N$I$A$i$+$G$9!#=i4|@_Dj$O\e(B @code{password} \e$B$G$9!#\e(B
+
+@item :connection
+\e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`$G!"\e(B@code{ssl}, @code{tls} \e$B$^$?$O\e(B
+\e$B$=$l0J30$r;XDj$G$-$^$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G!"0BA4$G$O$J$$@\B3$r\e(B
+\e$BMQ$$$^$9!#\e(BSSL/TLS \e$B$G$O30It%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KCm0U$7\e(B
+\e$B$F2<$5$$\e(B:
+
+@itemize @bullet
+@item
+@dfn{ssl:} SSL \e$B$r;H$$$^$9!#\e(BOpenSSL (@samp{openssl} \e$B%W%m%0%i%`\e(B) \e$B$+\e(B SSLeay
+(@samp{s_client}) \e$B$H30It%i%$%V%i%j\e(B @samp{ssl.el} \e$B$,I,MW$G$9!#\e(B
+@item
+@dfn{starttls:} STARTTLS (SSL \e$B$KN`;w\e(B) \e$B$r;H$$$^$9!#30It%i%$%V%i\e(B
+\e$B%j\e(B @samp{starttls.el} \e$B$H\e(B @samp{starttls} \e$B%W%m%0%i%`$,I,MW$G$9!#\e(B
+@samp{starttls}.
+@end itemize
+
+@item :leave
+\e$BHs\e(B-@code{nil} \e$B$G%a!<%k$r%5!<%P!<$K;D$7!"%a%C%;!<%8$N<hF@$K\e(B UIDL \e$B$r;H$$$^\e(B
+\e$B$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
 @end table
 
 @code{:program} \e$B$H\e(B @code{:function} \e$B%-!<%o!<%I$,;XDj$5$l$F$$$J$$$H!"\e(B
@@ -11904,10 +12171,11 @@ Maildir \e$B%a!<%k%=!<%9$NNc$r$U$?$D\e(B:
 @end lisp
 
 @item imap
-IMAP \e$B%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#2?$i$+$NM}M3$G\e(B IMAP \e$B$r0U?^$5$l$?$h\e(B
-\e$B$&$J%M%C%H%o!<%/>e$G%a!<%k$rFI$`%W%m%H%3%k$H$7$F07$$$?$/$J$$$H$-$O!"\e(B
-gnus \e$B$G$O\e(B POP \e$B%5!<%P!<$HF1MM$K07$&$3$H$,$G$-!"M?$($i$l$?\e(B IMAP \e$B%a!<%k%\%C\e(B
-\e$B%/%9$+$i5-;v$r<hF@$7$^$9!#>\$7$/$O\e(B @xref{IMAP} \e$B$r;2>H$7$F2<$5$$!#\e(B
+@sc{imap} \e$B%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#2?$i$+$NM}M3$G\e(B @sc{imap} \e$B$r0U\e(B
+\e$B?^$5$l$?$h$&$J%M%C%H%o!<%/>e$G%a!<%k$rFI$`%W%m%H%3%k$H$7$F07$$$?$/$J$$$H\e(B
+\e$B$-$O!"\e(Bgnus \e$B$G$O\e(B POP \e$B%5!<%P!<$HF1MM$K07$&$3$H$,$G$-!"M?$($i$l\e(B
+\e$B$?\e(B @sc{imap} \e$B%a!<%k%\%C%/%9$+$i5-;v$r<hF@$7$^$9!#>\$7$/$O\e(B @xref{IMAP} \e$B$r\e(B
+\e$B;2>H$7$F2<$5$$!#\e(B
 
 Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%V\e(B
 \e$B%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}
@@ -11916,18 +12184,18 @@ Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%
 
 @table @code
 @item :server
-IMAP \e$B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t\e(B @code{MAILHOST} \e$B$+$iF@$^$9!#\e(B
+@sc{imap} \e$B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t\e(B @code{MAILHOST} \e$B$+$iF@$^$9!#\e(B
 
 @item :port
-IMAP \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BSSL/TLS \e$B@\B3$K\e(B
-\e$B$O\e(B @samp{993} \e$B$G$9!#\e(B
+@sc{imap} \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BSSL/TLS \e$B@\\e(B
+\e$BB3$K$O\e(B @samp{993} \e$B$G$9!#\e(B
 
 @item :user
-IMAP \e$B%5!<%P!<$KEO$9MxMQ<TL>$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#\e(B
+@sc{imap} \e$B%5!<%P!<$KEO$9MxMQ<TL>$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#\e(B
 
 @item :password
-IMAP \e$B%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$5$l$F$$$J$$$H$-$O!"MxMQ<T$OF~NO\e(B
-\e$B$rB%$5$l$^$9!#\e(B
+@sc{imap} \e$B%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$5$l$F$$$J$$$H$-$O!"MxMQ<T$O\e(B
+\e$BF~NO$rB%$5$l$^$9!#\e(B
 
 @item :stream
 \e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`!#\e(B@code{imap-stream-alist} \e$B$K$"$k\e(B
@@ -11975,20 +12243,20 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 \e$B$-\e(B @sc{imap} \e$B%/%i%$%"%s%H$G%a!<%k%\%C%/%9$rGA$-!"$$$/$D$+$N5-;v$K4{\e(B
 \e$BFI\e(B (\e$B$b$7$/$O!"\e(BSEEN) \e$B$N0u$rIU$1$k$J$i!"\e(B@samp{nil} \e$B$K@_Dj$7$?$$$+$b$7$l$^\e(B
 \e$B$;$s!#$=$&$9$l$P!"%a!<%k%\%C%/%9$NA4$F$N5-;v$O0u$NG!2?$K4X$o$i$:<hF@$5$l\e(B
-\e$B$^$9!#=R8l$N40A4$J0lMw$O!"\e(BRFC2060 \e,A'\e(B6.4.4 \e$B$rFI$s$G$/$@$5$$!#\e(B
+\e$B$^$9!#=R8l$N40A4$J0lMw$O!"\e(BRFC2060 \e$B$N\e(B 6.4.4 \e$B@a$rFI$s$G$/$@$5$$!#\e(B
 
 @item :fetchflag
 \e$B%5!<%P!<$G!"<hF@$7$?5-;v$K0u$rIU$1$kJ}K!!#=i4|CM$N\e(B @samp{\Deleted} \e$B$O$=\e(B
 \e$B$l$i$K>C5n$N0u$rIU$1$^$9$,!"B>$K\e(B @samp{\Seen} \e$B$G$OC1$K4{FI$N0u$rIU$1$^$9!#\e(B
-\e$B$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u$b\e(B RFC2060 \e,A'\e(B2.3.2 \e$B$GDj5A$5\e(B
-\e$B$l$F$$$^$9!#\e(B
+\e$B$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u$b\e(B RFC2060 \e$B$N\e(B 2.3.2 \e$B@a$GDj\e(B
+\e$B5A$5$l$F$$$^$9!#\e(B
 
 @item :dontexpunge
 @code{nil} \e$B$G$J$+$C$?$i!"5-;v$r<hF@$7$?8e$G!"$=$l$i$K>C5n$N0u$,IU$$$F$$\e(B
 \e$B$F$b:o=|$7$^$;$s!#\e(B
 @end table
 
-IMAP \e$B%a!<%k%=!<%9$NNc\e(B:
+@sc{imap} \e$B%a!<%k%=!<%9$NNc\e(B:
 
 @lisp
 (imap :server "mail.mycorp.com"
@@ -11997,11 +12265,9 @@ IMAP \e$B%a!<%k%=!<%9$NNc\e(B:
 @end lisp
 
 @item webmail
-www.hotmail.com, webmail.netscape.com, www.netaddress.com,
-www.my-deja.com \e$B$J$I$N%&%'%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
-
-\e$BCm\e(B: \e$B8=:_\e(B mail.yahoo.com \e$B$O\e(B POP3 \e$B%5!<%S%9$rDs6!$7$F$$$^$9$N$G!"\e(B
-@sc{pop} \e$B%a!<%k%=!<%9$r;H$&$N$,NI$$$N$G$O$J$$$G$7$g$&$+!#\e(B
+@uref{www.hotmail.com}, @uref{webmail.netscape.com},
+@uref{www.netaddress.com}, @uref{www.yahoo.com} \e$B$J$I$N%&%'%V%a!<%k%5!<%P!<\e(B
+\e$B$+$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
@@ -12226,6 +12492,15 @@ www.my-deja.com \e$B$J$I$N%&%'%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
 @code{nil} \e$B$G$J$$$H!"%P%C%/%(%s%I$KF~$C$FMh$?5-;v\e(B (\e$BNc$($P!"\e(B@code{Gcc} \e$B$K\e(B
 \e$B$h$C$F\e(B) \e$B$N\e(B @code{Message-ID} \e$B$r%a!<%k=EJ#H/8+%U%!%$%k$KF~$l$^$9!#%G%#%U%)\e(B
 \e$B%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
+
+@item nnmail-cache-ignore-groups
+@vindex nnmail-cache-ignore-groups
+\e$B@55,I=8=$+@55,I=8=$N%j%9%H$G$9!#@55,I=8=$K%0%k!<%WL>$,%^%C%A$9$k\e(B
+\e$B$H\e(B @code{Message-ID} \e$B%-%c%C%7%e$K5-O?$5$l$^$;$s!#\e(B
+
+\e$BNc$($PFC5iJ,3d\e(B (@pxref{Fancy Mail Splitting}) \e$B$r4X\e(B
+\e$B?t\e(B @code{nnmail-split-fancy-with-parent} \e$B$H$H$b$K;H$C$F$$$k>l9g$KLrN)$D\e(B
+\e$B$G$7$g$&!#\e(B
 @end table
 
 @node Fancy Mail Splitting
@@ -12373,18 +12648,20 @@ table) \e$B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+\e(B
 
 \e$B$3$N5!G=$rMxMQ$9$k$?$a$K$O!"$^$:JQ\e(B
 \e$B?t\e(B @code{nnmail-treat-duplicates} \e$B$H\e(B @code{nnmail-cache-accepted-message-ids} \e$B$N\e(B
-\e$BCM$rHs\e(B nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#$=$l$,$G$-$?\e(B
+\e$BCM$rHs\e(B-nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#$=$l$,$G$-$?\e(B
 \e$B$i\e(B @code{nnmail-split-fancy-with-parent} \e$B$r;H$C$F$_$F$/$@$5$$!#%3%m%s$r\e(B
 \e$B;H$C$F$3$s$JIw$K=q$-$^$9\e(B:
 @lisp
-(setq nnmail-split-fancy
+(setq nnmail-treat-duplicates 'warn     ; \e$B$^$?$O\e(B 'delete
+      nnmail-cache-accepted-message-ids t
+      nnmail-split-fancy
       '(| (: nnmail-split-fancy-with-parent)
           ;; \e$B;D$j$N?6$jJ,$1J}$O$3$3$K=q$/\e(B
         ))
 @end lisp
 
 \e$B$3$N5!G=$O<B:]!"<!$NMM$KF/$$$F$$$^$9\e(B: \e$BJQ?t\e(B
-@code{nnmail-treat-duplicates} \e$B$NCM$,Hs\e(B nil \e$B$N>l9g!"\e(BGnus \e$B$O8+$D$1$?A45-\e(B
+@code{nnmail-treat-duplicates} \e$B$NCM$,Hs\e(B-nil \e$B$N>l9g!"\e(BGnus \e$B$O8+$D$1$?A45-\e(B
 \e$B;v$N%a%C%;!<%8\e(B ID \e$B$r\e(B \e$BJQ?t\e(B @code{nnmail-message-id-cache-file} \e$B$,;XDj$9$k\e(B
 \e$B%U%!%$%k$K5-O?$7$^$9!#$3$N$H$-!"$=$l$>$l$N5-;v$,B8:_$9$k%0%k!<%W$NL>A0$r\e(B
 \e$BJ;5-$7$^$9\e(B (\e$B$?$@$7%a!<%k$N>l9g$@$1!"$5$b$J$1$l$P%0%k!<%WL>$OD4$Y$^$;$s\e(B)\e$B!#\e(B
@@ -12401,10 +12678,17 @@ table) \e$B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+\e(B
 \e$B%$%k$NBg$-$5$O$@$$$?$$\e(B 300 \e$B%-%m%P%$%H$0$i$$$K$J$k$_$?$$$G$9\e(B)\e$B!#\e(B
 @vindex nnmail-cache-accepted-message-ids
 \e$B$5$i$K!"JQ?t\e(B @code{nnmail-cache-accepted-message-ids} \e$B$NCM$r\e(B
-\e$BHs\e(B @code{nil} \e$B$K@_Dj$9$l$P!"\e(Bgnus \e$B$O0\F0$5$l$?5-;v$N%a%C%;!<%8\e(B ID \e$B$r$b5-\e(B
+\e$BHs\e(B-@code{nil} \e$B$K@_Dj$9$l$P!"\e(Bgnus \e$B$O0\F0$5$l$?5-;v$N%a%C%;!<%8\e(B ID \e$B$r$b5-\e(B
 \e$BO?$9$k$N$G!"%U%)%m!<%"%C%W5-;v$O?F5-;v$N0\F0@h$HF1$8%0%k!<%W$KF~$k$h$&$K\e(B
 \e$B$J$j$^$9!#\e(B
 
+\e$B$"$k%0%k!<%W$r%-%c%C%7%e$K5-O?$7$?$/$J$$>l9g$O!"JQ\e(B
+\e$B?t\e(B @code{nnmail-cache-ignore-groups} \e$B$b;2>H$7$F2<$5$$!#Nc$($P!"30$K=P$9\e(B
+\e$B$9$Y$F$N%a%C%;!<%8$,\e(B `outgoing' \e$B%0%k!<%W$G=q$+$l$F$$$k$J$i$P!"\e(B
+@code{nnmail-cache-ignore-groups} \e$B$r$=$N%0%k!<%WL>$K%^%C%A$9$k$h$&$K@_Dj\e(B
+\e$B$9$k$N$,NI$$$G$9!#$5$b$J$$$H$"$J$?$N$9$Y$F$N%a%C%;!<%8$KBP$9$kJV;v$,!":G\e(B
+\e$B8e$O\e(B `outgoing' \e$B%0%k!<%W$KF~$C$F$7$^$&$G$7$g$&!#\e(B
+
 @node Group Mail Splitting
 @subsection \e$B%0%k!<%W%a!<%kJ,3d\e(B
 @cindex mail splitting
@@ -12490,7 +12774,7 @@ nnml:mail.others:
 \e$B%W$@$1$K;H$&$3$H$,$G$-$^$9!#\e(B
 
 @lisp
-(: gnus-mlsplt-fancy GROUPS NO-CROSSPOST CATCH-ALL)
+(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL)
 @end lisp
 
 @var{groups} \e$B$O=PNO$NJ,3d$r@8@.$9$k$?$a$K%Q%i%a!<%?$,Av::$5$l$k%0%k!<%W\e(B
@@ -12793,6 +13077,11 @@ Gnus \e$B$O5-;v$rI=<($9$k$H$-$K$=$l$r@vBu$9$k$?$a$K2aEY$N4X?t$rDs6!$7$F$$$^\e(B
 \e$B%X%C%@!<$K$=$l$,NI$/8+$($k$h$&$K\e(B ``\e$BM-MQ$J\e(B'' \e$B%j%9%H%5!<%P!<$,A0$NJ}$KIU$1\e(B
 \e$B2C$($?6uGr$rL5$/$7$^$9!#$"$!$!!#\e(B
 
+(\e$B$3$N4X?t$O$9$Y$F$N%a%C%;!<%8$N%\%G%#Cf$K$"$k%X%C%@!<\e(B (\e$B%\%G%#Cf$N%a%C%;!<\e(B
+\e$B%8$,;}$C$F$$$k%X%C%@!<9T$N$h$&$J$b$N\e(B) \e$B$KBP$7$F$bF0:n$9$k$N$G!";HMQ$K:]$7\e(B
+\e$B$F$O@x:_E*$J4m81$rUT$s$G$$$^$9!#$7$?$,$C$F%P%0$r=$@5$9$k$h$j$O!"J8=q$GFC\e(B
+\e$BD'$r<($9$N$,!"$b$A$m$s@5$7$$2r7h$NF;$G$9!#\e(B)
+
 @item nnmail-remove-list-identifiers
 @findex nnmail-remove-list-identifiers
 \e$B$$$/$D$+$N%j%9%H%5!<%P!<$OF10l<1JL;R$rIU$12C$($^$9\e(B---\e$BNc$($P!"\e(B
@@ -13032,9 +13321,10 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 @code{nnml} \e$B$O5-;vJ,3d$K4X$7$F$O$*$=$i$/0lHVCY$$%P%C%/%(%s%I$G$7$g$&!#$=\e(B
 \e$B$l$OB?$/$N%U%!%$%k$r:n$i$J$1$l$P$J$i$:!"$=$l$OF~$C$F$/$k%a!<%k$N$?$a\e(B
 \e$B$N\e(B @sc{nov} \e$B%G!<%?%Y!<%9$b:n@.$7$J$1$l$P$J$j$^$;$s!#$3$l$N$?$a$K!"%a!<%k\e(B
-\e$B$rFI$`;v$K4X$7$F$O:GB.$N%P%C%/%(%s%I$K$J$j$^$9!#\e(B
+\e$B$rFI$`;v$K4X$7$F$O$?$V$s:GB.$N%P%C%/%(%s%I$K$J$j$^$9!#\e(B
 
 @cindex self contained nnml servers
+@cindex marks
 \e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
 @code{nnml} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e$G$"\e(B
 \e$B$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B gnus \e$B$KLa$9\e(B (\e$BK\Mh$N\e(B @code{nnml} \e$B%5!<\e(B
@@ -13092,7 +13382,12 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 
 @item nnml-marks-file-name
 @vindex nnml-marks-file-name
-@sc{\e$B0u\e(B} \e$B%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H$O\e(B @file{.marks} \e$B$G$9!#\e(B
+@dfn{\e$B0u\e(B} \e$B%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H$O\e(B @file{.marks} \e$B$G$9!#\e(B
+
+@item nnml-use-compressed-files
+@vindex nnml-use-compressed-files
+\e$BHs\e(B-@code{nil} \e$B$@$C$?$i\e(B @code{nnml} \e$B$O05=L$5$l$?%a%C%;!<%8%U%!%$%k$r;H$&\e(B
+\e$B$3$H$r9MN8$KF~$l$^$9!#\e(B
 @end table
 
 @findex nnml-generate-nov-databases
@@ -13149,6 +13444,7 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 \e$B$($^$9!#\e(B
 
 @cindex self contained nnfolder servers
+@cindex marks
 \e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
 @code{nnfolder} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e\e(B
 \e$B$G$"$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B gnus \e$B$KLa$9\e(B (\e$BK\Mh\e(B
@@ -13438,11 +13734,11 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 * Web Archive::                 \e$B%&%'%V$KJ]4I$5$l$?%a!<%j%s%0%j%9%H$rFI$`\e(B
 * Web Newspaper::               \e$B%&%'%V$KJ]4I$5$l$??7J9$rFI$`\e(B
 * RSS::                         RDF Site Summary \e$B$rFI$`\e(B
-* Customizing w3::              Gnus \e$B$+$i\e(B Emacs/w3 \e$B$rA`:n$9$k\e(B
+* Customizing w3::              Gnus \e$B$+$i\e(B Emacs/W3 \e$B$rA`:n$9$k\e(B
 @end menu
 
 @samp{Web Newspaper} \e$B$r=|$/$9$Y$F$N%&%'%V%=!<%9$O!"F0:n$5$;$k$?$a\e(B
-\e$B$K\e(B Emacs/w3 \e$B$H\e(B url \e$B%i%$%V%i%j$,I,MW$G$9!#\e(B
+\e$B$K\e(B Emacs/W3 \e$B$H\e(B url \e$B%i%$%V%i%j$,I,MW$G$9!#\e(B
 
 \e$B$3$l$i$N%&%'%V%=!<%9$N0lHV$NLdBj$OD94|4V$OF0:n$7$J$$2DG=@-$,9b$$$3$H$G$9!#\e(B
 @sc{html} \e$B%G!<%?$+$i>pJs$r=8$a$k$N$O$;$$$<$$?dB,$G!"9=B$$,JQ2=$7$?$H$-$K\e(B
@@ -13460,36 +13756,38 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 @cindex archiving mail
 @cindex backup of mail
 
-\e$B$$$/$D$+$N%P%C%/%(%s%I!"FC$K\e(B nnml \e$B$H\e(B nnfolder \e$B$O!"$=$l$>$l$N%0%k!<%W$N5-\e(B
-\e$B;v$N0u$rK\Ev$KJ];}$7$^$9!#$3$l$i$N%5!<%P!<$G!"%0%k!<%W$N0u$rJ]$A$D$DJ]B8\e(B
-\e$B$7$?$j85$KLa$9$N$O$+$J$j4JC1$G$9!#\e(B
+\e$B$$$/$D$+$N%P%C%/%(%s%I!"FC$K\e(B @code{nnml}, @code{nnfolder} \e$B$*$h\e(B
+\e$B$S\e(B @code{nnmaildir} \e$B$O!"$=$l$>$l$N%0%k!<%W$N5-;v$N0u$rK\Ev$KJ];}$7$^$9!#\e(B
+\e$B$3$l$i$N%5!<%P!<$G!"%0%k!<%W$N0u$rJ]$A$D$DJ]B8$7$?$j85$KLa$9$N$O$+$J$j4J\e(B
+\e$BC1$G$9!#\e(B
 
 (\e$B$G$b!"%0%k!<%W%l%Y%k$H%0%k!<%W%Q%i%a!<%?$r$bJ];}$9$k$K$O!":#$^$G$H$*\e(B
-\e$B$j\e(B @code{.newsrc.eld} \e$B$N?@$K!"Iq$$$H@8lS$rJ{$2$J$1$l$P$J$j$^$;$s!#\e(B)
-
-@code{nnml} \e$B$+\e(B @code{nnfolder} \e$B$K$^$k$4$HJ]B8$9$k$K$O!"%5!<%P!<$N%G%#%l\e(B
-\e$B%/%H%j$r:F5"E*$K%3%T!<$7$^$9!#\e(Bgnus \e$B$r=*N;$9$kI,MW$OL5$$$N$G!"J]B8\e(B
-\e$B$O\e(B @code{cron} \e$B$d$=$l$KN`$9$k$b$N$,9T$J$&$3$H$,$G$-$^$9!#%G!<%?$rI|5"$5\e(B
-\e$B$;$k$K$O%G%#%l%/%H%jLZ\e(B (tree) \e$B$r85$KLa$9$3$H$G9T$J$$!"$=$N%G%#%l%/%H%j$r\e(B
-\e$B;X$7<($9$h$&$K\e(B gnus \e$B$N%5!<%P!<$NDj5A$KDI2C$7$^$9!#\e(B@ref{Article Backlog}\e$B!"\e(B
-@ref{Asynchronous Fetching} \e$B$*$h$S$=$NB>$O!"%G!<%?$r>e=q$-$7$F<YKb$r$9$k\e(B
-\e$B$+$b$7$l$J$$$N$G!"$"$J$?$O%G!<%?$rI|5"$5$;$kA0$K\e(B gnus \e$B$r=*N;$7$?$$$+$b$7\e(B
-\e$B$l$^$;$s!#\e(B
-
-\e$B8D!9$N\e(B @code{nnml} \e$B$d\e(B @code{nnfolder} \e$B$N%0%k!<%W$r!"0u$rJ];}$7$D$DJ]B8$9\e(B
-\e$B$k$3$H$b$G$-$^$9!#\e(B@code{nnml} \e$B$G$O!"$=$N%0%k!<%W$N%G%#%l%/%H%j$K$"$k$9$Y\e(B
-\e$B$F$N%U%!%$%k$r%3%T!<$7$^$9!#\e(B@code{nnfolder} \e$B$G$O!"4pK\$N%U%)%k%@!<%U%!%$\e(B
-\e$B%k\e(B (@code{FOO}) \e$B$H0u%U%!%$%k\e(B (@code{FOO.mrk}) \e$B$NN>J}$r%3%T!<$9$kI,MW$,$"\e(B
-\e$B$j$^$9!#%0%k!<%W$r85$KLa$9$N$O!"%0%k!<%W%P%C%U%!$G\e(B @kbd{G m} \e$B%-!<$r;H$$\e(B
-\e$B$^$9!#$=$N:G8e$N<j=g$K$h$C$F!"\e(Bgnus \e$B$O?7$7$$%G%#%l%/%H%j$,$G$-$?$3$H$rCN\e(B
-\e$B$j$^$9!#\e(B
+\e$B$j\e(B @file{.newsrc.eld} \e$B$N?@$K!"Iq$$$H@8lS$rJ{$2$J$1$l$P$J$j$^$;$s$,!#\e(B)
+
+@code{nnml}, @code{nnfolder} \e$B$^$?$O\e(B @code{nnmaildir} \e$B%5!<%P!<$K$^$k$4$H\e(B
+\e$BJ]B8$9$k$K$O!"%5!<%P!<$N%G%#%l%/%H%j$r:F5"E*$K%3%T!<$7$^$9!#\e(Bgnus \e$B$r=*N;\e(B
+\e$B$9$kI,MW$OL5$$$N$G!"J]B8$O\e(B @code{cron} \e$B$d$=$l$KN`$9$k$b$N$,9T$J$&$3$H$,\e(B
+\e$B$G$-$^$9!#%G!<%?$rI|5"$5$;$k$K$O%G%#%l%/%H%jLZ\e(B (tree) \e$B$r85$KLa$9$3$H$G9T\e(B
+\e$B$J$$!"$=$N%G%#%l%/%H%j$r;X$7<($9$h$&$K\e(B gnus \e$B$N%5!<%P!<$NDj5A$KDI2C$7$^$9!#\e(B
+@ref{Article Backlog}, @ref{Asynchronous Fetching} \e$B$*$h$S$=$NB>$O!"%G!<\e(B
+\e$B%?$r>e=q$-$7$F<YKb$r$9$k$+$b$7$l$J$$$N$G!"$"$J$?$O%G!<%?$rI|5"$5$;$kA0$K\e(B
+gnus \e$B$r=*N;$7$?$$$+$b$7$l$^$;$s!#\e(B
+
+\e$B8D!9$N\e(B @code{nnml}, @code{nnfolder} \e$B$^$?$O\e(B @code{nnmaildir} \e$B$N%0%k!<%W$r!"\e(B
+\e$B0u$rJ];}$7$D$DJ]B8$9$k$3$H$b$G$-$^$9!#\e(B@code{nnml} \e$B$+\e(B @code{nnmaildir} \e$B$G\e(B
+\e$B$O!"$=$N%0%k!<%W$N%G%#%l%/%H%j$K$"$k$9$Y$F$N%U%!%$%k$r%3%T!<$7$^$9!#\e(B
+@code{nnfolder} \e$B$G$O!"4pK\$N%U%)%k%@!<%U%!%$%k\e(B (@file{FOO}) \e$B$H0u%U%!%$\e(B
+\e$B%k\e(B (@file{FOO.mrk}) \e$B$NN>J}$r%3%T!<$9$kI,MW$,$"$j$^$9!#%0%k!<%W$r85$KLa$9\e(B
+\e$B$N$O!"%0%k!<%W%P%C%U%!$G\e(B @kbd{G m} \e$B%-!<$r;H$$$^$9!#$=$N:G8e$N<j=g$K$h$C\e(B
+\e$B$F!"\e(Bgnus \e$B$O?7$7$$%G%#%l%/%H%j$,$G$-$?$3$H$rCN$j$^$9!#\e(B@code{nnmaildir} \e$B$O\e(B
+\e$B<+F0E*$K?7$7$$%G%#%l%/%H%j$rCN$k$N$G!"$=$N>l9g\e(B @kbd{G m} \e$B$OITMW$G$9!#\e(B
 
 @node Web Searches
 @subsection \e$B%&%'%V8!:w\e(B
 @cindex nnweb
-@cindex DejaNews
-@cindex Alta Vista
-@cindex InReference
+@cindex Google
+@cindex dejanews
+@cindex gmane
 @cindex Usenet searches
 @cindex searching the Usenet
 
@@ -13510,11 +13808,11 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 \e$B%k!<%W$KF~$k$?$S$K\e(B(\e$B$?$H$(8!:w%Q%?!<%s$rJQ99$7$F$$$J$/$H$b\e(B)\e$B!"5-;v$N=g=x$,\e(B
 \e$B0c$C$F$$$k$+$b$7$l$^$;$s!#$^$?!"=EJ#M^\e(B
 \e$B@)\e(B (@pxref{Duplicate Suppression}) \e$B$r;H$C$F$b$&$^$/F/$+$J$$$G$7$g$&!#$H\e(B
-\e$B$$$&$N$O!"\e(B@code{nnweb} \e$B$O8!:w%(%s%8%s\e(B (\e$BNc$($P\e(B DejaNews) \e$B$r;H$C$F5-;v$rFI\e(B
-\e$B$_9~$`$^$G$O!"\e(B@code{Message-ID} \e$B$rCN$k$3$H$O$G$-$J$$$+$i$G$9!#$"$J$?$,FI\e(B
-\e$B$s$@5-;v$r21$($F$*$/$?$a$NM#0l$NJ}K!$O!"\e(B@code{Date} \e$B%X%C%@!<$r$b$H$K%9%3\e(B
-\e$B%"$rIU$1$k$3$H$@$1$G$9\e(B --- \e$B$D$^$j$"$J$?$,$=$N%0%k!<%W$r:G8e$KFI$s$@F|IU\e(B
-\e$B$h$j!"A0$KEj9F$5$l$?5-;v$rA4$F4{FI$K$9$k!"$H$$$&$3$H$G$9!#\e(B
+\e$B$$$&$N$O!"\e(B@code{nnweb} \e$B$O8!:w%(%s%8%s\e(B (\e$BNc$($P\e(B Google) \e$B$r;H$C$F5-;v$rFI$_\e(B
+\e$B9~$`$^$G$O!"\e(B@code{Message-ID} \e$B$rCN$k$3$H$O$G$-$J$$$+$i$G$9!#$"$J$?$,FI$s\e(B
+\e$B$@5-;v$r21$($F$*$/$?$a$NM#0l$NJ}K!$O!"\e(B@code{Date} \e$B%X%C%@!<$r$b$H$K%9%3%"\e(B
+\e$B$rIU$1$k$3$H$@$1$G$9\e(B --- \e$B$D$^$j$"$J$?$,$=$N%0%k!<%W$r:G8e$KFI$s$@F|IU$h\e(B
+\e$B$j!"A0$KEj9F$5$l$?5-;v$rA4$F4{FI$K$9$k!"$H$$$&$3$H$G$9!#\e(B
 
 \e$B$b$78!:w%(%s%8%s$N=PNO7A<0$,JQ99$5$l$k$H!"\e(B@code{nnweb} \e$B$O$=$l$r$&$^$/2r\e(B
 \e$B<a$G$-$:!"=hM}$O<:GT$9$k$G$7$g$&!#$b$7%&%'%VDs6!<TC#$,$=$s$J$3$H$r$7$?$i!"\e(B
@@ -13532,8 +13830,8 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 @item nnweb-type
 @vindex nnweb-type
 \e$B$I$N8!:w%(%s%8%s$r;H$C$F$$$k$+!#8=:_%5%]!<%H$5$l$F$$$k<oN`$O!"\e(B
-@code{dejanews}, @code{dejanewsold}, @code{altavista}, @code{reference} \e$B$G\e(B
-\e$B$9!#\e(B
+@code{google}, @code{dejanews} \e$B$=$7$F\e(B @code{gmane} \e$B$G$9!#\e(B
+@code{dejanews} \e$B$O\e(B @code{google} \e$B$NJLL>$K$J$C$F$$$k$3$H$KCm0U$7$F2<$5$$!#\e(B
 
 @item nnweb-search
 @vindex nnweb-search
@@ -13541,7 +13839,7 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 
 @item nnweb-max-hits
 @vindex nnweb-max-hits
-\e$BI=<($9$k8!:w7k2L$N:GBg?t!#=i4|CM$O\e(B 100 \e$B$G$9!#\e(B
+\e$BI=<($9$k8!:w7k2L$N:GBg?t!#=i4|CM$O\e(B 999 \e$B$G$9!#\e(B
 
 @item nnweb-type-definition
 @vindex nnweb-type-definition
@@ -13723,12 +14021,12 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
 \e$B%9%]%K%A!"\e(BCNET Japan\e$B!"\e(BHOTWIRED Japan\e$B!"\e(BZDNet Japan \e$B$J$I$KBP1~$7$F$$$^$9!#\e(B
 
 @code{nnshimbun} \e$B$O\e(B @code{shimbun} \e$B%i%$%V%i%j$K0MB8$7$F$$$^$9$N$G!"$=$l\e(B
-\e$B$r4^$s$G$$$k\e(B Emacs-W3M \e$B%Q%C%1!<%8$H30It%3%^%s%I\e(B W3M \e$B$r@h$K%$%s%9%H!<%k$7\e(B
+\e$B$r4^$s$G$$$k\e(B emacs-w3m \e$B%Q%C%1!<%8$H30It%3%^%s%I\e(B w3m \e$B$r@h$K%$%s%9%H!<%k$7\e(B
 \e$B$F$*$$$F$/$@$5$$!#>\$7$$$3$H$O0J2<$N%Z!<%8$GCN$k$3$H$,$G$-$^$9!#\e(B
 
 @example
   @uref{http://emacs-w3m.namazu.org/}
-  @uref{http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/}
+  @uref{http://w3m.sourceforge.net/}
 @end example
 
 @findex gnus-group-make-shimbun-group
@@ -13982,7 +14280,7 @@ Web Newspaper \e$B$K4X$9$k0J2<$N\e(B @code{nnshimbun} \e$BJQ?t$rJQ$($k$3$H$,2DG=$G$
 
 (defun gnus-user-format-function-X (header)
   (let ((descr
-        (assq nnrss-description-field (mail-header-extra header))))
+         (assq nnrss-description-field (mail-header-extra header))))
     (if descr (concat "\n\t" (cdr descr)) "")))
 @end lisp
 
@@ -14016,11 +14314,11 @@ Web Newspaper \e$B$K4X$9$k0J2<$N\e(B @code{nnshimbun} \e$BJQ?t$rJQ$($k$3$H$,2DG=$G$
 @cindex Netscape
 
 Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<(\e(B
-\e$B$9$k$?$a$K\e(B Emacs/w3 \e$B$r;H$$$^$9!#\e(BEmacs/w3 \e$B$N$3$H$O$=$N%^%K%e%"%k$K5-:\$5\e(B
+\e$B$9$k$?$a$K\e(B Emacs/W3 \e$B$r;H$$$^$9!#\e(BEmacs/W3 \e$B$N$3$H$O$=$N%^%K%e%"%k$K5-:\$5\e(B
 \e$B$l$F$$$^$9$,!"$3$3$G$O\e(B Gnus \e$B$N%f!<%6$K$H$C$F$h$jE,@Z$J$$$/$D$+$N;vJA$r=R\e(B
 \e$B$Y$k$3$H$K$7$^$9!#\e(B
 
-\e$BNc$($P!"$h$/$"$k<ALd$K\e(B Emacs/w3 \e$B$K\e(B @code{browse-url} \e$B$N5!G=\e(B (Netscape \e$B$N\e(B
+\e$BNc$($P!"$h$/$"$k<ALd$K\e(B Emacs/W3 \e$B$K\e(B @code{browse-url} \e$B$N5!G=\e(B (Netscape \e$B$N\e(B
 \e$B$h$&$J30It%W%i%&%6!<$r;H$&$h$&$K@_Dj$5$l$F$$$k\e(B) \e$B$r;H$C$F%j%s%/$r;2>H$5$;\e(B
 \e$B$k$K$O$I$&$7$?$i$h$$$+!"$H$$$&$N$,$"$j$^$9!#0J2<$O0l$D$NJ}K!$G$9!#\e(B
 
@@ -14040,14 +14338,14 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 \e$B$9$k$h$&$K$J$k$G$7$g$&!#\e(B
 
 @node IMAP
-@section @sc{imap}
+@section IMAP
 @cindex nnimap
 @cindex IMAP
 
-IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C%H%o!<\e(B
-\e$B%/%W%m%H%3%k$G$9!#8=BeIw$N\e(B NNTP \e$B$H9M$($F$/$@$5$$!#\e(BIMAP \e$B%5!<%P!<$X$N@\B3\e(B
-\e$B$O%K%e!<%9%5!<%P!<$X$N@\B3$HHs>o$K;w$F$$$F!"$=$N%5!<%P!<$N%M%C%H%o!<%/%"\e(B
-\e$B%I%l%9$r;XDj$9$k$@$1$K$J$C$F$$$^$9!#\e(B
+@sc{imap} \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C%H\e(B
+\e$B%o!<%/%W%m%H%3%k$G$9!#8=BeIw$N\e(B @sc{nntp} \e$B$H9M$($F$/$@$5$$!#\e(B@sc{imap} \e$B%5!<\e(B
+\e$B%P!<$X$N@\B3$O%K%e!<%9%5!<%P!<$X$N@\B3$HHs>o$K;w$F$$$F!"$=$N%5!<%P!<$N%M%C\e(B
+\e$B%H%o!<%/%"%I%l%9$r;XDj$9$k$@$1$K$J$C$F$$$^$9!#\e(B
 
 @sc{imap} \e$B$K$OFs$D$NFC<A$,$"$j$^$9!#0l$D$O!"\e(B@sc{imap} \e$B$O\e(B POP \e$B$G$G$-$k$3\e(B
 \e$B$H$OA4It$G$-$k!"$=$l$f$(\e(B POP++ \e$B$N$h$&$K$b8+$($k$H$$$&$3$H!#Fs$DL\$O!"\e(B
@@ -14102,8 +14400,8 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 @item nnimap-address
 @vindex nnimap-address
 
-\e$B1s3V\e(B IMAP \e$B%5!<%P!<$N%"%I%l%9$G$9!#;XDj$5$l$F$$$J$$>l9g$O2>A[%5!<%P!<$N$b\e(B
-\e$B$N$K$J$j$^$9!#\e(B
+\e$B1s3V\e(B @sc{imap} \e$B%5!<%P!<$N%"%I%l%9$G$9!#;XDj$5$l$F$$$J$$>l9g$O2>A[%5!<%P!<\e(B
+\e$B$N$b$N$K$J$j$^$9!#\e(B
 
 @item nnimap-server-port
 @vindex nnimap-server-port
@@ -14121,8 +14419,8 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 @vindex nnimap-list-pattern
 \e$B;HMQ2DG=$J%a!<%k%\%C%/%9$r@)8B$9$k$?$a$NJ8;zNs$+%j%9%H$G$9!#$3$l$O!"%5!<\e(B
 \e$B%P!<$KHs>o$KB?$/$N%a!<%k%\%C%/%9$,$"$k$1$l$I!"6=L#$N$"$k$b$N$O>/$7$@$1$G\e(B
-\e$B$"$k$H$-$K;HMQ$7$^$9!#%5!<%P!<$K$O%[!<%`%G%#%l%/%H%j!<$r\e(B IMAP \e$B7PM3$G=P$9\e(B
-\e$B$b$N$b$"$j$^$9$N$G!"$=$N>l9g$O$*$=$i$/%a!<%k%\%C%/%9\e(B
+\e$B$"$k$H$-$K;HMQ$7$^$9!#%5!<%P!<$K$O%[!<%`%G%#%l%/%H%j!<$r\e(B @sc{imap} \e$B7PM3\e(B
+\e$B$G=P$9$b$N$b$"$j$^$9$N$G!"$=$N>l9g$O$*$=$i$/%a!<%k%\%C%/%9\e(B
 \e$B$r\e(B @file{~/Mail/*} \e$B$K@)8B$7$?$$$G$7$g$&!#\e(B
 
 \e$BJ8;zNs$O\e(B REFERENCE \e$B$H>e$NJ8;zNs$H$N\e(B cons \e$B$G$"$k$3$H$b$G$-$^$9!#$I\e(B
@@ -14141,8 +14439,8 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 @vindex nnimap-stream
 \e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$o$l$k%9%H%j!<%`$N7?$G$9!#=i4|@_Dj$G\e(B
 \e$B$O\e(B nnimap \e$B$O\e(B SSL/TLS \e$B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#\e(B
-(SSL/TLS \e$B$r;H$&\e(B IMAP \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P\e(B
-\e$B$G$-$^$9$,!"$^$@9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
+(SSL/TLS \e$B$r;H$&\e(B @sc{imap} \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F0\e(B
+\e$B8!=P$G$-$^$9$,!"$^$@9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
 
 \e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
 
@@ -14165,9 +14463,8 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 @dfn{starttls:} STARTTLS (SSL \e$B$KN`;w\e(B) \e$B$r;H$$$^$9!#30It%i%$%V%i\e(B
 \e$B%j\e(B @samp{starttls.el} \e$B$H\e(B @samp{starttls} \e$B%W%m%0%i%`$,I,MW$G$9!#\e(B
 @item
-@dfn{ssl:} SSL \e$B$r;H$$$^$9!#\e(BOpenSSL (@samp{openssl} \e$B%W%m%0%i\e(B
-\e$B%`\e(B) \e$B$+\e(B SSLeay (@samp{s_client}) \e$B$H30It%i%$%V%i%j\e(B @samp{ssl.el} \e$B$,I,MW$G\e(B
-\e$B$9!#\e(B
+@dfn{ssl:} SSL \e$B$r;H$$$^$9!#\e(BOpenSSL (@samp{openssl} \e$B%W%m%0%i%`\e(B) \e$B$+\e(B SSLeay
+(@samp{s_client}) \e$B$H30It%i%$%V%i%j\e(B @samp{ssl.el} \e$B$,I,MW$G$9!#\e(B
 @item
 @dfn{shell:} \e$B%7%'%kL?Na$r;H$C$F\e(B @sc{imap} \e$B@\B3$r3+;O$7$^$9!#\e(B
 @item
@@ -14180,9 +14477,9 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 \e$B%s\e(B 1.5.x \e$B$H\e(B 1.6.x) \e$B$r;H$C$F$$$k$J$i!"\e(B
 @code{imap-process-connection-type} \e$B$r$$$8$j2s$7$F!"\e(B
 @code{imap.el} \e$B$,\e(B @samp{imtest} \e$B$HDL?.$9$k$H$-$K%Q%$%W$G$O$J$/\e(B
-\e$B$F\e(B pty \e$B$r;H$&$h$&$K$5$;$kI,MW$,$"$j$^$9!#$=$&$9$k$H$"$J$?$O\e(B IMAP \e$B%3%^%s\e(B
-\e$B%I$N9T$ND9$5$N@)8B$KG:$^$5$l$k$G$7$g$&!#$=$l$O%a!<%k%\%C%/%9$K$?$/$5$s$N\e(B
-\e$B5-;v$,$"$k$H$-$K\e(B Gnus \e$B$rL54|8B$K%O%s%0$5$;$F$7$^$&$+$b$7$l$^$;$s!#JQ\e(B
+\e$B$F\e(B pty \e$B$r;H$&$h$&$K$5$;$kI,MW$,$"$j$^$9!#$=$&$9$k$H$"$J$?$O\e(B @sc{imap} \e$B%3\e(B
+\e$B%^%s%I$N9T$ND9$5$N@)8B$KG:$^$5$l$k$G$7$g$&!#$=$l$O%a!<%k%\%C%/%9$K$?$/$5\e(B
+\e$B$s$N5-;v$,$"$k$H$-$K\e(B Gnus \e$B$rL54|8B$K%O%s%0$5$;$F$7$^$&$+$b$7$l$^$;$s!#JQ\e(B
 \e$B?t\e(B @code{imap-kerberos4-program} \e$B$O\e(B imtest \e$B%W%m%0%i%`$KEO$9%Q%?%a!<%?$r\e(B
 \e$B4^$_$^$9!#\e(B
 
@@ -14239,11 +14536,12 @@ nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e
 @cindex Expunging
 @vindex nnimap-expunge-on-close
 
-\e$B%Q%k%a%K%G%9$H0c$C$F!"\e(BIMAP \e$B$N@_7W<TC#$O!"B8:_$7$F$$$J$$$b$N$,<B:]$K$OB8\e(B
-\e$B:_$7$F$$$k$H7h$a$^$7$?!#$b$C$H>\$7$/@bL@$9$k$H!"\e(BIMAP \e$B$O<B:]$K$O5-;v$r>C\e(B
-\e$B5n$7$J$$!"5-;v$K\e(B @code{Deleted} \e$B$H$$$&0u$rIU$1$k35G0$,$"$j!"$3$l\e(B (\e$B$($C\e(B
-\e$B$H!"\e(B@code{Deleted} \e$B$H$$$&0u$rIU$1$k$3$H$G$9\e(B) \e$B$,\e(B nnimap \e$B$,\e(B Gnus \e$B$G5-;v$r\e(B
-\e$B>C5n$9$k$H$-$K$9$k$3$H$G$9\e(B (@kbd{G DEL} \e$B$J$I$G\e(B)\e$B!#\e(B
+\e$B%Q%k%a%K%G%9$H0c$C$F!"\e(B@sc{imap} \e$B$N@_7W<TC#$O!"B8:_$7$F$$$J$$$b$N$,<B:]$K\e(B
+\e$B$OB8:_$7$F$$$k$H7h$a$^$7$?!#$b$C$H>\$7$/@bL@$9$k$H!"\e(B@sc{imap} \e$B$O<B:]$K$O\e(B
+\e$B5-;v$r>C5n$7$J$$!"5-;v$K\e(B @code{Deleted} \e$B$H$$$&0u$rIU$1$k35G0$,$"$j!"$3\e(B
+\e$B$l\e(B (\e$B$($C$H!"\e(B@code{Deleted} \e$B$H$$$&0u$rIU$1$k$3$H$G\e(B
+\e$B$9\e(B) \e$B$,\e(B nnimap \e$B$,\e(B Gnus \e$B$G5-;v$r>C5n$9$k$H$-$K$9$k$3$H$G$9\e(B (@kbd{B DEL} \e$B$J\e(B
+\e$B$I$G\e(B)\e$B!#\e(B
 (\e$BLuCm\e(B: \e$B%Q%k%a%K%G%9$O5*85A0\e(B 5 \e$B@$5*$N%.%j%7%"$N\e(B Elea \e$BGI$NE/3X<T\e(B)
 
 \e$B5-;v$r\e(B @code{Deleted} \e$B%U%i%0$G0u$rIU$1$?$H$-$K$OK\Ev$O>C5n$5$l$F$$$J$$$N\e(B
@@ -14262,8 +14560,8 @@ nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e
 \e$B$?5-;v$r>C5n$7$^$9!#\e(B
 @item never
 \e$B7h$7$F5-;v$r>C5n$7$^$;$s!#8=:_$O!">C5n$N0u$,IU$$$?5-;v$r\e(B nnimap \e$B$GI=<($9\e(B
-\e$B$kJ}K!$O$"$j$^$;$s$,!"B>$N\e(B IMAP \e$B%/%i%$%"%s%H$O$G$O$G$-$k$+$b$7$l$^$;$s!#\e(B
-\e$B<j$G\e(B EXPUNGE \e$B%3%^%s%I$rH/9T$7$?$$$H$-$O!"\e(B@xref{Expunging mailboxes}\e$B!#\e(B
+\e$B$kJ}K!$O$"$j$^$;$s$,!"B>$N\e(B @sc{imap} \e$B%/%i%$%"%s%H$O$G$O$G$-$k$+$b$7$l$^\e(B
+\e$B$;$s!#<j$G\e(B EXPUNGE \e$B%3%^%s%I$rH/9T$7$?$$$H$-$O\e(B @xref{Expunging mailboxes}\e$B!#\e(B
 @item ask
 \e$B%a!<%k%\%C%/%9$rJD$8$k$H$-$K!"\e(Bnnimap \e$B$,>C5n$5$l$?5-;v$r:o=|$9$k$+$I$&$+\e(B
 \e$B$r?R$M$^$9!#\e(B
@@ -14272,11 +14570,12 @@ nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e
 @item nnimap-importantize-dormant
 @vindex nnimap-importantize-dormant
 
-\e$BHs\e(B nil \e$B$@$C$?$i!"B>$N\e(B IMAP \e$B%/%i%$%"%s%H$N$?$a$KJ]N15-;v$r0uIU$-$H$7$F$b\e(B
-\e$B0u$rIU$1$^$9!#\e(Bgnus \e$B$NFbIt$G$O!"J]N15-;v$O85!9$9$G$K0uIU$-$H$7$F$N$_0u$,\e(B
-\e$BIU$1$i$l$F$$$^$9!#$3$l$O!"B>$N\e(B IMAP \e$B%/%i%$%"%s%H$K$*$1$kJ]N15-;v$r!"$"$?\e(B
-\e$B$+$b0uIU$-$N$h$&$K$-$oN)$?$;$^$9!#\e(B(\e$BJL$N8@$$J}$r$9$k$H!"\e(Bgnus \e$B$OFs$D$N0u$r\e(B
-\e$BIU$1!"\e(BIMAP \e$B$O$?$C$?0l$D$@$H$$$&$3$H$G$9!#\e(B)
+\e$BHs\e(B-nil (\e$B%G%#%U%)%k%H\e(B) \e$B$@$C$?$i!"B>$N\e(B @sc{imap} \e$B%/%i%$%"%s%H$N$?$a$KJ]N1\e(B
+\e$B5-;v$r0uIU$-$H$7$F$b0u$rIU$1$^$9!#\e(Bgnus \e$B$NFbIt$G$O!"J]N15-;v$O85!9$9$G$K\e(B
+\e$BJ]N15-;v$H$7$F$N$_0u$,IU$1$i$l$F$$$^$9!#$3$l$O!"B>$N\e(B @sc{imap} \e$B%/%i%$%"\e(B
+\e$B%s%H$K$*$1$kJ]N15-;v$r!"$"$?$+$b0uIU$-$N$h$&$K$-$oN)$?$;$^$9!#\e(B(\e$BJL$N8@$$\e(B
+\e$BJ}$r$9$k$H!"\e(Bgnus \e$B$OFs$D$N0u$rIU$1!"\e(B@sc{imap} \e$B$O$?$C$?0l$D$@$H$$$&$3$H$G\e(B
+\e$B$9!#\e(B)
 
 \e$B$?$V$s$3$l$r$$$8$j$^$o$9$N$O!"$"$J$?$,%f!<%6C10L$NJ]N1%U%i%0$rIU$1$h$&$H\e(B
 \e$B$9$k$@$1$NM}M3$K$h$k$G$7$g$&!#$3$s$J46$8$G\e(B:
@@ -14296,7 +14595,7 @@ nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e
 @vindex nnimap-expunge-search-string
 
 \e$B$3$NJQ?t$K$O!"4|8B@Z$l>C5n$9$k$N$,K>$^$7$$5-;v$rC5$9$H$-$K%5!<%P!<$KAw$C\e(B
-\e$B$?\e(B IMAP \e$B$N8!:w%3%^%s%I$,F~$C$F$$$^$9!#%G%#%U%)%k%H\e(B
+\e$B$?\e(B @sc{imap} \e$B$N8!:w%3%^%s%I$,F~$C$F$$$^$9!#%G%#%U%)%k%H\e(B
 \e$B$O\e(B @code{"UID %s NOT SINCE %s"} \e$B$G!"$3$3$G:G=i$N\e(B @code{%s} \e$B$O\e(B UID \e$B$GCV$-\e(B
 \e$B49$($i$l!"FsHVL\$N\e(B @code{%s} \e$B$OF|IU$GCV$-49$($i$l$^$9!#\e(B
 
@@ -14326,10 +14625,10 @@ nnimap \e$B$K5-;v$NFbItE*$JF|IU$NBe$o$j$K\e(B Date: \e$B$r;H$&$h$&$K$5$;$^$9!#$5$i$
 @cindex splitting imap mail
 
 \e$BJ,3d$O\e(B gnus \e$B$NMxMQ<T$,2?G/$b$N4V0&$7$F$-$?$b$N$G!":#$d;D$j$N@$3&$bDI$$$D\e(B
-\e$B$3$&$H$7$F$$$^$9!#$O$$!"A[A|$7$F$/$@$5$$!"\e(BIMAP \e$B%5!<%P!<$N$J$+$K%5!<%P!<\e(B
-\e$BB&$GJ,3d$G$-$k$b$N$O$"$^$jB?$/$J$/!"$7$+$b$=$l$i$OI8=`$G$J$$%W%m%H%3%k$r\e(B
-\e$B;H$C$F$$$k$h$&$G$9!#$3$l$O!"\e(Bgnus \e$B$N\e(B IMAP \e$B%5%]!<%H$O<+J,<+?H$GJ,3d$r$7$J\e(B
-\e$B$1$l$P$J$i$J$$$H$$$&$3$H$G$9!#\e(B
+\e$B$3$&$H$7$F$$$^$9!#$O$$!"A[A|$7$F$/$@$5$$!"\e(B@sc{imap} \e$B%5!<%P!<$N$J$+$K%5!<\e(B
+\e$B%P!<B&$GJ,3d$G$-$k$b$N$O$"$^$jB?$/$J$/!"$7$+$b$=$l$i$OI8=`$G$J$$%W%m%H%3\e(B
+\e$B%k$r;H$C$F$$$k$h$&$G$9!#$3$l$O!"\e(Bgnus \e$B$N\e(B @sc{imap} \e$B%5%]!<%H$O<+J,<+?H$GJ,\e(B
+\e$B3d$r$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G$9!#\e(B
 
 \e$B$=$7$F<B:]$K$7$^$9!#\e(B
 
@@ -14352,8 +14651,8 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-crosspost}.
 @cindex inbox
 @vindex nnimap-split-inbox
 
-\e$BJ,3d$N85$H$J$k\e(B IMAP \e$B$N%a!<%k%\%C%/%9$NL>A0$r;XDj$7$?J8;zNs$+J8;zNs$N%j%9\e(B
-\e$B%H$G$9!#=i4|CM$O\e(B @code{nil} \e$B$G!"J,3d$O;HMQ$7$J$$$h$&$K$J$C$F$$$^$9\e(B!
+\e$BJ,3d$N85$H$J$k\e(B @sc{imap} \e$B$N%a!<%k%\%C%/%9$NL>A0$r;XDj$7$?J8;zNs$+J8;zNs\e(B
+\e$B$N%j%9%H$G$9!#=i4|CM$O\e(B @code{nil} \e$B$G!"J,3d$O;HMQ$7$J$$$h$&$K$J$C$F$$$^$9\e(B!
 
 @lisp
 (setq nnimap-split-inbox
@@ -14369,9 +14668,10 @@ Nnmail \e$B$KBP1~$9$k$b$N$O$"$j$^$;$s!#\e(B
 @code{nnimap-split-inbox} \e$B$G8+$D$+$C$??7$7$$%a!<%k$O$3$NJQ?t$K=>$C$FJ,3d\e(B
 \e$B$5$l$^$9!#\e(B
 
-\e$B$3$NJQ?t$O%j%9%H$N%j%9%H$+$i@.$j$^$9!#I{%j%9%H$N:G=i$NMWAG$O\e(B IMAP \e$B$N%a!<\e(B
-\e$B%k%\%C%/%9$G!"Fs$D$a$NMWAG$N@55,I=8=$K9gCW$7$?5-;v$N0\F0@h$r;XDj$7$^$9!#\e(B
-\e$B$o$+$j$^$7$?$+\e(B? \e$B$$$$$(!";d$b$o$+$j$^$;$s!#Nc$,I,MW$G$9!#\e(B
+\e$B$3$NJQ?t$O%j%9%H$N%j%9%H$+$i@.$j$^$9!#I{%j%9%H$N:G=i$NMWAG\e(B
+\e$B$O\e(B @sc{imap} \e$B$N%a!<%k%\%C%/%9$G!"Fs$D$a$NMWAG$N@55,I=8=$K9gCW$7$?5-;v$N\e(B
+\e$B0\F0@h$r;XDj$7$^$9!#$o$+$j$^$7$?$+\e(B? \e$B$$$$$(!";d$b$o$+$j$^$;$s!#Nc$,I,MW$G\e(B
+\e$B$9!#\e(B
 
 @lisp
 (setq nnimap-split-rule
@@ -14473,14 +14773,14 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-split-fancy}.
 @subsection IMAP \e$B$N\e(B ACL \e$B$rJT=8$9$k!#\e(B
 @cindex editing imap acls
 @cindex Access Control Lists
-@cindex Editing IMAP ACLs
+@cindex Editing @sc{imap} ACLs
 @kindex G l
 @findex gnus-group-nnimap-edit-acl
 
-ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(BIMAP \e$B$G$O\e(B ACL \e$B$OB>$N\e(B
-\e$BMxMQ<T$K$h$k$"$J$?$N%a!<%k%\%C%/%9$N;HMQ$r@)8B\e(B (\e$B$b$7$/$O5v2D\e(B) \e$B$9$k$?$a$K\e(B
-\e$B;H$o$l$F$$$^$9!#\e(BIMAP \e$B%5!<%P!<A4$F$K$3$N5!G=$,$"$k$o$1$G$O$J$/!"L5$$%5!<\e(B
-\e$B%P!<$G$3$l$i$N4X?t$r;H$&$H%(%i!<$,H/@8$7$^$9!#\e(B
+ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(B@sc{imap} \e$B$G\e(B
+\e$B$O\e(B ACL \e$B$OB>$NMxMQ<T$K$h$k$"$J$?$N%a!<%k%\%C%/%9$N;HMQ$r@)8B\e(B (\e$B$b$7$/$O5v\e(B
+\e$B2D\e(B) \e$B$9$k$?$a$K;H$o$l$F$$$^$9!#\e(B@sc{imap} \e$B%5!<%P!<A4$F$K$3$N5!G=$,$"$k$o$1\e(B
+\e$B$G$O$J$/!"L5$$%5!<%P!<$G$3$l$i$N4X?t$r;H$&$H%(%i!<$,H/@8$7$^$9!#\e(B
 
 \e$B%a!<%k%\%C%/%9$X$N\e(B ACL \e$B$rJT=8$9$k$?$a$K$O!"\e(B
 @kbd{G l} (@code{gnus-group-edit-nnimap-acl}) \e$B$rF~NO$7$^$9!#$=$&$9$k$H!"\e(B
@@ -14495,8 +14795,8 @@ ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(BIMAP \e$B$G
 \e$B$NB>$NMxMQ<T$,$=$l$r9XFI$9$k$3$H$J$/FI$`$3$H$,$G$-$^$9!#\e(B
 @item
 \e$B>/$J$/$H$b\e(B Cyrus \e$B$N%5!<%P!<$K$*$$$F$O!"\e(B"plussing" \e$B$,F0:n$9$k$?$a$K\e(B (\e$B$D$^\e(B
-\e$B$j!"\e(Buser+mail@@domain \e$B$,\e(B INBOX.mailbox \e$B$H$$$&\e(B IMAP \e$B$N%a!<%k%\%C%/%9$K$J\e(B
-\e$B$k\e(B)\e$B!"MxMQ<T\e(B "anyone" \e$B$KEj9F\e(B ("p") \e$B$N5v2D$rM?$($kI,MW$,$"$j$^$9!#\e(B
+\e$B$j!"\e(Buser+mail@@domain \e$B$,\e(B INBOX.mailbox \e$B$H$$$&\e(B @sc{imap} \e$B$N%a!<%k%\%C%/%9\e(B
+\e$B$K$J$k\e(B)\e$B!"MxMQ<T\e(B "anyone" \e$B$KEj9F\e(B ("p") \e$B$N5v2D$rM?$($kI,MW$,$"$j$^$9!#\e(B
 @end itemize
 
 @node Expunging mailboxes
@@ -14665,17 +14965,49 @@ rnews \e$B$N%P%C%AE>Aw7A<0!#\e(B
 \e$BE>Aw$5$l$?5-;v!#\e(B
 
 @item nsmail
-Netscape mail box\e$B!#\e(B
+Netscape \e$B$N%a!<%k%\%C%/%9!#\e(B
 
-@item mime-digest
 @item mime-parts
-MIME \e$BB>ItJ,%a%C%;!<%8\e(B (multipart) \e$B$G$9!#\e(B
+@sc{mime} \e$BItJ,%a%C%;!<%8\e(B (multipart)\e$B!#\e(B
 
 @item standard-digest
 \e$BI8=`\e(B (RFC 1153) \e$B$^$H$aAw$j7A<0!#\e(B
 
+@item mime-digest
+@sc{mime} \e$B$N$^$H$aAw$j%a%C%;!<%8!#\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
+
+@item rfc822-forward
+RFC822 \e$B$GE>Aw$5$l$?%a%C%;!<%8!#\e(B
+
+@item outlook
+Outlook \e$B$N%a!<%k%\%C%/%9!#\e(B
+
+@item oe-dbx
+Outlook Express \e$B$N\e(B dbx \e$B%a!<%k%\%C%/%9!#\e(B
+
+@item exim-bounce
+Exim MTA \e$B$+$iD7$MJV$5$l$?%a%C%;!<%8!#\e(B
+
+@item forward
+\e$BHs8x<0$N5,B'$GE>Aw$5$l$?%a%C%;!<%8!#\e(B
+
+@item rfc934
+RFC934 \e$B7A<0$GE>Aw$5$l$?%a%C%;!<%8!#\e(B
+
+@item mailman
+mailman \e$B$N$^$H$aAw$j!#\e(B
+
+@item clari-briefs
+Clarinet \e$B$N%K%e!<%99`L\$rMWLs$7$?$^$H$aAw$j!#\e(B
+
 @item slack-digest
 \e$BHsI8=`$^$H$aAw$j7A<0\e(B --- \e$B$@$$$?$$$O$&$^$/%^%C%A$9$k$,!"$G$b07$$$O2<<j!#\e(B
+
+@item mail-in-mail
+\e$B:G8e$N<jCJ!#\e(B
 @end table
 
 \e$B$^$?!"FCJL$J\e(B ``\e$B%U%!%$%k<oJL\e(B'' @code{guess} \e$B$r;H$&$3$H$b$G$-$^$9!#$3$l\e(B
@@ -14708,8 +15040,8 @@ MIME \e$BB>ItJ,%a%C%;!<%8\e(B (multipart) \e$B$G$9!#\e(B
 @code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
 @code{rfc822-forward}, @code{mime-parts}, @code{standard-digest},
 @code{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook},
-@code{oe-dbx} \e$B$*$h$S\e(B @code{mailman} \e$B$^$?$O\e(B @code{guess} \e$B$N$$$:$l$+$G$J$/\e(B
-\e$B$F$O$J$j$^$;$s!#\e(B
+@code{oe-dbx}, @code{mailman} \e$B$*$h$S\e(B @code{mail-in-mail} \e$B$^$?\e(B
+\e$B$O\e(B @code{guess} \e$B$N$$$:$l$+$G$J$/$F$O$J$j$^$;$s!#\e(B
 
 @item nndoc-post-type
 @vindex nndoc-post-type
@@ -15020,7 +15352,7 @@ gnus \e$B$,JV?.%Q%1%C%H$rC5$7$K9T$/>l=j!#=i4|@_DjCM$O\e(B @file{~/}\e$B!#\e(B
 @end table
 
 @node SOUP Groups
-@subsubsection @sc{soup} \e$B%0%k!<%W\e(B
+@subsubsection SOUP \e$B%0%k!<%W\e(B
 @cindex nnsoup
 
 @code{nnsoup} \e$B$O\e(B @sc{soup} \e$B%Q%1%C%H$rFI$`$?$a$N%P%C%/%(%s%I$G$9!#$3$l$O\e(B
@@ -15358,20 +15690,10 @@ Namazu \e$B$r;H$C$F!"%a!<%k$N;3$+$i$"$J$?$N9%$-$J%-!<%o!<%I$r4^$`5-;v$r8+\e(B
   @uref{http://namazu.org/}
 @end example
 
-\e$B<!$K!"$"$J$?$NHkB"$N%a!<%k$H1JB35-;v$N;3$N:w0z$r:n$j$^$9!#$=$N$?$a$K$O!"\e(B
-\e$B0J2<$N\e(B2\e$B$D$N%3%^%s%I$r<B9T$9$kI,MW$,$"$k$G$7$g$&!#\e(B
-
-@example
-  % mkdir ~/News/namazu
-  % mknmz -a -h -O ~/News/namazu ~/Mail ~/News/cache
-@end example
-
-\e$B$3$N%3%^%s%I$O!"\e(B(1) @file{~/News/namazu/} \e$B$H$$$&%G%#%l%/%H%j$r:n@.$9$k!"\e(B
-(2) \e$B$=$N%G%#%l%/%H%j$K\e(B @file{~/Mail/} \e$B0J2<$KJ]B8$5$l$F$$$k%a!<%k$H\e(B 
-@file{~/News/cache/} \e$B0J2<$KJ]B8$5$l$F$$$k1JB35-;v$N:w0z$r:n@.$9$k!"$H\e(B
-\e$B$$$&0UL#$G$9!#\e(B
-
-\e$B$5$"!"$3$l$G=`Hw$,$G$-$^$7$?!#\e(B
+@findex gnus-namazu-create-index
+\e$B<!$K!"$"$J$?$NHkB"$N%a!<%k$H1JB35-;v$N;3$N:w0z$r:n$k$?$a$K!"\e(B
+@kbd{M-x gnus-namazu-create-index} \e$B$H$7$F$/$@$5$$!#$5$"!"$3$l$G=`Hw$,\e(B
+\e$B$G$-$?$O$:$G$9!#\e(B
 
 @kindex C-c C-n (\e$B%0%k!<%W\e(B)
 @kindex C-c C-n (\e$B35N,\e(B)
@@ -15393,7 +15715,7 @@ gnus \e$B$NDL>o$N?t;z@\F,<-$d!"%W%m%;%9@\F,<-$rM}2r$7$^$9!#$G$9$+$i!"$"$J\e(B
 \e$B$N9T$K0\F0$7$F!"<!$N$h$&$K8!:w$9$k$3$H$,$G$-$^$9!#\e(B
 
 @example
-  @kbd{M-1 C-c C-n namazu RET}
+  @kbd{1 C-c C-n namazu RET}
 @end example
 
 \e$B$^$?!"35N,%P%C%U%!$+$i!"$$$-$J$j8!:w$9$k$3$H$b$G$-$^$9!#$3$N>l9g!"8!:w\e(B
@@ -15405,11 +15727,31 @@ gnus \e$B$NDL>o$N?t;z@\F,<-$d!"%W%m%;%9@\F,<-$rM}2r$7$^$9!#$G$9$+$i!"$"$J\e(B
   @kbd{C-c C-n +from:"Your E-Mail Address" RET}
 @end example
 
-\e$B:G8e$K!"\e(BNamazu \e$B$r$h$/J,$+$C$F$$$k?M$K$O!"ITMW$JCm0U$r0l$D!#\e(BNamazu \e$B$O!"\e(B
-\e$B;vA0$K:n@.$5$l$?:w0z$rMQ$$$F8!:w$r9T$$!":w0z$K$N$C$F$$$J$$%U%!%$%k$K$O\e(B
-\e$BL\$b$/$l$^$;$s!#$@$+$i!"Dj4|E*$K\e(B @code{mknmz} \e$B$r8F$S=P$7$F!"?7$?$J%a!<\e(B
-\e$B%k$N:w0z$rDI2C$7$J$$$H!"?7$7$$%a!<%k$O$$$D$^$G$?$C$F$b8!:w$5$l$J$$$3$H\e(B
-\e$B$K$J$j$^$9$+$i!"$"$7$+$i$:!#\e(B
+@vindex gnus-namazu-index-update-interval
+Namazu \e$B$O!";vA0$K=`Hw$5$l$?:w0z$rMQ$$$F8!:w$r9T$&$h$&$K@_7W$5$l$?8!:w\e(B
+\e$B%(%s%8%s$J$N$G!":w0z$KEPO?$5$l$F$$$J$$%U%!%$%k$O40A4$KL5;k$5$l$^$9!#$D\e(B
+\e$B$^$j!"Dj4|E*$K\e(B @code{mknmz} \e$B$r8F$S=P$7$F!"?7$?$J%a!<%k$N:w0z$rDI2C$7$J\e(B
+\e$B$$$H!"?7$7$$%a!<%k$O$$$D$^$G$?$C$F$b8!:wBP>]$K$J$i$J$$$3$H$K$J$j$^$9!#\e(B
+@file{gnus-namazu.el} \e$B$O!"\e(B@code{gnus-namazu-index-update-interval} \e$B$K\e(B
+\e$B;XDj$5$l$?4|4VKh$K<+F0E*$K:w0z$r99?7$9$k5!G=$rDs6!$7$F$$$^$9!#%G%U%)%k\e(B
+\e$B%H$N@_Dj$G$O!"\e(B3\e$BF|$*$-$K:w0z$r99?7$9$k$h$&$K$J$C$F$$$^$9$,!"$b$C$HIQHK\e(B
+\e$B$K\e(B(\e$BNc$($P\e(B1\e$BF|$*$-\e(B)\e$B$K99?7$9$k$h$&$K$7$?$$$J$i$P!"0J2<$N@_Dj$r\e(B 
+@file{~/.gnus} \e$B$KDI2C$7$F$/$@$5$$!#\e(B
+
+@example
+(setq gnus-namazu-index-update-interval 86400)
+@end example
+
+\e$B5U$K!":w0z$N99?7$r<+F0E*$K9T$$$?$/$J$$$J$i$P!"0J2<$N;XDj$r\e(B 
+@file{~/.gnus} \e$B$KDI2C$7$F$/$@$5$$!#\e(B
+
+@example
+(setq gnus-namazu-index-update-interval nil)
+@end example
+
+@findex{gnus-namazu-update-all-indices}
+\e$B$3$N>l9g!":w0z$r<jF0$G99?7$9$k$?$a$K\e(B @kbd{M-x
+gnus-namazu-update-all-indices} \e$B$H$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#\e(B
 
 @node Gnus Unplugged
 @section Gnus \e$B$N@Z$jN%$7\e(B
@@ -15444,11 +15786,11 @@ Gnus \e$B$r\e(B ``\e$B%*%U%i%$%s\e(B'' \e$B$N%K%e!<%9%j!<%@!<$H$7$F;H$&$N$O6K$a$F4JC1
 gnus \e$B$r@_Dj$7$^$9!#$^$:$d$C$F$*$$$G!#KM$O$3$3$GBT$C$F$k$+$i!#\e(B
 
 @item
-\e$B$=$7$?$i!"0J2<$NKbK!$N<vJ8$r$"$J$?$N\e(B @file{.gnus.el} \e$B%U%!%$%k$N:G8e$K=q\e(B
-\e$B$$$F$/$@$5$$!#\e(B
+\e$B$=$7$?$i!"0J2<$NKbK!$N<vJ8$r$"$J$?$N\e(B @file{.gnus.el} \e$B%U%!%$%k$K=q$$$F$/\e(B
+\e$B$@$5$$!#\e(B
 
 @lisp
-(gnus-agentize)
+(setq gnus-agent t)
 @end lisp
 @end itemize
 
@@ -15677,13 +16019,13 @@ gnus \e$B%(!<%8%'%s%H$,$=$N5-;v$r\e(B SPAM \e$B$@$H8+Pv$7$?$i??!#$3$NH/8+E*<jK!$O!"
 
 \e$B$b$7$/$O!"\e(B@file{~/.gnus.el} \e$B$d2?$+B>$N$b$N$G$b!"4{Dj\e(B
 \e$B$N\e(B @code{gnus-category-predicate-list} \e$B$K<+J,$N=R8l$rDI2C$9$k$3$H$b$G$-\e(B
-\e$B$^$9!#\e(B(\e$BCm0U\e(B: \e$B$3$l$O!"\e(B@code{gnus-agent} \e$B$G\e(B @code{(gnus-agentize)} \e$B$,FI$_\e(B
-\e$B9~$^$l$?8e$G$"$kI,MW$,$"$k$G$7$g$&\e(B)
+\e$B$^$9!#\e(B
 
 @lisp
+(require 'gnus-agent)
 (setq gnus-category-predicate-alist
       (append gnus-category-predicate-alist
-             '((old . my-article-old-p))))
+              '((old . my-article-old-p))))
 @end lisp
 
 \e$B$=$7$F!"C1$K<!$N$h$&$K=R8l$r;XDj$7$^$9\e(B:
@@ -15962,7 +16304,7 @@ $ emacs -batch -l ~/.gnus.el -f gnus-agent-batch
 @item J S
 @kindex J S (\e$B%(!<%8%'%s%H\e(B \e$B%0%k!<%W\e(B)
 @findex gnus-group-send-queue
-\e$B2<=q$-\e(B (queue) \e$B%0%k!<%W$K$"$kAw?.2DG=$J%a%C%;!<%8$rA4$FAw?.$9\e(B
+\e$B=gHVBT$A\e(B (queue) \e$B%0%k!<%W$K$"$kAw?.2DG=$J%a%C%;!<%8$rA4$FAw?.$9\e(B
 \e$B$k\e(B (@code{gnus-group-send-queue})\e$B!#\e(B@xref{Drafts}\e$B!#\e(B
 
 @item J a
@@ -16071,6 +16413,12 @@ $ emacs -batch -l ~/.gnus.el -f gnus-agent-batch
 \e$B=i4|@_DjCM\e(B) \e$B$G$"$l$P!"4{FI5-;v$N$_$,>C5n$NBP>]$H$J$j!"L$FI!"2D;k!"J]N15-\e(B
 \e$B;v$O$5$i$KL54|8B$KJ];}$7$^$9!#\e(B
 
+@findex gnus-agent-regenerate
+\e$B4|8B@Z$l>C5n$5$l$F$$$k$O$:$J$N$K;D$C$F$$$k5-;v$r8+$D$1$?$J$i$P!"$?$V$s$$\e(B
+\e$B$/$D$+$N\e(B gnus \e$B%(!<%8%'%s%H%U%!%$%k$,2u$l$F$$$^$9!#\e(B
+@code{gnus-agent-regenerate} \e$B$O!"5/$3$j$&$kLdBj$r=$I|$9$k$?$a$NFCJL$J%3\e(B
+\e$B%^%s%I$G$9!#\e(B
+
 @node Agent and IMAP
 @subsection \e$B%(!<%8%'%s%H$r\e(B IMAP \e$B$G;H$&J}K!\e(B
 
@@ -16167,8 +16515,8 @@ Gnus \e$B%(!<%8%'%s%H$,%U%!%$%k$r3JG<$9$k>l=j!#=i4|@_DjCM\e(B
 
 @item gnus-agent-cache
 @vindex gnus-agent-cache
-plugged \e$B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k\e(B NOV \e$B$H5-;v$r;H$&$+$I$&$+$r@)8f$9\e(B
-\e$B$kJQ?t!#\e(B
+plugged \e$B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k\e(B @sc{nov} \e$B$H5-;v$r;H$&$+$I$&$+$r@)\e(B
+\e$B8f$9$kJQ?t!#\e(B
 
 @item gnus-agent-go-online
 @vindex gnus-agent-go-online
@@ -16200,7 +16548,8 @@ plugged \e$B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k\e(B NOV \e$B$H5-;v$r;H$&$+$I$&$+$r@)8f$9
 (setq gnus-secondary-select-methods '((nnml "")))
 
 ;;; Gnus \e$B$r%*%U%i%$%s%K%e!<%9%j!<%@!<$K$9$k!#\e(B
-(gnus-agentize)
+;;; (gnus-agentize) ; \e$B5l<0$N@_Dj!#\e(B
+(setq gnus-agent t)
 @end lisp
 
 \e$B4pK\E*$K$O$3$l$@$1$GNI$$$O$:$G$9!#$3$l$r$"$J$?$N\e(B @file{~/.gnus.el} \e$B%U%!\e(B
@@ -16433,6 +16782,12 @@ Gnus \e$B$O35N,%P%C%U%!$r:n@.$9$kA0$K!"8=:_$N%0%k!<%W$KE,MQ$5$l$k$I$s\e(B
 \e$B8=:_$N5-;v$K;H$o$l$F$$$kA4$F$N%9%3%"K!B'\e(B (score rule) \e$B$rI=<($7$^\e(B
 \e$B$9\e(B (@code{gnus-score-find-trace})\e$B!#\e(B
 
+@item V w
+@kindex V w (\e$B35N,\e(B)
+@findex gnus-score-find-favourite-words
+\e$B%9%3%"$K;H$o$l$F$$$k8l$N%j%9%H$rI=<($7$^\e(B
+\e$B$9\e(B (@code{gnus-score-find-favourite-words})\e$B!#\e(B
+
 @item V R
 @kindex V R (\e$B35N,\e(B)
 @findex gnus-summary-rescore
@@ -16525,6 +16880,10 @@ File Editing})\e$B!#\e(B
 @item i
 @code{Messsage-ID} \e$B%X%C%@!<$K%9%3%"$rIU$1$^$9!#\e(B
 
+@item e
+\e$BDI2C$N%X%C%@!<\e(B (@code{gnus-extra-headers} \e$B$K@_Dj$5$l$F$$$F!"\e(B@sc{nntp} \e$B%5!<\e(B
+\e$B%P!<$,\e(B overview \e$B$K$=$l$i$N>pJs$r5-O?$7$F$$$k\e(B) \e$B$K%9%3%"$rIU$1$^$9!#\e(B
+
 @item f
 \e$B%U%)%m!<%"%C%W\e(B (followup) \e$B$K%9%3%"$rIU$1$^$9\e(B---\e$B$3$l$OCx<TL>$H$N9gCW$r$7!"\e(B
 \e$B$3$NCx<T$X$N%U%)%m!<%"%C%W$K%9%3%"$r2C$($^$9!#\e(B(\e$B$3$N%-!<$r;H$&$3$H$K$h$C\e(B
@@ -16590,10 +16949,10 @@ File Editing})\e$B!#\e(B
 @end table
 
 @item
-\e$B;M$D$a$G!":G8e$N%-!<$O$3$l$,0l;~E*\e(B (\e$B$9$J$o$A!"4|8B@Z$l>C5n\e(B) \e$B$N%9%3%"EPO?\e(B
-\e$B$+!"1JB3E*$J\e(B (\e$B$9$J$o$A!"4|8B@Z$l>C5n$G$J$$\e(B) \e$B%9%3%"EPO?$G$"$k$+$H$$$&$3$H!"\e(B
-\e$B$b$7$/$O$9$0$K$J$5$l$k$Y$-$+!"%9%3%"%U%!%$%k$KDI2C$9$k;v$O$7$J$$$+$H$$$&\e(B
-\e$B;v$r;XDj$7$^$9!#\e(B
+\e$B;M$D$a$GDL>o$O:G8e$N%-!<$G$9!#$3$l$,0l;~E*\e(B (\e$B$9$J$o$A4|8B@Z$l>C5n\e(B) \e$B$N%9%3\e(B
+\e$B%"EPO?$+!"1JB3E*$J\e(B (\e$B$9$J$o$A4|8B@Z$l>C5n$G$J$$\e(B) \e$B%9%3%"EPO?$G$"$k$+$H$$$&\e(B
+\e$B$3$H!"$b$7$/$O$9$0$K$J$5$l$k$Y$-$+!"%9%3%"%U%!%$%k$KDI2C$9$k;v$O$7$J$$$+\e(B
+\e$B$H$$$&;v$r;XDj$7$^$9!#\e(B
 
 @table @kbd
 @item t
@@ -16606,6 +16965,10 @@ File Editing})\e$B!#\e(B
 \e$BB(:B$N\e(B (immediate) \e$B%9%3%"IU$1$G$9!#\e(B
 @end table
 
+@item
+\e$B$b$7\e(B `e' (\e$BDI2C$N\e(B (extra)) \e$B%X%C%@!<$G%9%3%"IU$1$r9T$J$C$F$$$k$H!"$I$NL>A0\e(B
+\e$B$N%X%C%@!<$G9T$J$&$+$r?R$M$i$l$^$9!#$3$l$O\e(B @code{gnus-extra-headers} \e$B$K\e(B
+\e$B$"$kL>A0$G$J$1$l$P$J$j$^$;$s!#\e(B@samp{TAB} \e$B$K$h$kJd40$,$G$-$^$9!#\e(B
 @end enumerate
 
 \e$B$G$9$+$i!"8=:_$NCx<T$K@53N$J9gCW$G1JB3E*$K%9%3%"$rA}$d$7$?$$$H$7$^$7$g\e(B
@@ -16907,6 +17270,18 @@ Gnus \e$B$O0lHLE*$J%9%3%"%U%!%$%k$rFCDj$N%9%3%"%U%!%$%k8~$1$N$b$N$h$jA0$KE,\e(B
 \e$B$O\e(B @code{regexp}, @code{exact}, @code{word} \e$B7?$NC;=L7A$G!"$b$7$=$&$7$?$$\e(B
 \e$B$H;W$($P$3$A$i$rBe$o$j$K;H$&;v$,$G$-$^$9!#\e(B
 
+@item Extra
+\e$BI8=`$N\e(B overview \e$B%X%C%@!<$NJ8;zNs$HF1MM!"\e(B@code{gnus-extra-headers} \e$B$r;H$C\e(B
+\e$B$F$$$k$H!"$=$l$i$N%X%C%@!<$NCM$K%9%3%"$rIU$1$k$3$H$,$G$-$^$9!#$3$N>l9g%9\e(B
+\e$B%3%"EPO?$N\e(B 5 \e$BHVL\$NMWAG$,%9%3%"$rIU$1$k%X%C%@!<$NL>A0$K$J$j$^$9!#\e(B
+@sc{nntp} \e$B%5!<%P!<$,\e(B overview \e$B$K\e(B NNTP-Posting-Host \e$B$r5-O?$7$F$$$k$J$i$P!"\e(B
+@file{all.SCORE} \e$B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+$i%9%Q%`$N967b$,\e(B
+\e$B$"$k>l9g$KM-8z$G$9!#\e(B
+
+@lisp
+("111.222.333.444" -1000 nil s "NNTP-Posting-Host")
+@end lisp
+
 @item Lines, Chars
 \e$B$3$l$i$NFs$D$N%X%C%@!<$O0c$C$?9gCW$N7?$r;H$$$^$9\e(B: @code{<}, @code{>}, @code{=}, @code{>=}, @code{<=} \e$B$G\e(B
 \e$B$9!#\e(B
@@ -17142,16 +17517,16 @@ gnus \e$B$K$O$3$l$i$rA4$F<+F0E*$K\e(B --- \e$B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.\e(B
 @lisp
 (setq gnus-default-adaptive-score-alist
       '((gnus-unread-mark)
-       (gnus-ticked-mark (from 4))
-       (gnus-dormant-mark (from 5))
-       (gnus-del-mark (from -4) (subject -1))
-       (gnus-read-mark (from 4) (subject 2))
-       (gnus-expirable-mark (from -1) (subject -1))
-       (gnus-killed-mark (from -1) (subject -3))
-       (gnus-kill-file-mark)
-       (gnus-ancient-mark)
-       (gnus-low-score-mark)
-       (gnus-catchup-mark (from -1) (subject -1))))
+        (gnus-ticked-mark (from 4))
+        (gnus-dormant-mark (from 5))
+        (gnus-del-mark (from -4) (subject -1))
+        (gnus-read-mark (from 4) (subject 2))
+        (gnus-expirable-mark (from -1) (subject -1))
+        (gnus-killed-mark (from -1) (subject -3))
+        (gnus-kill-file-mark)
+        (gnus-ancient-mark)
+        (gnus-low-score-mark)
+        (gnus-catchup-mark (from -1) (subject -1))))
 @end lisp
 
 \e$B8+$F$*J,$+$j$N$h$&$K!"$3$NO"A[%j%9%H$N3FMWAG$O!"%-!<$H$7$F0u\e(B (\e$BJQ?tL>$+$b\e(B
@@ -18720,7 +19095,7 @@ The GNU Emacs Lisp Reference Manual}. XEmacs \e$B$G$O!"%U%l!<%`%W%m%Q%F%#%j\e(B
                      (vertical 0.24
                                (if (buffer-live-p gnus-summary-buffer)
                                    '(summary 0.5))
-                               (group 1.0)))))
+                               (group 1.0))))
 @end lisp
 
 \e$BJ#?t$N%U%l!<%`$X$NNI$/$"$kMWK>$O!"%a!<%k$H%K%e!<%9$N:n@.$K$OJL$N%U%l!<%`\e(B
@@ -19878,8 +20253,21 @@ Gnus \e$B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"\e(B
 
 \e$B$3$l$OITL{2w$G$9!#\e(B
 
-\e$B$3$l$KBP=h$9$kJ}K!$O!"\e(Bgnus \e$B$KA4$F$N\e(B spam \e$B$r\e(B @samp{spam} \e$B%a!<%k%0%k!<%W$K\e(B
-\e$BJ,N%$5$;$F$7$^$&$3$H$G$9\e(B (@pxref{Splitting Mail})\e$B!#\e(B
+@menu
+* Anti-Spam Basics::            \e$B$?$/$5$s$N\e(B spam \e$B$r8:$i$94JC1$JJ}K!\e(B
+* SpamAssassin::                Spam \e$BBP:v%D!<%k$N;H$$J}\e(B
+* Hashcash::                    CPU \e$B;~4V$rHq$d$7$F\e(B spam \e$BB`<#$9$k\e(B
+@end menu
+
+@node Anti-Spam Basics
+@subsection Spam \e$BB`<#$N4pAC\e(B
+@cindex email spam
+@cindex spam
+@cindex UCE
+@cindex unsolicited commercial email
+
+Spam \e$B$KBP=h$9$k0l$D$NJ}K!$O!"\e(Bgnus \e$B$KA4$F$N\e(B spam \e$B$r\e(B @samp{spam} \e$B%a!<%k%0\e(B
+\e$B%k!<%W$KJ,N%$5$;$F$7$^$&$3$H$G$9\e(B (@pxref{Splitting Mail})\e$B!#\e(B
 
 \e$B:G=i$K!"$"$J$?$KE~C#@-$N$"$k@5$7$$%a!<%k%"%I%l%9$r0l$DA*$S!"$=$l$rA4$F$N\e(B
 \e$B$"$J$?$N%K%e!<%95-;v$N\e(B @code{From} \e$B%X%C%@!<$KF~$l$^$9!#\e(B(\e$B$3$3$G$O\e(B
@@ -19914,10 +20302,10 @@ Gnus \e$B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"\e(B
 @samp{spam} \e$B%0%k!<%W$K9T$-$^$9!#\e(B(\e$B$3$N%"%$%G%"$O$*$=$i$/\e(B Tim Pierce \e$B;a$K\e(B
 \e$B$h$k$b$N$G$9!#\e(B)
 
-\e$B$3$l$K2C$($F!"B?$/$N%a!<%k\e(B spam \e$B20$O!"$"$J$?$N$H$3$m$N\e(B @code{smtp} \e$B%5!<\e(B
-\e$B%P!<$HD>@\OC$7!"\e(B@code{To} \e$B%X%C%@!<$K$"$J$?$N%a!<%k%"%I%l%9$,L@<($5$l$J$$\e(B
-\e$B$h$&$K$7$^$9!#$J$s$G$=$s$J$3$H$r$9$k$N$+$O$o$+$j$^$;$s$,\e(B --- \e$B$*$=$i$/;d\e(B
-\e$B$?$A$NN"$r$+$/5!9=$NN"$r$+$/$?$a$+$J\e(B? \e$B$I$A$i$K$7$F$b!"BP=h$O4JC1$J$3$H$G\e(B
+\e$B$3$l$K2C$($F!"B?$/$N%a!<%k\e(B spam \e$B20$O!"$"$J$?$N$H$3$m$N\e(B @sc{smtp} \e$B%5!<%P!<\e(B
+\e$B$HD>@\OC$7!"\e(B@code{To} \e$B%X%C%@!<$K$"$J$?$N%a!<%k%"%I%l%9$,L@<($5$l$J$$$h$&\e(B
+\e$B$K$7$^$9!#$J$s$G$=$s$J$3$H$r$9$k$N$+$O$o$+$j$^$;$s$,\e(B --- \e$B$*$=$i$/;d$?$A\e(B
+\e$B$NN"$r$+$/5!9=$NN"$r$+$/$?$a$+$J\e(B? \e$B$I$A$i$K$7$F$b!"BP=h$O4JC1$J$3$H$G\e(B
 \e$B$9\e(B --- \e$B$"$J$?08$F$G$J$$$b$N$rA4It\e(B @samp{spam} \e$B%0%k!<%W$K$$$l$k$@$1$G$9!#\e(B
 \e$B$3$l$O$*9%$_J,N%5,B'$N:G8e$K$3$s$JIw$KF~$l$k$3$H$G$G$-$^$9!#\e(B
 
@@ -19944,7 +20332,152 @@ Gnus \e$B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"\e(B
 \e$B$3$l$G;d$N$H$3$m$G$OF0$$$F$$$^$9!#$3$l$G$_$s$J$O4JC1$JJ}K!$G;d$KO"Mm$r<h\e(B
 \e$B$k$3$H$,$G$-\e(B (\e$BIaDL$K\e(B @kbd{r} \e$B$r2!$9$@$1$G$G$-$k\e(B)\e$B!";d$O\e(B spam \e$B$KHQ$o$5$l$k\e(B
 \e$B$3$H$OA4$/$"$j$^$;$s!#F@!9>uBV$G$9!#;d$N0U8+$H$7$F$O!"\e(B@code{From} \e$B%X%C%@!<\e(B
-\e$B$K56B$$7$FB8:_$7$J$$%I%a%$%s$KAw$i$;$k$N$O%-%?%J%$$G$9!#\e(B
+\e$B$r56B$$7$FB8:_$7$J$$%I%a%$%s$KAw$i$;$k$N$O%-%?%J%$$G$9!#\e(B
+
+@node SpamAssassin
+@subsection SpamAssassin, Vipul's Razor, DCC, etc
+@cindex SpamAssassin
+@cindex Vipul's Razor
+@cindex DCC
+
+Spam \e$B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(B
+\e$B<u$1<h$C$?$?$/$5$s$N\e(B spam \e$B$r8:$i$9$?$a$NB?$/$NF;6q$,$"$j$^$9!#$3$N9`$O?7\e(B
+\e$B5lCV$-49$($K$h$C$F$9$0$K;~BeCY$l$K$J$C$F$7$^$&$G$7$g$&$,!"9,$$$J$3$H$K$[\e(B
+\e$B$H$s$I$NF;6q$ON`;w$N%$%s%?!<%U%'!<%9$r;}$C$F$$$^$9!#$3$N9`$ONc$H$7\e(B
+\e$B$F\e(B SpamAssassin \e$B$r;H$C$F$$$^$9$,!"B>$N$[$H$s$I$NF;6q$K$b4JC1$KE,9g$9$k$O\e(B
+\e$B$:$G$9!#\e(B
+
+\e$B$b$7$"$J$?$,;H$&F;6q$,%a!<%k%5!<%P!<$K%$%s%9%H!<%k$5$l$F$$$J$$$J$i$P!"$"\e(B
+\e$B$J$?<+?H$,$=$l$r8F$S=P$9I,MW$,$"$j$^$9!#0J2<$K\e(B @code{:postscript} \e$B%a!<%k\e(B
+\e$B%=!<%9;X<(;R\e(B (@pxref{Mail Source Specifiers}) \e$B$r;H$&>l9g$N9M$(J}$r<($7$^\e(B
+\e$B$9!#\e(B
+
+@lisp
+(setq mail-sources
+      '((file :prescript "formail -bs spamassassin < /var/mail/%u")
+        (pop :user "jrl"
+             :server "pophost" 
+             :postscript "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t")))
+@end lisp
+
+\e$B$$$C$?$s%a!<%k$r<u$1$k%9%W!<%k$G!"Nc$($P\e(B spam \e$B$G$"$k$3$H$rI=<($9$k%X%C%@!<\e(B
+\e$B$r%a!<%k$K4^$a$k$h$&$K$7$F!"$=$l$r$U$k$$Mn$H$9=`Hw$r$7$^$9!#;H$&$N$OIaDL\e(B
+\e$B$NJ,3dJ}<0\e(B (@pxref{Splitting Mail}) \e$B$G$9\e(B:
+
+@lisp
+(setq nnmail-split-methods '(("spam"  "^X-Spam-Flag: YES")
+                             ...))
+@end lisp
+
+\e$B$^$?$OFC5iJ,3dJ}<0\e(B (@pxref{Fancy Mail Splitting}) \e$B$G$9\e(B:
+
+@lisp
+(setq nnmail-split-methods 'nnmail-split-fancy
+      nnmail-split-fancy '(| ("X-Spam-Flag" "YES" "spam")
+                             ...))
+@end lisp
+
+\e$B$$$/$i$+$N?M$?$A$O\e(B @code{:prescript} \e$B$r;H$C$F%a!<%k$r$$$m$s$J%W%m%0%i%`\e(B
+\e$B$K%Q%$%W$9$k$3$H$r7y$&$+$b$7$l$^$;$s\e(B (\e$B$b$72?$+$N%W%m%0%i%`$K%P%0$,$"$C$?\e(B
+\e$B$i!"$9$Y$F$N%a!<%k$r<:$C$F$7$^$&$+$b$7$l$^$;$s\e(B)\e$B!#$"$J$?$,$=$l$i$N0l?M$J\e(B
+\e$B$i$P!"JL$N2r$OJ,3d$9$k$H$-$K30It$NF;6q$r8F$V$3$H$G$9!#FC5iJ,3dJ}<0$NNc$G\e(B
+\e$B$9\e(B:
+
+@lisp
+(setq nnmail-split-fancy '(| (: kevin-spamassassin)
+                             ...))
+(defun kevin-spamassassin ()
+  (save-excursion
+    (let ((buf (or (get-buffer " *nnmail incoming*")
+                   (get-buffer " *nnml move*"))))
+      (if (not buf)
+          (progn (message "Oops, cannot find message buffer") nil)
+        (set-buffer buf)
+        (if (eq 1 (call-process-region (point-min) (point-max)
+                                       "spamc" nil nil nil "-c"))
+            "spam")))))
+@end lisp
+
+\e$B0J>e$,$3$l$K4X$9$k$3$H$G$9!#$$$/$D$+$N\e(B spam \e$B$O$I$&$7$F$bAGDL$j$7$F$7$^$&\e(B
+\e$B$N$G!"\e(Bspam \e$B$rFI$`$O$a$K$J$C$?$H$-$K8F$V$?$a$N5$$NMx$$$?4X?t$,M_$7$$$G$7$g\e(B
+\e$B$&!#$3$l$,$=$N5$$NMx$$$?4X?t$G$9\e(B:
+
+@lisp
+ (defun my-gnus-raze-spam ()
+  "Submit SPAM to Vipul's Razor, then mark it as expirable."
+  (interactive)
+  (gnus-summary-show-raw-article)
+  (gnus-summary-save-in-pipe "razor-report -f -d")
+  (gnus-summary-mark-as-expirable 1))
+@end lisp
+
+@node Hashcash
+@subsection Hashcash
+@cindex hashcash
+
+Spam \e$B$H@o$&$?$a$N?7$7$$5;K!$O!"%a%C%;!<%8$rAw?.$9$k:]$K$$$/$P$/$+$NIiC4\e(B
+\e$B$rAw?.<T$K6/$$$^$9!#$3$l$O%$%s%?!<%M%C%HI8=`$N0lIt$G$O$J$$$N$G!"@$3&Cf$N\e(B
+\e$B$9$Y$F$N?M$,$3$N5;K!$r;H$&$3$H$OEv$F$K$G$-$J$$$H$$$&L@$i$+$J7gE@$,$"$j$^\e(B
+\e$B$9$,!">.5,LO$J6&F1BN$G$OLr$KN)$D$G$7$g$&!#\e(B
+
+\e$BA09`$NF;6qN`$,<B:]$K$&$^$/F/$$$?$H$7$F$b!"$=$l$i$O?7$7$$7A<0$N\e(B spam \e$B$,8=\e(B
+\e$B$l$k$?$S$K$7$g$C$A$e$&99?7$+$D@0Hw$5$l$k$3$H$K$h$C$F$N$_F0:n$7$^$9!#$3$N\e(B
+\e$B$3$H$O!">.$5$J%Q!<%;%s%F!<%8$N\e(B spam \e$B$,$$$D$bAGDL$j$7$F$7$^$&$3$H$r0UL#$7\e(B
+\e$B$^$9!#$=$l$O$^$?!"$I$3$+$G$@$l$+$,$=$l$i$NF;6q$r99?7$9$k$?$a$K!"$?$/$5$s\e(B
+\e$B$N\e(B spam \e$B$rFI$^$J$1$l$P$J$i$J$$$3$H$r$b0UL#$7$^$9!#\e(BHashcash \e$B$O$=$l$r2sHr\e(B
+\e$B$7$^$9$,!"Be$o$j$K$"$J$?$,DL?.$9$k$9$Y$F$N?M$?$A$,!"$=$N;EAH$_$r;H$C$F$$\e(B
+\e$B$k$3$H$,I,MW$G$9!#$"$J$?$O<BMQ\e(B (pragmatic) \e$B$H65>r\e(B (dogmatic) \e$B$NFs$D$N<h\e(B
+\e$B$jAH$_$r9M$($k$3$H$,$G$-$^$9!#$=$l$i$N<h$jAH$_$K$OMxE@$b$"$l$PITMx$JE@$b\e(B
+\e$B$"$j$^$9$,!"$=$l$O@$$NCf$G$OIaDL$N$3$H$G!"$=$l$i$rO"78$5$;$?$b$N$,B>$N$P\e(B
+\e$B$i$P$i$J$b$N$h$j6/NO$J$N$G$9!#\e(B
+
+@cindex X-Hashcash
+\e$B!V$$$/$P$/$+$NIiC4!W$H$O\e(B CPU \e$B;~4V$r>CHq$9$k$3$H$G!"6qBNE*$K$O0lDj?t$N%S%C\e(B
+\e$B%H$^$G%O%C%7%e$N>WFM\e(B (hash collision) \e$B$r7W;;$9$k$3$H$G$9!#$=$N7k2L$H$7$F\e(B
+\e$B$N\e(B hashcash \e$B%/%C%-!<$O\e(B @samp{X-Hashcash:} \e$B%X%C%@!<$KA^F~$5$l$^$9!#$b$C$H\e(B
+\e$B>\$7$$$3$H!"$=$7$F$3$N5!G=$r;H$&$?$a$K%$%s%9%H!<%k$9$kI,MW$,$"$k30It%"%W\e(B
+\e$B%j%1!<%7%g%s$N\e(B @code{hashcash} \e$B$K$D$$$F\e(B
+\e$B$O\e(B @uref{http://www.cypherspace.org/~adam/hashcash/} \e$B$r;2>H$7$F2<$5$$!#\e(B
+\e$B$5$i$J$k>pJs$,\e(B @uref{http://www.camram.org/} \e$B$G8+$D$+$k$G$7$g$&!#\e(B
+
+\e$BAw?.$9$k%a%C%;!<%8$N$=$l$>$l$K$D$$$F\e(B hashcash \e$B$r8F$\$&$H;W$&$J$i!"$3$s$J\e(B
+\e$B$U$&$K$7$F2<$5$$\e(B:
+
+@lisp
+(require 'hashcash)
+(add-hook 'message-send-hook 'mail-add-payment)
+@end lisp
+
+@code{hashcash.el} \e$B%i%$%V%i%j\e(B
+\e$B$O\e(B @uref{http://users.actrix.gen.nz/mycroft/hashcash.el} \e$B$+3+H/HG\e(B
+\e$B$N\e(B gnus \e$B$N\e(B contrib \e$B%G%#%l%/%H%j$K$"$j$^$9!#\e(B
+
+\e$B$$$/$D$+$NDI2C$NJQ?t$N@_Dj$b$7$J$1$l$P$J$j$^$;$s\e(B:
+
+@table @code
+@item hashcash-default-payment
+@vindex hashcash-default-payment
+\e$B$3$NJQ?t$O%O%C%7%e$N>WFM$r@.$9%G%#%U%)%k%H$N%S%C%H?t$r<($7$^$9!#5,DjCM\e(B
+\e$B$O\e(B 0 \e$B$G!"2?$b9T$J$o$l$J$$$3$H$r0UL#$7$^$9!#Ds0F$5$l$F$$$kM-8z$JCM\e(B
+\e$B$O\e(B 17 \e$B$+$i\e(B 29 \e$B$^$G$N?t$G$9!#\e(B
+
+@item hashcash-payment-alist
+@vindex hashcash-payment-alist
+\e$B2??M$+$N<u<h?M$O!"$"$J$?$K%G%#%U%)%k%H$h$jB?$/$N\e(B CPU \e$B;~4V$rHq$d$9$3$H$r\e(B
+\e$BMW5a$9$k$+$b$7$l$^$;$s!#$3$NJQ?t$O\e(B @samp{(ADDR AMOUNT)} \e$B$N7A<0$NMWAG$N%j\e(B
+\e$B%9%H$G!"\e(BADDR \e$B$O<u<h?M\e(B (\e$B%a!<%k%"%I%l%9$+%K%e!<%9%0%k!<%W\e(B)\e$B!"\e(BAMOUNT \e$B$OI,MW\e(B
+\e$B$H$5$l$k>WFM$N%S%C%H?t$G$9!#$3$l$O$^$?\e(B @samp{(ADDR STRING AMOUNT)} \e$B$NMW\e(B
+\e$BAG$r;}$D$3$H$b2DG=$G!"\e(BSTRING \e$B$OJ8;zNs\e(B (\e$BDL>o$O%a!<%k%"%I%l%9$+%K%e!<%9%0\e(B
+\e$B%k!<%WL>\e(B) \e$B$H$7$F;H$o$l$^$9!#\e(B
+
+@item hashcash
+@vindex hashcash
+@code{hashcash} \e$B%P%$%J%j$,%$%s%9%H!<%k$5$l$F$$$k>l=j$r<($7$^$9!#\e(B
+@end table
+
+\e$B:#$N$H$3$m\e(B gnus \e$B$K\e(B hashcash \e$B%/%C%-!<$rG'>Z$9$k<jCJ$O$"$j$^$;$s!#$"$J$?$,\e(B
+\e$B<j:n6H$G%a!<%k$r$U$k$$$K$+$1$k%9%/%j%W%H$r%+%9%?%^%$%:$9$k$3$H$,5a$a$i$l\e(B
+\e$B$F$$$^$9!#$7$+$7!"$3$NJ,Ln$K$*$1$k2~NI$OM-MQ$J9W8%$K$J$k$G$7$g$&!#\e(B
 
 @node Various Various
 @section \e$B$$$m$$$m$N$$$m$$$m\e(B
@@ -20126,8 +20659,8 @@ but at the common table.@*
 
 XEmacs \e$B$O%Q%C%1!<%8$N=/=8$H$7$FG[I[$5$l$F$$$^$9!#\e(Bgnus \e$B$N\e(B XEmacs \e$B%Q%C%1!<\e(B
 \e$B%8$,I,MW$H$9$k$b$N$O2?$G$"$l!"$"$J$?$O%$%s%9%H!<%k$9$Y$-$G$9!#:#$N$H$3$m\e(B
-\e$BI,MW$J$N$O\e(B @samp{gnus}\e$B!"\e(B@samp{w3}\e$B!"\e(B@samp{mh-e}\e$B!"\e(B@samp{mailcrypt}\e$B!"\e(B
-@samp{rmail}\e$B!"\e(B@samp{eterm}\e$B!"\e(B@samp{mail-lib}\e$B!"\e(B@samp{xemacs-base} \e$B$*$h$S\e(B
+\e$BI,MW$J$N$O\e(B @samp{gnus}, @samp{w3}, @samp{mh-e}, @samp{mailcrypt},
+@samp{rmail}, @samp{eterm}, @samp{mail-lib}, @samp{xemacs-base} \e$B$*$h$S\e(B
 @samp{fsf-compat} \e$B$G$9!#\e(B
 
 @node History
@@ -20211,13 +20744,13 @@ XEmacs \e$B$O%Q%C%1!<%8$N=/=8$H$7$FG[I[$5$l$F$$$^$9!#\e(Bgnus \e$B$N\e(B XEmacs \e$B%
 @cindex Semi-gnus
 
 Lars \e$B$5$s$,D4@=$7$F%j%j!<%9$7$?\e(B Gnus \e$B$K2C$($F!"F|K\$G$O\e(B Semi-gnus \e$B$N3+H/\e(B
-\e$B$,9T$J$o$l$F$$$^$9!#$3$l$O\e(B SEMI \e$B$H$$$&\e(B MIME \e$B$N5!G=$r<B8=$9$k$?$a$N%i%$%V\e(B
-\e$B%i%j$r;H$&$3$H$rA0Ds$H$7$F$$$^$9!#\e(B
+\e$B$,9T$J$o$l$F$$$^$9!#$3$l$O\e(B @sc{semi} \e$B$H$$$&\e(B @sc{mime} \e$B$N5!G=$r<B8=$9$k$?\e(B
+\e$B$a$N%i%$%V%i%j$r;H$&$3$H$rA0Ds$H$7$F$$$^$9!#\e(B
 
 \e$B$3$l$i$N\e(B gnus \e$B$O\e(B Gnus 5.6 \e$B$H\e(B Pterodactyl Gnus \e$B$r85$K$7$F$$$^$9!#$=$l$i\e(B
 \e$B$O\e(B ``Semi-gnus'' \e$B$HAm>N$5$l!"\e(BT-gnus, Nana-gnus \e$B$*$h$S\e(B Chaos \e$B$N0[$J$C$?7O\e(B
-\e$BE}$,$"$j$^$9!#$3$l$i$O6/NO$J\e(B MIME \e$B$N5!G=$H3F9q8lBP1~$N5!G=$rDs6!$9$k$b$N\e(B
-\e$B$G!"FC$KF|K\?M$N%f!<%6$K$H$C$FBg;v$J$b$N$G$9!#\e(B
+\e$BE}$,$"$j$^$9!#$3$l$i$O6/NO$J\e(B @sc{mime} \e$B$N5!G=$H3F9q8lBP1~$N5!G=$rDs6!$9\e(B
+\e$B$k$b$N$G!"FC$KF|K\?M$N%f!<%6$K$H$C$FBg;v$J$b$N$G$9!#\e(B
 
 @node Why?
 @subsection \e$B$J$<\e(B?
@@ -20358,7 +20891,7 @@ RFC 1036 \e$B$N8e7Q$H$7$F=q$$$F$$$k$b$N$G$9!#%K%e!<%95-;v$NMM<0$KBP$7$F!"$$\e(B
 
 @item MIME - RFC 2045-2049 etc
 @cindex MIME
-MIME \e$B4XO"$N$9$Y$F$N\e(B RFC \e$B$,%5%]!<%H$5$l$F$$$^$9!#\e(B
+@sc{mime} \e$B4XO"$N$9$Y$F$N\e(B RFC \e$B$,%5%]!<%H$5$l$F$$$^$9!#\e(B
 
 @item Disposition Notifications - RFC 2298
 Message Mode \e$B$O<u?.<T$K3+Iu3NG'$rMW5a$9$k$3$H$,$G$-$^$9!#\e(B
@@ -20369,26 +20902,27 @@ Message Mode \e$B$O<u?.<T$K3+Iu3NG'$rMW5a$9$k$3$H$,$G$-$^$9!#\e(B
 @cindex RFC 2440
 RFC 1991 is the original PGP message specification, published as a
 Information RFC.  RFC 2440 was the follow-up, now called Open PGP, and
-put on the Standards Track.  Both document a non-MIME aware PGP
+put on the Standards Track.  Both document a non-@sc{mime} aware PGP
 format.  Gnus supports both encoding (signing and encryption) and
 decoding (verification and decryption).
 
 @item PGP/MIME - RFC 2015/3156
 RFC 2015 (superceded by 3156 which references RFC 2440 instead of RFC
-1991) describes the MIME-wrapping around the RF 1991/2440 format.
+1991) describes the @sc{mime}-wrapping around the RF 1991/2440 format.
 Gnus supports both encoding and decoding.
 
 @item S/MIME - RFC 2633
-RFC 2633 describes the S/MIME format.
+RFC 2633 describes the @sc{s/mime} format.
 
 @end ignore
 @item IMAP - RFC 1730/2060, RFC 2195, RFC 2086, RFC 2359, RFC 2595, RFC 1731
-RFC 1730 \e$B$O\e(B IMAP \e$B%P!<%8%g%s\e(B 4 \e$B$G!"\e(BRFC 2060 (IMAP 4 \e$B2~Dj\e(B 1) \e$B$GB?>/99?7$5\e(B
-\e$B$l$F$$$^$9!#\e(BRFC 2195 \e$B$O\e(B IMAP \e$B$N\e(B CRAM-MD5 \e$BG'>Z$K$D$$$F=R$Y$F$$$^$9!#\e(BRFC
-2086 \e$B$O\e(B IMAP \e$B$N;HMQ@)8B0lMw\e(B (ACL) \e$B$K$D$$$F=R$Y$F$$$^$9!#\e(BRFC
-2359 \e$B$O\e(B IMAP \e$B$N%W%m%H%3%k$N3HD%$K$D$$$F=R$Y$F$$$^$9!#\e(BRFC 2595 \e$B$O\e(B IMAP \e$B$K\e(B
-\e$B$*$1$kE,@Z$J\e(B TLS \e$B$NE}9g\e(B (STARTTLS) \e$B$K$D$$$F=R$Y$F$$$^$9!#\e(BRFC
-1731 \e$B$O\e(B IMAP \e$B$N\e(B GSSAPI/Kerberos4 \e$B$N<jK!$K$D$$$F=R$Y$F$$$^$9!#\e(B
+RFC 1730 \e$B$O\e(B @sc{imap} \e$B%P!<%8%g%s\e(B 4 \e$B$G!"\e(BRFC 2060 (@sc{imap} 4 \e$B2~Dj\e(B 1) \e$B$G\e(B
+\e$BB?>/99?7$5$l$F$$$^$9!#\e(BRFC 2195 \e$B$O\e(B @sc{imap} \e$B$N\e(B CRAM-MD5 \e$BG'>Z$K$D$$$F=R$Y\e(B
+\e$B$F$$$^$9!#\e(BRFC 2086 \e$B$O\e(B @sc{imap} \e$B$N;HMQ@)8B0lMw\e(B (ACL) \e$B$K$D$$$F=R$Y$F$$$^\e(B
+\e$B$9!#\e(BRFC 2359 \e$B$O\e(B @sc{imap} \e$B$N%W%m%H%3%k$N3HD%$K$D$$$F=R$Y$F$$$^$9!#\e(BRFC
+2595 \e$B$O\e(B @sc{imap} \e$B$K$*$1$kE,@Z$J\e(B TLS \e$B$NE}9g\e(B (STARTTLS) \e$B$K$D$$$F=R$Y$F$$\e(B
+\e$B$^$9!#\e(BRFC 1731 \e$B$O\e(B @sc{imap} \e$B$N\e(B GSSAPI/Kerberos4 \e$B$N<jK!$K$D$$$F=R$Y$F$$$^\e(B
+\e$B$9!#\e(B
 @end table
 
 \e$B>e$K=q$+$l$F$$$kJ8>O$K4X$9$k;v$G!"\e(BGnus \e$B$,$=$l$rK~$?$7$F$$$J$$$h$&$JF0:n\e(B
@@ -20431,7 +20965,7 @@ Meadow 1.00 \e$B0J>e!#\e(B(Mule for Windows \e$B$G$OF0$-$^$;$s!#\e(B)
 Gnus \e$B$OFs$D$NCJ3,$N=[4D$G3+H/$5$l$F$$$^$9!#:G=i$NCJ3,\e(B
 \e$B$O\e(B @samp{ding@@gnus.org} \e$B$G$N$?$/$5$s$N5DO@$,$"$j!"$=$3$GJQ99$d?7$7$$5!\e(B
 \e$BG=$rDs0F$7$^$9!#$3$NCJ3,$O\e(B @dfn{\e$B%"%k%U%!\e(B} \e$BCJ3,$H8F$P$l$^$9!#$H$$$&$N$O!"\e(B
-\e$B$3$NCJ3,$G%j%j!<%9$5$l$?\e(B Gnusae \e$B$O\e(B @dfn{\e$B%"%k%U%!%j%j!<%9\e(B}\e$B!"$b$7$/$O\e(B (\e$BB>\e(B
+\e$B$3$NCJ3,$G%j%j!<%9$5$l$?\e(B Gnusae \e$B$O\e(B @dfn{\e$B%"%k%U%!%j%j!<%9\e(B} \e$B$b$7$/$O\e(B (\e$BB>\e(B
 \e$B$NCDBN$G$O$h$jNI$/;H$o$l$k\e(B) @dfn{\e$B%9%J%C%W%7%g%C%H\e(B} \e$B$H8F$P$l$k$b$N$@$+$i\e(B
 \e$B$G$9!#$3$NCJ3,$G$O!"\e(Bgnus \e$B$OIT0BDj$G$"$k$H9M$($i$l$F$*$j!"0lHL$NMxMQ<T$K\e(B
 \e$B$h$C$F;H$o$l$k$b$N$G$O$"$j$^$;$s!#\e(BGnus \e$B%"%k%U%!%j%j!<%9\e(B
@@ -21464,29 +21998,29 @@ Gnus 5.8 \e$B$N?7$7$$5!G=\e(B:
 @lisp
 (setq mail-sources
       '((directory :path "~/mail/incoming/"
-                  :suffix ".in")))
+                   :suffix ".in")))
 @end lisp
 
 \e$B$b$C$H>\$7$$>pJs$O\e(B info \e$B$N\e(B Select Methods -> Getting Mail -> Mail
 Sources \e$B$GF@$k$3$H$,$G$-$^$9!#\e(B
 
 @item
-Gnus \e$B$O\e(B MIME \e$B$KBP1~$7$?%j!<%@!<$K$J$j$^$7$?!#$3$l$O\e(B Gnus \e$B$NB?$/$NItJ,$K\e(B
-\e$B1F6A$7$F$$$F!"$?$/$5$s$N?7$7$$%3%^%s%I$,DI2C$5$l$F$$$^$9!#>\:Y$O%^%K%e%"\e(B
-\e$B%k$r;2>H$7$F2<$5$$!#\e(B(\e$BLuCm\e(B: T-gnus \e$B$O\e(B SEMI \e$B$*$h$S\e(B FLIM \e$B$N=t5!G=$K4p$E$$$F\e(B
-\e$B$$$^$9!#\e(B)
+Gnus \e$B$O\e(B @sc{mime} \e$B$KBP1~$7$?%j!<%@!<$K$J$j$^$7$?!#$3$l$O\e(B Gnus \e$B$NB?$/$NIt\e(B
+\e$BJ,$K1F6A$7$F$$$F!"$?$/$5$s$N?7$7$$%3%^%s%I$,DI2C$5$l$F$$$^$9!#>\:Y$O%^%K%e\e(B
+\e$B%"%k$r;2>H$7$F2<$5$$!#\e(B(\e$BLuCm\e(B: T-gnus \e$B$O\e(B @sc{semi} \e$B$*$h$S\e(B @sc{flim} \e$B$N=t5!\e(B
+\e$BG=$K4p$E$$$F$$$^$9!#\e(B)
 
 @item
 Gnus \e$B$O$^$?3F9q8lBP1~$K$J$j$^$7$?!#$3$3$G$OMWLs$G$-$J$$$/$i$$$K\e(B Gnus \e$B$N\e(B
 \e$BB?$/$NItJ,$K1F6A$7$F$$$F!"?7$7$$$?$/$5$s$NJQ?t$,DI2C$5$l$F$$$^$9!#\e(B(\e$BLuCm\e(B:
-T-gnus \e$B$O\e(B SEMI \e$B$*$h$S\e(B FLIM \e$B$N=t5!G=$K4p$E$$$F$$$^$9!#\e(B)
+T-gnus \e$B$O\e(B @sc{semi} \e$B$*$h$S\e(B @sc{flim} \e$B$N=t5!G=$K4p$E$$$F$$$^$9!#\e(B)
 
 @item
 @code{gnus-auto-select-first} \e$B$,4X?t$G$"$C$F$b$h$/$J$j$^$7$?!#\e(B
 
 @item
-Summary \e$B%P%C%U%!$H\e(B NOV \e$B%U%!%$%k$K4^$a$kDI2C$N%X%C%@!<$r!"%f!<%6$,7h$a$k\e(B
-\e$B$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#\e(B
+Summary \e$B%P%C%U%!$H\e(B @sc{nov} \e$B%U%!%$%k$K4^$a$kDI2C$N%X%C%@!<$r!"%f!<%6$,7h\e(B
+\e$B$a$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#\e(B
 
 @item
 @code{gnus-article-display-hook} \e$B$,:o=|$5$l$^$7$?!#Be$o$j\e(B
@@ -21502,7 +22036,7 @@ Gnus posting styles \e$B$,:F$S2~Au$5$l$^$7$?!#8=:_$OHyL/$K0c$&5,B'$GF0:n$7$^\e(B
 \e$B>o$KJQ2=$9$k9=@.$rB3$1$^$9!#\e(B
 
 @item
-Gnus \e$B$O\e(B @code{nnimap} \e$B$K$h$C$F\e(B IMAP \e$B%a!<%k$rFI$`$3$H$,$G$-$^$9!#\e(B
+Gnus \e$B$O\e(B @code{nnimap} \e$B$K$h$C$F\e(B @sc{imap} \e$B%a!<%k$rFI$`$3$H$,$G$-$^$9!#\e(B
 @end itemize
 
 @iftex
@@ -21621,7 +22155,7 @@ Gnus \e$B$O%K%e!<%9$H%a!<%k$NN>J}$N$$$m$$$m$J%P%C%/%(%s%I$,M?$($?5-;v$rF@$^\e(B
 @item \e$B4pK\\e(B (native)
 @cindex native
 Gnus \e$B$O$$$D$b0l$D$NJ}K!\e(B (\e$B$H%P%C%/%(%s%I\e(B) \e$B$r%K%e!<%9$rF@$k$?$a$N\e(B @dfn{\e$B4p\e(B
-\e$BK\\e(B}\e$B!"$b$7$/$O=i4|@_Dj\e(B \e$B$H$7$F;H$$$^$9!#\e(B
+\e$BK\\e(B} \e$B$b$7$/$O=i4|@_Dj\e(B \e$B$H$7$F;H$$$^$9!#\e(B
 
 @item \e$B30It\e(B (foreign)
 @cindex foreign
@@ -21782,7 +22316,7 @@ Gnus \e$B$,%0%k!<%W$KF~$k$H!"%0%k!<%W$NA4$F$NL$FI5-;v$N%X%C%@!<$r%P%C%/%(%s\e(B
 @end menu
 
 @node Slow/Expensive Connection
-@subsection \e$BCY$$\e(B/\e$B9b$$\e(B @sc{nntp} \e$B@\B3\e(B
+@subsection \e$BCY$$\e(B/\e$B9b$$\e(B NNTP \e$B@\B3\e(B
 
 \e$B$b$7\e(B Emacs \e$B$r%m!<%+%k$N%^%7%s$G<B9T$7$F$$$F!"Hs>o$K:Y$$@~$N8~$3$&$N%^%7\e(B
 \e$B%s$+$i%K%e!<%9$r<hF@$7$F$$$k$N$G$"$l$P!"\e(Bgnus \e$B$,\e(B @sc{nntp} \e$B%5!<%P!<$+$i<h\e(B
@@ -21838,25 +22372,10 @@ Gnus \e$B$,>o$K35N,%P%C%U%!$rCf?4:F@_Dj$r$9$k$3$H$r6X;_$9$k$?$a$K$3$l\e(B
 \e$B$9!#$3$l$OAm$8$F$=$s$J$K8:$i$7$^$;$s!#$3$l$O!"5-;v$r$I$C$A$K$7$mFI$_$?$/\e(B
 \e$B$J$$$H$$$&;v$r7hDj$9$kA0$K!">/$7$NItJ,$7$+8+$kI,MW$,L5$$$H$$$&;v$G$9!#\e(B
 
-@item gnus-threada-hide-subtree
+@item gnus-thread-hide-subtree
 \e$B$3$l$,\e(B @code{nil} \e$B$G$J$1$l$P!"A4$F$N35N,%P%C%U%!$N%9%l%C%I$O=i$a$K1#$5$l\e(B
 \e$B$^$9!#\e(B
 
-\e$B$3$l$O=R8l;X<(;R$G$"$k$3$H$b$G$-$^$9\e(B (@pxref{Predicate Specifiers})\e$B!#Mx\e(B
-\e$BMQ$G$-$k=R8l\e(B
-\e$B$O\e(B @code{gnus-article-unread-p} \e$B$H\e(B @code{gnus-article-unseen-p} \e$B$G$9!#\e(B
-
-\e$B$3$l$ONc$G$9\e(B:
-
-@lisp
-(setq gnus-thread-hide-subtree
-      '(or gnus-article-unread-p
-           gnus-article-unseen-p))
-@end lisp
-
-(\e$B$3$l$O$+$J$j$P$+$2$?Nc$G$9!#$J$<$J$i$9$Y$F$N$^$@FI$^$l$?$3$H$,L5$$5-;v\e(B
-\e$B$OL$FI$G$b$"$k$+$i$J$N$G$9$,!"<g;]$O5b$_<h$C$F2<$5$$!#\e(B)
-
 @item gnus-updated-mode-lines
 \e$B$3$l$,\e(B @code{nil} \e$B$G$"$k$H!"\e(Bgnus \e$B$O%P%C%U%!$N%b!<%I9T$K>pJs$rF~$l$^$;$s\e(B
 \e$B$N$G!";~4V$r@aLs$G$-$k$G$7$g$&!#\e(B
@@ -22223,10 +22742,10 @@ Gnus \e$B$O%0%k!<%WL>$H5-;vHV9f$K$h$C$F$=$l$>$l$N%a%C%;!<%8$rFCDj$7$^$9!#$=\e(B
 \e$B5-;vHV9f\e(B (\e$B$N%j%9%H\e(B) \e$B$@$1$G!"B?$/$N%P%C%/%(%s%I$G$O\e(B @code{Message-ID} \e$B$K\e(B
 \e$B$h$k<hF@$O%5%]!<%H$7$F$$$^$;$s!#$G$b$I$A$i$b%5%]!<%H$7$F$$$/$Y$-$G$7$g$&\e(B
 
-\e$B7k2L$N%G!<%?$O\e(B HEAD \e$B$+\e(B NOV \e$B9T$N$$$:$l$+$G$"$j!"JV5QCM$O$3$l$rH?1G$7\e(B
+\e$B7k2L$N%G!<%?$O\e(B HEAD \e$B$+\e(B @sc{nov} \e$B9T$N$$$:$l$+$G$"$j!"JV5QCM$O$3$l$rH?1G$7\e(B
 \e$B$?\e(B @code{headers} \e$B$+\e(B @code{nov} \e$B$N$$$:$l$+$G$J$/$F$O$J$j$^$;$s!#$3$l$O:#\e(B
-\e$B8e!"\e(BHEAD \e$B$H\e(B NOV \e$B9T$,:.:_$9$k\e(B @code{various} \e$B$K3HD%$5$l$k$+$b$7$l$^$;$s$,!"\e(B
-\e$B8=:_$N\e(B gnus \e$B$G$O%5%]!<%H$5$l$F$$$^$;$s!#\e(B
+\e$B8e!"\e(BHEAD \e$B$H\e(B @sc{nov} \e$B9T$,:.:_$9$k\e(B @code{various} \e$B$K3HD%$5$l$k$+$b$7$l$^\e(B
+\e$B$;$s$,!"8=:_$N\e(B gnus \e$B$G$O%5%]!<%H$5$l$F$$$^$;$s!#\e(B
 
 @var{fetch-old} \e$B$,\e(B @code{nil} \e$B0J30$G$"$l$P!"$"$k0UL#$G$N!VM>J,$J%X%C%@!<!W\e(B
 \e$B$r<hF@$7$h$&$H$7$^$9!#$3$l$ODL>o!"\e(B@code{articles} \e$B$NCf$N:G>.HV9f$N5-;v$h\e(B
@@ -22362,7 +22881,8 @@ field      = <text except TAB>
 \e$B$H$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#$$$/$D$+$N5-;v$O<h$j>C$5$l$F$$$k$+$b$7$l\e(B
 \e$B$^$;$s!#\e(BGnus \e$B$OAm?t$OC1$K<N$F$F$7$^$C$F$$$k$N$G!"\e(B(\e$B$b$7$=$l$,LdBj$H$J$k$H\e(B
 \e$B$-$K\e(B) \e$B@5$7$$CM$r@8@.$9$kLLE]$rIi$&$Y$-$+$I$&$+$O!"FI<T$X$N2]Bj$H$7$F;D$7\e(B
-\e$B$F$"$j$^$9!#\e(B
+\e$B$F$"$j$^$9!#$b$7$=$N%0%k!<%W$K5-;v$,L5$1$l$P!":G>.5-;vHV9f$O\e(B 1\e$B!":GBg\e(B
+\e$B$O\e(B 0 \e$B$H$7$FJs9p$5$l$J$1$l$P$J$j$^$;$s!#\e(B
 
 @example
 group-status = [ error / info ] eol
@@ -22390,7 +22910,8 @@ ifi.discussion 3324 3300 n
 @end example
 
 \e$B3F9T$K$O%0%k!<%WL>$,$"$j!"$=$7$F$=$N%0%k!<%WFb$N:GBg$N5-;vHV9f!":G>.$N5-\e(B
-\e$B;vHV9f!"$=$7$F:G8e$K%U%i%0$G$9!#\e(B
+\e$B;vHV9f!"$=$7$F:G8e$K%U%i%0$G$9!#$b$7$=$N%0%k!<%W$K5-;v$,L5$1$l$P!":G>.5-\e(B
+\e$B;vHV9f$O\e(B 1\e$B!":GBg$O\e(B 0 \e$B$H$7$FJs9p$5$l$J$1$l$P$J$j$^$;$s!#\e(B
 
 @example
 active-file = *active-line
@@ -22558,10 +23079,10 @@ description-buffer = *description-line
 \e$B$O?7$7$$%0%k!<%W$r8+$D$1$k$h$j$b!"3Z$r$7$FA4$F$N%0%k!<%W$N%j%9%H$rJV$9$+\e(B
 \e$B$b$7$l$^$;$s!#$7$+$7%P%C%/%(%s%I$,JV$9B?$/$N%0%k!<%W$KBP$7$F$3$l\e(B (\e$BLuCm\e(B:
 \e$B?7$7$$%0%k!<%W$H$7$F07$&$3$H\e(B) \e$B$r$7$F$O$$$1$^$;$s!#IaDL!"%f!<%6!<<+?H$,:n$C\e(B
-\e$B$?%0%k!<%W$J$i$PB?$9$.$k$3$H$O$J$$$G$7$g$&!#$G$9$+$i\e(B nnml \e$B$H$=$l$KN`$9$k\e(B
-\e$B$b$N$O$?$V$s?4G[$"$j$^$;$s!#$7$+$7\e(B nntp \e$B$N$h$&$J%P%C%/%(%s%I$G$O%0%k!<%W\e(B
-\e$B$O%5!<%P!<$K$h$C$F:n$i$l$F$$$^$9$+$i!"B?$/$N%0%k!<%W$,JV$C$F$/$k$3$H$,$"\e(B
-\e$B$j$($^$9!#\e(B
+\e$B$?%0%k!<%W$J$i$PB?$9$.$k$3$H$O$J$$$G$7$g$&!#$G$9$+$i\e(B @code{nnml} \e$B$H$=$l\e(B
+\e$B$KN`$9$k$b$N$O$?$V$s?4G[$"$j$^$;$s!#$7$+$7\e(B @code{nntp} \e$B$N$h$&$J%P%C%/%(\e(B
+\e$B%s%I$G$O%0%k!<%W$O%5!<%P!<$K$h$C$F:n$i$l$F$$$^$9$+$i!"B?$/$N%0%k!<%W$,JV$C\e(B
+\e$B$F$/$k$3$H$,$"$j$($^$9!#\e(B
 
 @item (nnchoke-request-create-group GROUP &optional SERVER)
 
@@ -22878,9 +23399,10 @@ description-buffer = *description-line
 @node Mail-like Back Ends
 @subsubsection \e$B%a!<%kIw%P%C%/%(%s%I\e(B
 
-\e$B%a!<%k%P%C%/%(%s%I$,$=$NB>$N%P%C%/%(%s%I$KBP$7$F0l@~$r2h$7$F$$$kE@$O!"%a!<\e(B
-\e$B%k%P%C%/%(%s%I$O\e(B @file{nnmail.el} \e$B$NCf$N6&DL4X?t$K6/$/0MB8$7$F$$$k$H$$$&\e(B
-\e$BE@$G$9!#Nc$($P!"\e(B@code{nnml-request-scan} \e$B$NDj5A$O$3$N$h$&$K$J$j$^$9!#\e(B
+\e$B%a!<%k%P%C%/%(%s%I$,$=$NB>$N%P%C%/%(%s%I$KBP$7$F0l@~$r2h$7$F$$$kE@$O!"$[\e(B
+\e$B$H$s$I$N%a!<%k%P%C%/%(%s%I$O\e(B @file{nnmail.el} \e$B$NCf$N6&DL4X?t$K6/$/0MB8$7\e(B
+\e$B$F$$$k$H$$$&E@$G$9!#Nc$($P!"\e(B@code{nnml-request-scan} \e$B$NDj5A$O$3$N$h$&$K\e(B
+\e$B$J$j$^$9!#\e(B
 
 @lisp
 (deffoo nnml-request-scan (&optional group server)