T-gnus 6.16.3 revision 00.
[elisp/gnus.git-] / texi / gnus-ja.texi
index 04f426b..fbb57b2 100644 (file)
@@ -53,6 +53,9 @@
 
 \newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}}
 \newcommand{\gnuscode}[1]{\gnustt{#1}}
+\newcommand{\gnusasis}[1]{\gnustt{#1}}
+\newcommand{\gnusurl}[1]{\gnustt{#1}}
+\newcommand{\gnuscommand}[1]{\gnustt{#1}}
 \newcommand{\gnusenv}[1]{\gnustt{#1}}
 \newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''}
 \newcommand{\gnuslisp}[1]{\gnustt{#1}}
 }
 }{\end{list}}
 
+\newenvironment{asislist}%
+{\begin{list}{}{
+}
+}{\end{list}}
+
 \newenvironment{kbdlist}%
 {\begin{list}{}{
 \labelwidth=0cm
@@ -618,16 +626,13 @@ Reply, Followup and Post
 * Summary Mail Commands::       \e$B%a!<%k$rAw$k\e(B
 * Summary Post Commands::       \e$B%K%e!<%9$rAw$k\e(B
 * Summary Message Commands::    \e$BB>$N%a%C%;!<%84XO"$NL?Na\e(B
-* Canceling and Superseding::   
+* Canceling and Superseding::
 
 Marking Articles
 
 * Unread Articles::             \e$BL$FI5-;v$X$N0u\e(B
 * Read Articles::               \e$B4{FI5-;v$X$N0u\e(B
 * Other Marks::                 \e$B9XFIEY$K1F6A$7$J$$0u\e(B
-
-Marking Articles
-
 * Setting Marks::               \e$B0u$NIU$1J}$H>C$7J}\e(B
 * Generic Mark Commands::       \e$B0u$r$I$N$h$&$K%+%9%?%^%$%:$9$k$+\e(B
 * Setting Process Marks::       \e$B8e$N<B9T$N$?$a$N5-;v$N0u$NIU$1J}\e(B
@@ -682,7 +687,7 @@ Various Summary Stuff
 
 * Summary Group Information::   \e$B>pJs;X8~$NL?Na\e(B
 * Searching for Articles::      \e$BJ#?t5-;vL?Na\e(B
-* Summary Generation Commands::  
+* Summary Generation Commands::
 * Really Various Summary Commands::  \e$B$"$N$d$C$+$$$JB>$KE,9g$7$J$$L?Na\e(B
 
 Article Buffer
@@ -770,7 +775,7 @@ Choosing a Mail Back End
 
 Browsing the Web
 
-* Archiving Mail::              
+* Archiving Mail::
 * Web Searches::                \e$BJ8;zNs$K%^%C%A$9$k5-;v$+$i%0%k!<%W$r:n$k\e(B
 * Slashdot::                    Slashdot \e$B$N%3%a%s%H$rFI$`\e(B
 * Ultimate::                    Ultimate Bulletin Board \e$B%7%9%F%`\e(B
@@ -786,6 +791,7 @@ Browsing the Web
 * Editing IMAP ACLs::           \e$B%a!<%k%\%C%/%9$X$NB>$NMxMQ<T$N;HMQ$r@)8B\e(B/\e$B5v2D$9$k\e(B
 * Expunging mailboxes::         ``\e$B%a!<%k%\%C%/%905=L\e(B'' \e$B%\%?%s$HEy2A$J$b$N\e(B
 * A note on namespaces::        gnus \e$B$G\e(B @acronym{IMAP} \e$BL>A06u4V$r;H$&\e(B(\e$B;H$o$J$$\e(B)\e$BJ}K!\e(B
+* Debugging IMAP::              \e$B$b$N$4$H$,F/$+$J$$$H$-$K$9$k$Y$-$3$H\e(B
 
 Other Sources
 
@@ -843,7 +849,7 @@ Scoring
 
 * Summary Score Commands::      \e$B8=:_$N%0%k!<%W$N$?$a$N%9%3%"EPO?$rDI2C$9$k\e(B
 * Group Score Commands::        \e$B0lHLE*$J%9%3%"L?Na\e(B
-* Score Variables::             \e$B$"$J$?$N%9%3%"$r%+%9%?%^%$%:$9$k\e(B (\e$B$^$!!"$J$s$FMQ8l$G$7$g$&\e(B)
+* Score Variables::             \e$B$"$J$?$N%9%3%"$r%+%9%?%^%$%:$9$k\e(B (\e$B$^$!!"$J$s$FMQ8l\e(B (Scoring) \e$B$G$7$g$&\e(B)
 * Score File Format::           \e$B%9%3%"%U%!%$%k$K2?$rF~$l$k$+\e(B
 * Score File Editing::          \e$B<j$G%9%3%"%U%!%$%k$rJT=8$9$k;v$b$G$-$k\e(B
 * Adaptive Scoring::            \e$BBg;P\e(B (Big Sister) Gnus \e$B$O$"$J$?$,2?$rFI$s$@$+CN$C$F$$$k\e(B
@@ -853,7 +859,7 @@ Scoring
 * Scoring Tips::                \e$B$I$&$d$C$F8z2LE*$K%9%3%"$rIU$1$k$+\e(B
 * Reverse Scoring::             \e$B8E$$$b$N$N;R$G$"$k$H$$$&LdBj$OLdBj$G$O$J$$\e(B
 * Global Score Files::          \e$BCO$r$D$+$_!"<*$r@Z$jNv$/%9%3%"%U%!%$%k\e(B
-* Kill Files::                  \e$B$=$l$i$O$^$@$3$3$K$"$j$^$9$,!"L5;k$9$k;v$,$G$-$k\e(B
+* Kill Files::                  \e$B$=$l$i$O$^$@$3$3$K$"$k$,!"L5;k$9$k;v$,$G$-$k\e(B
 * Converting Kill Files::       \e$B>C5n%U%!%$%k$r%9%3%"%U%!%$%k$KJQ49$9$k\e(B
 * GroupLens::                   \e$B$I$l$rFI$`$N$,9%$-$+$NM=8@$rF@$k\e(B
 * Advanced Scoring::            \e$B%9%3%"$NK!B'$r:n$k$?$a$KO@M}I=8=$r;H$&\e(B
@@ -907,9 +913,10 @@ Formatting Variables
 
 Image Enhancements
 
-* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
-* Smileys::                     \e$BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!\e(B
 * X-Face::                      \e$B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k\e(B
+* Face::                        \e$B$h$j%U%!%s%-!<$G$A$C$A$c$J%+%i!<$N3($rI=<($9$k\e(B
+* Smileys::                     \e$BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!\e(B
+* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
 * XVarious::                    \e$B$=$NB>$N\e(B XEmacs \e$B$G\e(B Gnus \e$B$JJQ?t\e(B
 
 Thwarting Email Spam
@@ -918,8 +925,28 @@ 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
-* Filtering Spam Using The Spam ELisp Package::  
-* Filtering Spam Using Statistics with spam-stat::  
+* Filtering Spam Using The Spam ELisp Package::
+* Filtering Spam Using Statistics with spam-stat::
+
+Filtering Spam Using The Spam ELisp Package
+
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the spam elisp package::
+
+Filtering Spam Using Statistics with spam-stat
+
+* Creating a spam-stat dictionary::
+* Splitting mail using spam-stat::
+* Low-level interface to the spam-stat dictionary::
 
 Appendices
 
@@ -1100,7 +1127,7 @@ gnus \e$B$O\e(B @code{gnus-secondary-servers} \e$B%j%9%H\e(B (\e$B$b$7B8:_$9$k$J$i$P\e
 \e$BNa$r;H$&$3$H$NJ}$,NI$$$G$7$g$&!#$=$l$O!"A*Br2DG=$J%0%k!<%W$rI=<($7!"$=$N\e(B
 \e$BCf$+$i$I$l$G$b9%$-$J$b$N$r9XFI$9$k$3$H$,$G$-$^$9!#$3$l\e(B
 \e$B$O\e(B @file{.newsrc} \e$B$NJ];}$r$:$C$H$d$j$d$9$/$7$^$9!#\e(B
-@xref{Foreign Groups, \e$B30It%0%k!<%W\e(B}\e$B!#\e(B
+@xref{Foreign Groups, \e$B30It%0%k!<%W\e(B}.
 
 @vindex gnus-secondary-select-methods
 @c @head
@@ -1167,7 +1194,7 @@ 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$r;H$&$3$H$,$G$-$^$9!#5^$$$G$$$k$H$-$K$b$T$C$?$j$G$7$g$&!#$3$NL?Na$OK\Mh\e(B
 \e$B$N%5!<%P!<$K$O@\B3$7$^$;$s!=!=$=$NBe$o$j$K!"%l%Y%k\e(B 1 \e$B$H\e(B 2 \e$B$K$"$k$9$Y$F$N\e(B
 \e$B%0%k!<%W$r3hF0>uBV$K$7$^$9\e(B (\e$B4pK\%0%k!<%W$G$J$$%0%k!<%W$O$=$NFs$D$N%l%Y%k\e(B
-\e$B$K$7$F$*$/$N$,K>$^$7$$$G$7$g$&\e(B)\e$B!#\e(B@pxref{Group Levels} \e$B$b;2>H$7$F2<$5$$!#\e(B
+\e$B$K$7$F$*$/$N$,K>$^$7$$$G$7$g$&\e(B)\e$B!#\e(B@ref{Group Levels} \e$B$b;2>H$7$F2<$5$$!#\e(B
 
 @node Slave Gnusae
 @section gnus \e$B$r%9%l!<%V$K$9$k\e(B
@@ -1594,8 +1621,7 @@ Gnus \e$B$O5/F0$7$?$H$-$d!"<B:]$K?7$7$$5-;v$,E~Ce$7$F$$$k$+$r7hDj$7$h$&$H$9\e(B
 \e$B$K56$NL>A0$r;}$D%0%k!<%W$rGS=|$9$k$?$a$K;H$o$l$F$-$^$7$?$,!"6=L#$NL5$$%0\e(B
 \e$B%k!<%W$N3,AX$rL5;k$9$k$?$a$K;H$&$3$H$b$G$-$^$9!#$7$+$7!"$3$l$O$*4+$a$G$-\e(B
 \e$B$^$;$s!#K\Ev$N$3$H$r8@$&$H!"A4$/;?@.$G$-$^$;$s!#Be$o$j$K!"$=$N$h$&$JMQES\e(B
-\e$B$KMQ$$$i$l$kJQ?t$N35N,$rCN$k$?$a$K!"\e(B@pxref{New Groups} \e$B$r;2>H$7$F$/$@$5\e(B
-\e$B$$!#\e(B
+\e$B$KMQ$$$i$l$kJQ?t$N35N,$rCN$k$?$a$K!"\e(B@ref{New Groups} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 @c This variable is
 @c @code{nil} by default, and will slow down active file handling somewhat
@@ -1796,12 +1822,12 @@ Gnus \e$B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$K<B9T$5$l$k%U%C%/$G$9!#\e(B
 \e$B$3$N7A<0$O\e(B @code{gnus-group-line-format} \e$BJQ?t$r$$$8$k$3$H$G!"$I$s$JIw$K\e(B
 \e$B$G$bJQ$($i$l$^$9!#$3$NJQ?t$O\e(B @code{format} \e$B$N;EMMIw$KF0:n$7$^$9!#$D$^\e(B
 \e$B$j\e(B (\e$B$"$N%/%=\e(B) C \e$B8@8l$r;H$&?M$?$A$N$?$a!"\e(Bprintf \e$B$N;EMM$H$[$\F1$8$G$9!#\e(B
-@xref{Formatting Variables}
+@xref{Formatting Variables}.
 
 @samp{%M%S%5y:%B%(%g%)\n} \e$B$H$$$&CM$G>e5-$N9T$r@8@.$7$^$9!#\e(B
 
 \e$B%3%m%s$O!"$3$N9T$NCf$KI,$:L5$/$F$O$$$1$^$;$s!#%+!<%=%k$O!"2?$+$NA`:n$r$7\e(B
-\e$B$?8e$O>o$K%3%m%s$N$H$3$m$K0\F0$9$k$+$i$G$9!#\e(B@xref{Positioning Point}\e$B!#B>\e(B
+\e$B$?8e$O>o$K%3%m%s$N$H$3$m$K0\F0$9$k$+$i$G$9!#\e(B@xref{Positioning Point}. \e$BB>\e(B
 \e$B$K$O2?$bI,MW$G$O$"$j$^$;$s!=!=%0%k!<%WL>$5$($b$G$9!#I=<($5$l$F$$$kJ8;z$O\e(B
 \e$BA4$F$?$@$N2hLL$N>~$j$G$"$j!"\e(Bgnus \e$B$,$=$l$rD4$Y$k$3$H$O$"$j$^$;$s!#\e(BGnus \e$B$O\e(B
 \e$BI,MW$H$9$kA4$F$N<B>pJs$r!"%F%-%9%HB0@-$r;H$C$F21$($F$$$^$9!#\e(B
@@ -1979,7 +2005,7 @@ Gnus \e$B$O\e(B @code{gnus-user-format-function-}@samp{X} \e$B4X?t$r8F$S=P$7$^$9!#$
         (t . my-group-face-5)))
 @end lisp
 
-@pxref{Faces and Fonts} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
+@ref{Faces and Fonts} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
 
 \e$B$3$N\e(B form \e$B$,I>2A$5$l$k$H$-$KF0E*$KB+G{$5$l$F$$$kJQ?t$K$O0J2<$N$b$N$,$"$j\e(B
 \e$B$^$9!#\e(B
@@ -2155,9 +2181,9 @@ Gnus \e$B$O\e(B @code{gnus-user-format-function-}@samp{X} \e$B4X?t$r8F$S=P$7$^$9!#$
 \e$B$r\e(B gnus \e$B$KM?$($^$9!#\e(B@code{nil} \e$B$@$C$?$i!"$I$N%0%k!<%W$bBg$-$$$H9M$($^$;\e(B
 \e$B$s!#%G%#%U%)%k%HCM$O\e(B 200 \e$B$G$9!#%0%k!<%W$K\e(B (\e$BL$FI$H0uIU$-$N\e(B) \e$B5-;v$,$3$N?t\e(B
 \e$B0J>e$"$l$P!"\e(Bgnus \e$B$O$=$N%0%k!<%W$KF~$kA0$KMxMQ<T$K3NG'$r5a$a$^$9!#MxMQ<T\e(B
-\e$B$O%5!<%P$+$i$$$/$D$N5-;v$r<hF@$9$k$+$r;XDj$G$-$^$9!#$b$7MxMQ<T$,Ii$N?t\e(B
-(@var{-n}) \e$B$r;XDj$9$l$P!"8E$$J}$+$i\e(B @var{n} \e$B8D$N5-;v$r<hF@$7$^$9!#@5$N?t\e(B
-\e$B$G$"$l$P!"?7$7$/E~Ce$7$?J}$+$i\e(B @var{n} \e$B8D$N5-;v$r<hF@$7$^$9!#\e(B
+\e$B$O%5!<%P$+$i$$$/$D$N5-;v$r<hF@$9$k$+$r;XDj$G$-$^$9!#$b$7MxMQ<T$,Ii$N\e(B
+\e$B?t\e(B (@var{-n}) \e$B$r;XDj$9$l$P!"8E$$J}$+$i\e(B @var{n} \e$B8D$N5-;v$r<hF@$7$^$9!#@5\e(B
+\e$B$N?t$G$"$l$P!"?7$7$/E~Ce$7$?J}$+$i\e(B @var{n} \e$B8D$N5-;v$r<hF@$7$^$9!#\e(B
 
 @vindex gnus-large-ephemeral-newsgroup
 @code{gnus-large-ephemeral-newsgroup} \e$B$O\e(B @code{gnus-large-newsgroup} \e$B$H\e(B
@@ -2507,8 +2533,8 @@ Gnus \e$B$ODL>o!"\e(B@code{gnus-activate-level} \e$B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @cindex making groups
 \e$B?7$7$$%0%k!<%W$r:n@.$7$^$9\e(B (@code{gnus-group-make-group})\e$B!#\e(BGnus \e$B$O%W%m%s\e(B
 \e$B%W%H$rI=<($7$F!"L>A0$HJ}K!$H!">l9g$K$h$C$F$O\e(B @dfn{address} \e$B$NF~NO$r5a$a\e(B
-\e$B$F$-$^$9!#$h$j4JC1$K\e(B @acronym{NNTP} \e$B%0%k!<%W$r9XFI$9$kJ}K!$O!"\e(B
-@pxref{Browse Foreign Server}\e$B!#\e(B
+\e$B$F$-$^$9!#$h$j4JC1$K\e(B @acronym{NNTP} \e$B%0%k!<%W$r9XFI$9$kJ}K!$K$D$$$F$O!"\e(B
+@ref{Browse Foreign Server} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item G n
 @kindex G n (\e$B%0%k!<%W\e(B)
@@ -2617,7 +2643,7 @@ 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{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook},
 @code{oe-dbx} \e$B$*$h$S\e(B @code{mailman} \e$B$G$9!#@\F,<-$J$7$G$3$N%3%^%s%I$r<B9T\e(B
 \e$B$9$k$H!"\e(Bgnus \e$B$O%U%!%$%k%?%$%W$r?dB,$7$^$9!#\e(B
-@xref{Document Groups}\e$B!#\e(B
+@xref{Document Groups}.
 
 @item G u
 @kindex G u (\e$B%0%k!<%W\e(B)
@@ -2643,6 +2669,13 @@ 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^$
 @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 R
+@kindex G R (\e$B%0%k!<%W\e(B)
+@findex gnus-group-make-rss-group
+@acronym{RSS} feed \e$B$K4p$E$/%0%k!<%W$r:n$j$^\e(B
+\e$B$9\e(B (@code{gnus-group-make-rss-group})\e$B!#\e(BURL \e$B$NF~NO$rB%$5$l$^$9!#\e(B
+@xref{RSS}.
+
 @item G DEL
 @kindex G DEL (\e$B%0%k!<%W\e(B)
 @findex gnus-group-delete-group
@@ -2667,16 +2700,16 @@ 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=>$$$^$9!#\e(B
 @end table
 
-\e$B$5$^$6$^$JA*BrJ}K!$K4X$9$k$5$i$J$k>pJs$O\e(B @xref{Select Methods} \e$B$r;2>H$7\e(B
-\e$B$F$/$@$5$$!#\e(B
+\e$B$5$^$6$^$JA*BrJ}K!$K4X$9$k$5$i$J$k>pJs$O\e(B @ref{Select Methods} \e$B$r;2>H$7$F\e(B
+\e$B2<$5$$!#\e(B
 
 @vindex gnus-activate-foreign-newsgroups
 \e$B$b$7\e(B @code{gnus-activate-foreign-newsgroups} \e$B$,@5$N?t$G$"$l$P!"\e(Bgnus \e$B$O5/\e(B
 \e$BF0;~$K!"$3$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N30It%0%k!<%W$rA4$F%A%'%C%/$7$^$9!#\e(B
 \e$B$3$l$OFC$K0c$C$?\e(B @acronym{NNTP} \e$B%5!<%P$+$i$?$/$5$s$N%0%k!<%W$r9XFI$7$F$$\e(B
-\e$B$k>l9g$J$I!"$7$P$i$/;~4V$,$+$+$k$+$b$7$l$^$;$s!#\e(B@pxref{Group Levels} \e$B$b\e(B
-\e$B;2>H$7$F2<$5$$!#\e(B@code{gnus-activate-level} \e$B$b30It%K%e!<%9%0%k!<%W$N3hF0\e(B
-\e$B2=$K1F6A$r5Z$\$7$^$9!#\e(B
+\e$B$k>l9g$J$I!"$7$P$i$/;~4V$,$+$+$k$+$b$7$l$^$;$s!#\e(B@ref{Group Levels} \e$B$b;2\e(B
+\e$B>H$7$F2<$5$$!#\e(B@code{gnus-activate-level} \e$B$b30It%K%e!<%9%0%k!<%W$N3h@-2=\e(B
+\e$B$K1F6A$r5Z$\$7$^$9!#\e(B
 
 @node Group Parameters
 @section \e$B%0%k!<%W%Q%i%a!<%?\e(B
@@ -2742,9 +2775,6 @@ 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<+F0E*$KIU2C$5$l$^$9!#\e(B
 @vindex gnus-add-to-list
 
-\e$B$b$7\e(B @kbd{a} \e$B%3%^%s%I$r%a!<%k%0%k!<%W$G<B9T$7$?$H$-!"\e(B@code{to-list} \e$B%0%k!<\e(B
-\e$B%W%Q%i%a!<%?$,$J$1$l$P!"Aw?.;~$K<+F0E*$KIU2C$5$l$^$9!#\e(B
-
 @findex gnus-mailing-list-mode
 @cindex mail list groups
 \e$B$b$7$3$N%0%k!<%W%Q%i%a!<%?$,@_Dj$5$l$F$$$k$H!"35N,%P%C%U%!$KF~$C$?$H$-\e(B
@@ -2755,16 +2785,22 @@ 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^$
 @anchor{subscribed}
 @item subscribed
 @cindex subscribed
+@cindex Mail-Followup-To
+@findex gnus-find-subscribed-addresses
 \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%@!<$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{Mailing Lists, , Mailing Lists, message, The Message
-Manual}) \e$B$r8+$F2<$5$$!#\e(B
+\e$B@8@.$9$k$?$a$N\e(B (\e$B$[$s$N\e(B) \e$BBh0lJb$G$9!#FsJbL\$O\e(B @file{.gnus.el} \e$B$K0J2<$rF~\e(B
+\e$B$l$k$3$H$G$9!#\e(B
+
+@lisp
+(setq message-subscribed-address-functions
+      '(gnus-find-subscribed-addresses))
+@end lisp
 
-@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
+\e$BMxMQ$G$-$k\e(B MFT \e$BBP1~5!G=$r40A4$K07$&$K$O!"$3$3\e(B (@pxref{Mailing Lists, ,
+Mailing Lists, message-ja, The Message Manual}) \e$B$r8+$F2<$5$$!#\e(B
 
 @item visible
 @cindex visible
@@ -2800,15 +2836,17 @@ Manual}) \e$B$r8+$F2<$5$$!#\e(B
 \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!#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
+\e$BB'$h$j$bM%@h$5$l$^$9\e(B (@pxref{Archived Messages})\e$B!#\e(B
+
+@strong{\e$B7Y9p\e(B}: @code{nntp} (\e$B$^$?$O$=$N<o$N\e(B) \e$B%0%k!<%W$N%Q%i%a!<%?%j%9%H\e(B
+\e$B$K\e(B @code{(gcc-self . t)} \e$B$r2C$($k$3$H$K8zNO$O$"$j$^$;$s!#\e(B@code{nntp} \e$B%5!<\e(B
+\e$B%P!<$O5-;v$r<u$1F~$l$^$;$s!#\e(B
 
 @item auto-expire
 @cindex auto-expire
 \e$B%0%k!<%W%Q%i%a!<%?$K\e(B @code{(auto-expire . t)} \e$B$N$h$&$JMWAG$,$"$l$P!"A4$F\e(B
 \e$B$N4{FI5-;v$O;~8B>C5n$5$l$k$h$&$K0u$rIU$1$i$l$^$9!#B>$NJ}K!$O!"\e(B
-@pxref{Expiring Mail}\e$B!#\e(B
+@xref{Expiring Mail}.
 
 @code{gnus-auto-expirable-newsgroups} \e$B$b;2>H$7$F2<$5$$!#\e(B
 
@@ -2831,6 +2869,11 @@ Manual}) \e$B$r8+$F2<$5$$!#\e(B
 \e$B?t\e(B (\e$B@0?t$G$"$kI,MW$O$J$$\e(B) \e$B$+$b$7$/$O\e(B @code{never} \e$B$+\e(B @code{immediate} \e$B$N\e(B
 \e$B%7%s%\%k$r;XDj$G$-$^$9!#\e(B
 
+@item expiry-target
+@cindex expiry-target
+\e$B;~8B>C5n$5$l$k%a%C%;!<%8$N2L$F$k>l=j!#$3$N%Q%l%a!<%?\e(B
+\e$B$O\e(B @code{nnmail-expiry-target} \e$B$r>e=q$-$7$^$9!#\e(B
+
 @item score-file
 @cindex score file group parameter
 @code{(score-file . "file")} \e$B$N$h$&$JMWAG$O!"\e(B@file{file} \e$B$r8=:_$N%0%k!<\e(B
@@ -2954,10 +2997,10 @@ See also @code{gnus-group-ignored-charsets-alist}.
 \e$B$K\e(B @samp{fileinto "group.name";} \e$B$H$$$&%F%9%H>r7o$rK\BN$K;}$D!"\e(B
 Sieve \e$B$N\e(B @samp{IF} \e$B@)8f9=B$BN$,:n$i$l$^$9!#\e(B
 
-\e$BNc$($P!"$b$7\e(B INBOX.list.sieve \e$B%0%k!<%W$,\e(B @code{(sieve address "sender"
-"sieve-admin@@extundo.com")} \e$B$H$$$&%0%k!<%W%Q%i%a!<%?$r;}$C$F$$$?$J$i$P!"\e(B
-\e$B%0%k!<%W%Q%i%a!<%?$r\e(B Sieve \e$B%9%/%j%W%H$KJQ49$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:
+\e$BNc$($P!"$b$7\e(B @samp{INBOX.list.sieve} \e$B%0%k!<%W$,\e(B @code{(sieve address
+"sender" "sieve-admin@@extundo.com")} \e$B$H$$$&%0%k!<%W%Q%i%a!<%?$r;}$C$F$$\e(B
+\e$B$?$J$i$P!"%0%k!<%W%Q%i%a!<%?$r\e(B Sieve \e$B%9%/%j%W%H$KJQ49$9$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\" @{
@@ -2966,7 +3009,14 @@ if address \"sender\" \"sieve-admin@@extundo.com\" @{
 @end example
 
 Sieve \e$B8@8l$O\e(B RFC 3028 \e$B$G=R$Y$i$l$F$$$^\e(B
-\e$B$9\e(B (@pxref{Top, , Top, sieve, Emacs Sieve})\e$B!#\e(B
+\e$B$9\e(B (@pxref{Top, Emacs Sieve, Top, sieve, Emacs Sieve})\e$B!#\e(B
+
+@item (agent parameters)
+\e$B%(!<%8%'%s%H$r;H$&$h$&$K$7$F$"$k$H!"8D!9$N%0%k!<%W$G%(!<%8%'%s%H$N?6$kIq\e(B
+\e$B$$$r@)8f$9$k$I$N%Q%i%a!<%?$b@_Dj$9$k$3$H$,$G$-$^$9!#%(!<%8%'%s%H%Q%i%a!<\e(B
+\e$B%?$K$D$$$F$O\e(B @ref{Category Syntax} \e$B$r;2>H$7$F2<$5$$!#$?$$$F$$$N%f!<%6$O!"\e(B
+\e$B@_Dj$KMW$9$k6lO+$r:G>.8B$K$9$k$?$a$K!"%(!<%8%'%s%H%+%F%4%j!<$+%0%k!<%W%H\e(B
+\e$B%T%C%/$N$I$A$i$+$G%(!<%8%'%s%H%Q%i%a!<%?$r@_Dj$9$k$3$H$rA*$V$G$7$g$&!#\e(B
 
 @item (@var{variable} @var{form})
 \e$B%0%k!<%W$KF~$k$H$-$K!"$=$N%0%k!<%W%m!<%+%k$NJQ?t$r@_Dj$9$k%0%k!<%W%Q%i%a!<\e(B
@@ -2990,12 +3040,16 @@ 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<h$k$3$H$G$9!#$b$7%K%e!<%9%0%k!<%W\e(B
+
+@example
+nntp+news.gnus.org:gmane.text.docbook.apps
+@end example
+
+\e$B$,!"$9$Y$F$N5-;v$NBjL>$K\e(B @samp{DOC-BOOK-APPS:} \e$B$H$$$&%?%0$r;}$C$F$$$k$J\e(B
+\e$B$i$P!"$=$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?$K\e(B @code{(gnus-list-identifiers
+"DOCBOOK-APPS:")} \e$B$rF~$l$k$3$H$K$h$C$F!"$=$N%0%k!<%W$N35N,%P%C%U%!$KI=<(\e(B
+\e$B$5$l$k5-;v$NBjL>$+$i%?%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
@@ -3591,7 +3645,9 @@ Gnus
 \e$B$K\e(B yank \e$B$5$l$k$3$H$K5$$r$D$1$F$/$@$5$$!#\e(B
 
 \e$B$G$9$+$i!"$"$k%H%T%C%/$r%H%T%C%/$N%j%9%H$N@hF,$K0\F0$9$k$K$O!"C1$K$=$3\e(B
-\e$B$G\e(B @kbd{C-k} \e$B$rC!$-$^$9!#$3$l$O%+%C%H!u%Z!<%9%H$N%+%C%H$KAjEv$7$^$9!#\e(B
+\e$B$G\e(B @kbd{C-k} \e$B$rC!$-$^$9!#$3$l$O%+%C%H!u%Z!<%9%H$N%+%C%H$KAjEv$7$^$9!#$=\e(B
+\e$B$&$7$?$i%+!<%=%k$r%P%C%U%!$N@hF,\e(B (``Gnus'' \e$B%H%T%C%/$N??2<\e(B) \e$B$K0\F0$7$F!"\e(B
+@kbd{C-y} \e$B$rC!$$$F2<$5$$!#$3$l$O%+%C%H!u%Z!<%9%H$N%Z!<%9%H$KAjEv$7$^$9!#\e(B
 \e$B$J$"$s$@!"4JC1$8$c$s!#\e(B
 
 @kbd{C-k} \e$B$H\e(B @kbd{C-y} \e$B$O%H%T%C%/$HF1MM$K%0%k!<%W$K$b;H$($^$9!#$9$J$o$A!"\e(B
@@ -3836,8 +3892,8 @@ Gnus \e$B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^\e(B
 @end table
 
 \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
+\e$B$9!#%0%k!<%W$N%=!<%H$K$D$$$F$N$5$i$J$k>pJs$O\e(B @ref{Sorting Groups} \e$B$r;2>H\e(B
+\e$B$7$F2<$5$$!#\e(B
 
 @node Topic Topology
 @subsection \e$B%H%T%C%/$N0LAj9=B$\e(B
@@ -3888,7 +3944,10 @@ Gnus
 
 \e$B%H%T%C%/Fb$NA4$F$N%0%k!<%W$O%0%k!<%W%Q%i%a!<%?$r!"$=$N?F\e(B (\e$B$H@hAD\e(B) \e$B$N%H%T%C\e(B
 \e$B%/%Q%i%a!<%?$+$i7Q>5$7$^$9!#%0%k!<%W%Q%i%a!<%?$H$7$F@5$7$$$b$N$OA4$F!"%H\e(B
-\e$B%T%C%/%Q%i%a!<%?$H$7$F$b@5$7$$$b$N$G$9\e(B(@pxref{Group Parameters})\e$B!#\e(B
+\e$B%T%C%/%Q%i%a!<%?$H$7$F$b@5$7$$$b$N$G$9\e(B(@pxref{Group Parameters})\e$B!#%(!<%8%'\e(B
+\e$B%s%H$r;H$&$h$&$K$7$F$"$k$H!"$9$Y$F$N%(!<%8%'%s%H%Q%i%a!<%?\e(B (@ref{Category
+Syntax} \e$B$N\e(B Agent Parameters \e$B$r;2>H\e(B (\e$BLuCm\e(B: \e$BI,MW$J$i\e(B Index \e$B$r;H$C$F\e(B)) \e$B$OM-\e(B
+\e$B8z$J%H%T%C%/%Q%i%a!<%?$G$b$"$j$^$9!#\e(B
 
 \e$B$5$i$K!"0J2<$N%Q%i%a!<%?$O%H%T%C%/%Q%i%a!<%?$H$7$F$N$_M-8z$G$9\e(B:
 
@@ -3913,6 +3972,7 @@ Gnus
 \e$B$k$+$bCN$l$J$$$1$I!"$=$l$O$4<+M3$K\e(B)\e$B!#\e(B
 
 @example
+@group
 Gnus
   Emacs
      3: comp.emacs
@@ -3925,6 +3985,7 @@ Gnus
      8: comp.binaries.fractals
     13: comp.sources.unix
    452: alt.sex.emacs
+@end group
 @end example
 
 @samp{Emacs} \e$B%H%T%C%/$O%H%T%C%/%Q%i%a!<\e(B
@@ -3969,7 +4030,7 @@ Gnus
 @kindex ^ (\e$B%0%k!<%W\e(B)
 @findex gnus-group-enter-server-mode
 \e$B%5!<%P%P%C%U%!%b!<%I$KF~$k\e(B (@code{gnus-group-enter-server-mode})\e$B!#\e(B
-@xref{Server Buffer}\e$B!#\e(B
+@xref{Server Buffer}.
 
 @item a
 @kindex a (\e$B%0%k!<%W\e(B)
@@ -3979,7 +4040,7 @@ Gnus
 \e$B%W$KEj9F$7$^$9!#$b$7@\F,<-$,\e(B 1 \e$B$@$C$?$i!"$I$N%0%k!<%W$KEj9F$9$k$+$r?R$M\e(B
 \e$B$^$9!#$3$N4X?t$NL>A0$+$iO"A[$5$l$k$3$H$H$ON"J"$K!"@\F,<-$G%a!<%k%0%k!<%W\e(B
 \e$B$,;XDj$5$l$?>l9g$O!"%K%e!<%9$NBe$o$j$K%a!<%k$NMM<0$,MQ0U$5$l$^$9!#\e(B
-@xref{Composing Messages}\e$B!#\e(B
+@xref{Composing Messages}.
 
 @item m
 @kindex m (\e$B%0%k!<%W\e(B)
@@ -3994,7 +4055,7 @@ Gnus
 @findex gnus-group-news
 \e$B%K%e!<%9$N:n@.$r3+;O$7$^$9\e(B (@code{gnus-group-news})\e$B!#$b$7@\F,<-$,M?$($i\e(B
 \e$B$l$?$i8=:_0LCV$N%0%k!<%W$KEj9F$7$^$9!#$b$7@\F,<-$,\e(B 1 \e$B$@$C$?$i!"$I$N%0%k!<\e(B
-\e$B%W$KEj9F$9$k$+$r?R$M$^$9!#\e(B@xref{Composing Messages}\e$B!#\e(B
+\e$B%W$KEj9F$9$k$+$r?R$M$^$9!#\e(B@xref{Composing Messages}.
 
 \e$B$3$N4X?t$O!"$?$H$(%a!<%k%0%k!<%W$G;H$o$l$?$H$7$F$b!"<B:]$K$O%K%e!<%9$NMM\e(B
 \e$B<0$rMQ0U$7$^$9!#$3$l$O!"%a%C%;!<%8$r<B:]$K$O%M%C%H%o!<%/7PM3$GAw$i$:$K!"\e(B
@@ -4312,7 +4373,7 @@ if address "sender" "owner-ding@@hpc.uh.edu" @{
 @}
 @end example
 
-@xref{Top, ,Top, sieve, Emacs Sieve}.
+@xref{Top, Emacs Sieve, Top, sieve, Emacs Sieve}.
 
 @table @kbd
 @item D g
@@ -4436,7 +4497,7 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$BA`:n$7$?8e$K!"%+!<%=%k$O$$$D$b%3%m%s$+%]%$%s%H0LCV$N%^!<%+!<$N>l=j$K0\F0\e(B
 \e$B$7$^$9!#\e(B(\e$B$b$A$m$s!"$3$NF0:n$rJQ$($k$3$H$,$G$-$J$$$H$7$?$i\e(B Gnus \e$B$K$O$"$k\e(B
 \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$BF0$-$K$J$k$h$&$K!"?7$?$K=q$1$PNI$$$N$G$9!#\e(B) @xref{Positioning Point}.
 
 \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
 
@@ -4447,7 +4508,7 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$B5-;v?t!#\e(B
 @item S
 \e$BI=Bj$NJ8;zNs!#\e(B@code{gnus-list-identifiers} \e$B$N@_Dj$K$h$C$F%a!<%j%s%0%j%9\e(B
-\e$B%H$NI8<1$,:o=|$5$l$^$9!#\e(B@xref{Article Hiding}\e$B!#\e(B
+\e$B%H$NI8<1$,:o=|$5$l$^$9!#\e(B@xref{Article Hiding}.
 @item s
 \e$B%9%l%C%I\e(B (thread) \e$B$N4p5-;v$G$"$k$H$-$+D>A0$N5-;v$,0c$&I=Bj$N$H$-$O$=$NBj\e(B
 \e$BL>$G!"$=$l0J30$O\e(B @code{gnus-summary-same-subject}\e$B!#\e(B
@@ -4539,12 +4600,12 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 @item <
 \e$BFs==0z$/%9%l%C%I%l%Y%k$N6uGr!#\e(B
 @item U
-\e$BL$FI!#\e(B@xref{Read Articles}\e$B!#\e(B
+\e$BL$FI!#\e(B@xref{Read Articles}.
 
 @item R
 \e$B$3$NJ6$i$o$7$$L>A0;XDj;R$O\e(B @dfn{secondary mark} \e$B$K$h$C$FDj5A$5$l$^$9!#$3\e(B
 \e$B$N%^!<%/$O5-;v$,4{$KJVEz:Q$_$N$b$N$+!"%-%c%C%7%e$5$l$?$b$N$+!"$"$k$$$OJ]\e(B
-\e$BB8$5$l$?$b$N$+$rI=$7$^$9!#\e(B@xref{Other Marks}\e$B!#\e(B
+\e$BB8$5$l$?$b$N$+$rI=$7$^$9!#\e(B@xref{Other Marks}.
 
 @item i
 \e$B?t;z$H$7$F$N%9%3%"\e(B (@pxref{Scoring})\e$B!#\e(B
@@ -4584,8 +4645,8 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 @item u
 \e$BMxMQ<TDj5A;XDj;R!#%U%)!<%^%C%HJ8;zNs$NCf$N<!$NJ8;z$,1Q;z$G$"$kI,MW$,$"$j\e(B
 \e$B$^$9!#$3$l$K$h$j\e(B gnus \e$B$O4X\e(B
-\e$B?t\e(B @code{gnus-user-format-function-}@samp{X} \e$B$r8F$S=P$7$^$9$,!"$3$3\e(B
-\e$B$G\e(B @samp{X} \e$B$O\e(B @samp{%U} \e$B$N<!$NJ8;z$G$9!#4X?t$K$O8=:_$N5-;v$N%X%C%@!<$,\e(B
+\e$B?t\e(B @code{gnus-user-format-function-}@var{x} \e$B$r8F$S=P$7$^$9$,!"$3$3\e(B
+\e$B$G\e(B @var{x} \e$B$O\e(B @samp{%u} \e$B$N<!$NJ8;z$G$9!#4X?t$K$O8=:_$N5-;v$N%X%C%@!<$,\e(B
 \e$B0z?t$H$7$FEO$5$l$^$9!#4X?t$OJ8;zNs$rJV$7!"B>$N35N,;XDj$HF1MM$K35N,$KA^F~\e(B
 \e$B$5$l$^$9!#\e(B
 @end table
@@ -4825,7 +4886,7 @@ Gnus \e$B$,<!$N%0%k!<%W$K0\F0$9$k$3$H$r3NG'$r$9$k$?$a$K!"%-!<$r2!$9$3$H$rMW\e(B
 \e$B$9!#$3$NJQ?t$,\e(B @code{almost-quietly} \e$B$G$"$k$H!"%0%k!<%W$N0lHV:G8e$N5-;v\e(B
 \e$B$rFI$s$G$$$?$H$-$K8B$jF1$8$3$H$,5/$3$j$^$9!#:G8e$K!"$b$7$3$NJQ?t\e(B
 \e$B$,\e(B @code{slightly-quietly} \e$B$G$"$k$H!"L?Na\e(B @kbd{Z n} \e$B$O3NG'$r$;$:$K<!$N%0\e(B
-\e$B%k!<%W$K0\$j$^$9!#\e(B@pxref{Group Levels} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
+\e$B%k!<%W$K0\$j$^$9!#\e(B@ref{Group Levels} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
 
 @item gnus-auto-select-same
 @vindex gnus-auto-select-same
@@ -4879,7 +4940,7 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 \e$B$9$G$K5-;v%&%#%s%I%&$r3+$$$F$$$k$H$-$K:FEY\e(B @kbd{SPACE} \e$B$r2!$9$H!"$=$N5-\e(B
 \e$B;v$O%9%/%m!<%k$5$l$^$9!#%K%e!<%9%0%k!<%WA4BN$r\e(B @kbd{SPACE} \e$B$GJXMx$KDLFI\e(B
-\e$B$G$-$^$9!#\e(B@pxref{Paging the Article}\e$B!#\e(B
+\e$B$G$-$^$9!#\e(B@xref{Paging the Article}.
 
 @item G n
 @itemx n
@@ -4952,7 +5013,7 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 @kbd{l} \e$B$,:G=*Fs$D$N5-;v$N4V$r0\F0$9$k$N$KBP$7$F!"$3$l$O9%$-$J$@$1A0$N5-\e(B
 \e$B;v$rMzNr$+$iA*$S=P$9$3$H$,$G$-$kE@$G$9!#2?$i$+$N$3$l$K4X78$7$?$3$H\e(B
 \e$B$O\e(B (\e$B$b$7$3$l$i$NL?Na$r$?$/$5$s;H$&$N$G$"$l$P\e(B)\e$B!"\e(B
-@pxref{Article Backlog} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+@ref{Article Backlog} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 @item G j
 @item j
@@ -5092,7 +5153,7 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 * Summary Mail Commands::       \e$B%a!<%k$rAw$k\e(B
 * Summary Post Commands::       \e$B%K%e!<%9$rAw$k\e(B
 * Summary Message Commands::    \e$BB>$N%a%C%;!<%84XO"$NL?Na\e(B
-* Canceling and Superseding::   
+* Canceling and Superseding::
 @end menu
 
 @node Summary Mail Commands
@@ -5128,7 +5189,8 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 \e$B8=:_$N5-;v$r=q$$$??M$KBP$7$F!"9-$$JVEz\e(B (wide reply) \e$B$r$7$^\e(B
 \e$B$9\e(B (@code{gnus-summary-wide-reply})\e$B!#\e(B@dfn{\e$B9-$$JVEz\e(B} \e$B$H$O%X%C%@!<\e(B
 \e$B$N\e(B @code{To}, @code{From}, (\e$B$b$7$/$O\e(B @code{Reply-to}) \e$B$H\e(B @code{Cc}) \e$B$N$9\e(B
-\e$B$Y$F$N?M$KJVEz$r$9$k$3$H$G$9!#\e(B
+\e$B$Y$F$N?M$KJVEz$r$9$k$3$H$G$9!#\e(B@code{Mail-Followup-To} \e$B$,$"$l$P!"Be$o$j$K\e(B
+\e$B$=$l$,;H$o$l$^$9!#\e(B
 
 @item S W
 @kindex S W (\e$B35N,\e(B)
@@ -5160,7 +5222,7 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 \e$BL5;k$7$^$9\e(B (@code{gnus-summary-reply-broken-reply-to})\e$B!#%a!<%j%s%0%j%9%H\e(B
 \e$B$,$=$N%j%9%H$r;X$9\e(B @code{Reply-To} \e$B$r2a$C$F@_Dj$9$k$?$a$K$3$l$,I,MW$J$N\e(B
 \e$B$G$"$l$P!"$"$J$?$O$?$V$sBe$o$j$K\e(B @code{broken-reply-to} \e$B%0%k!<%W%Q%i%a!<\e(B
-\e$B%?$r@_Dj$7$?$$$H;W$$!"$=$l$OF0:n$9$k$G$7$g$&!#\e(B
+\e$B%?$r@_Dj$9$kI,MW$,$"$j!"$=$l$OF0:n$9$k$G$7$g$&!#\e(B
 
 @item S B R
 @kindex S B R (\e$B35N,\e(B)
@@ -5232,7 +5294,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
 \e$B$N0c$C$?%"%+%&%s%H$K%a!<%k$rE>Aw$7$?$$$H$-$KMQ$$$i$l$^$9!#\e(B(\e$B$b$7$"$J$?\e(B
 \e$B$,\e(B @code{root} \e$B$G$"$j!"\e(B@code{postmaster} \e$B$G$b$"$j!"\e(B
 @code{root} \e$B$K\e(B @code{postmaster} \e$B$X$N%a!<%k$r<u$1<h$C$?>l9g$O!"$=$l\e(B
-\e$B$r\e(B @code{postmaster} \e$B$K$b:FAw$7$?$$$H;W$&$G$7$g$&!#Ca=x$,$J$1$l$P$J$j$^\e(B
+\e$B$r\e(B @code{postmaster} \e$B$K$b:FAw$9$kI,MW$,$"$k$7$g$&!#Ca=x$,$J$1$l$P$J$j$^\e(B
 \e$B$;$s\e(B! (Ordnung 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
@@ -5691,7 +5753,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$*
 
 @item
 @vindex gnus-downloaded-mark
-gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$r;H$C$F$$$k$H$-!"5-;v\e(B
+gnus \e$B%(!<%8%'%s%H\e(B (@pxref{Agent Basics}) \e$B$r;H$C$F$$$k$H$-!"5-;v\e(B
 \e$B$O\e(B unplugged (\e$B%*%U%i%$%s\e(B) \e$B$G8+$k$?$a$K%@%&%s%m!<%I$5$l$F$$$k$+$b$7$l$^$;\e(B
 \e$B$s!#\e(B@samp{%O} \e$B$N;EMM$r;H$C$F$$$k$H!"$=$l$i$N5-;v$K$O$=$N;EMM\e(B
 \e$B$K\e(B @samp{+} \e$B$N0u$,IU$-$^$9!#\e(B(\e$BJQ?t\e(B @code{gnus-downloaded-mark} \e$B$G$I$NJ8;z\e(B
@@ -5699,18 +5761,18 @@ gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$r;H$C$F$$$k$H$-!"5-;v\e(B
 
 @item
 @vindex gnus-undownloaded-mark
-gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$r;H$C$F$$$k$H$-!"$$$/$D$+$N5-;v\e(B
-\e$B$O%@%&%s%m!<%I$5$l$F$$$J$$$+$b$7$l$^$;$s!#\e(BUnplugged (\e$B%*%U%i%$%s\e(B) \e$B$N>uBV\e(B
-\e$B$G$O$=$N$h$&$J5-;v$r8+$k$3$H$,$G$-$^$;$s!#\e(B@samp{%O} \e$B$N;EMM$r;H$C$F$$$k$H!"\e(B
-\e$B$=$l$i$N5-;v$K$O$=$N;EMM$K\e(B @samp{-} \e$B$N0u$,IU$-$^$9!#\e(B(\e$BJQ\e(B
+gnus \e$B%(!<%8%'%s%H\e(B (@pxref{Agent Basics}) \e$B$r;H$C$F$$$k$H$-!"$$$/$D$+$N5-\e(B
+\e$B;v$O%@%&%s%m!<%I$5$l$F$$$J$$$+$b$7$l$^$;$s!#\e(BUnplugged (\e$B%*%U%i%$%s\e(B) \e$B$N>u\e(B
+\e$BBV$G$O$=$N$h$&$J5-;v$r8+$k$3$H$,$G$-$^$;$s!#\e(B@samp{%O} \e$B$N;EMM$r;H$C$F$$$k\e(B
+\e$B$H!"$=$l$i$N5-;v$K$O$=$N;EMM$K\e(B @samp{-} \e$B$N0u$,IU$-$^$9!#\e(B(\e$BJQ\e(B
 \e$B?t\e(B @code{gnus-undownloaded-mark} \e$B$G$I$NJ8;z$r;H$&$+$r@)8f$7$^$9!#\e(B)
 
 @item
 @vindex gnus-downloadable-mark
-gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&%s\e(B
-\e$B%m!<%I$7$^$9$,!"<+F0E*$K%@%&%s%m!<%I$5$l$J$$5-;v$K$b%@%&%s%m!<%I$N$?$a$N\e(B
-\e$BL@<(E*$J0u$rIU$1$k$3$H$O2DG=$G$9!#$=$N$h$&$JL@<(E*$K0u$,IU$1$i$l$?5-;v$K\e(B
-\e$B$O!":G=i$N7e$K\e(B @samp{%} \e$B$N0u$,IU$-$^$9!#\e(B(\e$BJQ\e(B
+gnus \e$B%(!<%8%'%s%H\e(B (@pxref{Agent Basics}) \e$B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&\e(B
+\e$B%s%m!<%I$7$^$9$,!"<+F0E*$K%@%&%s%m!<%I$5$l$J$$5-;v$K$b%@%&%s%m!<%I$N$?$a\e(B
+\e$B$NL@<(E*$J0u$rIU$1$k$3$H$O2DG=$G$9!#$=$N$h$&$JL@<(E*$K0u$,IU$1$i$l$?5-;v\e(B
+\e$B$K$O!":G=i$N7e$K\e(B @samp{%} \e$B$N0u$,IU$-$^$9!#\e(B(\e$BJQ\e(B
 \e$B?t\e(B @code{gnus-downloadable-mark} \e$B$G$I$NJ8;z$r;H$&$+$r@)8f$7$^$9!#\e(B)
 
 @item
@@ -5916,7 +5978,7 @@ gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&%s
 \e$B%W%m%;%90u$O35N,%P%C%U%!!<$K\e(B @code{#} \e$B$H$7$FI=<($5$l!"B>$N%3%^%s%I$G=hM}\e(B
 \e$B$5$;$k5-;v$K0u$rIU$1$k$?$a$K;H$o$l$^$9!#Nc$($P!";M$D$N5-;v$K$K0u$rIU$1$F\e(B
 \e$B$+$i\e(B @kbd{*} \e$B%3%^%s%I$r;H$&$H!"\e(Bgnus \e$B$O$=$l$i;M$D$N5-;v$r%-%c%C%7%e$KF~$l\e(B
-\e$B$^$9!#>\$7$/$O\e(B @pxref{Process/Prefix} \e$B$r$I$&$>!#\e(B
+\e$B$^$9!#>\$7$/$O\e(B @ref{Process/Prefix} \e$B$r$I$&$>!#\e(B
 
 @table @kbd
 @item M P p
@@ -6029,7 +6091,7 @@ gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&%s
 @end table
 
 \e$B$=$7$F!"$I$&$d$C$F5-;v$NK\J8\e(B (body) \e$B$NFbMF$r4p$K%W%m%;%90u$rIU$1$k$+$O!"\e(B
-@pxref{Searching for Articles} \e$B$N\e(B @kbd{&} \e$BL?Na$r;2>H$7$F2<$5$$!#\e(B
+@ref{Searching for Articles} \e$B$N\e(B @kbd{&} \e$BL?Na$r;2>H$7$F2<$5$$!#\e(B
 
 @node Limiting
 @section \e$B@)8B$r$9$k\e(B
@@ -6119,7 +6181,7 @@ gnus \e$B%(!<%8%'%s%H\e(B @pxref{Agent Basics} \e$B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&%s
 @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-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
+\e$B4X$9$k>\:Y$O\e(B @ref{Group Parameters} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item / E
 @itemx M S
@@ -6196,8 +6258,8 @@ Gnus \e$B$O=i4|@_Dj$G5-;v$r%9%l%C%I$K$7$^$9!#\e(B@dfn{\e$B%9%l%C%I$K$9$k\e(B} \e$B$H$
 \e$B$K!"\e(B@code{References} \e$BMs$O$7$P$7$P2u$l$F$$$k$+!";~$K$OC1$K$J$$$H$$$&$3$H\e(B
 \e$B$,$"$j$^$9!#IT;W5D$J%K%e!<%9$NA}?#$,LdBj$rA}$d$7$^$9$N$G!"4n$P$7$$7k2L$r\e(B
 \e$BF@$k$?$a$K$OB>$NH/8+K!$r:NMQ$7$J$1$l$P$J$j$^$;$s!#2a>j$JBP:vK!$OB8:_$7$F\e(B
-\e$B$$$F!"$=$N62$k$Y$->\:Y$O\e(B @pxref{Customizing Threading} \e$B$K>\$7$/=q$$$F$"\e(B
-\e$B$j$^$9!#\e(B
+\e$B$$$F!"$=$N62$k$Y$->\:Y$O\e(B @ref{Customizing Threading} \e$B$K>\$7$/=q$$$F$"$j\e(B
+\e$B$^$9!#\e(B
 
 \e$B$^$:!"35G0$N354Q$G$9\e(B:
 
@@ -6287,7 +6349,7 @@ Gnus \e$B$O?F$N$U$j$r$9$k$_$;$+$1$N35N,9T$r$D$/$j$^$9!#$_$;$+$1$N9T$O$I$NK\\e(B
 \e$B:G=i$NK\Ev$N5-;v$rA*Br$r$9$k$@$1$K$J$j$^$9!#$_$;$+$1$N:,K\$NMM<0$r;XDj\e(B
 \e$B$9$k$?$a$K!"\e(B@code{gnus-summary-dummy-line-format} \e$B$,;H$o$l$^$9!#$3$l$O$?$C\e(B
 \e$B$?0l$D$@$1$N%U%)!<%^%C%H$N;EMM$r<u$1IU$1$^$9\e(B: @samp{S} \e$B$G!"$3$l$O5-;v$N\e(B
-\e$BI=Bj$G$9!#\e(B@xref{Formatting Variables}\e$B!#$?$H$(=8$a$k$b$N$,L5$/$F$b!"$9$Y\e(B
+\e$BI=Bj$G$9!#\e(B@xref{Formatting Variables}. \e$B$?$H$(=8$a$k$b$N$,L5$/$F$b!"$9$Y\e(B
 \e$B$F$N%9%l%C%I$K$_$;$+$1$N:,K\$r;}$?$;$?$$>l9g$O!"\e(B
 @code{gnus-summary-make-false-root-always} \e$B$r\e(B @code{t} \e$B$K@_Dj$7$F2<$5$$!#\e(B
 
@@ -6712,7 +6774,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$
 @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
+@findex gnus-thread-sort-by-most-recent-number
+@findex gnus-thread-sort-by-most-recent-date
 \e$B$b$7%9%l%C%I$N35N,I=<($r;H$C$F$$$k$N$G$"$l$P!"\e(B
 @code{gnus-thread-sort-functions} \e$B$r@_Dj$9$k$3$H$G%9%l%C%I$rJB$SBX$($k$3\e(B
 \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
@@ -7261,8 +7324,8 @@ gnus \e$B$,J]B8$9$k5-;v$N\e(B @code{Archive-name} \e$B9T$rD4$Y$F!"$=$l$r%U%!%$%kL>$
 
 \e$B$3$l$O%U%!%$%kL>$r>/$7$-$l$$$K$9$k4X?t$NNc$G$9!#\e(B
 @samp{nnml:mail.whatever} \e$B$N$h$&$J%a!<%k%0%k!<%W$,$?$/$5$s$"$k$N$G$"$l$P!"\e(B
-\e$BJ]B8$9$k$?$a$N%U%!%$%kL>$r:n$kA0$K$3$l$i$N%0%k!<%WL>$N:G=i$r@Z$jMn$H$7$?\e(B
-\e$B$$$+$b$7$l$^$;$s!#<!$NJ*$O$A$g$&$I$=$l$r$7$^$9\e(B:
+\e$BJ]B8$9$k$?$a$N%U%!%$%kL>$r:n$kA0$K$3$l$i$N%0%k!<%WL>$N:G=i$r@Z$jMn$H$9I,\e(B
+\e$BMW$,$"$k$+$b$7$l$^$;$s!#<!$NJ*$O$^$5$K$=$l$r$7$^$9\e(B:
 
 @lisp
 (defun my-save-name (group)
@@ -7865,8 +7928,8 @@ 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{gnus-emphasis-alist} \e$B$HF1$89=J8$r;H$$$^$9!#\e(B
 @code{highlight-words} \e$B%0%k!<%W%Q%i%a!<%?$r;H$&$3$H$b$G$-$^$9!#\e(B
 
-\e$B5-;v$r<+F0E*$K%U%)%s$HJQ99$5$;$k$?$a$K$O\e(B @xref{Customizing Articles} \e$B$r\e(B
-\e$B;2>H$7$F2<$5$$!#\e(B
+\e$B5-;v$r<+F0E*$K%U%)%s$HJQ99$5$;$k$?$a$K$O\e(B @ref{Customizing Articles} \e$B$r;2\e(B
+\e$B>H$7$F2<$5$$!#\e(B
 
 @node Article Hiding
 @subsection \e$B5-;v$r1#$9\e(B
@@ -8032,9 +8095,9 @@ Gnus \e$B$O$I$3$N0zMQJ8$,1#$5$l$F$$$k$+$r<($9$?$a$K%\%?%s$rIU$12C$(!"J8>O$N\e(B
 \e$B$($l$P!"$=$l$i$O>o$K1#$7$^$9!#\e(B
 
 \e$B0zMQ%+%9%?%^%$%:$N$?$a$NB>$NJQ?t$N>pJs$N$?$a\e(B
-\e$B$K\e(B @pxref{Article Highlighting} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
+\e$B$K\e(B @ref{Article Highlighting} \e$B$b;2>H$7$F$/$@$5$$!#\e(B
 
-\e$B<+F0E*$K5-;v$NMWAG$r1#$9$?$a$NJ}K!$O\e(B @xref{Customizing Articles} \e$B$r;2>H\e(B
+\e$B<+F0E*$K5-;v$NMWAG$r1#$9$?$a$NJ}K!$O\e(B @ref{Customizing Articles} \e$B$r;2>H\e(B
 \e$B$7$F2<$5$$!#\e(B
 
 @node Article Washing
@@ -8051,7 +8114,7 @@ Gnus \e$B$O$I$3$N0zMQJ8$,1#$5$l$F$$$k$+$r<($9$?$a$K%\%?%s$rIU$12C$(!"J8>O$N\e(B
 \e$B$?$V$s!#\e(B
 
 gnus \e$B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-\e(B
-\e$B$O\e(B @xref{Customizing Articles} \e$B$r;2>H$7$F2<$5$$!#\e(B
+\e$B$O\e(B @ref{Customizing Articles} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @table @kbd
 @item C-u g
@@ -8069,7 +8132,7 @@ gnus \e$B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-\e(B
 @findex gnus-summary-stop-page-breaking
 \e$B%Z!<%8$N6h@Z$j$r8=:_$N5-;v$+$i<h$j=|$-$^\e(B
 \e$B$9\e(B (@code{gnus-summary-stop-page-breaking})\e$B!#%Z!<%8$N6h@Z$j$KIU$$$F\e(B
-\e$B$O\e(B @xref{Misc Article} \e$B$r;2>H$7$F2<$5$$!#\e(B
+\e$B$O\e(B @ref{Misc Article} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item W r
 @kindex W r (\e$B35N,\e(B)
@@ -8343,8 +8406,8 @@ Verify a signed (@acronym{PGP}, @acronym{PGP/MIME} or
 \e$B$9\e(B (@code{gnus-article-strip-trailing-space})\e$B!#\e(B
 @end table
 
-\e$B5-;v$N@vBu$r<+F0E*$K$9$k$?$a$NJ}K!$O\e(B @xref{Customizing Articles} \e$B$r;2>H\e(B
-\e$B$7$F2<$5$$!#\e(B
+\e$B5-;v$N@vBu$r<+F0E*$K$9$k$?$a$NJ}K!$O\e(B @ref{Customizing Articles} \e$B$r;2>H$7\e(B
+\e$B$F2<$5$$!#\e(B
 
 @node Article Header
 @subsection \e$B5-;v%X%C%@!<\e(B
@@ -8520,8 +8583,8 @@ Archive Network) \e$B%"!<%+%$%V$N%G%#%l%/%H%j$G$9!#\e(B
 \e$B%^%&%9$N%+!<%=%k$,%\%?%s$N>e$K$"$k$H$-$K;H$o$l$k%U%'%$%9$G$9!#\e(B
 @end table
 
-\e$B5-;v$r<+F0E*$K%\%?%s2=$9$kJ}K!$O\e(B @xref{Customizing Articles} \e$B$r;2>H$7$F\e(B
-\e$B2<$5$$!#\e(B
+\e$B5-;v$r<+F0E*$K%\%?%s2=$9$kJ}K!$O\e(B @ref{Customizing Articles} \e$B$r;2>H$7$F2<\e(B
+\e$B$5$$!#\e(B
 
 @node Article Button Levels
 @subsection Article button levels
@@ -8666,8 +8729,8 @@ 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$G$9!#;d$,?.MQ$G$-$^$;$s$+\e(B? *\e$B$/$9$/$9\e(B(\e$B>P\e(B)*
 @end table
 
-\e$B<+F0E*$K9%$`=q<0$GF|IU$rI=<($9$kJ}K!$O\e(B @xref{Customizing Articles} \e$B$r;2\e(B
-\e$B>H$7$F2<$5$$!#\e(B
+\e$B<+F0E*$K9%$`=q<0$GF|IU$rI=<($9$kJ}K!$O\e(B @ref{Customizing Articles} \e$B$r;2>H\e(B
+\e$B$7$F2<$5$$!#\e(B
 
 @node Article Display
 @subsection Article Display
@@ -8681,12 +8744,15 @@ 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
 @code{X-Face} \e$B%X%C%@!<$O>.$5$JGr9u2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i6!5k$5$l\e(B
 \e$B$^$9\e(B (@pxref{X-Face})\e$B!#\e(B
 
-\e$B0lJ}\e(B Picon \e$B$O$"$J$?<+?H$N%7%9%F%`$K0MB8$7!"\e(Bgnus \e$B$O%X%C%@!<$K%^%C%A$9$k$"\e(B
-\e$B$J$?$N;}$AJ*$rC5$7$F$_$^$9\e(B (@pxref{Picons})\e$B!#\e(B
+@code{Face} \e$B%X%C%@!<$O>.$5$J%+%i!<2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i6!5k$5$l\e(B
+\e$B$^$9\e(B (@pxref{Face})\e$B!#\e(B
 
 \e$B%9%^%$%j!<$O!"?M!9$,%a%C%;!<%8$K;6$i$+$7$?$,$k>.$5$J\e(B @samp{:-)} \e$B%7%s%\%k\e(B
 \e$B$G$9!#\e(B
 
+\e$B0lJ}\e(B Picon \e$B$O$"$J$?<+?H$N%7%9%F%`$K0MB8$7!"\e(Bgnus \e$B$O%X%C%@!<$K%^%C%A$9$k$"\e(B
+\e$B$J$?$N;}$AJ*$rC5$7$F$_$^$9\e(B (@pxref{Picons})\e$B!#\e(B
+
 \e$B$3$l$i$9$Y$F$N5!G=$O%H%0%k$G$9!#$b$7$9$G$K$=$l$i$,B8:_$7$F$$$?$J$i$P!"$=\e(B
 \e$B$l$i$O:o=|$5$l$^$9!#\e(B
 
@@ -8969,11 +9035,10 @@ 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$[$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},
-@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
+@code{nnbabyl}, @code{nnmaildir} \e$B$*$h$S\e(B @code{nnml} \e$B$O$I$N%0%k!<%W$+$i$N\e(B
+\e$B5-;v$b0LCV$rF@$k$3$H$,$G$-$^$9$,!"\e(B@code{nnfolder} \e$B$H\e(B @code{nnimap} \e$B$O8=\e(B
+\e$B:_$N%0%k!<%W$KEj9F$7$?5-;v$N0LCV$7$+F@$k;v$,$G$-$^$;$s!#\e(B(\e$B$=$NB>$N$b$N$O\e(B
+\e$B;~4V$,$+$+$j$9$.$^$9!#\e(B) @code{nnmh} \e$B$G$OA4$/IT2DG=$G$9!#\e(B
 
 @node Alternative Approaches
 @section \e$BBeBX<jCJ\e(B
@@ -9140,7 +9205,7 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 \e$BI=Bj!#\e(B
 @end table
 
-@xref{Formatting Variables}\e$B!#\e(B
+@xref{Formatting Variables}.
 
 \e$BI=<($K4XO"$7$?JQ?t$O\e(B:
 
@@ -9228,7 +9293,7 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
              (article 1.0))))
 @end lisp
 
-@xref{Window Layout}\e$B!#\e(B
+@xref{Window Layout}.
 
 @node Mail Group Commands
 @section \e$B%a!<%k%0%k!<%WL?Na\e(B
@@ -9389,7 +9454,7 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 @menu
 * Summary Group Information::   \e$B>pJs;X8~$NL?Na\e(B
 * Searching for Articles::      \e$BJ#?t5-;vL?Na\e(B
-* Summary Generation Commands::  
+* Summary Generation Commands::
 * Really Various Summary Commands::  \e$B$"$N$d$C$+$$$JB>$KE,9g$7$J$$L?Na\e(B
 @end menu
 
@@ -9477,7 +9542,7 @@ Gnus \e$B$,F1$8\e(B @code{Message-ID} \e$B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$
 @item H f
 @kindex H f (\e$B35N,\e(B)
 @findex gnus-summary-fetch-faq
-@vindex gnus-grou-faq-directory
+@vindex gnus-group-faq-directory
 \e$B8=:_$N%0%k!<%W$N\e(B @acronym{FAQ} (frequently asked questions (\e$BIQHK$K$5$l$k\e(B
 \e$B<ALd\e(B) \e$B$N%j%9%H\e(B) \e$B$r<hF@$7$h$&$H$7$^$9\e(B (@code{gnus-summary-fetch-faq})\e$B!#\e(B
 gnus \e$B$OIaDL$O1s3V%^%7%s$N%G%#%l%/%H%j$G$"\e(B
@@ -9530,8 +9595,8 @@ Gnus \e$B$N\e(B info \e$B$N@a\e(B (node) \e$B$K0\F0$7$^$9\e(B (@code{gnus-info-find-no
 \e$B$b$7%X%C%@!<$,6uJ8;zNs$J$i$P!"5-;vA4BN$rC5$7$^$9!#$b$7@\F,0z?t$rM?$($i$l\e(B
 \e$B$l$P!"Be$o$j$K8e$m8~$-$KC5$7$^$9!#\e(B
 
-\e$BNc$($P\e(B @kbd{& RET \e$BJ8;zNs\e(B #} \e$B$O!"%X%C%@!<$+K\J8$K\e(B @samp{\e$BJ8;zNs\e(B} \e$B$r;}$D$9\e(B
-\e$B$Y$F$N5-;v$K%W%m%;%90u$rIU$1$^$9!#\e(B
+\e$BNc$($P\e(B @kbd{& RET \e$BJ8;zNs\e(B RET #} \e$B$O!"%X%C%@!<$+K\J8$K\e(B @samp{\e$BJ8;zNs\e(B} \e$B$r;}\e(B
+\e$B$D$9$Y$F$N5-;v$K%W%m%;%90u$rIU$1$^$9!#\e(B
 
 @item M-&
 @kindex M-& (\e$B35N,\e(B)
@@ -9626,8 +9691,10 @@ Parameters}) \e$B$rJT=8$7$^$9\e(B (@code{gnus-summary-edit-parameters})\e$B!#\e(B
 
 @table @kbd
 @item Z Z
+@itemx Z Q
 @itemx q
 @kindex Z Z (\e$B35N,\e(B)
+@kindex Z Q (\e$B35N,\e(B)
 @findex q (\e$B35N,\e(B)
 @findex gnus-summary-exit
 @vindex gnus-summary-exit-hook
@@ -9672,7 +9739,9 @@ Parameters}) \e$B$rJT=8$7$^$9\e(B (@code{gnus-summary-edit-parameters})\e$B!#\e(B
 \e$B$9\e(B (@code{gnus-summary-catchup-and-goto-next-group})\e$B!#\e(B
 
 @item Z R
+@itemx C-x C-s
 @kindex Z R (\e$B35N,\e(B)
+@kindex C-x C-s (\e$B35N,\e(B)
 @findex gnus-summary-reselect-current-group
 \e$B8=:_$N%0%k!<%W$r=P$F!"$=$l$+$iF~$jD>$7$^\e(B
 \e$B$9\e(B (@code{gnus-summary-reselect-current-group})\e$B!#$b$7@\F,0z?t$rM?$($i$l\e(B
@@ -9789,7 +9858,7 @@ 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
 
 \e$B$^!"?M@8$O$=$N$h$&$J$b$N$G$9!#\e(B
 
-\e$BBeBX<jCJ$KIU$$$F$O\e(B @pxref{Duplicate Suppression} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+\e$BBeBX<jCJ$KIU$$$F$O\e(B @ref{Duplicate Suppression} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 @node Duplicate Suppression
 @section \e$B=EJ#$NM^@)\e(B
@@ -9894,13 +9963,13 @@ manual (@pxref{Security, ,Security, message, Message Manual}).
 @vindex mm-verify-option
 Option of verifying signed parts.  @code{never}, not verify;
 @code{always}, always verify; @code{known}, only verify known
-protocols. Otherwise, ask user.
+protocols.  Otherwise, ask user.
 
 @item mm-decrypt-option
 @vindex mm-decrypt-option
 Option of decrypting encrypted parts.  @code{never}, no decryption;
 @code{always}, always decrypt; @code{known}, only decrypt known
-protocols. Otherwise, ask user.
+protocols.  Otherwise, ask user.
 
 @item mml1991-use
 @vindex mml1991-use
@@ -10176,7 +10245,7 @@ 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,
 \e$B$K$7$F$*$-!"<~$j$K?M$,$$$J$$;~$r8+7W$i$C$F5-;v%P%C%U%!$K8=$o$l$k%\%?%s$r\e(B
 \e$B2!$7$^$7$g$&!#\e(B
 
-@c Also see @pxref{MIME Commands}.
+@c Also @xref{MIME Commands}.
 
 @node Customizing Articles
 @section \e$B5-;v$N%+%9%?%^%$%:\e(B
@@ -10218,7 +10287,7 @@ 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,
 \e$B:G=i$NMWAG$,J8;zNs$G$J$$%j%9%H$G$9\e(B:
 
 \e$B%j%9%H$O:F5"E*$KI>2A$5$l$^$9!#%j%9%H$N:G=i$NMWAG$O=R8l$G$9!#0J2<$N=R8l$,\e(B
-\e$BG'<1$5$l$^$9\e(B: @code{or}, @code{and}, @code{not}, @code{typep}. \e$B$3$l$,Nc\e(B
+\e$BG'<1$5$l$^$9\e(B: @code{or}, @code{and}, @code{not}, @code{typep}\e$B!#$3$l$,Nc\e(B
 \e$B$G$9\e(B:
 
 @lisp
@@ -10292,10 +10361,14 @@ 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,
 
 @xref{Smileys}.
 
-@item gnus-treat-display-xface (head)
+@item gnus-treat-display-x-face (head)
 
 @xref{X-Face}.
 
+@item gnus-treat-display-face (head)
+
+@xref{Face}.
+
 @item gnus-treat-emphasize (t, head, integer)
 @item gnus-treat-fill-article (t, integer)
 @item gnus-treat-fill-long-lines (t, integer)
@@ -10530,8 +10603,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,
 \e$BEj9F$N$?$a$NL?Na$r$9$k$H!"$"$J$?$O%a%C%;!<%8%P%C%U%!$K0\F0$7$^$9!#\e(B
 \e$B$=$3$G$O!"5-;v$r9%$-$J$h$&$KJT=8$9$k;v$,$G$-$^$9!#\e(B
 \e$B$=$N8e$G\e(B @kbd{C-c C-c} \e$B$r2!$9;v$K$h$C$F!"5-;v$rAw?.$7$^\e(B
-\e$B$9\e(B (@pxref{Top, , Overview, message, Message Manual})\e$B!#5-;v$O$"$J$?$N@_\e(B
-\e$BDj$K4p$E$$$FAw?.$5$l$^$9\e(B (@pxref{Posting Server})\e$B!#\e(B
+\e$B$9\e(B (@pxref{Top, , Overview, message-ja, Message Manual})\e$B!#5-;v$O$"$J$?$N\e(B
+\e$B@_Dj$K4p$E$$$FAw?.$5$l$^$9\e(B (@pxref{Posting Server})\e$B!#\e(B
 
 @menu
 * Mail::                        \e$B%a!<%k$HJVEz\e(B
@@ -10544,8 +10617,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,
 @c * Signing and encrypting::      How to compose secure messages.
 @end menu
 
-\e$BEj9F$9$k$Y$-$G$J$+$C$?5-;v$r:o=|$9$k$?$a$N>pJs$O\e(B @pxref{Canceling and
-Superseding} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+\e$BEj9F$9$k$Y$-$G$J$+$C$?5-;v$r:o=|$9$k$?$a$N>pJs$K$D$$$F\e(B @ref{Canceling
+and Superseding} \e$B$b;2>H$7$F2<$5$$!#\e(B
 
 @node Mail
 @section \e$B%a!<%k\e(B
@@ -10674,14 +10747,15 @@ ISP \e$B$,\e(B @acronym{POP}-before-@acronym{SMTP} \e$B$NG'>Z$rMW5a$7$F$$$k>l9g$KM-
 @vindex gnus-user-agent
 @cindex User-Agent
 
-(\e$BLuCm\e(B: T-gnus \e$B$G$O8=:_$3$NJQ?t$K$h$k@)8f$O5!G=$7$^$;$s!#\e(B) \e$B$3$NJQ?t$O!"$I\e(B
-\e$B$N>pJs$,\e(B User-Agent \e$B%X%C%@!<$KDDNs$5$l$k$+$r@)8f$7$^$9!#$=$l$O<!$N%7%s%\\e(B
-\e$B%k$^$?$OJ8;zNs$N$&$A$N$I$l$+$G$"$k$3$H$,$G$-$^$9\e(B: @code{gnus} (Gnus \e$B$N%P!<\e(B
-\e$B%8%g%s$N$_\e(B)\e$B!"\e(B@code{emacs-gnus} (Emacs \e$B$H\e(B Gnus \e$B$N%P!<%8%g%s$@$1\e(B)\e$B!"\e(B
+\e$B$3$NJQ?t$O!"$I$N>pJs$,\e(B User-Agent \e$B%X%C%@!<$KDDNs$5$l$k$+$r@)8f$7$^$9!#\e(B
+\e$B$=$l$O<!$N%7%s%\%k$^$?$OJ8;zNs$N$&$A$N$I$l$+$G$"$k$3$H$,$G$-$^$9\e(B:
+@code{gnus} (Gnus \e$B$N%P!<%8%g%s$N$_\e(B)\e$B!"\e(B
+@code{emacs-gnus} (Emacs \e$B$H\e(B Gnus \e$B$N%P!<%8%g%s$@$1\e(B)\e$B!"\e(B
 @code{emacs-gnus-config} (@code{emacs-gnus} \e$B$HF1$8!\%7%9%F%`9=@.\e(B)\e$B!"\e(B
-@code{emacs-gnus-type} (@code{emacs-gnus}) \e$B$HF1$8!\%7%9%F%`%?%$%W\e(B)\e$B!"$^$?\e(B
-\e$B$O9%$_$NJ8;zNs!#$3$l$rJ8;zNs$K$9$k$H$-$O!"@5$7$$%U%)!<%^%C%H$K$J$C$F$$$k\e(B
-\e$B$3$H$r3N$+$a$F2<$5$$\e(B (RFC2616 \e$B;2>H\e(B)\e$B!#\e(B
+@code{emacs-gnus-type} (@code{emacs-gnus}) \e$B$HF1$8!\%7%9%F%`%?%$%W\e(B)\e$B!"\e(B
+@code{gnus-mime-edit} (Gnus \e$B$H\e(B MIME Edit \e$B$J$I$N%P!<%8%g%s\e(B)\e$B!"$^$?$O9%$_$N\e(B
+\e$BJ8;zNs!#$3$l$rJ8;zNs$K$9$k$H$-$O!"@5$7$$%U%)!<%^%C%H$K$J$C$F$$$k$3$H$r3N\e(B
+\e$B$+$a$F2<$5$$\e(B (RFC2616 \e$B;2>H\e(B)\e$B!#\e(B
 @end table
 
 \e$B$"$J$?$O<+J,$,Aw$k%a%C%;!<%8$NDV$j$rD4$Y$kI,MW$,$"$k$+$b$7$l$^$;$s!#$b$7\e(B
@@ -10759,9 +10833,8 @@ 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$3$NJQ?t$O<!$N$h$&$J;v$r$9$k$?$a$K;H$o$l$^$9\e(B:
 
-@itemize @bullet
-@item
-\e$BJ8;zNs\e(B
+@table @asis
+@item \e$BJ8;zNs\e(B
 \e$B%a%C%;!<%8$O$=$N%0%k!<%W$KJ]B8$5$l$^$9!#\e(B
 
 \e$B$"$J$?$O%0%k!<%WL>$KA*BrJ}K!$r4^$a$k$3$H$,$G$-$^$9$,!"$=$&$9$k$H$=$N%a%C\e(B
@@ -10773,17 +10846,16 @@ 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=P$F9T$/%a%C%;!<%8$O\e(B @samp{nnfolder+archive:foo} \e$B$KJ]B8$5$l$^$9$,!"$b$7\e(B
 \e$B$"$J$?$,\e(B @code{"nnml:foo"} \e$B$H$$$&CM$r;H$&$H!"\e(B@samp{nnml:foo} \e$B$KJ]B8$5$l\e(B
 \e$B$^$9!#\e(B
-@samp{nnml:foo}.
-@item
-\e$BJ8;zNs$N%j%9%H\e(B
+
+@item \e$BJ8;zNs$N%j%9%H\e(B
 \e$B%a%C%;!<%8$O$=$l$i$NA4$F$N%0%k!<%W$KJ]B8$5$l$^$9!#\e(B
-@item
-\e$B@55,I=8=!"4X?t!"MM<0$NO"A[%j%9%H\e(B
+
+@item \e$B@55,I=8=!"4X?t!"MM<0$NO"A[%j%9%H\e(B
 \e$B%-!<$,!X9gCW!Y$9$k$H!"7k2L$,;H$o$l$^$9!#\e(B
-@item
-@code{nil}
+
+@item @code{nil}
 \e$B%a%C%;!<%8$NJ]B8$O9T$o$l$^$;$s!#$3$l$,%G%#%U%)%k%H$G$9!#\e(B
-@end itemize
+@end table
 
 \e$B;n$7$F$_$^$7$g$&\e(B:
 
@@ -10912,22 +10984,30 @@ 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$,J8;zNs$G$"$l$P!"\e(Bgnus \e$B$O$=$l$r%0%k!<%WL>$K@55,I=8=$H$7$F9gCWA`:n$r9T$$\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-;v\e(B
 \e$B$NCf$+$iL>A0$,9gCW$9$k%X%C%@!<$rC5$7!"$=$l$r@55,I=8=$HHf3S$7$^$9!#9gCW$H\e(B
-\e$B@55,I=8=$OJ8;zNs$G$9!#\e(B(\e$B$3$3$G!"85$N5-;v$H$OJV?.$^$?$O%U%)%m!<%"%C%W$7$h\e(B
-\e$B$&$H$7$F$$$k$b$N$G$9!#JV?.$"$k$$$O%U%)%m!<%"%C%W$r:n@.$7$F$$$J$1$l$P!"9g\e(B
-\e$BCW$9$k$b$N$O2?$b$"$j$^$;$s!#\e(B) \e$B$b$7\e(B @code{\e$B9gCW\e(B} \e$B$,4X?t$N%7%s%\%k$G$"$l$P!"\e(B
-\e$B$=$N4X?t$,0z?tL5$7$G8F$P$l$^$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,\e(B
-\e$B;2>H$5$l$^$9!#$=$l$,%j%9%H$G$"$l$P!"$=$N%j%9%H$,\e(B @code{\e$BI>2A\e(B} \e$B$5$l$^$9!#\e(B
-\e$B$I$N>l9g$G$b!"$3$l$,\e(B @code{nil}\e$B$G$J$$CM$r5"$;$P!"MM<0\e(B
-\e$B$O\e(B @code{\e$B9gCW$7$?\e(B} \e$B$H8@$$$^$9!#\e(B
+\e$B@55,I=8=$OJ8;zNs$G$9!#\e(B(\e$B85$N5-;v$H$OJV?.$^$?$O%U%)%m!<%"%C%W$7$h$&$H$7$F\e(B
+\e$B$$$k$b$N$G$9!#JV?.$"$k$$$O%U%)%m!<%"%C%W$r:n@.$7$F$$$J$1$l$P!"9gCW$9$k$b\e(B
+\e$B$N$O2?$b$"$j$^$;$s!#\e(B) \e$B$b$7\e(B @code{\e$B9gCW\e(B} \e$B$,4X?t$N%7%s%\%k$G$"$l$P!"$=$N4X\e(B
+\e$B?t$,0z?tL5$7$G8F$P$l$^$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,;2>H$5\e(B
+\e$B$l$^$9!#$=$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>l\e(B
+\e$B9g$G$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@$$\e(B
+\e$B$^$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{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$O\e(B @code{(@var{name} @var{value})} \e$B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>$O!"\e(B
+\e$B0J2<$N$I$l$+$G$"$k;v$,$G$-$^$9!#\e(B
+
+@itemize @bullet
+@item @code{signature}
+@item @code{signature-file}
+@item @code{x-face-file}
+@item @code{address}, @code{user-mail-address} \e$B$r>e=q$-$7$^$9\e(B
+@item @code{name}, @code{(user-full-name)} \e$B$r>e=q$-$7$^$9\e(B
+@item @code{body}
+@end itemize
+
+\e$BB0@-L>$OJ8;zNs$^$?$O%7%s%\%k$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$3$l$O%X%C%@!<\e(B
+\e$BL>$H$7$F;H$o$l!"$=$NCM$,5-;v$N%X%C%@!<$KA^F~$5$l$^$9!#$b$7B0@-L>\e(B
+\e$B$,\e(B @code{nil} \e$B$@$C$?$i$=$N%X%C%@!<L>$O:o=|$5$l$^$9!#$b$7B0@-L>\e(B
 \e$B$,\e(B @code{eval} \e$B$@$C$?$i$=$NMM<0$,I>2A$5$l!"7k2L$O<N$F$i$l$^$9!#\e(B
 
 \e$BB0@-CM$OJ8;zNs\e(B (\e$B$=$N$^$^;H$o$l$^$9\e(B)\e$B!"0z?t$NL5$$4X?t\e(B (\e$BJV$jCM$,;H$o$l$^$9\e(B)\e$B!"\e(B
@@ -11132,52 +11212,52 @@ are in reply to encrypted messages.  Gnus offers
 @code{gnus-message-replysignencrypted} (on by default) will sign
 automatically encrypted messages.
 
-Instructing MML to perform security operations on a @acronym{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.
+Instructing @acronym{MML} to perform security operations on a
+@acronym{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
+@kindex C-c C-m s s (Message)
 @findex mml-secure-message-sign-smime
 
 Digitally sign current message using @acronym{S/MIME}.
 
 @item C-c C-m s o
-@kindex C-c C-m s o
+@kindex C-c C-m s o (Message)
 @findex mml-secure-message-sign-pgp
 
 Digitally sign current message using @acronym{PGP}.
 
 @item C-c C-m s p
-@kindex C-c C-m s p
+@kindex C-c C-m s p (Message)
 @findex mml-secure-message-sign-pgp
 
 Digitally sign current message using @acronym{PGP/MIME}.
 
 @item C-c C-m c s
-@kindex C-c C-m c s
+@kindex C-c C-m c s (Message)
 @findex mml-secure-message-encrypt-smime
 
 Digitally encrypt current message using @acronym{S/MIME}.
 
 @item C-c C-m c o
-@kindex C-c C-m c o
+@kindex C-c C-m c o (Message)
 @findex mml-secure-message-encrypt-pgp
 
 Digitally encrypt current message using @acronym{PGP}.
 
 @item C-c C-m c p
-@kindex C-c C-m c p
+@kindex C-c C-m c p (Message)
 @findex mml-secure-message-encrypt-pgpmime
 
 Digitally encrypt current message using @acronym{PGP/MIME}.
 
 @item C-c C-m C-n
-@kindex C-c C-m C-n
+@kindex C-c C-m C-n (Message)
 @findex mml-unsecure-message
-Remove security related MML tags from message.
+Remove security related @acronym{MML} tags from message.
 
 @end table
 
@@ -11468,27 +11548,26 @@ Remove security related MML tags from message.
 \e$B$;$s!#\e(B
 
 \e$B:G=i$K!"?7$7$$%5!<%P!<$rIU$12C$($kI,MW$,$"$j$^$9!#L?Na\e(B @kbd{a} \e$B$,$=$l$r\e(B
-\e$B$7$^$9!#$*$=$i$/%-%c%C%7%e$rFI$`$?$a$K$O\e(B @code{nnspool} \e$B$r;H$&$N$,0lHVNI\e(B
-\e$B$$$G$7$g$&!#\e(B@code{nnml} \e$B$d\e(B @code{nnmh} \e$B$b;H$&;v$,$G$-$^$9$1$I!#\e(B
+\e$B$7$^$9!#$*$=$i$/%-%c%C%7%e$rFI$`$?$a$K$O\e(B @code{nnml} \e$B$r;H$&$N$,0lHVNI$$\e(B
+\e$B$G$7$g$&!#\e(B@code{nnspool} \e$B$d\e(B @code{nnmh} \e$B$b;H$&;v$,$G$-$^$9$1$I!#\e(B
 
-@kbd{a nnspool RET cache RET} \e$B$HBG$C$F$/$@$5$$!#\e(B
+@kbd{a nnml RET cache RET} \e$B$HBG$C$F$/$@$5$$!#\e(B
 
-\e$B$9$k$H\e(B @samp{cache} \e$B$H8F$P$l$k!$\e(B @code{nnspool} \e$B$N;v<B>e$N%5!<%P!<\e(B
-\e$B$,$G$-$k$O$:$G$9!#<!$O$=$l$rJT=8$7$F!"@5$7$$Dj5A$rM?$($k$@$1$G$9!#%5!<%P!<\e(B
-\e$B$rJT=8$9$k$?$a$K\e(B @kbd{e} \e$B$rBG$C$F$/$@$5$$!#0J2<$N$b$N$r4^$`%P%C%U%!$KF~\e(B
-\e$B$k$G$7$g$&!#\e(B
+\e$B$9$k$H\e(B @samp{cache} \e$B$H8F$P$l$k!"\e(B@code{nnml} \e$B$N;v<B>e$N%5!<%P!<$,$G$-$k$O\e(B
+\e$B$:$G$9!#<!$O$=$l$rJT=8$7$F!"@5$7$$Dj5A$rM?$($k$@$1$G$9!#%5!<%P!<$rJT=8$9\e(B
+\e$B$k$?$a$K\e(B @kbd{e} \e$B$rBG$C$F$/$@$5$$!#0J2<$N$b$N$r4^$`%P%C%U%!$KF~$k$G$7$g\e(B
+\e$B$&!#\e(B
 
 @lisp
-(nnspool "cache")
+(nnml "cache")
 @end lisp
 
 \e$B$=$l$r<!$N$b$N$KJQ99$7$F$/$@$5$$\e(B:
 
 @lisp
-(nnspool "cache"
-         (nnspool-spool-directory "~/News/cache/")
-         (nnspool-nov-directory "~/News/cache/")
-         (nnspool-active-file "~/News/cache/active"))
+(nnml "cache"
+      (nnml-directory "~/News/cache/")
+      (nnml-active-file "~/News/cache/active"))
 @end lisp
 
 \e$B%5!<%P!<%P%C%U%!$KLa$k$?$a$K\e(B @kbd{C-c C-c} \e$B$HBG$C$F$/$@$5$$!#:#$d$3$N;v\e(B
@@ -11552,8 +11631,8 @@ Remove security related MML tags from message.
 \e$B$^$;$s!#0lEY\e(B ``connection refused'' (\e$B@\B3$O5qH]$5$l$^$7$?\e(B) \e$B$r<u$1<h$k$H!"\e(B
 \e$B$=$l$O%5!<%P!<$,\e(B ``down'' (\e$BMn$A$F$$$k\e(B) \e$B$G$"$k$H$_$J$7$^$9!#\e(B
 
-\e$B$=$l$G!"0l;~E*$K$=$N%^%7%s$N5!7y$,0-$$$@$1$@$C$?$i2?$,5/$3$k$N$G$7$g$&\e(B?
-\e$B%^%7%s$,I|3h$7$?$+$I$&$+$r$I$&$9$l$PD4$Y$k;v$,$G$-$k$N$G$7$g$&\e(B?
+\e$B$=$l$G!"0l;~E*$K$=$N%^%7%s$N5!7y$,0-$$$@$1$@$C$?$i2?$,5/$3$k$N$G$7$g\e(B
+\e$B$&\e(B? \e$B%^%7%s$,I|3h$7$?$+$I$&$+$r$I$&$9$l$PD4$Y$k;v$,$G$-$k$N$G$7$g$&\e(B?
 
 \e$B%5!<%P!<%P%C%U%!$KHt$S0\$C$F\e(B (@pxref{Server Buffer})\e$B!"0J2<$NL?Na$G$D$D$/\e(B
 \e$B$@$1$G$G$-$^$9\e(B:
@@ -12211,7 +12290,7 @@ 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$=$&$G$O$"$j$^$;$s!#8E$$5-;v$O$$$m$s$J;EAH$_$K$h$C$F\e(B @dfn{expire} \e$B$5$l\e(B
 \e$B$k$N$G$9!#%K%e!<%95-;v$O%K%e!<%9$N4IM}?M\e(B (\e$B$,4IM}$7$F$$$k%5!<%P\e(B) \e$B$K$h$C\e(B
 \e$B$F\e(B expire \e$B$N=hM}$,@)8f$5$l!"%a!<%k$N\e(B expire \e$B$N=hM}$O$"$J$?$,@)8f$7$^$9!#\e(B
-\e$B%a!<%k$N\e(B expire \e$B$K$D$$$F$O\e(B @pxref{Expiring Mail} \e$B$r;2>H$7$F2<$5$$!#\e(B
+\e$B%a!<%k$N\e(B expire \e$B$K$D$$$F$O\e(B @ref{Expiring Mail} \e$B$r;2>H$7$F2<$5$$!#\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
@@ -12285,12 +12364,13 @@ 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$3$l$O\e(B gnus \e$B$G%a!<%k$rFI$`$?$a$K=<J,$G$"$k$O$:$G$9!#%^%K%e%"%k$N$3$NItJ,\e(B
 \e$B$NB>$N9`$r=OFI$9$kI,MW$,$"$k$+$b$7$l$^$;$s$,!#FC\e(B
-\e$B$K\e(B @pxref{Choosing a Mail Back End} \e$B$H\e(B @pxref{Expiring Mail} \e$B$r!#\e(B
+\e$B$K\e(B @ref{Choosing a Mail Back End} \e$B$H\e(B @ref{Expiring Mail} \e$B$r!#\e(B
 
 @node Splitting Mail
 @subsection \e$B%a!<%k$NJ,3d\e(B
 @cindex splitting mail
 @cindex mail splitting
+@cindex mail filtering (splitting)
 
 @vindex nnmail-split-methods
 \e$BJQ?t\e(B @code{nnmail-split-methods} \e$B$OF~$C$F$/$k%a!<%k$r$I$N$h$&$K%0%k!<%W\e(B
@@ -12691,7 +12771,7 @@ Maildir \e$B%a!<%k%=!<%9$NNc$r$U$?$D\e(B:
 \e$B>\$7$/$O\e(B @xref{IMAP} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 Kerberos, GSSAPI, @acronym{TLS}/@acronym{SSL} \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30\e(B
-\e$BIt%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}\e$B!#\e(B
+\e$BIt%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}.
 
 \e$B%-!<%o!<%I\e(B:
 
@@ -12779,9 +12859,9 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 @end lisp
 
 @item webmail
-@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
+@uref{http://www.hotmail.com/}, @uref{http://webmail.netscape.com/},
+@uref{http://www.netaddress.com/}, @uref{http://www.yahoo.com/} \e$B$J$I$N%&%'\e(B
+\e$B%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
 
 \e$BCm\e(B: \e$B%&%'%V%a!<%k$O%/%C%-!<$KBg$-$/0MB8$7$^$9!#\e(Burl "4.0pre.46" \e$B$r;H$&>l9g\e(B
 \e$B$O\e(B "one-line-cookie" \e$B%Q%C%A$rEv$F$kI,MW$,$"$j$^$9!#\e(B
@@ -12843,9 +12923,9 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 @subsubsection \e$B4X?t%$%s%?!<%U%'!<%9\e(B
 
 \e$B>e5-$N$$$/$D$+$N%-!<%o!<%I$O!"<B9T$9$k$?$a$N\e(B Lisp \e$B4X?t$r;XDj$7$^$9!#4X?t\e(B
-\e$B$,<B9T$5$l$F$$$k4V$@$1!"$=$l$>$l$N%-!<%o!<%I\e(B @code{:foo} \e$B$NCM$H$7$F\e(B Lisp
\e$BJQ?t\e(B @code{foo} \e$B$,;H$o$l$^$9!#Nc$($P!"0J2<$N%a!<%k%=!<%9$N@_DjNc$K$D$$\e(B
-\e$B$F9M$($F$_$F2<$5$$!#\e(B
+\e$B$,<B9T$5$l$F$$$k4V$@$1!"$=$l$>$l$N%-!<%o!<%I\e(B @code{:foo} \e$B$NCM$H$7\e(B
+\e$B$F\e(B Lisp \e$BJQ?t\e(B @code{foo} \e$B$,;H$o$l$^$9!#Nc$($P!"0J2<$N%a!<%k%=!<%9$N@_DjNc\e(B
+\e$B$K$D$$$F9M$($F$_$F2<$5$$!#\e(B
 
 @lisp
 (setq mail-sources '((pop :user "jrl"
@@ -13072,16 +13152,15 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 @end lisp
 
 \e$B$3$NJQ?t$O\e(B @dfn{\e$BJ,3d\e(B} \e$B$NMM<0$K$J$C$F$$$^$9!#J,3d$O\e(B (\e$B$"$k$$$O\e(B) \e$B$=$l$>$l$N\e(B
-\e$BJ,3d$,B>$NJ,3d$r4^$`:F5"E*9=B$$G$9!#$3$l$O;HMQ2DG=$J8^$D$NJ,3d9=J8$G$9\e(B:
+\e$BJ,3d$,B>$NJ,3d$r4^$`:F5"E*9=B$$G$9!#$3$l$O;HMQ2DG=$JJ,3d9=J8$G$9\e(B:
 
-@enumerate
+@table @code
 
-@item
-@samp{group}: \e$B$b$7J,3d$,J8;zNs$G$"$k$H!"$=$l$O%0%k!<%WL>$H$7$F$_$J$5$l$^\e(B
-\e$B$9!#IaDL$N@55,I=8=$N9gCW$,$J$5$l$^$9!#Nc$O2<$NJ}$r8+$F2<$5$$!#\e(B
+@item group
+\e$B$b$7J,3d$,J8;zNs$G$"$k$H!"$=$l$O%0%k!<%WL>$H$7$F$_$J$5$l$^$9!#IaDL$N@55,\e(B
+\e$BI=8=$N9gCW$,$J$5$l$^$9!#Nc$O2<$NJ}$r8+$F2<$5$$!#\e(B
 
-@item
-@code{(@var{field} @var{value} @code{[-} @var{restrict} @code{[@dots{}]}@code{]} @var{split})}:
+@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split})
 \e$B$b$7J,3d$,%j%9%H$G!":G=i$NMWAG$,J8;zNs$G$"$j!"%X%C%@!<\e(B @var{field} (\e$B@55,\e(B
 \e$BI=8=\e(B) \e$B$,\e(B @var{value} (\e$B$3$l$b@55,I=8=\e(B) \e$B$r4^$s$G$$$k>l9g!"%a%C%;!<%8\e(B
 \e$B$r\e(B @var{split} \e$B$G;XDj$5$l$?$H$3$m$KC_@Q$7$^$9!#\e(B@var{restrict} (\e$B$^$?B>$N\e(B
@@ -13089,24 +13168,24 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 \e$B$+$NJ8;zNs$K9gCW$7$?$i!"\e(B@var{split} \e$B$OL5;k$5$l$^$9!#\e(B@var{restrict} \e$B$NJD\e(B
 \e$BJq$N$I$l$b$,9gCW$7$J$1$l$P\e(B @var{split} \e$B$,<B9T$5$l$^$9!#\e(B
 
-@item
-@code{(| @var{split}@dots{})}: \e$BJ,3d$,%j%9%H$G!":G=i$NMWAG\e(B
-\e$B$,\e(B @code{|} (\e$B?bD>K@\e(B) \e$B$G$"$k$H!"$=$l$>$l$N\e(B @var{split} \e$B$r$=$N$&$A$N0l$D$,\e(B
-\e$B9gCW$9$k$^$G<B9T$7$^$9!#\e(B@var{split} \e$B$O%a!<%k%a%C%;!<%8$,0l$D0J>e$N%0%k!<\e(B
-\e$B%W$KC_@Q$5$l$?$H$-$K\e(B ``\e$B9gCW$7$?\e(B'' \e$B$H$7$^$9!#\e(B
+@item (| @var{split} @dots{})
+\e$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,\e(B @code{|} (\e$B?bD>K@\e(B) \e$B$G$"$k$H!"$=$l$>$l\e(B
+\e$B$N\e(B @var{split} \e$B$r$=$N$&$A$N0l$D$,9gCW$9$k$^$G<B9T$7$^$9!#\e(B@var{split} \e$B$O\e(B
+\e$B%a!<%k%a%C%;!<%8$,0l$D0J>e$N%0%k!<%W$KC_@Q$5$l$?$H$-$K\e(B ``\e$B9gCW$7$?\e(B'' \e$B$H$7\e(B
+\e$B$^$9!#\e(B
 
-@item
-@code{(& @var{split}@dots{})}: \e$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,\e(B @code{&} \e$B$G\e(B
-\e$B$"$k$H!"%j%9%H$NA4$F$N\e(B @var{split} (\e$BJ#?t\e(B) \e$B$r<B9T$7$^$9!#\e(B
+@item (& @var{split} @dots{})
+\e$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,\e(B @code{&} \e$B$G$"$k$H!"%j%9%H$NA4$F\e(B
+\e$B$N\e(B @var{split} (\e$BJ#?t\e(B) \e$B$r<B9T$7$^$9!#\e(B
 
-@item
-@code{junk}: \e$B$b$7J,3d$,%7%s%\%k\e(B @code{junk} \e$B$G$"$k$H!"$=$N%a%C%;!<%8$rJ]\e(B
-\e$BB8$7$^$;$s\e(B (\e$B$9$J$o$A!">C5n$7$F$7$^$$$^$9\e(B)\e$B!#Hs>o$KCm0U$7$F;H$C$F2<$5$$!#\e(B
+@item junk
+\e$B$b$7J,3d$,%7%s%\%k\e(B @code{junk} \e$B$G$"$k$H!"$=$N%a%C%;!<%8$rJ]B8$7$^$;\e(B
+\e$B$s\e(B (\e$B$9$J$o$A!">C5n$7$F$7$^$$$^$9\e(B)\e$B!#Hs>o$KCm0U$7$F;H$C$F2<$5$$!#\e(B
 
-@item
-@code{(: @var{function} @var{arg1} @var{arg2} @dots{})}: \e$B$b$7J,3d$,%j%9\e(B
-\e$B%H$G!":G=i$NMWAG$,\e(B @code{:} \e$B$G$"$k$H!"FsHVL\$NMWAG$,\e(B @var{args} \e$B$r0z?t$H\e(B
-\e$B$7$F4X?t$H$7$F8F$P$l$^$9!#4X?t$O\e(B @var{split} \e$B$rJV$9$Y$-$G$9!#\e(B
+@item (: @var{function} @var{arg1} @var{arg2} @dots{})
+\e$B$b$7J,3d$,%j%9%H$G!":G=i$NMWAG$,\e(B @code{:} \e$B$G$"$k$H!"FsHVL\$NMWAG\e(B
+\e$B$,\e(B @var{args} \e$B$r0z?t$H$7$F4X?t$H$7$F8F$P$l$^$9!#4X?t$O\e(B @var{split} \e$B$rJV\e(B
+\e$B$9$Y$-$G$9!#\e(B
 
 @cindex body split
 \e$BNc$($P0J2<$N4X?t$O!"5-;v$N%\%G%#$K4p$E$$$?J,3d$K;H$($k$G$7$g$&\e(B:
@@ -13114,25 +13193,29 @@ UNDELETED} \e$B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I\e(B
 @lisp
 (defun split-on-body ()
   (save-excursion
-    (set-buffer " *nnmail incoming*")
-    (goto-char (point-min))
-    (when (re-search-forward "Some.*string" nil t)
-      "string.group")))
-@end lisp
-
-@code{:} \e$B$,;H$o$l$k$H$-!"%P%C%U%!\e(B @samp{" *nnmail incoming*"} \e$B$O%a%C%;!<\e(B
-\e$B%8$NItJ,$K69$a$i$l$^$9!#\e(B
-
-@item
-@code{(! @var{func} @var{split})}: \e$BJ,3d$,%j%9%H$G!":G=i$NMWAG\e(B
-\e$B$,\e(B @code{!} \e$B$G$"$k$H\e(B @var{split} \e$B$,<B9T$5$l!"\e(B
+    (save-restriction
+      (widen)
+      (goto-char (point-min))
+      (when (re-search-forward "Some.*string" nil t)
+        "string.group"))))
+@end lisp
+
+@var{function} \e$B$,Av$i$5$l$k$H$-!"%P%C%U%!$O%a%C%;!<%8$NItJ,$K69$a$i$l$^\e(B
+\e$B$9!#$=$l$,>e5-$NNc$G\e(B @code{save-excursion} \e$B$H\e(B @code{save-restriction} \e$B$N\e(B
+\e$B8e$G\e(B @code{(widen)} \e$B$,8F$P$l$kI,MW$,$"$kM}M3$G$9!#$5$i$K\e(B nnimap \e$B%P%C%/%(\e(B
+\e$B%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<%I$5$l$J$$$3$H$KCm0U\e(B
+\e$B$7$F2<$5$$!#$=$l$r$9$k$?$a$K$O\e(B @code{nnimap-split-download-body} \e$B$r\e(B t \e$B$K\e(B
+\e$B@_Dj$9$kI,MW$,$"$j$^$9\e(B (@pxref{Splitting in IMAP})\e$B!#\e(B
+
+@item (! @var{func} @var{split})
+\e$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,\e(B @code{!} \e$B$G$"$k$H\e(B @var{split} \e$B$,<B9T$5$l!"\e(B
 @var{func} \e$B$O\e(B @var{split} \e$B$N7k2L$r0z?t$H$7$F8F$P$l$^$9!#\e(B@var{func} \e$B$OJ,\e(B
 \e$B3d$rJV$9$Y$-$G$9!#\e(B
 
-@item
-@code{nil}: \e$B$b$7J,3d$,\e(B @code{nil} \e$B$G$"$l$P!"$=$l$OL5;k$5$l$^$9!#\e(B
+@item nil
+\e$B$b$7J,3d$,\e(B @code{nil} \e$B$G$"$l$P!"$=$l$OL5;k$5$l$^$9!#\e(B
 
-@end enumerate
+@end table
 
 \e$B$3$l$i$NJ,3d$G!"\e(B@var{fileld} \e$B$O40A4$J%U%#!<%k%IL>$K9gCW$7$J$1$l$P$J$j$^\e(B
 \e$B$;$s!#\e(B@var{value} \e$B$O4pAC%b!<%I\e(B (fundamental mode) \e$B9=J8%F!<%V%k\e(B (syntax
@@ -13142,9 +13225,21 @@ table) \e$B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+\e(B
 
 @vindex nnmail-split-abbrev-alist
 @var{field} \e$B$H\e(B @var{value} \e$B$O\e(B Lisp \e$B%7%s%\%k\e(B (symbol) \e$B$G$"$k;v$b$G$-!"$=\e(B
-\e$B$N>l9g$O$=$l$i$O\e(B @code{nnmail-split-abbrev-alist} \e$B$G;XDj$5$l$F$$$k$h$&$K\e(B
-\e$BE83+$5$l$^$9!#$3$l$O%;%k$N\e(B @code{car} \e$B$,%-!<$r4^$s$G$$$F!"\e(B@code{cdr} \e$B$,\e(B
-\e$B4XO"IU$1$i$l$?CM$r;}$C$F$$$k%3%s%9%;%k\e(B (cons cell) \e$B$NO"A[%j%9%H$G$9!#\e(B
+\e$B$N>l9g$=$l$i$O\e(B @code{nnmail-split-abbrev-alist} \e$B$G;XDj$5$l$F$$$k$h$&$KE8\e(B
+\e$B3+$5$l$^$9!#$3$l$O%;%k$N\e(B @sc{car} \e$B$,%-!<$r4^$s$G$$$F!"\e(B@sc{cdr} \e$B$,4XO"IU\e(B
+\e$B$1$i$l$?CM$r;}$C$F$$$k%3%s%9%;%k\e(B (cons cell) \e$B$NO"A[%j%9%H$G$9!#0J2<$N9`\e(B
+\e$BL\$,!"$"$i$+$8$a\e(B @code{nnmail-split-abbrev-alist} \e$B$KDj5A$5$l$F$$$^$9\e(B:
+
+@table @code
+@item from
+@samp{From}\e$B!"\e(B@samp{Sender} \e$B$*$h$S\e(B @samp{Resent-From} \e$B$N3F%U%#!<%k%I$K9g\e(B
+\e$BCW$7$^$9!#\e(B
+@item to
+@samp{To}\e$B!"\e(B@samp{Cc}\e$B!"\e(B@samp{Apparently-To}\e$B!"\e(B@samp{Resent-To} \e$B$*$h\e(B
+\e$B$S\e(B @samp{Resent-Cc} \e$B$N3F%U%#!<%k%I$K9gCW$7$^$9!#\e(B
+@item any
+@code{from} \e$B$H\e(B @code{to} \e$B$rE}9g$7$?$b$N$G$9!#\e(B
+@end table
 
 @vindex nnmail-split-fancy-syntax-table
 @code{nnmail-split-fancy-syntax-table} \e$B$,$3$l$i$NA4$F$NJ,3d$,<B9T$5$l$F\e(B
@@ -13165,6 +13260,24 @@ 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;H$o$l$^$9!#F1MM$K!"MWAG\e(B @samp{\\1} \e$B$+$i\e(B @samp{\\9} \e$B$^$G$O%0%k!<%WIU\e(B
 \e$B$1\e(B 1 \e$B$+$i\e(B 9 \e$B$^$G$G9gCW$7$?J8;zNs$GBeBX$5$l$^$9!#\e(B
 
+@vindex nnmail-split-fancy-match-partial-words
+@code{nnmail-split-fancy-match-partial-words} \e$B$O!"FC5iJ,3d$GItJ,E*$J8l$,\e(B
+\e$B9gCW$9$k$+$I$&$+$r@)8f$7$^$9!#\e(B
+
+\e$BDL>o\e(B @code{nnmail-split-fancy} \e$B$GM?$($i$l$k@55,I=8=$O!"0E$K8l$N6h@Z$j$r\e(B
+\e$BI=$9\e(B @code{\<...\>} \e$B0u$G0O$^$l$F$$$^$9!#$3$NJQ?t$,??$G$"$k$H!"$=$l$i$O2?\e(B
+\e$B$K$h$C$F$b0E$K0O$^$l$^$;$s!#\e(B
+
+@example
+(any "joe" "joemail")
+@end example
+
+\e$B$3$NNc$G!"DL>o\e(B @samp{joedavis@@foo.org} \e$B$+$iMh$?%a%C%;!<%8\e(B
+\e$B$O\e(B @samp{joemail} \e$B$K3JG<$5$l$^$;$s!#$7$+$7!"\e(B
+@code{nnmail-split-fancy-match-partial-words} \e$B$r\e(B t \e$B$K@_Dj$9$k$H9gCW$,5/\e(B
+\e$B$-$^$9!#MW$9$k$K!"8l$r6h@Z$k>r7o$,:o=|$5$l!"Be$o$j$K9gCW$,$h\e(B
+\e$B$j\e(B grep \e$B$i$7$/$J$k$N$G$9!#\e(B
+
 @findex nnmail-split-fancy-with-parent
 \e$B4X?t\e(B @code{nnmail-split-fancy-with-parent} \e$B$O!"%U%)%m!<%"%C%W5-;v$r?F5-\e(B
 \e$B;v$HF1$8%0%k!<%W$K?6$jJ,$1$k$?$a$K;H$$$^$9!#%a!<%k$N?6$jJ,$1$r0l@87|L?@_\e(B
@@ -13216,10 +13329,10 @@ 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%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
+\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
+\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
@@ -13230,31 +13343,32 @@ 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$?!<$/$5$s$N%a!<%j%s%0%j%9%H$r9XFI$7$F$$$k$1$l$I!"<j$G%a!<%kJ,3d5,B'$r0]\e(B
 \e$B;}$7$?$/$J$$$H$-$O!"%0%k!<%W%a!<%kJ,3d$H$$$&$b$N$,$"$J$?$N$?$a$K$"$j$^$9!#\e(B
 \e$B%0%k!<%W%Q%i%a!<%?$+%0%k!<%W%+%9%?%^%$%:\e(B
-\e$B$G\e(B @var{to-list}, @var{to-address} \e$B$NN>J}$b$7$/$O$I$A$i$+$r@_Dj$7\e(B
+\e$B$G\e(B @code{to-list}, @code{to-address} \e$B$NN>J}$b$7$/$O$I$A$i$+$r@_Dj$7\e(B
 \e$B$F\e(B @code{nnmail-split-methods} \e$B$r\e(B @code{gnus-group-split} \e$B$K@_Dj$9$k$@$1\e(B
 \e$B$G$9!#J,3d4X?t$OA4$F$N%0%k!<%W$G$3$l$i$N%Q%i%a!<%?$rAv::$7!"$=$l$K=>$C$F\e(B
 \e$BJ,3d$7$^$9!#$9$J$o$A!"%a!<%k%0%k!<%W$N%Q%i%a!<\e(B
-\e$B%?\e(B @var{to-list} \e$B$+\e(B @var{to-address} \e$B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5$l$?\e(B
-\e$B$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^$9!#\e(B
+\e$B%?\e(B @code{to-list} \e$B$+\e(B @code{to-address} \e$B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5$l\e(B
+\e$B$?$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^$9!#\e(B
 
 \e$B$H$-$K$O!"%a!<%j%s%0%j%9%H$K$OJ#?t$N%"%I%l%9$,$"$j!"%a!<%kJ,3d$K$=$l$iA4\e(B
-\e$B$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s\e(B: @var{extra-aliases} \e$B%0%k!<%W%Q%i\e(B
-\e$B%a!<%?$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#@55,I=8=$r;H$$$?\e(B
-\e$B$1$l$P!"\e(B@var{split-regexp} \e$B$r@_Dj$7$F$/$@$5$$!#\e(B
+\e$B$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s\e(B: @code{extra-aliases} \e$B%0%k!<%W%Q\e(B
+\e$B%i%a!<%?$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#@55,I=8=$r;H$$\e(B
+\e$B$?$1$l$P!"\e(B@code{split-regexp} \e$B$r@_Dj$7$F$/$@$5$$!#\e(B
 
 \e$B$3$l$i$NA4$F$N%0%k!<%W$N%Q%i%a!<%?$O!"\e(B@code{nnmail-split-fancy} \e$BJ,3d$r:n\e(B
 \e$B@.$9$k$?$a$K;HMQ$5$l!"$=$l$O\e(B @var{field} \e$B$,\e(B @samp{any} \e$B$G!"\e(B
-@var{value} \e$B$,\e(B @var{to-list}, @var{to-address}, @var{extra-aliases} \e$B$NA4\e(B
-\e$B$F!"\e(B@var{split-regexp} \e$B$NA4$F$N9gCW$K9gCW$9$kC1FH$N@55,I=8=!"\e(B
-@var{split} \e$B$,%0%k!<%W$NL>A0$K$J$j$^$9!#\e(B@var{restrict} \e$B$b;HMQ$G$-$^$9\e(B:
-@var{split-exclude} \e$B%Q%i%a!<%?$r@55,I=8=$N%j%9%H$K@_Dj$9$k$@$1$G$9!#\e(B
+@var{value} \e$B$,\e(B @code{to-list}, @code{to-address},
+@code{extra-aliases} \e$B$N$9$Y$F!"\e(B@code{split-regexp} \e$B$NA4$F$N9gCW$K9gCW$9\e(B
+\e$B$kC1FH$N@55,I=8=!"\e(B@var{split} \e$B$,%0%k!<%W$NL>A0$K$J$j$^$9!#\e(B@var{restrict}
+\e$B$b;HMQ$G$-$^$9\e(B: @code{split-exclude} \e$B%Q%i%a!<%?$r@55,I=8=$N%j%9%H$K@_Dj\e(B
+\e$B$9$k$@$1$G$9!#\e(B
 
 \e$B$3$l$i$NA4$F$N%Q%i%a!<%?$r;H$C$F@5$7$$J,3d$,@8@.$5$l$J$$$H$-$d!"2?$+0c$C\e(B
 \e$B$?$b$N$,I,MW$J$H$-$O!"%Q%i%a!<\e(B
-\e$B%?\e(B @var{split-spec} \e$B$r\e(B @code{nnmail-split-fancy} \e$BJ,3d$K@_Dj$9$k$3$H$,$G\e(B
+\e$B%?\e(B @code{split-spec} \e$B$r\e(B @code{nnmail-split-fancy} \e$BJ,3d$K@_Dj$9$k$3$H$,$G\e(B
 \e$B$-$^$9!#$3$N>l9g$O!"B>$NA0$K=q$$$?A4$F$N%Q%i%a!<%?\e(B
 \e$B$O\e(B @code{gnus-group-split} \e$B$KL5;k$5$l$^$9!#FC$K!"\e(B
-@var{split-spec} \e$B$O\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$,$G$-!"$=$N>l9g$O%0%k!<%W\e(B
+@code{split-spec} \e$B$O\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$,$G$-!"$=$N>l9g$O%0%k!<%W\e(B
 \e$B$O\e(B @code{gnus-group-split} \e$B$KL5;k$5$l$^$9!#\e(B
 
 @vindex gnus-group-split-default-catch-all-group
@@ -13263,7 +13377,7 @@ 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$^$9!#%a%C%;!<%8$,$I$NJ,3d$K$b9gCW$7$J$1$l$P!"$I$l$+$N%0%k!<%W\e(B
 \e$B$G\e(B @var{split-spec} \e$B$,\e(B @code{catch-all} \e$B$K@_Dj$5$l$F$$$J$$>l9g\e(B
 \e$B$O\e(B @code{gnus-group-split-default-catch-all-group} \e$B$G;XDj$5$l$F$$$k%0%k!<\e(B
-\e$B%W$KJ]B8$5$l$^$9!#\e(B@var{split-spec} \e$B$,\e(B @code{catch-all} \e$B$K@_Dj$5$l$F$$$k\e(B
+\e$B%W$KJ]B8$5$l$^$9!#\e(B@code{split-spec} \e$B$,\e(B @code{catch-all} \e$B$K@_Dj$5$l$F$$$k\e(B
 \e$B%0%k!<%W$,$"$k>l9g$O!"$=$N%0%k!<%W$,A4$F$rJa3M$9$k%0%k!<%W$H$7$F;HMQ$5$l\e(B
 \e$B$^$9!#$3$NJQ?t$O$7$P$7$PC1$K%0%k!<%W$r;XDj$9$k$?$a$K;H$o$l$^$9$,!"G$0U$N\e(B
 \e$BJ#;($JFC5iJ,3d$r$b@_Dj$9$k\e(B (\e$B7k6I!"%0%k!<%WL>$OFC5iJ,3d$J$N$G$9\e(B) \e$B$N$G!"8D\e(B
@@ -13312,12 +13426,12 @@ nnml:mail.others:
 @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
 \e$BL>$N%j%9%H$+@55,I=8=$G$9!#\e(B@var{no-crosspost} \e$B$OAj8_Ej9F$r;HMQ6X;_$K$k$?\e(B
 \e$B$a$K;H$&$3$H$,$G$-$^$9!#$=$N>l9g!"C10l$N\e(B @code{|} \e$BJ,3d$,=PNO$5$l$^$9!#\e(B
-@var{catch-all} \e$B$O\e(B @var{gnus-group-split-default-catch-all-group} \e$B$N$h$&\e(B
-\e$B$K!":G8e$N<jCJ$H$7$F;H$o$l$kFC5iJ,3d$G$9!#\e(B
-@var{catch-all} \e$B$,\e(B @code{nil} \e$B$G$"$k$+!"\e(B@var{split-regexp} \e$B$,$I$l$+$NA*\e(B
+@var{catch-all} \e$B$O\e(B @code{gnus-group-split-default-catch-all-group} \e$B$N$h\e(B
+\e$B$&$K!":G8e$N<jCJ$H$7$F;H$o$l$kFC5iJ,3d$G$9!#\e(B
+@var{catch-all} \e$B$,\e(B @code{nil} \e$B$G$"$k$+!"\e(B@code{split-regexp} \e$B$,$I$l$+$NA*\e(B
 \e$BBr$5$l$?%0%k!<%W6uJ8;zNs$K9gCW$9$k$H!"A4Ja3MJ,3d$O9T$o$l$^$;$s!#$=$&$G$J\e(B
-\e$B$$>l9g!"%0%k!<%W$K\e(B @var{split-spec} \e$B$,\e(B @code{catch-all} \e$B$K@_Dj$5$l$F$$$k\e(B
-\e$B$b$N$,$"$k$H!"$3$N%0%k!<%W$,\e(B @var{catch-all} \e$B0z?t$r>e=q$-$7$^$9!#\e(B
+\e$B$$>l9g!"%0%k!<%W$K\e(B @code{split-spec} \e$B$,\e(B @code{catch-all} \e$B$K@_Dj$5$l$F$$\e(B
+\e$B$k$b$N$,$"$k$H!"$3$N%0%k!<%W$,\e(B @var{catch-all} \e$B0z?t$r>e=q$-$7$^$9!#\e(B
 
 @findex gnus-group-split-setup
 \e$BIT1?$J$3$H$K!"A4$F$N%0%k%W$H%Q%i%a!<%?$rAv::$9$k$3$H$OHs>o$KCY$$$G$9!#FC\e(B
@@ -13425,13 +13539,14 @@ Gnus \e$B$KK>$^$7$/$J$$%a!<%k$r:o=|$5$;$k$?$a$K$O!"5-;v$r\e(B @dfn{\e$B4|8B@Z$l>C5n
 \e$B$l$i$N\e(B ``\e$B5-;v\e(B'' \e$B$r>C5n$7$^$;$s!#\e(B
 
 \e$B<j:n6H$G5-;v$K4|8B@Z$l>C5n2DG=$N0u$rIU$1$J$1$l$P$J$i$J$$$o$1$G$O$"$j$^$;\e(B
-\e$B$s!#\e(Bgnus \e$B$O\e(B `auto-expire' \e$B$*$h$S\e(B `total-expire' \e$B$H8F$P$l$kFs$D$N5!G=$rDs\e(B
-\e$B6!$7$F!"$"$J$?$N<j=u$1$r$7$^$9!#$+$$$D$^$s$G8@$($P!"\e(B`auto-expire' \e$B$O$"$J\e(B
-\e$B$?$,5-;v$rA*Br$7$?$H$-$K\e(B gnus \e$B$,\e(B @kbd{E} \e$B$rC!$$$F$/$l$k$3$H$r0UL#$7$^$9!#\e(B
-\e$B$=$7$F\e(B `total-expire' \e$B$O!"$9$Y$F$N4{FI$N5-;v$O4|8B@Z$l>C5n2DG=$G$"$k\e(B
-\e$B$H\e(B gnus \e$B$,2r<a$9$k$3$H$r0UL#$7$^$9!#$7$?$,$C$F\e(B @samp{E} \e$B$N0u$,IU$1$i$l$?\e(B
-\e$B5-;v$K2C$($F!"\e(B@samp{r}, @samp{R}, @samp{O}, @samp{K}, @samp{Y} \e$B$J$I$N0u\e(B
-\e$B$,IU$1$i$l$?5-;v$b4|8B@Z$l>C5n2DG=$G$"$k$H2r<a$5$l$^$9!#\e(B
+\e$B$s!#\e(Bgnus \e$B$O\e(B ``auto-expire'' \e$B$*$h$S\e(B ``total-expire'' \e$B$H8F$P$l$kFs$D$N5!G=\e(B
+\e$B$rDs6!$7$F!"$"$J$?$N<j=u$1$r$7$^$9!#$+$$$D$^$s$G8@$($P!"\e(B
+``auto-expire'' \e$B$O$"$J$?$,5-;v$rA*Br$7$?$H$-$K\e(B gnus \e$B$,\e(B @kbd{E} \e$B$rC!$$$F\e(B
+\e$B$/$l$k$3$H$r0UL#$7$^$9!#$=$7$F\e(B ``total-expire'' \e$B$O!"$9$Y$F$N4{FI$N5-;v$O\e(B
+\e$B4|8B@Z$l>C5n2DG=$G$"$k$H\e(B gnus \e$B$,2r<a$9$k$3$H$r0UL#$7$^$9!#$7$?$,$C\e(B
+\e$B$F\e(B @samp{E} \e$B$N0u$,IU$1$i$l$?5-;v$K2C$($F!"\e(B@samp{r}, @samp{R}, @samp{O},
+@samp{K}, @samp{Y} \e$B$J$I$N0u$,IU$1$i$l$?5-;v$b4|8B@Z$l>C5n2DG=$G$"$k$H2r\e(B
+\e$B<a$5$l$^$9!#\e(B
 
 Auto-expire \e$B$^$?$O\e(B total-expire \e$B$O!"$$$D;HMQ$5$l$k$Y$-$G$9$+\e(B? \e$B%a!<%j%s%0\e(B
 \e$B%j%9%H$r9XFI$7$F$$$k$[$H$s$I$N?M!9$O!"$=$l$>$l$N%j%9%H$r$=$l<+?H$N%0%k!<\e(B
@@ -13445,9 +13560,9 @@ Auto-expire \e$B$^$?$O\e(B total-expire \e$B$N$I$A$i$,NI$$$G$9$+\e(B? \e$B$=$l$OEz$($
 to stick around \e$B$N0ULu\e(B) \e$B5-;v$K$D$$$F$O!":#$^$G$I$*$j2D;k\e(B (tick)\e$B!"J]\e(B
 \e$BN1\e(B (dormant) \e$B$^$?$O4{FI\e(B (read) \e$B$NCf$+$iA*$V$3$H$,$G$-$k\e(B - \e$B$H$$$&$3$H$G$9!#\e(B
 \e$B$7$+$7\e(B total-expire \e$B$G$O\e(B dormant \e$B$H\e(B ticked \e$B$+$i$7$+A*$Y$^$;$s!#\e(B
-total-expire \e$B$NMxE@$O!"E,1~%9%3%"IU$1\e(B @pxref{Adaptive Scoring} \e$B$GNI9%$K\e(B
-\e$BF/$/$3$H$G$9!#\e(BAuto-expire \e$B$ODL>o$N%9%3%"IU$1$G$OF0:n$7$^$9$,!"E,1~%9%3%"\e(B
-\e$BIU$1$G$O$@$a$G$9!#\e(B
+total-expire \e$B$NMxE@$O!"E,1~%9%3%"IU$1\e(B (@pxref{Adaptive Scoring}) \e$B$GNI9%\e(B
+\e$B$KF/$/$3$H$G$9!#\e(BAuto-expire \e$B$ODL>o$N%9%3%"IU$1$G$OF0:n$7$^$9$,!"E,1~%9%3\e(B
+\e$B%"IU$1$G$O$@$a$G$9!#\e(B
 
 @vindex gnus-auto-expirable-newsgroups
 \e$B@55,I=8=\e(B @code{gnus-auto-expirable-newsgroups} \e$B$K9gCW$9$k%0%k!<%W$OA4$F\e(B
@@ -13656,7 +13771,7 @@ Gnus \e$B$O5-;v$rI=<($9$k$H$-$K$=$l$r@vBu$9$k$?$a$K2aEY$N4X?t$rDs6!$7$F$$$^\e(B
 @end lisp
 
 \e$B$3$l$O\e(B @code{gnus-list-identifiers} \e$B$GHsGK2uE*$K9T$&$3$H$b$G$-$^$9!#\e(B
-@xref{Article Hiding}\e$B!#\e(B
+@xref{Article Hiding}.
 
 @item nnmail-remove-tabs
 @findex nnmail-remove-tabs
@@ -13907,7 +14022,7 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 
 @item nnml-newsgroups-file
 @vindex nnml-newgroups-file
-@code{nnml} \e$B%0%k!<%W5-=R%U%!%$%k!#\e(B@xref{Newsgroups File Format}\e$B!#4{DjCM\e(B
+@code{nnml} \e$B%0%k!<%W5-=R%U%!%$%k!#\e(B@xref{Newsgroups File Format}. \e$B4{DjCM\e(B
 \e$B$O\e(B @file{~/Mail/newsgroups} \e$B$G$9!#\e(B
 
 @item nnml-get-new-mail
@@ -13977,10 +14092,10 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 
 @item nnmh-be-safe
 @vindex nnmh-be-safe
-@code{nil} \e$B$G$J$1$l$P!"\e(B@code{nnmh} \e$B$O%U%)%k%@!<$K$"$k5-;v$,<B:]$K\e(B gnus
-\e$B$,9M$($F$$$k$b$N$HF1$8$G$"$k$+$rD4$Y$k$H$$$&GO</$2$?;v$r$d$j$^$9!#$=$l$O\e(B
-\e$BF|IU$HL\$KF~$kA4$F$N>pJs$rD4$Y$^$9$N$G!"$3$l$r\e(B @code{t} \e$B$K@_Dj$9$k;v$O?<\e(B
-\e$B9o$JB.EYDc2<$,5/$3$k$H$$$&;v$G$9!#$b$7\e(B @code{nnmh} \e$B5-;v$rFI$`$N\e(B
+@code{nil} \e$B$G$J$1$l$P!"\e(B@code{nnmh} \e$B$O%U%)%k%@!<$K$"$k5-;v$,<B:]\e(B
+\e$B$K\e(B gnus \e$B$,9M$($F$$$k$b$N$HF1$8$G$"$k$+$rD4$Y$k$H$$$&GO</$2$?;v$r$d$j$^$9!#\e(B
+\e$B$=$l$OF|IU$HL\$KF~$kA4$F$N>pJs$rD4$Y$^$9$N$G!"$3$l$r\e(B @code{t} \e$B$K@_Dj$9$k\e(B
+\e$B;v$O?<9o$JB.EYDc2<$,5/$3$k$H$$$&;v$G$9!#$b$7\e(B @code{nnmh} \e$B5-;v$rFI$`$N\e(B
 \e$B$K\e(B gnus \e$B0J30$N$b$N$r;H$C$F$$$J$$$N$G$"$l$P!"$3$NJQ?t$r\e(B @code{t} \e$B$K@_Dj$9\e(B
 \e$B$kI,MW$O$"$j$^$;$s!#4{DjCM$O\e(B @code{nil} \e$B$G$9!#\e(B
 @end table
@@ -13994,37 +14109,38 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 \e$B$N\e(B maildir \e$B$K\e(B maildir \e$B%U%)!<%^%C%H$G%a!<%k$r3JG<$7$^$9!#$3$N%U%)!<%^%C\e(B
 \e$B%H$O\e(B @uref{http://cr.yp.to/proto/maildir.html} \e$B$*$h\e(B
 \e$B$S\e(B @uref{http://www.qmail.org/man/man5/maildir.html} \e$B$GJ8=q2=$5$l$F$$$^\e(B
-\e$B$9!#$^$?\e(B nnmaildir \e$B$O\e(B maildir \e$B$NCf$N\e(B @file{.nnmaildir/} \e$B%G%#%l%/%H%j$KFC\e(B
-\e$BJL$J>pJs$r3JG<$7$^$9!#\e(B
+\e$B$9!#$^$?\e(B @code{nnmaildir} \e$B$O\e(B maildir \e$B$NCf$N\e(B @file{.nnmaildir/} \e$B%G%#%l%/\e(B
+\e$B%H%j$KFCJL$J>pJs$r3JG<$7$^$9!#\e(B
 
 Maildir \e$B%U%)!<%^%C%H$O%m%C%/$rI,MW$H$7$J$$F1;~G[Aw$H9VFI$r2DG=$K$9$k$?$a\e(B
 \e$B$K@_7W$5$l$^$7$?!#B>$N%P%C%/%(%s%I$G$O!"%a!<%k$r2?$i$+$N%9%W!<%k$KEO$7$F\e(B
 \e$B$=$N%9%W!<%k$+$i%0%k!<%W$KJ,3d$9$k$?$a$K\e(B Gnus \e$B$r@_Dj$7$J$1$l$P$J$i$J$$$G\e(B
-\e$B$7$g$&!#$=$l$O:#$^$GDL$j\e(B nnmaildir \e$B$G9T$J$&$3$H$,$G$-$^$9$,!"$b$C$H0lHL\e(B
-\e$BE*$J@_Dj$O\e(B Gnus \e$B$N%0%k!<%W$H$7$F8=$o$l$k\e(B maildir \e$B$K%a!<%k$rD>@\G[Aw$9$k\e(B
-\e$B$3$H$G$9!#\e(B
+\e$B$7$g$&!#$=$l$O:#$^$GDL$j\e(B @code{nnmaildir} \e$B$G9T$J$&$3$H$,$G$-$^$9$,!"$b$C\e(B
+\e$B$H0lHLE*$J@_Dj$O\e(B Gnus \e$B$N%0%k!<%W$H$7$F8=$o$l$k\e(B maildir \e$B$K%a!<%k$rD>@\G[\e(B
+\e$BAw$9$k$3$H$G$9!#\e(B
 
-nnmaildir \e$B$O40A4$K?.Mj$G$-$k$3$H$rL\;X$7$F$$$^$9\e(B: @kbd{C-g} \e$B$O%a%b%j!<Cf\e(B
-\e$B$N%G!<%?$r2u$7$^$;$s$7!"\e(B@code{SIGKILL} \e$B$,%U%!%$%k$NCf$N%G!<%?$r2u$9$3$H\e(B
-\e$B$O$"$j$^$;$s!#\e(B
+@code{nnmaildir} \e$B$O40A4$K?.Mj$G$-$k$3$H$rL\;X$7$F$$$^$9\e(B: @kbd{C-g} \e$B$O%a\e(B
+\e$B%b%j!<Cf$N%G!<%?$r2u$7$^$;$s$7!"\e(B@code{SIGKILL} \e$B$,%U%!%$%k$NCf$N%G!<%?$r\e(B
+\e$B2u$9$3$H$O$"$j$^$;$s!#\e(B
 
-nnmaildir \e$B$O5-;v$N0u$H\e(B @acronym{NOV} \e$B%G!<%?$r$=$l$>$l$N\e(B maildir \e$B$K3JG<$7\e(B
-\e$B$^$9!#$=$l$K$h$C$F!"$"$k\e(B Gnus \e$B$N4D6-$+$iJL$N>l=j$K\e(B maildir \e$BA4BN$r%3%T!<\e(B
-\e$B$9$k$3$H$,$G$-!"0u$OJ]B8$5$l$^$9!#\e(B
+@code{nnmaildir} \e$B$O5-;v$N0u$H\e(B @acronym{NOV} \e$B%G!<%?$r$=$l$>$l$N\e(B maildir
+\e$B$K3JG<$7$^$9!#$=$l$K$h$C$F!"$"$k\e(B Gnus \e$B$N4D6-$+$iJL$N>l=j$K\e(B maildir \e$BA4BN\e(B
+\e$B$r%3%T!<$9$k$3$H$,$G$-!"0u$OJ]B8$5$l$^$9!#\e(B
 
 \e$B2>A[%5!<%P!<$N@_Dj\e(B:
 
 @table @code
 @item directory
-\e$B$=$l$>$l$N\e(B nnmaildir \e$B%5!<%P!<\e(B (\e$B0l$D$r1[$($k%5!<%P!<$,I,MW$@$H$O$H$F$b;W\e(B
-\e$B$($^$;$s$,\e(B) \e$B$KBP$7$F%G%#%l%/%H%j$r:n$j!"$=$l$r\e(B maildir \e$B$^$?$O\e(B maildir \e$B$X\e(B
-\e$B$N%7%s%\%j%C%/%j%s%/$H$7$F<BAu$9$kI,MW$,$"$j$^$9\e(B (\e$BB>$NL\E*$N$?$a$K$9$G$K\e(B
-\e$B;H$o$l$F$$$k%G%#%l%/%H%j$rA*$s$G$O$$$1$^$;$s\e(B)\e$B!#$=$l$>$l$N\e(B maildir \e$B$O!"$=\e(B
-\e$B$N%5!<%P!<$N%K%e!<%9%0%k!<%W$H$7$F\e(B Gnus \e$B$K8=$l!"%7%s%\%j%C%/%j%s%/$N%U%!\e(B
-\e$B%$%kL>$,$=$N%0%k!<%W$NL>A0$K$J$j$^$9!#%G%#%l%/%H%j$K$"$k\e(B `.' \e$B$G;O$^$k$I\e(B
-\e$B$s$J%U%!%$%kL>$bL5;k$5$l$^$9!#%G%#%l%/%H%j$O:G=i$K\e(B Gnus \e$B$r5/F0$7$?$H$-$H\e(B
-\e$B%0%k!<%W%P%C%U%!$G\e(B @kbd{g} \e$B$r%?%$%W$7$?$H$-$O$$$D$G$bAv::$5$l!"$I$l$+\e(B
-\e$B$N\e(B maildir \e$B$,:o=|$^$?$ODI2C$5$l$?$H$-$KDLCN$7$^$9!#\e(B
+\e$B$=$l$>$l$N\e(B @code{nnmaildir} \e$B%5!<%P!<\e(B (\e$B0l$D$r1[$($k%5!<%P!<$,I,MW$@$H$O$H\e(B
+\e$B$F$b;W$($^$;$s$,\e(B) \e$B$KBP$7$F%G%#%l%/%H%j$r:n$j!"$=$l$r\e(B maildir \e$B$^$?\e(B
+\e$B$O\e(B maildir \e$B$X$N%7%s%\%j%C%/%j%s%/$H$7$F<BAu$9$kI,MW$,$"$j$^$9\e(B (\e$BB>$NL\E*\e(B
+\e$B$N$?$a$K$9$G$K;H$o$l$F$$$k%G%#%l%/%H%j$rA*$s$G$O$$$1$^$;$s\e(B)\e$B!#$=$l$>$l\e(B
+\e$B$N\e(B maildir \e$B$O!"$=$N%5!<%P!<$N%K%e!<%9%0%k!<%W$H$7$F\e(B Gnus \e$B$K8=$l!"%7%s%\\e(B
+\e$B%j%C%/%j%s%/$N%U%!%$%kL>$,$=$N%0%k!<%W$NL>A0$K$J$j$^$9!#%G%#%l%/%H%j$K$"\e(B
+\e$B$k\e(B @samp{.} \e$B$G;O$^$k$I$s$J%U%!%$%kL>$bL5;k$5$l$^$9!#%G%#%l%/%H%j$O:G=i\e(B
+\e$B$K\e(B Gnus \e$B$r5/F0$7$?$H$-$H%0%k!<%W%P%C%U%!$G\e(B @kbd{g} \e$B$r%?%$%W$7$?$H$-$O$$\e(B
+\e$B$D$G$bAv::$5$l!"$I$l$+$N\e(B maildir \e$B$,:o=|$^$?$ODI2C$5$l$?$H$-\e(B
+\e$B$K\e(B @code{nnmaildir} \e$B$ODLCN$7$^$9!#\e(B
 
 @code{directory} \e$B%Q%i%a!<%?$NCM$O\e(B Lisp \e$B<0$G$J$1$l$P$J$j$^$;$s!#\e(B
 @code{eval} \e$B$G=hM}$5$l$?8e$G!"\e(B@code{expand-file-name} \e$B$K$h$C$F$3$N%5!<%P!<\e(B
@@ -14033,7 +14149,7 @@ nnmaildir \e$B$O5-;v$N0u$H\e(B @acronym{NOV} \e$B%G!<%?$r$=$l$>$l$N\e(B maildir \e$B$
 \e$BL5MQ\e(B; \e$BC1$J$kJ8;zNs$GF0:n$7$^$9\e(B)\e$B!#$3$N%Q%i%a!<%?$OG$0U$G$O$J$/!"@_Dj$7$J\e(B
 \e$B$1$l$P$J$j$^$;$s!#\e(B@code{"~/Mail"} \e$B$d$=$l$N%5%V%G%#%l%/%H%j$r;H$&$3$H$O?d\e(B
 \e$B>)$G$-$^$;$s!#$$$/$D$+$N\e(B Gnus \e$B$NB>$NItJ,$,$=$l$r%G%#%U%)%k%H$G$$$m$s$J$b\e(B
-\e$B$N$K;H$&$N$G!"\e(Bnnmaildir \e$B$G$b$=$l$r;H$&$H:.Mp$9$k$+$b$7$l$^$;$s!#\e(B
+\e$B$N$K;H$&$N$G!"\e(B@code{nnmaildir} \e$B$G$b$=$l$r;H$&$H:.Mp$9$k$+$b$7$l$^$;$s!#\e(B
 @code{"~/.nnmaildir"} \e$B$,0lHLE*$JCM$G$9!#\e(B
 
 @item target-prefix
@@ -14042,12 +14158,12 @@ nnmaildir \e$B$O5-;v$N0u$H\e(B @acronym{NOV} \e$B%G!<%?$r$=$l$>$l$N\e(B maildir \e$B$
 \e$B$NL>A0$r3MF@$7$^$9!#<0$O%5!<%P!<$,3+DL$7$?$H$-$@$1\e(B @code{eval} \e$B$5$l!"$=\e(B
 \e$B$N7k2LF@$i$l$?J8;zNs$,!"%5!<%P!<$,JD$8$i$l$k$^$G;H$o$l$^$9!#\e(B
 
-nnmaildir \e$B%5!<%P!<$K%0%k!<%W$r:n$k$H!"$=$NL>A0$NF,\e(B
+@code{nnmaildir} \e$B%5!<%P!<$K%0%k!<%W$r:n$k$H!"$=$NL>A0$NF,\e(B
 \e$B$K\e(B @code{target-prefix} \e$B$,IU2C$5$l$?\e(B maildir \e$B$H!"$=$N\e(B maildir \e$B$r;X$7<($9\e(B
 \e$B%7%s%\%j%C%/%j%s%/$,AG$N%0%k!<%WL>$NL>A0$G:n@.$5$l$^$9!#$7$?$,$C$F!"\e(B
 @code{directory} \e$B$,\e(B @code{"~/.nnmaildir"} \e$B$G!"\e(B
 @code{target-prefix} \e$B$,\e(B @code{"../maildirs/"} \e$B$@$C$?>l9g$K\e(B @code{foo} \e$B$H\e(B
-\e$B$$$&%0%k!<%W$r:n$k$H!"\e(Bnnmaildir \e$B$O\e(B maildir \e$B$H$7\e(B
+\e$B$$$&%0%k!<%W$r:n$k$H!"\e(B@code{nnmaildir} \e$B$O\e(B maildir \e$B$H$7\e(B
 \e$B$F\e(B @file{~/.nnmaildir/../maildirs/foo} \e$B$r!"\e(B@file{../maildirs/foo} \e$B$X$N%7\e(B
 \e$B%s%\%j%C%/%j%s%/$H$7$F\e(B @file{~/.nnmaildir/foo} \e$B$r:n@.$7$^$9!#\e(B
 
@@ -14082,21 +14198,22 @@ nnmaildir \e$B%5!<%P!<$K%0%k!<%W$r:n$k$H!"$=$NL>A0$NF,\e(B
 \e$B$k\e(B @code{mail-sources} \e$B$+$i!"=>Mh$N\e(B Gnus \e$B$NJ}K!$G%a!<%k$r<h$j9~$_$^$9!#\e(B
 \e$B%G%#%U%)%k%HCM$O\e(B @code{nil} \e$B$G$9!#\e(B
 
-@code{mail-sources} \e$B$H\e(B nnmaildir \e$B%0%k!<%W$NN>J}$GF1$8\e(B maildir \e$B$r;H$C$F\e(B
-\e$B$O\e(B @emph{\e$B$$$1$^$;$s\e(B}\e$B!#$=$N7k2L$O1?NI$/M-1W$K$J$k$+$b$7$l$^$;$s$,!"$=$s$J\e(B
-\e$B0U?^$G$O@_7W$5$l$F$$$^$;$s!#>-Mh$O0c$&7k2L$r$b$?$i$92DG=@-$,$"$j$^$9!#$"\e(B
-\e$B$J$?$NJ,3d5,B'$,?7$7$$%0%k!<%W$r:n$k$h$&$K$J$C$F$$$k>l9g$O!"\e(B
+@code{mail-sources} \e$B$H\e(B @code{nnmaildir} \e$B%0%k!<%W$NN>J}$GF1$8\e(B maildir \e$B$r\e(B
+\e$B;H$C$F$O\e(B @emph{\e$B$$$1$^$;$s\e(B}\e$B!#$=$N7k2L$O1?NI$/M-1W$K$J$k$+$b$7$l$^$;$s$,!"\e(B
+\e$B$=$s$J0U?^$G$O@_7W$5$l$F$$$^$;$s!#>-Mh$O0c$&7k2L$r$b$?$i$92DG=@-$,$"$j$^\e(B
+\e$B$9!#$"$J$?$NJ,3d5,B'$,?7$7$$%0%k!<%W$r:n$k$h$&$K$J$C$F$$$k>l9g$O!"\e(B
 @code{create-directory} \e$B%5!<%P!<%Q%i%a!<%?$rM?$($k$3$H$rK:$l$J$$$G2<$5$$!#\e(B
 @end table
 
 @subsubsection \e$B%0%k!<%W%Q%i%a!<%?\e(B
 
-nnmaildir \e$B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y$F$rL5;k\e(B
-\e$B$7$F$b0BA4$G$9!#%G%#%U%)%k%H$N\e(B nnmaildir \e$B$NF0:n$O!"B>$N%a!<%k%P%C%/%(%s\e(B
-\e$B%I$N%G%#%U%)%k%H\e(B (\e$B5-;v$,0l=54V8e$K>C5n$5$l$k!"$J$I\e(B) \e$B$HF1$8$G$9!#4|8B@Z$l\e(B
-\e$B>C5n$N%Q%i%a!<%?$r=|$$$F!"$3$N5!G=$O$9$Y$F\e(B nnmaildir \e$B$KFCM-$G$9!#$7$?$,$C\e(B
-\e$B$F!"JL$N%P%C%/%(%s%I$G$9$G$K9T$C$F$$$kF0:n$rC1$KF'=1$5$;$h$&$H$$$&$N$G$"\e(B
-\e$B$l$P!"$3$l$rL5;k$9$k$3$H$,$G$-$^$9!#\e(B
+@code{nnmaildir} \e$B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y\e(B
+\e$B$F$rL5;k$7$F$b0BA4$G$9!#%G%#%U%)%k%H$N\e(B @code{nnmaildir} \e$B$NF0:n$O!"B>$N%a!<\e(B
+\e$B%k%P%C%/%(%s%I$N%G%#%U%)%k%H\e(B (\e$B5-;v$,0l=54V8e$K>C5n$5$l$k!"$J$I\e(B) \e$B$HF1$8$G\e(B
+\e$B$9!#4|8B@Z$l>C5n$N%Q%i%a!<%?$r=|$$$F!"$3$N5!G=$O$9$Y\e(B
+\e$B$F\e(B @code{nnmaildir} \e$B$KFCM-$G$9!#$7$?$,$C$F!"JL$N%P%C%/%(%s%I$G$9$G$K9T$C\e(B
+\e$B$F$$$kF0:n$rC1$KF'=1$5$;$h$&$H$$$&$N$G$"$l$P!"$3$l$rL5;k$9$k$3$H$,$G$-$^\e(B
+\e$B$9!#\e(B
 
 \e$B$3$l$i$N%Q%i%a!<%?$N$&$A$N$I$l$G$b!"$=$NCM$,%Y%/%H%k$G$"$k>l9g$O!"%*%j%8\e(B
 \e$B%J%k$NCM$KBe$o$C$F!"Bh0l$NMWAG$,\e(B Lisp \e$B<0$H$7$FI>2A$5$l$?7k2L$,;H$o$l$^$9!#\e(B
@@ -14114,30 +14231,30 @@ nnmaildir \e$B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y$F$rL5;k\e(B
 \e$B$5$l$F$$$J$$$H!"$$$D$b$N\e(B @code{nnmail-expiry-wait}(@code{-function}) \e$BJQ\e(B
 \e$B?t\e(B (@code{expiry-wait}(@code{-function}) \e$B%0%k!<%W%Q%i%a!<%?$G>e=q$-$5$l\e(B
 \e$B$k\e(B) \e$B$r:G8e$N$h$j$I$3$m$K$7$^$9!#\e(B3\e$BF|$NCM$,M_$7$$$J$i$P!"\e(B@code{[(* 3 24 60
-60)]} \e$B$N$h$&$J$b$N$r;H$C$F2<$5$$!#\e(Bnnmaildir \e$B$O<0$rI>2A$7$F!"$=$N7k2L$r;H\e(B
-\e$B$$$^$9!#5-;v$N<wL?$O5-;v%U%!%$%k$NJQ99;~9o$r4pE@$K7WB,$5$l$^$9!#DL>o$3$l\e(B
-\e$B$O5-;v$,G[Aw$5$l$?;~9o$HF1$8$G$9$,!"5-;v$NJT=8$O$=$l$r<c$/$7$^$9!#\e(B(\e$B4|8B\e(B
-\e$B@Z$l>C5n0J30$N\e(B) \e$B5-;v$N0\F0$b$^$?!"5-;v$r<c$/$7$F$7$^$&$G$7$g$&!#\e(B
+60)]} \e$B$N$h$&$J$b$N$r;H$C$F2<$5$$!#\e(B@code{nnmaildir} \e$B$O<0$rI>2A$7$F!"$=$N\e(B
+\e$B7k2L$r;H$$$^$9!#5-;v$N<wL?$O5-;v%U%!%$%k$NJQ99;~9o$r4pE@$K7WB,$5$l$^$9!#\e(B
+\e$BDL>o$3$l$O5-;v$,G[Aw$5$l$?;~9o$HF1$8$G$9$,!"5-;v$NJT=8$O$=$l$r<c$/$7$^$9!#\e(B
+(\e$B4|8B@Z$l>C5n0J30$N\e(B) \e$B5-;v$N0\F0$b$^$?!"5-;v$r<c$/$7$F$7$^$&$G$7$g$&!#\e(B
 
 @item expire-group
 \e$B$3$l$,J8;zNs\e(B (@code{"backend+server.address.string:group.name"} \e$B$N$h$&$J\e(B
 \e$B40A4$J\e(B Gnus \e$B$N%0%k!<%WL>\e(B) \e$B$G!"$+$D$=$N%Q%i%a!<%?$,F1$8L>A0$N%0%k!<%W$KB0\e(B
 \e$B$5$J$$>l9g!"4|8B@Z$l>C5n$,9T$J$o$l$k:]$K!"5-;v$O>C5n$5$l$kA0$K;XDj$5$l$?\e(B
-\e$B%0%k!<%W$K0\F0$5$;$i$l$^$9!#\e(B@emph{\e$B$3$l$,\e(B nnmaildir \e$B%0%k!<%W$K@_Dj$5$l$k\e(B
-\e$B$H!"0\F0@h$N%0%k!<%W$K$*$$$F!"5-;v$,85$N%0%k!<%W$K$"$C$?$H$-$H$A$g$&$IF1\e(B
-\e$B$8$@$18E$/$J$j$^$9!#\e(B} \e$B$7$?$,$C$F!"0\F0@h$N%0%k!<%W$K$*$1\e(B
+\e$B%0%k!<%W$K0\F0$5$;$i$l$^$9!#\e(B@emph{\e$B$3$l$,\e(B @code{nnmaildir} \e$B%0%k!<%W$K@_Dj\e(B
+\e$B$5$l$k$H!"0\F0@h$N%0%k!<%W$K$*$$$F!"5-;v$,85$N%0%k!<%W$K$"$C$?$H$-$H$A$g\e(B
+\e$B$&$IF1$8$@$18E$/$J$j$^$9!#\e(B} \e$B$7$?$,$C$F!"0\F0@h$N%0%k!<%W$K$*$1\e(B
 \e$B$k\e(B @code{expire-age} \e$B$K$OCm0U$7$F2<$5$$!#$3$l$,%Q%i%a!<%?$,B0$9$k$N$HF1\e(B
 \e$B$8%0%k!<%W$NL>A0$K@_Dj$5$l$k$H!"5-;v$O$^$C$?$/4|8B@Z$l>C5n$5$l$^$;$s!#%Y\e(B
 \e$B%/%H%k<0$r;H$&$H!":G=i$NMWAG$,0l2s!"$=$l$>$l$N5-;v$K$D$$$FI>2A$5$l$^$9!#\e(B
 \e$B$7$?$,$C$F!"5-;v$r$I$3$KCV$/$+$r7h$a$k$?$a$K!"$=$N<0\e(B
 \e$B$O\e(B @code{nnmaildir-article-file-name} \e$B$J$I$K>H2q$9$k$3$H$,$G$-$^$9!#\e(B
 @emph{\e$B$3$N%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(B
-nnmaildir \e$B$O\e(B @code{expiry-target} \e$B%0%k!<%W%Q%i%a!<%?\e(B
+@code{nnmaildir} \e$B$O\e(B @code{expiry-target} \e$B%0%k!<%W%Q%i%a!<%?\e(B
 \e$B$d\e(B @code{nnmail-expiry-target} \e$BJQ?t$r8\$_$^$;$s!#\e(B}
 
 @item read-only
-\e$B$3$l$,\e(B @code{t} \e$B$K@_Dj$5$l$F$$$k$H!"\e(Bnnmaildir \e$B$O$=$N5-;v$r$3$N%0%k!<%W$G\e(B
-\e$BFI$_=P$7@lMQ$H$7$F07$$$^$9!#$3$N0UL#$O!"5-;v$O\e(B @file{new/} \e$B$+\e(B
+\e$B$3$l$,\e(B @code{t} \e$B$K@_Dj$5$l$F$$$k$H!"\e(B@code{nnmaildir} \e$B$O$=$N5-;v$r$3$N%0\e(B
+\e$B%k!<%W$GFI$_=P$7@lMQ$H$7$F07$$$^$9!#$3$N0UL#$O!"5-;v$O\e(B @file{new/} \e$B$+\e(B
 \e$B$i\e(B @file{cur/} \e$B$K2~L>$5$l$J$$!"5-;v$O\e(B @file{cur/} \e$B$G$O$J\e(B
 \e$B$/\e(B @file{new/} \e$B$G$N$_8+$D$+$k!"5-;v$O>C5n$5$l$J$$!"5-;v$OJT=8$G$-$J$$!"\e(B
 \e$B$H$$$&$3$H$G$9!#\e(B@file{new/} \e$B$OB>$N\e(B maildir \e$B$N\e(B @file{new/} \e$B%G%#%l%/%H%j!"\e(B
@@ -14155,44 +14272,44 @@ nnmaildir \e$B$O\e(B @code{expiry-target} \e$B%0%k!<%W%Q%i%a!<%?\e(B
 \e$BDj$5$l$F$$$k4X?t$G$9!#\e(B
 
 @item distrust-Lines:
-\e$BHs\e(B-@code{nil} \e$B$G$"$k$H!"\e(Bnnmaildir \e$B$O\e(B @code{Lines:} \e$B%X%C%@!<%U%#!<%k%I$r\e(B
-\e$B;H$&Be$o$j$K$$$D$b5-;v$N9T?t$r?t$($^$9!#\e(B@code{nil} \e$B$@$C$?>l9g$O!"$"$l$P\e(B
-\e$B$=$N%X%C%@!<%U%#!<%k%I$,;H$o$l$^$9!#\e(B
+\e$BHs\e(B-@code{nil} \e$B$G$"$k$H!"\e(B@code{nnmaildir} \e$B$O\e(B @code{Lines:} \e$B%X%C%@!<%U%#!<\e(B
+\e$B%k%I$r;H$&Be$o$j$K$$$D$b5-;v$N9T?t$r?t$($^$9!#\e(B@code{nil} \e$B$@$C$?>l9g$O!"\e(B
+\e$B$"$l$P$=$N%X%C%@!<%U%#!<%k%I$,;H$o$l$^$9!#\e(B
 
 @item always-marks
 @code{['(read expire)]} \e$B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#\e(BGnus \e$B$,5-;v$N0u\e(B
-\e$B$r\e(B nnmaildir \e$B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F$$$k0u\e(B
-\e$B$,2?$G$"$k$+$H$OL54X78$K!"\e(Bnnmaildir \e$B$O$9$Y$F$N5-;v$,$3$l$i$N0u$r;}$C$F$$\e(B
-\e$B$k$HEz$($^$9!#$3$l$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O:o=|$5$l$k$G$7$g\e(B
-\e$B$&!#$=$l$O\e(B Gnus \e$BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$PJ|4~$5$l$k$Y$-$G\e(B
-\e$B$9!#\e(B
+\e$B$r\e(B @code{nnmaildir} \e$B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F\e(B
+\e$B$$$k0u$,2?$G$"$k$+$H$OL54X78$K!"\e(B@code{nnmaildir} \e$B$O$9$Y$F$N5-;v$,$3$l$i\e(B
+\e$B$N0u$r;}$C$F$$$k$HEz$($^$9!#$3$l$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O\e(B
+\e$B:o=|$5$l$k$G$7$g$&!#$=$l$O\e(B Gnus \e$BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$P\e(B
+\e$BJ|4~$5$l$k$Y$-$G$9!#\e(B
 
 @item never-marks
 @code{['(tick expire)]} \e$B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#\e(BGnus \e$B$,5-;v$N0u\e(B
-\e$B$r\e(B nnmaildir \e$B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F$$$k0u\e(B
-\e$B$,2?$G$"$k$+$H$OL54X78$K!"\e(Bnnmaildir \e$B$O$3$l$i$N0u$r;}$C$F$$$k5-;v$OL5$$$H\e(B
-\e$BEz$($^$9!#\e(B@code{never-marks} \e$B$O\e(B @code{always-marks} \e$B$r>e=q$-$7$^$9!#$3$l\e(B
-\e$B$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O:o=|$5$l$k$G$7$g$&!#$=$l$O\e(B Gnus
-\e$BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$PJ|4~$5$l$k$Y$-$G$9!#\e(B
+\e$B$r\e(B @code{nnmaildir} \e$B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F\e(B
+\e$B$$$k0u$,2?$G$"$k$+$H$OL54X78$K!"\e(B@code{nnmaildir} \e$B$O$3$l$i$N0u$r;}$C$F$$\e(B
+\e$B$k5-;v$OL5$$$HEz$($^$9!#\e(B@code{never-marks} \e$B$O\e(B @code{always-marks} \e$B$r>e=q\e(B
+\e$B$-$7$^$9!#$3$l$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O:o=|$5$l$k$G$7$g$&!#\e(B
+\e$B$=$l$O\e(B Gnus \e$BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$PJ|4~$5$l$k$Y$-$G$9!#\e(B
 
 @item nov-cache-size
 @acronym{NOV} \e$B%a%b%j!<%-%c%C%7%e$N%5%$%:$r;XDj$9$k@0?t$G$9!#%9%T!<%I%"%C\e(B
-\e$B%W$N$?$a$K!"\e(Bnnmaildir \e$B$O$=$l$>$l$N%0%k!<%W$N8BDj$5$l$??t$N5-;v$KBP$7$F!"\e(B
-\e$B%a%b%j!<>e$K\e(B @acronym{NOV} \e$B%G!<%?$rJ];}$7$^$9!#\e(B(\e$B$3$l$O$?$V$sM-MQ$G$O$J$/!"\e(B
-\e$B>-Mh$O$*$=$i$/:o=|$5$l$k$G$7$g$&\e(B)\e$B!#$3$N%Q%i%a!<%?$NCM$O!"%5!<%P!<$,3+DL\e(B
-\e$B$7$?8e$G:G=i$K%0%k!<%W$,8+$i$l$?$H$-!"$9$J$o$A0lHL$K$O:G=i$K\e(B Gnus \e$B$r5/F0\e(B
-\e$B$7$?$H$-!"$@$1CmL\$5$l$^$9!#%5!<%P!<$,JD$8$i$l$F:F$S3+DL$5$l$k$^$G$O!"\e(B
-@acronym{NOV} \e$B%-%c%C%7%e$N%5%$%:$OJQ99$5$l$^$;$s!#%G%#%U%)%k%H$O35N,%P%C\e(B
-\e$B%U%!$KI=<($5$l$k5-;v$N?t$N8+@Q$j\e(B (@code{tick} \e$B0u$,$"$C$F\e(B @code{read} \e$B$,\e(B
-\e$BL5$$5-;v$N?t$K>/!9$NM>J,$r2C$($?$b$N\e(B) \e$B$G$9!#\e(B
+\e$B%W$N$?$a$K!"\e(B@code{nnmaildir} \e$B$O$=$l$>$l$N%0%k!<%W$N8BDj$5$l$??t$N5-;v$K\e(B
+\e$BBP$7$F!"%a%b%j!<>e$K\e(B @acronym{NOV} \e$B%G!<%?$rJ];}$7$^$9!#\e(B(\e$B$3$l$O$?$V$sM-MQ\e(B
+\e$B$G$O$J$/!">-Mh$O$*$=$i$/:o=|$5$l$k$G$7$g$&\e(B)\e$B!#$3$N%Q%i%a!<%?$NCM$O!"%5!<\e(B
+\e$B%P!<$,3+DL$7$?8e$G:G=i$K%0%k!<%W$,8+$i$l$?$H$-!"$9$J$o$A0lHL$K$O:G=i\e(B
+\e$B$K\e(B Gnus \e$B$r5/F0$7$?$H$-!"$@$1CmL\$5$l$^$9!#%5!<%P!<$,JD$8$i$l$F:F$S3+DL$5\e(B
+\e$B$l$k$^$G$O!"\e(B@acronym{NOV} \e$B%-%c%C%7%e$N%5%$%:$OJQ99$5$l$^$;$s!#%G%#%U%)%k\e(B
+\e$B%H$O35N,%P%C%U%!$KI=<($5$l$k5-;v$N?t$N8+@Q$j\e(B (@code{tick} \e$B0u$,$"$C\e(B
+\e$B$F\e(B @code{read} \e$B$,L5$$5-;v$N?t$K>/!9$NM>J,$r2C$($?$b$N\e(B) \e$B$G$9!#\e(B
 @end table
 
 @subsubsection \e$B5-;v$N<1JL\e(B
 \e$B5-;v$O$=$l$>$l$N\e(B maildir \e$B$N\e(B @file{cur/} \e$B%G%#%l%/%H%j$K3JG<$5$l$^$9!#3F!9\e(B
 \e$B$N5-;v$K$O\e(B @code{uniq:info} \e$B$N$h$&$JL>A0$,IU$1$i$l$^$9!#$3$3\e(B
-\e$B$G\e(B @code{uniq} \e$B$O%3%m%s$r4^$_$^$;$s!#\e(Bnnmaildir \e$B$O\e(B @code{:info} \e$B$NItJ,$r\e(B
-\e$BJ];}$7$^$9$,L5;k$7$^$9!#\e(B(\e$BB>$N\e(B maildir \e$B%j!<%@!<$O0lHL$K0u$r3JG<$9$k$?$a$K\e(B
-\e$B$3$NItJ,$r;H$$$^$9!#\e(B) @code{uniq} \e$B$NItJ,$O5-;v$r%f%K!<%/$K<1JL$7!"\e(B
+\e$B$G\e(B @code{uniq} \e$B$O%3%m%s$r4^$_$^$;$s!#\e(B@code{nnmaildir} \e$B$O\e(B @code{:info} \e$B$N\e(B
+\e$BItJ,$rJ];}$7$^$9$,L5;k$7$^$9!#\e(B(\e$BB>$N\e(B maildir \e$B%j!<%@!<$O0lHL$K0u$r3JG<$9$k\e(B
+\e$B$?$a$K$3$NItJ,$r;H$$$^$9!#\e(B) @code{uniq} \e$B$NItJ,$O5-;v$r%f%K!<%/$K<1JL$7!"\e(B
 maildir \e$B$N\e(B @file{.nnmaildir/} \e$B%5%V%G%#%l%/%H%j$N?'!9$J>l=j$K5-;v$K4XO"$7\e(B
 \e$B$?>pJs$r3JG<$9$k$?$a$K;H$o$l$^$9!#35N,%P%C%U%!$G5-;v$rMW5a$7$?8e$G!"5-;v\e(B
 \e$B$N40A4$J%Q%9L>$,\e(B @code{nnmaildir-article-file-name} \e$BJQ?t$+$iF@$i$l$^$9!#\e(B
@@ -14204,28 +14321,28 @@ maildir \e$B$N\e(B @file{.nnmaildir/} \e$B%5%V%G%#%l%/%H%j$N?'!9$J>l=j$K5-;v$K4XO"$
 \e$BMW$O$"$^$j$"$j$^$;$s!#5-;v$N\e(B @acronym{NOV} \e$B%G!<%?$O5-;v\e(B
 \e$B$+\e(B @code{nnmail-extra-headers} \e$B$,JQ2=$7$?$H$-$K<+F0E*$K99?7$5$l$^\e(B
 \e$B$9!#\e(B) \e$BBP1~$9$k\e(B @acronym{NOV} \e$B%U%!%$%k$r$?$@>C$9$3$H$K$h$C$FC10l$N5-;v\e(B
-\e$B$N\e(B @acronym{NOV} \e$B%G!<%?$N@8@.$r\e(B nnmaildir \e$B$K6/@)$9$k$3$H$O$G$-$^$9!#$7$+\e(B
-\e$B$7\e(B @emph{\e$B$4MQ?4\e(B}\e$B!#$3$l$O\e(B nnmaildir \e$B$,$3$N5-;v$K?7$7$$5-;vHV9f$r3d$j?6$i\e(B
-\e$B$;!"\e(B@code{seen} \e$B0u!"%(!<%8%'%s%H!"$*$h$S%-%c%C%7%e$K$H$C$FLLE]$J$3$H$K$J\e(B
-\e$B$j$^$9!#\e(B
+\e$B$N\e(B @acronym{NOV} \e$B%G!<%?$N@8@.$r\e(B @code{nnmaildir} \e$B$K6/@)$9$k$3$H$O$G$-$^\e(B
+\e$B$9!#$7$+$7\e(B @emph{\e$B$4MQ?4\e(B}\e$B!#$3$l$O\e(B @code{nnmaildir} \e$B$,$3$N5-;v$K?7$7$$5-;v\e(B
+\e$BHV9f$r3d$j?6$i$;!"\e(B@code{seen} \e$B0u!"%(!<%8%'%s%H!"$*$h$S%-%c%C%7%e$K$H$C$F\e(B
+\e$BLLE]$J$3$H$K$J$j$^$9!#\e(B
 
 @subsubsection \e$B5-;v$N0u\e(B
 @file{.nnmaildir/marks/flag/uniq} \e$B%U%!%$%k$,$"$k>l9g$K!"\e(B@code{uniq} \e$B$K$h$C\e(B
 \e$B$F<1JL$5$l$k5-;v$O!"\e(B@code{flag} \e$B0u$r;}$D$b$N$H9M$($i$l$^$9!#\e(B
-Gnus \e$B$,\e(B nnmaildir \e$B$K%0%k!<%W$N0u$r?R$M$k$H!"\e(Bnnmaildir \e$B$O$=$N$h$&$J%U%!%$\e(B
-\e$B%k$rC5$7$F!"8+$D$1$?0u$N%;%C%H$rJs9p$7$^$9!#\e(BGnus \e$B$,\e(B nnmaildir \e$B$K0u$N%;%C\e(B
-\e$B%H$N3JG<$rMW5a$9$k$H!"\e(Bnnmaildir \e$B$OI,MW$JBP1~$9$k%U%!%$%k$r@8@.$7!"$^$?$O\e(B
-\e$B>C5n$7$^$9!#\e(B(\e$B<B:]$O!"$=$l$>$l$N0u$N$?$a$K?7$7$$%U%!%$%k$r:n$k$N$G$O$J$/!"\e(B
-i\e$B%N!<%I\e(B \e$B$r@aLs$9$k$?$a$KC1$K\e(B @file{.nnmaildir/markfile} \e$B$X$N%O!<%I%j%s%/\e(B
-\e$B$rD%$j$^$9!#\e(B)
+Gnus \e$B$,\e(B @code{nnmaildir} \e$B$K%0%k!<%W$N0u$r?R$M$k$H!"\e(B@code{nnmaildir} \e$B$O$=\e(B
+\e$B$N$h$&$J%U%!%$%k$rC5$7$F!"8+$D$1$?0u$N%;%C%H$rJs9p$7$^$9!#\e(B
+Gnus \e$B$,\e(B @code{nnmaildir} \e$B$K0u$N%;%C%H$N3JG<$rMW5a$9$k$H!"\e(B
+@code{nnmaildir} \e$B$OI,MW$JBP1~$9$k%U%!%$%k$r@8@.$7!"$^$?$O>C5n$7$^$9!#\e(B(\e$B<B\e(B
+\e$B:]$O!"$=$l$>$l$N0u$N$?$a$K?7$7$$%U%!%$%k$r:n$k$N$G$O$J$/!"\e(Bi\e$B%N!<%I\e(B \e$B$r@aLs\e(B
+\e$B$9$k$?$a$KC1$K\e(B @file{.nnmaildir/markfile} \e$B$X$N%O!<%I%j%s%/$rD%$j$^$9!#\e(B)
 
 @file{.nnmaildir/marks/} \e$B$K?7$7$$%G%#%l%/%H%j$r:n$k$3$H$K$h$C$F!"?7$7$$\e(B
 \e$B0u$rAOB$$9$k$3$H$,$G$-$^$9!#0u$rJ];}$7$D$D\e(B maildir \e$B$r\e(B tar \e$B$G$^$H$a$F%5!<\e(B
 \e$B%P!<$+$i$=$l$r:o=|$7!"8e$G\e(B tar \e$B$r$[$I$/$3$H$,$G$-$^$9!#0u%U%!%$%k$r:n@.\e(B
 \e$B$^$?$O>C5n$9$k$3$H$K$h$C$F!"$"$J$?<+?H$,0u$rDI2C$^$?$O:o=|$9$k$3$H$,$G$-\e(B
-\e$B$^$9!#\e(BGnus \e$B$,F0:n$7$F$$$F\e(B nnmaildir \e$B%5!<%P!<$,3+DL$7$F$$$k$H$-$K$3$l$r9T\e(B
-\e$B$J$&>l9g$O!":G=i$K$9$Y$F$N\e(B nnmaildir \e$B%0%k!<%W$N35N,%P%C%U%!$+$iB`=P$7$F\e(B
-\e$B%0%k!<%W%P%C%U%!$G\e(B @kbd{s} \e$B$r%?%$%W$7!"$=$N8e%0%k!<%W%P%C%U%!\e(B
+\e$B$^$9!#\e(BGnus \e$B$,F0:n$7$F$$$F\e(B @code{nnmaildir} \e$B%5!<%P!<$,3+DL$7$F$$$k$H$-$K\e(B
+\e$B$3$l$r9T$J$&>l9g$O!":G=i$K$9$Y$F$N\e(B @code{nnmaildir} \e$B%0%k!<%W$N35N,%P%C%U%!\e(B
+\e$B$+$iB`=P$7$F%0%k!<%W%P%C%U%!$G\e(B @kbd{s} \e$B$r%?%$%W$7!"$=$N8e%0%k!<%W%P%C%U%!\e(B
 \e$B$G\e(B @kbd{g} \e$B$+\e(B @kbd{M-g} \e$B$r%?%$%W$9$k$N$,:GNI$G$9!#$=$&$7$J$$$H\e(B Gnus \e$B$OJQ\e(B
 \e$B99$rB*$($F$/$l$:$K!"$=$l$i$r85$KLa$7$F$7$^$&$+$b$7$l$^$;$s!#\e(B
 
@@ -14267,7 +14384,7 @@ i\e$B%N!<%I\e(B \e$B$r@aLs$9$k$?$a$KC1$K\e(B @file{.nnmaildir/markfile} \e$B$X$N%O!<%
 
 @item nnfolder-newgroups-file
 @vindex nnfolder-newsgroups-file
-\e$B%0%k!<%W5-=R%U%!%$%k$NL>A0!#\e(B@xref{Newsgroups File Format}\e$B!#4{DjCM\e(B
+\e$B%0%k!<%W5-=R%U%!%$%k$NL>A0!#\e(B@xref{Newsgroups File Format}. \e$B4{DjCM\e(B
 \e$B$O\e(B @file{~/Mail/newsgroups"} \e$B$G$9!#\e(B
 
 @item nnfolder-get-new-mail
@@ -14518,7 +14635,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
 \e$B$^$9!#\e(B
 
 @menu
-* Archiving Mail::              
+* Archiving Mail::
 * Web Searches::                \e$BJ8;zNs$K%^%C%A$9$k5-;v$+$i%0%k!<%W$r:n$k\e(B
 * Slashdot::                    Slashdot \e$B$N%3%a%s%H$rFI$`\e(B
 * Ultimate::                    Ultimate Bulletin Board \e$B%7%9%F%`\e(B
@@ -14561,8 +14678,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
 \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;$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#\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\e(B
+\e$B$K\e(B gnus \e$B$r=*N;$9$kI,MW$,$"$k$+$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
@@ -14685,8 +14802,8 @@ gnus \e$B$r=*N;$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#\e(B
 
 @code{nnslashdot} \e$B%3%a%s%H$K%U%)%m!<%"%C%W\e(B (\e$B$^$?$O?7$7$$%3%a%s%H$NEj9F\e(B)
 \e$B$r$9$k$H$-$O!">/$7\e(B @acronym{HTML} \e$B$KJQ49$5$l$^$9!#FC$K!"\e(B@samp{> } \e$B$G0zMQ\e(B
-\e$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K\e(B @code{blockquote} \e$B$G0zMQ$5$l!"=pL>$K$O$=$l\e(B
-\e$B$>$l$N9T$N:G8e$K\e(B @code{br} \e$B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!\e(B
+\e$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K\e(B @samp{blockquote} \e$B$G0zMQ$5$l!"=pL>$K$O$=$l\e(B
+\e$B$>$l$N9T$N:G8e$K\e(B @samp{br} \e$B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!\e(B
 \e$B$KD>@\\e(B @acronym{HTML} \e$B$r=q$/$3$H$,$G$-$^$9!#\e(BSlashdot \e$B$O$$$/$D\e(B
 \e$B$+\e(B @acronym{HTML} \e$B$rA*JL$9$k$3$H$K5$$r$D$1$F$/$@$5$$!#\e(B
 
@@ -14716,18 +14833,16 @@ gnus \e$B$r=*N;$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#\e(B
 
 @item nnslashdot-active-url
 @vindex nnslashdot-active-url
-\e$B%K%e!<%95-;v$H%3%a%s%H$r<hF@$9$k$?$a$K;H$o$l$k\e(B @sc{url} \e$B$NJ8;zNs$G$9!#=i\e(B
-\e$B4|CM$O\e(B @samp{http://slashdot.org/search.pl?section=&min=%d} \e$B$G$9!#\e(B
+\e$B%K%e!<%95-;v$H%3%a%s%H$r<hF@$9$k$?$a$K;H$o$l$k\e(B @acronym{URL} \e$B$NJ8;zNs$G\e(B
+\e$B$9!#=i4|CM$O\e(B @samp{http://slashdot.org/search.pl?section=&min=%d} \e$B$G$9!#\e(B
 
 @item nnslashdot-comments-url
 @vindex nnslashdot-comments-url
-\e$B%3%a%s%H$r<hF@$9$k$?$a$K;HMQ$5$l$k\e(B @sc{url} \e$BJ8;zNs$G$9!#=i4|CM\e(B
-\e$B$O\e(B @samp{http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d} \e$B$G\e(B
-\e$B$9!#\e(B
+\e$B%3%a%s%H$r<hF@$9$k$?$a$K;HMQ$5$l$k\e(B @acronym{URL} \e$BJ8;zNs$G$9!#\e(B
 
 @item nnslashdot-article-url
 @vindex nnslashdot-article-url
-\e$B%K%e!<%95-;v$r<hF@$9$k$?$a$K;H$o$l$k\e(B @sc{url} \e$BJ8;zNs$G$9!#=i4|CM\e(B
+\e$B%K%e!<%95-;v$r<hF@$9$k$?$a$K;H$o$l$k\e(B @acronym{URL} \e$BJ8;zNs$G$9!#=i4|CM\e(B
 \e$B$O\e(B @samp{http://slashdot.org/article.pl?sid=%s&mode=nocomment} \e$B$G$9!#\e(B
 
 @item nnslashdot-threshold
@@ -14752,10 +14867,10 @@ gnus \e$B$r=*N;$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#\e(B
 @code{nnultimate} \e$B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O%0%k!<%W%P%C%U%!$G0J2<$N\e(B
 \e$B$h$&$J$b$N$r$9$k$3$H$G$9\e(B: @kbd{B nnultimate RET
 http://www.tcj.com/messboard.ubbcgi/ RET}\e$B!#\e(B(\e$B6=L#$N$"$k2q5D<<\e(B
-\e$B$N\e(B @sc{url} (@samp{Ultimate.cgi} \e$BEy$r:G8e$K4^$s$G$$$J$$$b$N\e(B) \e$B$KJQ$($F$/\e(B
-\e$B$@$5$$!#\e(BUltimate \e$B%&%'%V%5%$%H$K$O$?$/$5$s5s$2$i$l$F$$$^$9!#\e(B) \e$B$=$l$+$i%5!<\e(B
-\e$B%P!<%P%C%U%!$G6=L#$N$"$k%0%k!<%W$r9XFI$7!"%0%k!<%W%P%C%U%!$+$i$=$l$i$rFI\e(B
-\e$B$s$G$/$@$5$$!#\e(B
+\e$B$N\e(B @acronym{URL} (@samp{Ultimate.cgi} \e$BEy$r:G8e$K4^$s$G$$$J$$$b$N\e(B) \e$B$KJQ$(\e(B
+\e$B$F$/$@$5$$!#\e(BUltimate \e$B%&%'%V%5%$%H$K$O$?$/$5$s5s$2$i$l$F$$$^$9!#\e(B) \e$B$=$l$+\e(B
+\e$B$i%5!<%P!<%P%C%U%!$G6=L#$N$"$k%0%k!<%W$r9XFI$7!"%0%k!<%W%P%C%U%!$+$i$=$l\e(B
+\e$B$i$rFI$s$G$/$@$5$$!#\e(B
 
 \e$B0J2<$N\e(B @code{nnutimate} \e$BJQ?t$rJQ992DG=$G$9\e(B:
 
@@ -14833,13 +14948,21 @@ http://w3m.sourceforge.net/
 @cindex nnrss
 @cindex RSS
 
-\e$B$$$/$D$+$N%5%$%H$O\e(B RDF site summary (RSS) \e$B$r;}$C$F$$$^\e(B
-\e$B$9\e(B @uref{http://purl.org/rss/1.0/spec}\e$B!#$3$l$O$H$F$b5,B'E*$+$DNI<A$J%$%s\e(B
-\e$B%?!<%U%'!<%9$G!"\e(Bgnus \e$B$,%0%k!<%W$r>o$K?7$7$/$7$F$*$/$?$a$N>pJs$rF@$k$3$H\e(B
-\e$B$,$G$-$^$9!#\e(B
+\e$B$$$/$D$+$N%5%$%H$O\e(B RDF site summary (@acronym{RSS}) \e$B$r;}$C$F$$$^$9!#\e(B
+@acronym{RSS} \e$B$O!"%K%e!<%9$K4XO"$9$k%5%$%H\e(B (BBC \e$B$d\e(B CNN \e$B$N$h$&$J\e(B) \e$B$N<gMW\e(B
+\e$B9`L\$rMWLs$9$k$?$a$N%U%)!<%^%C%H$G$9!#$7$+$74pK\E*$K!"%j%9%H$N$h$&$J$b$N\e(B
+\e$B$J$i2?$G$b!"\e(B@acronym{RSS} feed \e$B$H$7$FDs6!$9$k$3$H$,$G$-$^\e(B
+\e$B$9\e(B: weblogs\e$B!"\e(Bchangelogs \e$B$"$k$$$O\e(B wiki (\e$BNc$(\e(B
+\e$B$P\e(B @url{http://cliki.net/recent-changes.rdf}) \e$B$X$N:G6a$NJQ99!#\e(B
+
+@acronym{RSS} \e$B$O$H$F$b5,B'E*$+$DNI<A$J%$%s%?!<%U%'!<%9$G!"\e(Bgnus \e$B$,%0%k!<\e(B
+\e$B%W$r>o$K?7$7$/$7$F$*$/$?$a$N>pJs$rF@$k$3$H$,$G$-$^$9!#\e(B
 
-\e$B4JC1$K\e(B @code{nnrss} \e$B$r;H$$;O$a$k$K$O!"%0%k!<%W%P%C%U%!\e(B
-\e$B$G\e(B @kbd{B nnrss RET RET} \e$B$H%?%$%W$7$F!"%0%k!<%W$r9VFI$7$F2<$5$$!#\e(B
+Feed \e$B$r9VFI$9$k$K$O!"35N,%P%C%U%!$+$i\e(B @kbd{G R} \e$B$r;H$C$F2<$5$$\e(B---feed \e$B$N\e(B
+\e$B=j:_$NF~NO$r5a$a$i$l$k$G$7$g$&!#\e(B
+
+\e$B4JC1$K\e(B @code{nnrss} \e$B$r$O$8$a$kJ}K!$O!"%0%k!<%W%P%C%U%!$G\e(B @kbd{B nnrss
+RET y} \e$B$N$h$&$J$3$H$r>'$(!"$=$7$F%0%k!<%W$r9VFI$9$k$3$H$G$9!#\e(B
 
 \e$B0J2<$N\e(B @code{nnrss} \e$BJQ?t$,JQ992DG=$G$9\e(B:
 
@@ -14848,6 +14971,14 @@ http://w3m.sourceforge.net/
 @vindex nnrss-directory
 @code{nnrss} \e$B$,%U%!%$%k$r=q$-9~$`%G%#%l%/%H%j!<$G!"%G%#%U%)%k%H\e(B
 \e$B$O\e(B @file{~/News/rss/} \e$B$G$9!#\e(B
+
+@item nnrss-use-local
+@vindex nnrss-use-local
+@findex nnrss-generate-download-script
+@code{nnrss-use-local} \e$B$r\e(B @code{t} \e$B$K@_Dj$9$k$H!"\e(B
+@code{nnrss} \e$B$O\e(B @code{nnrss-directory} \e$B$K$"$k%m!<%+%k%U%!%$%k$+$i\e(B feed
+\e$B$rFI$_$^$9!#\e(B@code{nnrss-generate-download-script}\e$B%3%^%s%I$r;H$&$3$H$K$h$C\e(B
+\e$B$F!"\e(B@command{wget} \e$B$r;H$C$?%@%&%s%m!<%I!&%9%/%j%W%H$r:n$k$3$H$,$G$-$^$9!#\e(B
 @end table
 
 \e$B35N,%P%C%U%!$K@bL@$rI=<($5$;$?$$$J$i$P!"0J2<$N%3!<%I$,Lr$KN)$D$G$7$g$&!#\e(B
@@ -14939,7 +15070,7 @@ 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=<
 @code{mail-sources} \e$B$K\e(B imap \e$B$rEPO?$7$F2<$5$$!#$3$l$K$h$C\e(B
 \e$B$F\e(B gnus \e$B$O\e(B @acronym{IMAP} \e$B%5!<%P!<$+$i%a!<%k$r<h$j9~$s$G!"%m!<%+%k%G%#%9\e(B
 \e$B%/$KCyB"$7$^$9!#$3$3$G$O$=$N;H$$J}$N@bL@$O$7$^$;$s$N$G!"\e(B
-@xref{Mail Sources} \e$B$r;2>H$7$F2<$5$$!#\e(B
+@ref{Mail Sources} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @acronym{IMAP} \e$B$r%a!<%k$rCyB"$9$k%W%m%H%3%k$H$7$F;H$$$?$$$H$-$O!"\e(B
 @code{gnus-secondary-select-methods} \e$B$K\e(B nnimap \e$B$rEPO?$7$F2<$5$$!#$3$l$K\e(B
@@ -15067,7 +15198,7 @@ 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 2.0.14 \e$BL$K~$N\e(B Cyrus IMAPD \e$B$K4^$^$l$F$$$k\e(B @samp{imtest} (\e$B%P!<%8%g\e(B
 \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
+@file{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$?\e(B
 \e$B$O\e(B @acronym{IMAP} \e$B%3%^%s%I$N9T$ND9$5$N@)8B$KG:$^$5$l$k$G$7$g$&!#$=$l$O%a!<\e(B
 \e$B%k%\%C%/%9$K$?$/$5$s$N5-;v$,$"$k$H$-$K\e(B Gnus \e$B$rL54|8B$K%O%s%0$5$;$F$7$^$&\e(B
@@ -15124,14 +15255,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%`\e(B @code{imtest} \e$B$,I,MW$G$9!#\e(B
 @item
 @dfn{digest-md5:} DIGEST-MD5 \e$B$G0E9f2=$5$l$?\e(B \e$BMxMQ<TL>\e(B/\e$B%Q%9%o!<%I\e(B \e$B$G$9!#30\e(B
-\e$BIt%i%$%V%i%j\e(B @code{digest-md5.el} \e$B$,I,MW$G$9!#\e(B
+\e$BIt%i%$%V%i%j\e(B @file{digest-md5.el} \e$B$,I,MW$G$9!#\e(B
 @item
 @dfn{cram-md5:} CRAM-MD5 \e$B$G0E9f2=$5$l$?\e(B \e$BMxMQ<TL>\e(B/\e$B%Q%9%o!<%I\e(B \e$B$G$9!#\e(B
 @item
 @dfn{login:} LOGIN \e$B7PM3$G$N@8$N\e(B \e$BMxMQ<TL>\e(B/\e$B%Q%9%o!<%I\e(B \e$B$G$9!#\e(B
 @item
-@dfn{anonymous:} \e$BEE;R%a!<%k%"%I%l%9$r%Q%9%o!<%I$H$7!"\e(B`anonymous' \e$B$H$7$F\e(B
-\e$B%m%0%$%s$7$^$9!#\e(B
+@dfn{anonymous:} \e$BEE;R%a!<%k%"%I%l%9$r%Q%9%o!<%I$H$7$FM?$(!"\e(B
+``anonymous'' \e$B$H$7$F%m%0%$%s$7$^$9!#\e(B
 @end itemize
 
 @item nnimap-expunge-on-close
@@ -15164,7 +15295,7 @@ 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$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 @acronym{IMAP} \e$B%/%i%$%"%s%H$O$G$O$G$-$k$+$b$7\e(B
 \e$B$l$^$;$s!#<j$G\e(B EXPUNGE \e$B%3%^%s%I$rH/9T$7$?$$$H$-\e(B
-\e$B$O\e(B @xref{Expunging mailboxes}\e$B!#\e(B
+\e$B$O\e(B @xref{Expunging mailboxes}.
 @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
@@ -15229,6 +15360,7 @@ 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$
 * Editing IMAP ACLs::           \e$B%a!<%k%\%C%/%9$X$NB>$NMxMQ<T$N;HMQ$r@)8B\e(B/\e$B5v2D$9$k\e(B
 * Expunging mailboxes::         ``\e$B%a!<%k%\%C%/%905=L\e(B'' \e$B%\%?%s$HEy2A$J$b$N\e(B
 * A note on namespaces::        gnus \e$B$G\e(B @acronym{IMAP} \e$BL>A06u4V$r;H$&\e(B(\e$B;H$o$J$$\e(B)\e$BJ}K!\e(B
+* Debugging IMAP::              \e$B$b$N$4$H$,F/$+$J$$$H$-$K$9$k$Y$-$3$H\e(B
 @end menu
 
 @node Splitting in IMAP
@@ -15243,6 +15375,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$
 
 \e$B$=$7$F<B:]$K$7$^$9!#\e(B
 
+(\e$B$D$$$G$K8@$($P!"$_$s$J$,L48+$F$$$?$N$G$7$g$&$M!#$=$N7k2L\e(B Sieve \e$B$O;T>l@j\e(B
+\e$BM-N($rA}$7$F!"$$$/$D$b$N\e(B IMAP \e$B%5!<%P!<$K$h$C$F%5%]!<%H$5$l$k$h$&$K$J$j$^\e(B
+\e$B$7$?!#9,$$$K\e(B gnus \e$B$b$=$l$r%5%]!<%H$7$^$9!#\e(B@xref{Sieve Commands}.)
+
 \e$B4XO"$9$kJQ?t$O;0$D$G$9\e(B:
 
 @table @code
@@ -15298,7 +15434,7 @@ Nnmail \e$B$KBP1~$9$k$b$N$O$"$j$^$;$s!#\e(B
 \e$B$r\e(B INBOX.junk \e$B$KF~$l!"$=$NB>A4$F$N$b$N$r\e(B INBOX.private \e$B$KF~$l$^$9!#\e(B
 
 \e$B:G=i$NJ8;zNs$O!"\e(Breplace-match \e$B$G9gCW$7$?%F%-%9%H$+$iI{I=8=$rA^F~$9$k$H$-\e(B
-\e$B$K;HMQ$5$l$k$N$HF1$8$h$&$J!"\e(B`\\1' \e$B7A<0$r4^$`$3$H$,$G$-$^$9!#Nc$($P\e(B:
+\e$B$K;HMQ$5$l$k$N$HF1$8$h$&$J!"\e(B@samp{\\1} \e$B7A<0$r4^$`$3$H$,$G$-$^$9!#Nc$($P\e(B:
 
 @lisp
 ("INBOX.lists.\\1"     "^Sender: owner-\\([a-z-]+\\)@@")
@@ -15368,7 +15504,7 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-split-methods}.
 
 \e$B$b$7$"$J$?$,FC5iJ,3d$r;H$$$?$$$J$i$P!"\e(B@code{nnimap-split-rule} \e$B$NCM\e(B
 \e$B$r\e(B @code{nnmail-split-fancy} \e$B$K@_Dj$9$k$3$H$,$G$-$^$9!#\e(B
-@xref{Fancy Mail Splitting}\e$B!#\e(B
+@xref{Fancy Mail Splitting}.
 
 \e$B$7$+$7\e(B nnmail \e$B$H\e(B nnimap \e$B$H$G0[$J$kFC5iJ,3dJ}<0$r;}$D$h$&$K$9$k$K$O!"\e(B
 @code{nnimap-split-rule} \e$B$NCM$r\e(B @code{nnimap-split-fancy} \e$B$K@_Dj$7$F!"\e(B
@@ -15433,7 +15569,7 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-split-fancy}.
 @cindex editing imap acls
 @cindex Access Control Lists
 @cindex Editing @acronym{IMAP} ACLs
-@kindex G l
+@kindex G l (\e$B%0%k!<%W\e(B)
 @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(B@acronym{IMAP} \e$B$G\e(B
@@ -15465,11 +15601,11 @@ ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(B@acronym{I
 
 @cindex expunge
 @cindex manual expunging
-@kindex G x
+@kindex G x (\e$B%0%k!<%W\e(B)
 @findex gnus-group-nnimap-expunge
 
 @code{nnimap-expunge-on-close} \e$B$K\e(B @code{never} \e$B$r@_Dj$7$F$$$l$P!"%a!<%k\e(B
-\e$B%\%C%/%9$NA4$F$N>C5n$5$l$?5-;v$r<jF0$G:o=|$7$?$$$H;W$&$G$7$g$&!#\e(B
+\e$B%\%C%/%9$NA4$F$N>C5n$5$l$?5-;v$r<jF0$G:o=|$9$kI,MW$,$"$k$G$7$g$&!#\e(B
 @kbd{G x} \e$B$,$^$5$K$3$N$3$H$r$7$^$9!#\e(B
 
 \e$B8=;~E@$G$O!">C5n$5$l$?5-;v$rI=<($9$kJ}K!$O$"$j$^$;$s!#$?$@>C5n$G$-$k$@$1\e(B
@@ -15518,6 +15654,37 @@ ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(B@acronym{I
 \e$B=q$r8+$F2<$5$$!#$=$l$i$O6/NO$J9)6q$J$N$G!"$I$s$J8z2L$,$"$k$+$,3N$+$J>l9g\e(B
 \e$B$@$1;H$C$F2<$5$$!#\e(B
 
+@node Debugging IMAP
+@subsection IMAP \e$B$N%G%P%C%0\e(B
+@cindex IMAP debugging
+@cindex protocol dump (IMAP)
+
+@acronym{IMAP} \e$B$O\e(B @acronym{NNTP} \e$B$d\e(B @acronym{POP3} \e$B$h$j$b$C$HJ#;($J%W%m\e(B
+\e$B%H%3%k$G$9!#<BAu>e$N%P%0$,L5$$$H$O8@$$@Z$l$J$$$N$G!";d$?$A$O!"$9$0$K$=$l\e(B
+\e$B$i$rD>$9$?$a$K:GA1$r?T$/$7$^$9!#$"$J$?$,4qL/$J?6$kIq$$$K=P2q$C$?$H$7$?$i!"\e(B
+\e$B%5!<%P!<$+\e(B gnus \e$B$N$I$A$i$+$K%P%0$,$"$k2DG=@-$,$"$j$^$9!#\e(B
+
+\e$B$"$J$?$,0lHLE*$J%M%C%H%o!<%/!&%W%m%H%3%k$K@:DL$7$F$$$k$J$i$P!"\e(BGnus \e$B$H%5!<\e(B
+\e$B%P!<$N4V$G$d$j$H$j$5$l$k%W%m%H%3%k!&%@%s%W$rFI$`$3$H$K$h$C$F!"$*$=$i$/$$\e(B
+\e$B$/$D$+$N<j3]$+$j$rCj=P$9$k$3$H$,$G$-$k$G$7$g$&!#@:DL$7$F$$$J$/$F$b!"%W%m\e(B
+\e$B%H%3%k!&%@%s%W$r\e(B IMAP \e$B$K4X$9$k%P%0Js9p$K4^$a$l$P!"$=$NLdBj$N2r7h$K$H$C$F\e(B
+\e$B=EMW$J%G!<%?$G;d$?$A$r=u$1$^$9!#$7$?$,$C$F!"\e(Bgnus \e$B$N\e(B IMAP \e$B%P%0$rJs9p$9$k\e(B
+\e$B$H$-$K!"%W%m%H%3%k!&%@%s%W$r4^$a$k$3$H$r6/$/>)Ne$7$^$9!#\e(B
+
+@vindex imap-log
+\e$B%W%m%H%3%k!&%@%s%W$O!"$=$l$rM-8z$K$7$F$$$k$H$?$/$5$s$N%G!<%?$r@8@.$9$k$N\e(B
+\e$B$G!"%G%#%U%)%k%H$G$OL58z$K$J$C$F$$$^$9!#M-8z$K$9$k$K$O!"0J2<$N$h$&\e(B
+\e$B$K\e(B @code{imap-log} \e$B$r@_Dj$7$F2<$5$$\e(B:
+
+@lisp
+(setq imap-log t)
+@end lisp
+
+\e$B$3$l$O\e(B @code{imap.el} \e$B%Q%C%1!<%8$K!"%5!<%P!<$H$N$d$j$H$j$r2?$G$b5-O?$5$;\e(B
+\e$B$^$9!#$=$N5-O?$O\e(B @samp{*imap-log*} \e$B$H$$$&%P%C%U%!$K3JG<$5$l$^$9!#$H$-$H\e(B
+\e$B$7$F\e(B @code{BAD} \e$B$H$$$&;%$,IU$1$i$l$k!"%(%i!<%a%C%;!<%8$rC5$7$F2<$5$$!#$G\e(B
+\e$B$b!"%P%0$rDs=P$9$k$H$-$O!"$9$Y$F$N%G!<%?$r4^$a$k$h$&$K$7$F2<$5$$!#\e(B
+
 @node Other Sources
 @section \e$B$=$NB>$N%0%k!<%W8;\e(B
 
@@ -16319,10 +16486,11 @@ nnvirtual \e$B%0%k!<%W\e(B (@dfn{nnvirtual group}) \e$B$O<B$OB>$N%0%k!<%W$N=89g0J>e
 @cindex kibozing
 
 @dfn{Kiboze} \e$B$9$k!"$H$O!"\e(B``\e$B%K%e!<%9%9%W!<%kA4It\e(B (\e$B$"$k$$$O$=$N0lIt\e(B) \e$B$+\e(B
-\e$B$i\e(B grep \e$B$9$k$3$H\e(B'' \e$B$H%*%C%/%9%U%)!<%IBg<-E5$K$h$C$FDj5A$5$l$F$$$^$9!#\e(B
-@code{nnkiboze} \e$B$O$3$l$r$"$J$?$N$?$a$K9T$C$F$/$l$k%P%C%/%(%s%I$G$9!#4r$7\e(B
-\e$B$$$M\e(B! \e$B$3$l$G$I$s$J\e(B @acronym{NNTP} \e$B%5!<%P!<$G$b!"Lr$KN)$?$J$$MW5a$G;_$^$C\e(B
-\e$B$F$7$^$&$^$G9s;H$9$k$3$H$,$G$-$k$M!#$"$"!"$J$s$F9,$;$J$s$@\e(B!
+\e$B$i\e(B grep \e$B$9$k$3$H\e(B'' \e$B$H\e(B @acronym{OED} (\e$B%*%C%/%9%U%)!<%IBg<-E5\e(B) \e$B$K$h$C$FDj\e(B
+\e$B5A$5$l$F$$$^$9!#\e(B@code{nnkiboze} \e$B$O$3$l$r$"$J$?$N$?$a$K9T$C$F$/$l$k%P%C%/\e(B
+\e$B%(%s%I$G$9!#4r$7$$$M\e(B! \e$B$3$l$G$I$s$J\e(B @acronym{NNTP} \e$B%5!<%P!<$G$b!"Lr$KN)$?\e(B
+\e$B$J$$MW5a$G;_$^$C$F$7$^$&$^$G9s;H$9$k$3$H$,$G$-$k$M!#$"$"!"$J$s$F9,$;$J$s\e(B
+\e$B$@\e(B!
 
 @kindex G k (\e$B%0%k!<%W\e(B)
 kiboze \e$B%0%k!<%W$r:n@.$9$k$K$O!"%0%k!<%W%P%C%U%!$G\e(B @kbd{G k} \e$BL?Na$r;H$$$^\e(B
@@ -16355,9 +16523,9 @@ Gnus \e$B$O$=$N\e(B @code{nnkiboze} \e$B%0%k!<%W$N0lIt$H$J$k$Y$-5-;v$,$"$k$+$I$&$+$
 \e$B$bNI$$$7!"30It%0%k!<%W$G$b9=$$$^$;$s!#L5@)8B$G$9!#\e(B
 
 @vindex nnkiboze-directory
-@code{nnkiboze} \e$B%0%k!<%W$N@8@.$K$h$C$F!"Fs$D$N%U%!%$%k\e(B
- @code{nnkiboze-directory} \e$BFb$K:n@.$5$l$^$9!#$3$N=i4|@_DjCM\e(B
-\e$B$O\e(B @file{~/News/} \e$B$G$9!#0lJ}$N%U%!%$%k$O$=$N%0%k!<%W$NA45-;v\e(B
+@code{nnkiboze} \e$B%0%k!<%W$N@8@.$K$h$C$F!"Fs$D$N%U%!%$\e(B
+\e$B%k\e(B @code{nnkiboze-directory} \e$BFb$K:n@.$5$l$^$9!#$3$N=i4|@_DjCM\e(B
+\e$B$O\e(B @file{~/News/kiboze/} \e$B$G$9!#0lJ}$N%U%!%$%k$O$=$N%0%k!<%W$NA45-;v\e(B
 \e$B$N\e(B @acronym{NOV} \e$B%X%C%@!<9T$r4^$s$G$$$F!"$b$&0lJ}$O9=@.5-;v$r8+$D$1$k$?\e(B
 \e$B$a$K$I$N%0%k!<%W$,8!:w$5$l$?$+$N>pJs$r3JG<$9$k!"\e(B@file{.newsrc} \e$B$NJd=u%U%!\e(B
 \e$B%$%k$G$9!#\e(B
@@ -16406,7 +16574,7 @@ Namazu \e$B$r;H$C$F!"%a!<%k$N;3$+$i$"$J$?$N9%$-$J%-!<%o!<%I$r4^$`5-;v$r8+\e(B
 @end example
 
 \e$B$3$&$9$k$H!"\e(Bgnus \e$B$H\e(B namazu \e$B$NAPJ}$N%-!<%o!<%I$rF1;~$K4^$`%a!<%k$rA4$F\e(B
-\e$BC5$7=P$7!"$=$l$i$N%a!<%k$+$i$J$k2>A[%0%k!<%W$r:n@.$7$^$9\e(B(@xref{Virtual
+\e$BC5$7=P$7!"$=$l$i$N%a!<%k$+$i$J$k2>A[%0%k!<%W$r:n@.$7$^$9\e(B (@pxref{Virtual
 Groups})\e$B!#\e(B
 
 @kbd{C-c C-n}\e$B$K$h$C$F8F$S=P$5$l$kL?Na\e(B @code{gnus-namazu-search} \e$B$O!"\e(B
@@ -16559,14 +16727,14 @@ Gnus \e$B$r\e(B @code{gnus-unplugged} \e$B$G5/F0$7$^$9!#$3$l$O\e(B gnus \e$B%(!<%8%'%
 \e$B$79~$`$?$a$K\e(B @kbd{J j} \e$B$rC!$-!"$=$7$FIaDL$O?7Ce%a!<%k$r8!::$9$k$?$a\e(B
 \e$B$K\e(B @kbd{g} \e$B$r;H$$$^$9!#\e(Bgnus \e$B%(!<%8%'%s%H$,@Z$jN%$5$l$F$$\e(B
 \e$B$k\e(B (@dfn{unplugged}) \e$B$H$-$N?7Ce%a!<%k$N8!::$K$D$$$F\e(B
-\e$B$O\e(B @pxref{Mail Source Specifiers} \e$B$r;2>H$7$F2<$5$$!#\e(B
+\e$B$O\e(B @ref{Mail Source Specifiers} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item
 \e$B$=$7$F!"$=$N>l$G$9$0$K?7$7$$%K%e!<%9$rFI$`$3$H$b$G$-$^$9$7!"%K%e!<%9$r%m!<\e(B
 \e$B%+%k%^%7%s$K%@%&%s%m!<%I$9$k$3$H$b$G$-$^$9!#8e<T$r<B9T$7$?$1$l$P!"\e(B
 @kbd{g} \e$B$r2!$7$F?7Ce%a!<%k$r8!::$7$F$+$i\e(B @kbd{J s} \e$B$GA4%0%k!<%W$+$iE,@Z\e(B
 \e$B$J5-;v$rA4$F<hF@$7$^$9!#\e(B(Gnus \e$B$K$I$N5-;v$r%@%&%s%m!<%I$7$?$$$+$r;XDj$9$k\e(B
-\e$B$K$O\e(B @pxref{Agent Categories} \e$B$r;2>H$7$F$/$@$5$$!#\e(B)
+\e$B$K$O\e(B @ref{Agent Categories} \e$B$r;2>H$7$F$/$@$5$$!#\e(B)
 
 @item
 \e$B5-;v$r<hF@$7$?8e$O\e(B @kbd{J j} \e$B$r2!$7$F!"\e(Bgnus \e$B$r:F$S@Z$jN%$7>uBV$K$5$;!"\e(B
@@ -16597,7 +16765,7 @@ Commands}) \e$B$+!"$^$?$O%(!<%8%'%s%H$K07$C$FM_$7$/$J$$$N$K<+F0E*$KDI2C$5$l\e(B
 \e$B%@%&%s%m!<%IJ}?K$r7hDj$7$^$9!#$"$J$?$NJ}?K$r<BAu$9$k$?$a$K%(!<%8%'%s%HJ,\e(B
 \e$BN`!"%H%T%C%/%Q%i%a!<%?!"%0%k!<%W%Q%i%a!<%?$N$I$l$r;H$&$+$r$$$C$?$s7h$a$F\e(B
 \e$B$7$^$($P!"$3$l$O$+$J$j4JC1$G$9!#$"$J$?$,\e(B gnus \e$B$N=i?4<T$J$i$P!"$?$V$sJ,N`\e(B
-\e$B$G;O$a$k$N$,:GNI$G$7$g$&\e(B @xref{Agent Categories}\e$B!#\e(B
+\e$B$G;O$a$k$N$,:GNI$G$7$g$&!"\e(B@xref{Agent Categories}.
 
 \e$B%H%T%C%/%Q%i%a!<%?\e(B (@pxref{Topic Parameters}) \e$B$H%(!<%8%'%s%HJ,\e(B
 \e$BN`\e(B (@pxref{Agent Categories}) \e$B$NN>J}$O!"B??t$N%0%k!<%W$KE,MQ$9$kJ}?K$N@_\e(B
@@ -16654,12 +16822,13 @@ Commands}) \e$B$+!"$^$?$O%(!<%8%'%s%H$K07$C$FM_$7$/$J$$$N$K<+F0E*$KDI2C$5$l\e(B
 \e$BJQ?t$r>e=q$-$9$kB?$/$NG$0U$J%Q%i%a!<%?$+$i@.$j$^$9!#%(!<%8%'%s%H%Q%i%a!<\e(B
 \e$B%?$N40A4$J%j%9%H$r0J2<$K<($7$^$9!#\e(B
 
+@cindex Agent Parameters
 @table @code
 @item gnus-agent-cat-name
-The name of the category.
+\e$BJ,N`$NL>A0!#\e(B
 
 @item gnus-agent-cat-groups
-The list of groups that are in this category.
+\e$B$3$NJ,N`$K$"$k%0%k!<%W$N%j%9%H!#\e(B
 
 @item gnus-agent-cat-predicate
 (\e$BDL>o\e(B) \e$B$I$N5-;v$r%@%&%s%m!<%I$9$k$N$,E,Ev$+$H$$$&Bg$^$+$JNX3T$rM?$($k=R\e(B
@@ -16691,6 +16860,12 @@ The list of groups that are in this category.
 
 @item gnus-agent-cat-length-when-long
 @code{gnus-agent-long-article} \e$B$r>e=q$-$9$k@0?t!#\e(B
+
+@item gnus-agent-cat-disable-undownloaded-faces
+\e$B%@%&%s%m!<%I$5$l$F$$$J$$5-;v$r\e(B gnus-summary-*-undownloaded-face \e$B$r;H$C$F\e(B
+\e$B35N,%P%C%U%!$K$9$Y$-\e(B @emph{\e$B$G$O$J$$\e(B} \e$B$3$H$r<($9%7%s%\%k!#CM\e(B
+\e$B$,\e(B @code{nil} \e$B$@$H!"B>$N%7%s%\%k$,$=$l$i$rM^@)$7$F$$$F$b!"%@%&%s%m!<%I$5\e(B
+\e$B$l$F$$$J$$5-;vMQ$N%U%'!<%9$r;H$($k$h$&$K$J$j$^$9!#\e(B
 @end table
 
 \e$B$$$C$?$sJ,N`$,:n$i$l$?$i!"J,N`$NL>A0$rJQ$($k$3$H$O$G$-$^$;$s!#\e(B
@@ -17110,7 +17285,7 @@ parameters at one time (@code{gnus-category-customize-category}).
 @kindex J S (\e$B%(!<%8%'%s%H\e(B \e$B%0%k!<%W\e(B)
 @findex gnus-group-send-queue
 \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
+\e$B$k\e(B (@code{gnus-group-send-queue})\e$B!#\e(B@xref{Drafts}.
 
 @item J a
 @kindex J a (\e$B%(!<%8%'%s%H\e(B \e$B%0%k!<%W\e(B)
@@ -17273,10 +17448,9 @@ gnus \e$B$,\e(B @dfn{plugged} \e$B$G$"$k$H$-$K!"$9$G$K%(!<%8%'%s%H$K3JG<$5$l$F$$$k%
 
 \e$B$"$J$?$,$=$&K>$`$N$G$"$l$P!"\e(B@dfn{plugged} \e$B$J4|4V$O>o$K%X%C%@!<$H5-;v$r%@\e(B
 \e$B%&%s%m!<%I$9$k$h$&$K!"%(!<%8%'%s%H\e(B (@code{gnus-agent-cache} \e$B;2\e(B
-\e$B>H\e(B @pxref{Agent Variables}) \e$B$r@_Dj$9$k$3$H$,$G$-$^$9!#\e(Bgnus \e$B$O$[$H$s$I3N\e(B
-\e$B$+$K$b$C$HCY$/$J$j$^$9$,!"%5!<%P!<$H$NF14|$OJ]$?$l$^$9!#\e(B
-nntp \e$B$+\e(B nnimap \e$B%P%C%/%(%s%I$r;H$C$F$$$k>l9g$O!"$?$V$s$3$N:G8e$NE@$O0UL#\e(B
-\e$B$r$J$5$J$$$G$7$g$&!#\e(B
+\e$B>H\e(B @ref{Agent Variables}) \e$B$r@_Dj$9$k$3$H$,$G$-$^$9!#\e(Bgnus \e$B$O$[$H$s$I3N$+\e(B
+\e$B$K$b$C$HCY$/$J$j$^$9$,!"%5!<%P!<$H$NF14|$OJ]$?$l$^$9!#\e(Bnntp \e$B$+\e(B nnimap \e$B%P%C\e(B
+\e$B%/%(%s%I$r;H$C$F$$$k>l9g$O!"$?$V$s$3$N:G8e$NE@$O0UL#$r$J$5$J$$$G$7$g$&!#\e(B
 
 @node Agent Expiry
 @subsection \e$B%(!<%8%'%s%H4|8B@Z$l>C5n\e(B
@@ -17469,9 +17643,13 @@ plugged \e$B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k\e(B @acronym{NOV} \e$B$H5-;v$r;H$&$+$I$&
 
 @item gnus-agent-consider-all-articles
 @vindex gnus-agent-consider-all-articles
-@code{gnus-agent-consider-all-articles} \e$B$,\e(B \e$BHs\e(B-@code{nil} \e$B$@$C$?$i!"%(!<\e(B
-\e$B%8%'%s%H$O$9$Y$F$N8+Ev$?$i$J$$%X%C%@!<$r<hF@$7$^$9!#\e(B@code{nil} \e$B$@$C$?$i\e(B
-\e$B?7$7$$%X%C%@!<$@$1$r<hF@$7$^$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
+@code{gnus-agent-consider-all-articles} \e$B$,Hs\e(B-@code{nil} \e$B$@$C$?$i!"%(!<%8%'\e(B
+\e$B%s%H$O$9$Y$F$N5-;v$K$D$$$F!"$=$l$i$r%@%&%s%m!<%I$9$kI,MW$,$"$k$+$I$&$+$r\e(B
+\e$B%(!<%8%'%s%H$N=R8l$K7hDj$5$;$^$9!#\e(B@code{nil} \e$B$@$C$?>l9g!"$=$l$,%G%#%U%)\e(B
+\e$B%k%H$G$9$,!"%(!<%8%'%s%H$OL$FI$N5-;v$r%@%&%s%m!<%I$9$k$+$I$&$+$@$1$r=R8l\e(B
+\e$B$K7hDj$5$;$^$9!#$3$l$rM-8z$K$9$k$K$O!"8e$G%(!<%8%'%s%H$,4|8B@Z$l>C5n$9$k\e(B
+\e$B5-;v$r2?EY$b7+$jJV$7%@%&%s%m!<%I$7$J$$$h$&$K!"%(!<%8%'%s%H$N4|8B@Z$l>C5n\e(B
+\e$B$N@_Dj\e(B (@pxref{Category Variables}) \e$B$r8+D>$9I,MW$b$"$k$+$b$7$l$^$;$s!#\e(B
 
 @item gnus-agent-max-fetch-size
 @vindex gnus-agent-max-fetch-size
@@ -17696,7 +17874,7 @@ Gnus Agent \e$B$O$h$/$"$kB>$N%*%U%i%$%s%K%e!<%9%j!<%@!<$N$h$&$K$OF0:n$7$^$;\e(B
 \e$BA4$F$N5-;v$O%9%3%"$N=i4|CM$r;}$C$F$*\e(B
 \e$B$j\e(B (@code{gnus-summary-default-score})\e$B!"$3$l$O%G%#%U%)%k%H$G\e(B 0 \e$B$G$9!#$3\e(B
 \e$B$N%9%3%"$OBPOCE*$d!"%9%3%"%U%!%$%k\e(B (score file) \e$B$NJ}K!$K$h$j!">e$2$i$l$?\e(B
-\e$B$j2<$2$i$l$?$j$7$^$9!#\e(B@code{gnus-summary-bark-below} \e$B$h$j$bDc$$%9%3%"$N\e(B
+\e$B$j2<$2$i$l$?$j$7$^$9!#\e(B@code{gnus-summary-mark-below} \e$B$h$j$bDc$$%9%3%"$N\e(B
 \e$B5-;v$K$O4{FI$N0u$,IU$-$^$9!#\e(B
 
 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
@@ -17713,7 +17891,7 @@ 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
 @menu
 * Summary Score Commands::      \e$B8=:_$N%0%k!<%W$N$?$a$N%9%3%"EPO?$rDI2C$9$k\e(B
 * Group Score Commands::        \e$B0lHLE*$J%9%3%"L?Na\e(B
-* Score Variables::             \e$B$"$J$?$N%9%3%"$r%+%9%?%^%$%:$9$k\e(B (\e$B$^$!!"$J$s$FMQ8l$G$7$g$&\e(B)
+* Score Variables::             \e$B$"$J$?$N%9%3%"$r%+%9%?%^%$%:$9$k\e(B (\e$B$^$!!"$J$s$FMQ8l\e(B (Scoring) \e$B$G$7$g$&\e(B)
 * Score File Format::           \e$B%9%3%"%U%!%$%k$K2?$rF~$l$k$+\e(B
 * Score File Editing::          \e$B<j$G%9%3%"%U%!%$%k$rJT=8$9$k;v$b$G$-$k\e(B
 * Adaptive Scoring::            \e$BBg;P\e(B (Big Sister) Gnus \e$B$O$"$J$?$,2?$rFI$s$@$+CN$C$F$$$k\e(B
@@ -17723,7 +17901,7 @@ 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
 * Scoring Tips::                \e$B$I$&$d$C$F8z2LE*$K%9%3%"$rIU$1$k$+\e(B
 * Reverse Scoring::             \e$B8E$$$b$N$N;R$G$"$k$H$$$&LdBj$OLdBj$G$O$J$$\e(B
 * Global Score Files::          \e$BCO$r$D$+$_!"<*$r@Z$jNv$/%9%3%"%U%!%$%k\e(B
-* Kill Files::                  \e$B$=$l$i$O$^$@$3$3$K$"$j$^$9$,!"L5;k$9$k;v$,$G$-$k\e(B
+* Kill Files::                  \e$B$=$l$i$O$^$@$3$3$K$"$k$,!"L5;k$9$k;v$,$G$-$k\e(B
 * Converting Kill Files::       \e$B>C5n%U%!%$%k$r%9%3%"%U%!%$%k$KJQ49$9$k\e(B
 * GroupLens::                   \e$B$I$l$rFI$`$N$,9%$-$+$NM=8@$rF@$k\e(B
 * Advanced Scoring::            \e$B%9%3%"$NK!B'$r:n$k$?$a$KO@M}I=8=$r;H$&\e(B
@@ -18129,6 +18307,7 @@ 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$BNc$($P!"%5!<%P!<$rFCDj$7$J$$A4BN%9%3%"%U%!%$%k$r;H$C$F!"?F%0%k!<%W$K=`$8\e(B
 \e$B$?%9%3%"IU$1$r9T$J$&$J$i$P!"<!$NCM$r;H$($PNI$$$G$7$g$&!#\e(B
+
 @example
 (list (lambda (group) ("all.SCORE"))
       'gnus-score-find-hierarchical)
@@ -18196,7 +18375,7 @@ Gnus \e$B$O0lHLE*$J%9%3%"%U%!%$%k$rFCDj$N%9%3%"%U%!%$%k8~$1$N$b$N$h$jA0$KE,\e(B
 @end lisp
 
 \e$B$3$NNc$O$?$$$F$$$N%9%3%"%U%!%$%k$NMWAG$r@bL@$7$F$$$^$9!#0c$C$?J}K!$K$D$$\e(B
-\e$B$F$O!"\e(B@pxref{Advanced Scoring} \e$B$r8+$F$/$@$5$$!#\e(B
+\e$B$F$O!"\e(B@ref{Advanced Scoring} \e$B$r8+$F$/$@$5$$!#\e(B
 
 \e$B$3$l$O\e(B Lisp \e$B%3!<%I$N$h$&$K8+$($^$9$,!"<B:]$O$3$3$K$"$k$b$N$O2?\e(B
 \e$B$b\e(B @code{\e$BI>2A\e(B} (eval) \e$B$5$l$^$;$s!#$7$+$7!"\e(BLisp \e$B%j!<%@!<$,$3$NMM<0$rFI$_\e(B
@@ -18263,12 +18442,13 @@ gnus \e$B$K5-;vA4BN$r<hF@$7$F\e(B,\e$B5-;v$N$h$jBg$-$JItJ,$G9gCW$r9T$&$h$&$K$9$k;0$
 \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
-@acronym{NNTP} \e$B%5!<%P!<$,\e(B overview \e$B$K\e(B NNTP-Posting-Host \e$B$r5-O?$7$F$$$k$J\e(B
-\e$B$i$P!"\e(B@file{all.SCORE} \e$B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+$i\e(B spam \e$B$N\e(B
-\e$B967b$,$"$k>l9g$KM-8z$G$9!#\e(B
+@acronym{NNTP} \e$B%5!<%P!<$,\e(B overview \e$B$K\e(B @samp{NNTP-Posting-Host} \e$B$r5-O?$7\e(B
+\e$B$F$$$k$J$i$P!"\e(B@file{all.SCORE} \e$B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+\e(B
+\e$B$i\e(B spam \e$B$N967b$,$"$k>l9g$KM-8z$G$9!#\e(B
 
 @lisp
-("111.222.333.444" -1000 nil s "NNTP-Posting-Host")
+("111.222.333.444" -1000 nil s
+ "NNTP-Posting-Host")
 @end lisp
 
 @item Lines, Chars
@@ -18325,7 +18505,7 @@ Date (\e$BF|IU\e(B) \e$B%X%C%@!<$K$O;0$D$N$J$s$H$J$/$P$+$2$F$$$k9gCW$N7?$,$"$j$^$9\e
 \e$B9F$5$l$?5-;v$K9gCW$9$k;v$KCm0U$7$F$/$@$5$$!#I8=`;~$O0l2H$K$H$C$FHs>o$KM-\e(B
 \e$B1W$J3Z$7$_$G$7$g$&\e(B?)
 
-@item Head, Body All
+@item Head, Body, All
 \e$B$3$l$i$N;0$D$N9gCW$N%-!<$O\e(B @code{From} \e$B%X%C%@!<\e(B (\e$B$J$I\e(B) \e$B$HF1$89gCW$N7?$r\e(B
 \e$B;H$$$^$9!#\e(B
 
@@ -18491,7 +18671,7 @@ 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
 
 @vindex gnus-use-adaptive-scoring
 \e$B5-;v$rFI$s$@$H$-!"$"$k$$$O5-;v$K4{FI$N0u$r$D$1$?$H$-!"5-;v$r:o=|$7$?$H$-\e(B
-\e$B$K!"$=$N0u$r;D$7$F$*$$$F$/$@$5$$!#%0%k!<%W$+$i=P$k$H$-$K\e(Bgnus \e$B$O!"$=$l$i\e(B
+\e$B$K!"$=$N0u$r;D$7$F$*$$$F$/$@$5$$!#%0%k!<%W$+$i=P$k$H$-$K\e(B gnus \e$B$O!"$=$l$i\e(B
 \e$B$N0u$NJU$j$rSL$.2s$j!"2?$N0u$r8+$D$1$?$+$K0MB8$7$F%9%3%"MWAG$rDI2C$7$^$9!#\e(B
 \e$B$3$N5!G=\e(B
 \e$B$O\e(B @code{gnus-use-adaptive-scoring} \e$B$r\e(B @code{t} \e$B$+\e(B @code{(line)} \e$B$K@_Dj\e(B
@@ -18790,9 +18970,9 @@ gnus \e$B$,\e(B ``\e$BEAE}E*\e(B'' \e$B$J%X%C%@!<\e(B -- @samp{From}, @samp{Subject} \e
 
 \e$B$5$F!"%K%e!<%9%0%k!<%W$G$O$J$/$F%a!<%k%0%k!<%W$G$3$l$r9T$J$&$N$O$5$[$IBg\e(B
 \e$BJQ$G$O$J$/!"$=$N$?$a$N$9$0$l$?<jCJ$,MQ0U$5$l$F$$$^$9!#$3$N%^%K%e%"%k\e(B
-\e$B$N\e(B @pxref{To From Newsgroups} \e$B$N9`$G$O$3$N5!9=$,$I$&F/$/$+$,>\$7$/@bL@$5\e(B
-\e$B$l$F$$$^$9$,!"$3$3$G$O\e(B @code{nnml} \e$B$G\e(B @samp{To} \e$B$H\e(B @samp{Cc} \e$B%X%C%@!<$K\e(B
-\e$B%9%3%"$rIU$1$kJ}K!$ND4M}$NNc$r5s$2$^$7$g$&!#\e(B
+\e$B$N\e(B @ref{To From Newsgroups} \e$B$N9`$G$O$3$N5!9=$,$I$&F/$/$+$,>\$7$/@bL@$5$l\e(B
+\e$B$F$$$^$9$,!"$3$3$G$O\e(B @code{nnml} \e$B$G\e(B @samp{To} \e$B$H\e(B @samp{Cc} \e$B%X%C%@!<$K%9\e(B
+\e$B%3%"$rIU$1$kJ}K!$ND4M}$NNc$r5s$2$^$7$g$&!#\e(B
 
 \e$B0J2<$r\e(B @file{~/.gnus.el} \e$B%U%!%$%k$KCV$$$F2<$5$$!#\e(B
 
@@ -19075,6 +19255,9 @@ Gnus \e$B$O$^$@!"$"$N$&$6$C$?$$8E$$>C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#<B:]>C\e(B
 @section GroupLens
 @cindex GroupLens
 
+@sc{\e$BCm0U\e(B:} \e$B;DG0$J$3$H$K\e(B GroupLens \e$B5!9=$OJD:?$5$l$F$$$k$h$&$J$N$G!"$3$N9`\e(B
+\e$B$O<g$H$7$FNr;KE*$J6=<q$N$?$a$K=q$+$l$F$$$^$9!#\e(B
+
 @uref{http://www.cs.umn.edu/Research/GroupLens/, GroupLens} \e$B$O!"KhF|:n@.\e(B
 \e$B$5$l$kB?$/$NNL$N%K%e!<%95-;v$+$i<A$NNI$$5-;v$rB>$N?M$H6&$K8+$D$1$k$N$r=u\e(B
 \e$B$1$k$?$a$N6&F1A*JL5!9=$G$9!#\e(B
@@ -19087,9 +19270,6 @@ Gnus \e$B$O$^$@!"$"$N$&$6$C$?$$8E$$>C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#<B:]>C\e(B
 \e$B$l$P!"M=8@$N7A$G!"$=$l$i$N?M$,5-;v$r$I$&;W$&$+$r$"$J$?$K9p$2$^$9!#$"$J$?\e(B
 \e$B$O$3$NM=8@$r5-;v$rFI$_$?$$$+$I$&$+$r7hDj$9$k$N$KLrN)$F$k;v$,$G$-$^$9!#\e(B
 
-@sc{\e$BCm0U\e(B:} \e$B;DG0$J$3$H$K\e(B GroupLens \e$B5!9=$OJD:?$5$l$F$$$k$h$&$J$N$G!"$3$N9`\e(B
-\e$B$O<g$H$7$FNr;KE*$J6=<q$N$?$a$K=q$+$l$F$$$^$9!#\e(B
-
 @menu
 * Using GroupLens::             \e$B$I$N$h$&$K\e(B gnus \e$B$K\e(B GroupLens \e$B$r;H$o$;$k$h$&$K$9$k$+\e(B
 * Rating Articles::             GropLens \e$B$K$"$J$?$,$I$N$h$&$KCM$rIU$1$k$+$rCN$i$;$k\e(B
@@ -19430,16 +19610,21 @@ Gnus \e$B$O$3$NLdBj$N2r7h$r=u$1$k$?$a$K%9%3%"$rIe$i$;$k5!9=$rDs6!$7$^$9!#%9\e(B
 
 @lisp
 (defun gnus-decay-score (score)
-  "Decay SCORE.
-This is done according to `gnus-score-decay-constant'
+  "Decay SCORE according to `gnus-score-decay-constant'
 and `gnus-score-decay-scale'."
-  (floor
-   (- score
-      (* (if (< score 0) 1 -1)
-         (min (abs score)
-              (max gnus-score-decay-constant
-                   (* (abs score)
-                      gnus-score-decay-scale)))))))
+  (let ((n (- score
+              (* (if (< score 0) -1 1)
+                 (min (abs score)
+                      (max gnus-score-decay-constant
+                           (* (abs score)
+                              gnus-score-decay-scale)))))))
+    (if (and (featurep 'xemacs)
+             ;; XEmacs' floor can handle only the floating point
+             ;; number below the half of the maximum integer.
+             (> (abs n) (lsh -1 -2)))
+        (string-to-number
+         (car (split-string (number-to-string n) "\\.")))
+      (floor n))))
 @end lisp
 
 @vindex gnus-score-decay-scale
@@ -19607,7 +19792,7 @@ Gnus \e$B$r=*N;$9$kA0$K3NG'$rMW5a$7$^$9!#$3$NJQ?t$O=i4|@_Dj$G\e(B @code{t} \e$B$G$9
 \e$B0z?t$rLrN)$F$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B
 
 \e$B$b$7$I$N$h$&$K\e(B gnus \e$B$,$3$l$r<BAu$7$F$$$k$+$K6=L#$,$"$k$J$i!"\e(B
-@pxref{Extended Interactive} \e$B$r8+$F$/$@$5$$!#\e(B
+@ref{Extended Interactive} \e$B$r8+$F$/$@$5$$!#\e(B
 
 @node Formatting Variables
 @section \e$B=qK!;EMMJQ?t\e(B
@@ -19756,7 +19941,7 @@ Emacs \e$B$,\e(B @samp{%b} \e$B$r<u$1<h$k$H!"\e(BEmacs \e$B$N%b!<%I9TI=<($NItJ,$,$=$l
 @code{nil} \e$B$K$7$F$$$F\e(B (\e$B=i4|CM$O\e(B@code{t})\e$B!"$3$l$i$N>e5i;2>H$r$?$/$5$s;H$C\e(B
 \e$B$F$$$k$J$i!"\e(BT-gnus \e$B$,$H$F$bCY$/$J$k$N$,$o$+$k$G$7$g$&!#$3$l$O$"$J$?$,9T\e(B
 \e$B$N308+$KK~B-$7$?$H$-$K\e(B @kbd{M-x gnus-compile} \e$B$r<B9T$9$k;v$G3JCJ$KB.EYDc\e(B
-\e$B2<$r8:$i$9;v$,$G$-$^$9!#\e(B@xref{Compilation}\e$B!#\e(B
+\e$B2<$r8:$i$9;v$,$G$-$^$9!#\e(B@xref{Compilation}.
 
 @node User-Defined Specs
 @subsection \e$BMxMQ<TDj5A$N;XDj\e(B
@@ -20398,9 +20583,9 @@ gnus \e$B$O3:Ev$9$k$G$"$m$&>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t\e(B
 Gnus\e$B!"$=$l$O\e(B(\e$B8@$$EA$($K$h$l$P\e(B)\e$B$+$D$F=q$+$l$?$$$+$J$k%W%m%0%i%`$h$j$bBg$-\e(B
 \e$B$/!"$"$J$?$,$d$C$FM_$7$$$H;W$&$5$^$6$^$J4qL/$J$3$H$r!"$"$J$?$N$$$J$$$H$3\e(B
 \e$B$m$G9T$C$F$/$l$k$b$N$G$9!#Nc$($P!"$"$J$?$O;~$?$^?7Ce%a!<%k$r%A%'%C%/$7$F\e(B
-\e$B$b$i$$$?$/$J$k$+$bCN$l$^$;$s!#$"$k$$$O\e(B Emacs \e$B$r$7$P$i$/J|$C$F$*$$$?$H$-\e(B
-\e$BA4$F$N%5!<%P$N@\B3$r@ZCG$7$F$b$i$$$?$/$J$k$+$b$7$l$^$;$s!#B>$K$b2?$+$=$&\e(B
-\e$B$$$C$?$3$H$G$9!#\e(B
+\e$B$b$i$$$?$$$+$bCN$l$^$;$s!#$"$k$$$O\e(B Emacs \e$B$r$7$P$i$/J|$C$F$*$$$?$H$-A4$F\e(B
+\e$B$N%5!<%P$N@\B3$r@ZCG$7$F$b$i$$$?$/$J$k$+$b$7$l$^$;$s!#B>$K$b2?$+$=$&$$$C\e(B
+\e$B$?$3$H$G$9!#\e(B
 
 Gnus \e$B$O$5$^$6$^$J@)8f;R\e(B @dfn{handlers} \e$B$rDj5A$9$k$3$H$K$h$C$F$=$N$h$&$J\e(B
 \e$B$3$H$r2DG=$K$7$^$9!#3F@)8f;R$O;0$D$NMWAG$+$i@.$j$^$9!#\e(B
@@ -20715,135 +20900,13 @@ XEmacs \e$B$=$l$K\e(B Emacs 21@footnote{MS \e$B%&%#%s%I%&%:$N\e(B Emacs 21 \e$B$O$^$@
 gnus \e$B$O$3$l$rMxMQ$9$k$3$H$K$7$^$9!#\e(B
 
 @menu
-* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
+* X-Face::                      \e$B%U%!%s%-!<$G$A$C$A$c$JGr9u$N3($rI=<($9$k\e(B
+* Face::                        \e$B$h$j%U%!%s%-!<$G$A$C$A$c$J%+%i!<$N3($rI=<($9$k\e(B
 * Smileys::                     \e$BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!\e(B
-* X-Face::                      \e$B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k\e(B
+* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
 * XVarious::                    \e$B$=$NB>$N\e(B XEmacs \e$B$G\e(B Gnus \e$B$JJQ?t\e(B
 @end menu
 
-@node Picons
-@subsection Picons
-
-@iftex
-@iflatex
-\include{picons}
-@end iflatex
-@end iftex
-
-\e$B$=$l$G!D!"$"$J$?$O$3$N%K%e!<%9%j!<%@!<$r$5$i$K$b$C$HCY$/$7$?$$$C$F$o$1$@\e(B
-\e$B$M\e(B! \e$B$3$l$O$=$&$9$k$N$K$T$C$?$j$JJ}K!$G$9!#$5$i$K$3$l$O!"$"$J$?$,%K%e!<%9\e(B
-\e$B$rFI$s$G$$$k$s$@$H$$$&$3$H$r!"$"$J$?$N8*1[$7$K8+$D$a$F$$$k?M$K0u>]$E$1$k\e(B
-\e$B$?$a$NAG@2$i$7$$J}K!$G$b$"$j$^$9!#\e(B
-
-Picon \e$B$H$O$J$s$G$7$g$&\e(B? Picons \e$B%&%'%V%5%$%H$+$iD>@\0zMQ$7$^$7$g$&!#\e(B
-
-@iftex
-@iflatex
-\margindex{}
-@end iflatex
-@end iftex
-
-@quotation
-@dfn{Picon} \e$B$H$O!"\e(B``\e$B8D?M%"%$%3%s\e(B (personal icons)'' \e$B$NN,$G$9!#$3$l$O!"%M%C\e(B
-\e$B%H>e$NMxMQ<T$d%I%a%$%s$rI=8=$9$k$N$K;H$o$l$k$?$a$N>.$5$J2hA|$G!"%G!<%?%Y!<\e(B
-\e$B%9$r;}$?$;$F!"$"$kEE;R%a!<%k%"%I%l%9$,$"$C$?$i!"$=$l$KE,@Z$J2hA|$r8+$D$1\e(B
-\e$B$i$l$k$h$&$K$7$F$*$/$b$N$G$9!#MxMQ<T$H%I%a%$%s0J30$K$b!"\e(BUsenet \e$B%K%e!<%9\e(B
-\e$B%0%k!<%W$dE75$M=Js$N$?$a$N\e(Bpicon \e$B%G!<%?%Y!<%9$,$"$j$^$9!#\e(Bpicon \e$B$OGr9u\e(B
-\e$B$N\e(B @code{XBM} \e$B7A<0$G$b%+%i!<$N\e(B @code{XPM} \e$B7A<0$G$b\e(B @code{GIF} \e$B7A<0$G$b9=\e(B
-\e$B$$$^$;$s!#\e(B
-@end quotation
-
-@vindex gnus-picon-databases
-Picon \e$B%G!<%?%Y!<%9$NF~<j$H%$%s%9%H!<%k$N<j=g$K$D$$$F$O!"%&%'%V%V%i%&%6!<\e(B
-\e$B$G\e(B @uref{http://www.cs.indiana.edu/picons/ftp/index.html} \e$B$rK,$M$F$_$F2<\e(B
-\e$B$5$$!#\e(B
-
-\e$B$b$7\e(B Debian GNU/Linux \e$B$r;H$C$F$$$k$N$J$i!"\e(B@samp{apt-get install
-picons.*} \e$B$H8@$($P\e(B gnus \e$B$,8+$D$1$k$3$H$,$G$-$k\e(B picon \e$B$,%$%s%9%H!<%k$5$l\e(B
-\e$B$^$9!#\e(B
-
-Picon \e$B$NI=<($,$G$-$k$h$&$K$9$k$?$a$K$O!"\e(Bpicon \e$B%G!<%?%Y!<%9$,$"$k%G%#%l%/\e(B
-\e$B%H%j$,!"$?$@C1$K\e(B @code{gnus-picon-databases} \e$B$K@_Dj$5$l$F$$$k$h$&$K$7$F\e(B
-\e$B2<$5$$!#\e(B
-
-\e$B$b$N$4$H$N=j:_$r4IM}$9$k$?$a$K!"0J2<$NJQ?t$r@_$1$F$$$^$9!#\e(B
-
-@table @code
-@item gnus-picon-database
-@vindex gnus-picon-database
-Picon \e$B%G!<%?%Y!<%9$N>l=j$G$9!#$3$l$O\e(B @file{news}, @file{domains},
-@file{users} (\e$B$J$I$J$I\e(B) \e$B$N%5%V%G%#%l%/%H%j!<$,4^$^$l$F$$$k%G%#%l%/%H%j!<\e(B
-\e$B$N%j%9%H$G$9!#\e(B@code{("/usr/lib/picon" "/usr/local/faces")} \e$B$,%G%#%U%)%k\e(B
-\e$B%H$G$9!#\e(B
-
-@item gnus-picon-news-directories
-@vindex gnus-picon-news-directories
-@code{gnus-picon-database} \e$B$+$i%K%e!<%9%0%k!<%WMQ$N%U%'!<%9$rC5$9$?$a$N\e(B
-\e$B%5%V%G%#%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{("news")} \e$B$G$9!#\e(B
-
-@item gnus-picon-user-directories
-@vindex gnus-picon-user-directories
-@code{gnus-picon-database} \e$B$+$i%f!<%6$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#%l%/\e(B
-\e$B%H%j!<$N%j%9%H$G$9!#\e(B@code{("local" "users" "usenix" "misc")} \e$B$,%G%#%U%)\e(B
-\e$B%k%H$G$9!#\e(B
-
-@item gnus-picon-domain-directories
-@vindex gnus-picon-domain-directories
-@code{gnus-picon-database} \e$B$+$i%I%a%$%sL>$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#\e(B
-\e$B%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{("domains")} \e$B$G$9!#$3$N%j%9\e(B
-\e$B%H$K\e(B @samp{"unknown"} \e$B$rDI2C$7$F$*$-$?$/$J$k?M$b$$$k$G$7$g$&!#\e(B
-
-@item gnus-picon-file-types
-@vindex gnus-picon-file-types
-Picon \e$B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"\e(B
-@code{("xpm" "gif" "xbm")} \e$B$+$i\e(B Emacs \e$B$KAH$_9~$^$l$F$$$J$$$b$N$r=|30$7$?\e(B
-\e$B$b$N$G$9!#\e(B
-@end table
-
-@node Smileys
-@subsection \e$B%9%^%$%j!<\e(B
-@cindex smileys
-
-@iftex
-@iflatex
-\gnusfig{-3cm}{0.5cm}{\epsfig{figure=ps/BigFace,height=20cm}}
-\input{smiley}
-@end iflatex
-@end iftex
-
-\e$B%9%^%$%j!<\e(B @dfn{smiley} \e$B$O\e(B gnus \e$B$H$OJL$N%Q%C%1!<%8$G$9$,!"%9%^%$%j!<$r;H$C\e(B
-\e$B$F$$$k%Q%C%1!<%8$O8=:_\e(B gnus \e$B$@$1$G$9$N$G!"$3$3$G@bL@$7$^$9!#\e(B
-
-\e$B0l8@$G8@$($P\e(B --- gnus \e$B$G%9%^%$%j!<$r;H$&$K$O!"0J2<\e(B
-\e$B$r\e(B @file{~/.gnus.el} \e$B%U%!%$%k$K=q$$$F$/$@$5$$!#\e(B
-
-@lisp
-(setq gnus-treat-display-smileys t)
-@end lisp
-
-\e$B%9%^%$%j!<$O!"J8;z$N4i%^!<%/\e(B --- @samp{:-)}, @samp{8-)}, @samp{:-(} \e$B$J$I\e(B
-\e$B$H$$$C$?$b$N\e(B --- \e$B$r3($KBP1~$5$;!"J8;z$N4i%^!<%/$NBe$o$j$K$=$N3($rI=<($7\e(B
-\e$B$^$9!#$3$NJQ49$OJ8;z$K%^%C%A$9$k@55,I=8=$H$=$l$N%U%!%$%kL>$X$NBP1~$N%j%9\e(B
-\e$B%H$G@)8f$5$l$^$9!#\e(B
-
-@vindex smiley-regexp-alist
-\e$B;H$o$l$kO"A[%j%9%H$O!"JQ?t\e(B @code{smiley-regexp-alist} \e$B$G@_Dj$7$^$9!#3FMW\e(B
-\e$BAG$N:G=i$N9`L\$O%^%C%A$5$;$?$$@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$($?$$\e(B
-\e$B%0%k!<%W$K%^%C%A$9$k@55,I=8=!"$=$7$F;0HVL\$NMWAG$OI=<($5$;$?$$%U%!%$%k$N\e(B
-\e$BL>A0$G$9!#\e(B
-
-\e$B0J2<$NJQ?t$O!"%9%^%$%j!<$,$3$l$i$N%U%!%$%k$rC5$9>l=j$r%+%9%?%^%$%:$7$^$9\e(B:
-
-@table @code
-@item smiley-data-directory
-@vindex smiley-data-directory
-\e$B%9%^%$%j!<$,4i%U%!%$%k$rC5$9>l=j!#\e(B
-
-@item gnus-smiley-file-types
-@vindex gnus-smiley-file-types
-\e$B%9%^%$%j!<$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N%j%9%H$G$9!#\e(B
-@end table
-
 @node X-Face
 @subsection X-Face
 @cindex x-face
@@ -20854,7 +20917,6 @@ Picon \e$B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"\e(B
 
 @cindex x-face
 @findex gnus-article-display-x-face
-@findex gnus-article-x-face-command
 @vindex gnus-article-x-face-command
 @vindex gnus-article-x-face-too-ugly
 @iftex
@@ -20932,6 +20994,168 @@ gnus \e$B$O!"30$K=P$9%a%C%;!<%8$K\e(B X-Face \e$B%X%C%@!<$r4JC1$KA^F~$9$k$?$a$N!"JX
                                  "~/My-face.gif"))))))
 @end lisp
 
+@node Face
+@subsection Face
+@cindex face
+
+@c #### FIXME: faces and x-faces'implementations should really be harmonized.
+
+@code{Face} \e$B%X%C%@!<$O!"K\<AE*$K$h$j%U%!%s%-!<$J\e(B @code{X-Face} \e$B$NJQ7A$G\e(B
+\e$B$9!#$=$l$i$O!"%a%C%;!<%8$r=q$$$??M$r>]D'$7$F$$$k$3$H$,4|BT$5$l$k!"\e(B
+48\e$B!_\e(B48 \e$B2hAG$N%+%i!<2hA|$rIA$-$^$9!#\e(B
+
+@cindex face
+@findex gnus-article-display-face
+@code{Face} \e$B%X%C%@!<$NFbMF$O!"\e(Bbase64 \e$B$G%(%s%3!<%I$5$l$?\e(B PNG \e$B$N2hA|$G$J$1\e(B
+\e$B$l$P$J$j$^$;$s!#@53N$J;EMM$K$D$$$F!"\e(B
+@uref{http://quimby.gnus.org/circus/face/} \e$B$r;2>H$7$F2<$5$$!#\e(B
+
+\e$BAw?.$9$k%a%C%;!<%8$K4JC1$K\e(B Face \e$B%X%C%@!<$rA^F~$G$-$k$h$&$K$9$k$?$a$K!"\e(B
+Gnus \e$B$O\e(B 2\e$B!A\e(B3 \e$B$N4X?t$HJQ?t$rDs6!$7$^$9!#\e(B
+
+@findex gnus-convert-png-to-face
+@code{gnus-convert-png-to-face} \e$B$O\e(B 726-byte \e$B0J2<$N\e(B 48\e$B!_\e(B48 \e$B$N\e(B PNG \e$B$N2hA|\e(B
+\e$B$rFI$_9~$s$G!"$=$l$r\e(B Face \e$B$KJQ49$7$^$9!#\e(B
+
+@findex gnus-face-from-file
+@vindex gnus-convert-image-to-face-command
+@code{gnus-face-from-file} \e$B$O\e(B JPEG \e$B$N%U%!%$%kL>$r%Q%i%a!<%?$H$7$F<u$1<h\e(B
+\e$B$j!"\e(Bshell \e$B%3%^%s%I\e(B @code{gnus-convert-image-to-face-command} \e$B$r;H$C$F$=\e(B
+\e$B$N%U%!%$%k$r\e(B Face \e$B%U%)!<%^%C%H$KJQ49$7$^$9!#\e(B
+
+\e$B$3$N4X?t$NBeI=E*$J;H$$J}$r5s$2$F$*$-$^$7$g$&!#0J2<$N$h$&$J$b$N\e(B
+\e$B$r\e(B @file{~/.gnus.el} \e$B%U%!%$%k$KF~$l$F2<$5$$\e(B:
+
+@lisp
+(setq message-required-news-headers
+      (nconc message-required-news-headers
+             (list '(Face . (lambda ()
+                              (gnus-face-from-file "~/face.jpg"))))))
+@end lisp
+
+@node Smileys
+@subsection \e$B%9%^%$%j!<\e(B
+@cindex smileys
+
+@iftex
+@iflatex
+\gnusfig{-3cm}{0.5cm}{\epsfig{figure=ps/BigFace,height=20cm}}
+\input{smiley}
+@end iflatex
+@end iftex
+
+\e$B%9%^%$%j!<\e(B @dfn{smiley} \e$B$O\e(B gnus \e$B$H$OJL$N%Q%C%1!<%8$G$9$,!"%9%^%$%j!<$r;H$C\e(B
+\e$B$F$$$k%Q%C%1!<%8$O8=:_\e(B gnus \e$B$@$1$G$9$N$G!"$3$3$G@bL@$7$^$9!#\e(B
+
+\e$B0l8@$G8@$($P\e(B --- gnus \e$B$G%9%^%$%j!<$r;H$&$K$O!"0J2<\e(B
+\e$B$r\e(B @file{~/.gnus.el} \e$B%U%!%$%k$K=q$$$F$/$@$5$$!#\e(B
+
+@lisp
+(setq gnus-treat-display-smileys t)
+@end lisp
+
+\e$B%9%^%$%j!<$O!"J8;z$N4i%^!<%/\e(B --- @samp{:-)}, @samp{8-)}, @samp{:-(} \e$B$J$I\e(B
+\e$B$H$$$C$?$b$N\e(B --- \e$B$r3($KBP1~$5$;!"J8;z$N4i%^!<%/$NBe$o$j$K$=$N3($rI=<($7\e(B
+\e$B$^$9!#$3$NJQ49$OJ8;z$K%^%C%A$9$k@55,I=8=$H$=$l$N%U%!%$%kL>$X$NBP1~$N%j%9\e(B
+\e$B%H$G@)8f$5$l$^$9!#\e(B
+
+@vindex smiley-regexp-alist
+\e$B;H$o$l$kO"A[%j%9%H$O!"JQ?t\e(B @code{smiley-regexp-alist} \e$B$G@_Dj$7$^$9!#3FMW\e(B
+\e$BAG$N:G=i$N9`L\$O%^%C%A$5$;$?$$@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$($?$$\e(B
+\e$B%0%k!<%W$K%^%C%A$9$k@55,I=8=!"$=$7$F;0HVL\$NMWAG$OI=<($5$;$?$$%U%!%$%k$N\e(B
+\e$BL>A0$G$9!#\e(B
+
+\e$B0J2<$NJQ?t$O!"%9%^%$%j!<$,$3$l$i$N%U%!%$%k$rC5$9>l=j$r%+%9%?%^%$%:$7$^$9\e(B:
+
+@table @code
+@item smiley-data-directory
+@vindex smiley-data-directory
+\e$B%9%^%$%j!<$,4i%U%!%$%k$rC5$9>l=j!#\e(B
+
+@item gnus-smiley-file-types
+@vindex gnus-smiley-file-types
+\e$B%9%^%$%j!<$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N%j%9%H$G$9!#\e(B
+@end table
+
+@node Picons
+@subsection Picons
+
+@iftex
+@iflatex
+\include{picons}
+@end iflatex
+@end iftex
+
+\e$B$=$l$G!D!"$"$J$?$O$3$N%K%e!<%9%j!<%@!<$r$5$i$K$b$C$HCY$/$7$?$$$C$F$o$1$@\e(B
+\e$B$M\e(B! \e$B$3$l$O$=$&$9$k$N$K$T$C$?$j$JJ}K!$G$9!#$5$i$K$3$l$O!"$"$J$?$,%K%e!<%9\e(B
+\e$B$rFI$s$G$$$k$s$@$H$$$&$3$H$r!"$"$J$?$N8*1[$7$K8+$D$a$F$$$k?M$K0u>]$E$1$k\e(B
+\e$B$?$a$NAG@2$i$7$$J}K!$G$b$"$j$^$9!#\e(B
+
+Picon \e$B$H$O$J$s$G$7$g$&\e(B? Picons \e$B%&%'%V%5%$%H$+$iD>@\0zMQ$7$^$7$g$&!#\e(B
+
+@iftex
+@iflatex
+\margindex{}
+@end iflatex
+@end iftex
+
+@quotation
+@dfn{Picon} \e$B$H$O!"\e(B``\e$B8D?M%"%$%3%s\e(B (personal icons)'' \e$B$NN,$G$9!#$3$l$O!"%M%C\e(B
+\e$B%H>e$NMxMQ<T$d%I%a%$%s$rI=8=$9$k$N$K;H$o$l$k$?$a$N>.$5$J2hA|$G!"%G!<%?%Y!<\e(B
+\e$B%9$r;}$?$;$F!"$"$kEE;R%a!<%k%"%I%l%9$,$"$C$?$i!"$=$l$KE,@Z$J2hA|$r8+$D$1\e(B
+\e$B$i$l$k$h$&$K$7$F$*$/$b$N$G$9!#MxMQ<T$H%I%a%$%s0J30$K$b!"\e(BUsenet \e$B%K%e!<%9\e(B
+\e$B%0%k!<%W$dE75$M=Js$N$?$a$N\e(Bpicon \e$B%G!<%?%Y!<%9$,$"$j$^$9!#\e(Bpicon \e$B$OGr9u\e(B
+\e$B$N\e(B @code{XBM} \e$B7A<0$G$b%+%i!<$N\e(B @code{XPM} \e$B7A<0$G$b\e(B @code{GIF} \e$B7A<0$G$b9=\e(B
+\e$B$$$^$;$s!#\e(B
+@end quotation
+
+@vindex gnus-picon-databases
+Picon \e$B%G!<%?%Y!<%9$NF~<j$H%$%s%9%H!<%k$N<j=g$K$D$$$F$O!"%&%'%V%V%i%&%6!<\e(B
+\e$B$G\e(B @uref{http://www.cs.indiana.edu/picons/ftp/index.html} \e$B$rK,$M$F$_$F2<\e(B
+\e$B$5$$!#\e(B
+
+\e$B$b$7\e(B Debian GNU/Linux \e$B$r;H$C$F$$$k$N$J$i!"\e(B@samp{apt-get install
+picons.*} \e$B$H8@$($P\e(B gnus \e$B$,8+$D$1$k$3$H$,$G$-$k\e(B picon \e$B$,%$%s%9%H!<%k$5$l\e(B
+\e$B$^$9!#\e(B
+
+Picon \e$B$NI=<($,$G$-$k$h$&$K$9$k$?$a$K$O!"\e(Bpicon \e$B%G!<%?%Y!<%9$,$"$k%G%#%l%/\e(B
+\e$B%H%j$,!"$?$@C1$K\e(B @code{gnus-picon-databases} \e$B$K@_Dj$5$l$F$$$k$h$&$K$7$F\e(B
+\e$B2<$5$$!#\e(B
+
+\e$B$b$N$4$H$N=j:_$r4IM}$9$k$?$a$K!"0J2<$NJQ?t$r@_$1$F$$$^$9!#\e(B
+
+@table @code
+@item gnus-picon-database
+@vindex gnus-picon-database
+Picon \e$B%G!<%?%Y!<%9$N>l=j$G$9!#$3$l$O\e(B @file{news}, @file{domains},
+@file{users} (\e$B$J$I$J$I\e(B) \e$B$N%5%V%G%#%l%/%H%j!<$,4^$^$l$F$$$k%G%#%l%/%H%j!<\e(B
+\e$B$N%j%9%H$G$9!#\e(B@code{("/usr/lib/picon" "/usr/local/faces")} \e$B$,%G%#%U%)%k\e(B
+\e$B%H$G$9!#\e(B
+
+@item gnus-picon-news-directories
+@vindex gnus-picon-news-directories
+@code{gnus-picon-database} \e$B$+$i%K%e!<%9%0%k!<%WMQ$N%U%'!<%9$rC5$9$?$a$N\e(B
+\e$B%5%V%G%#%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{("news")} \e$B$G$9!#\e(B
+
+@item gnus-picon-user-directories
+@vindex gnus-picon-user-directories
+@code{gnus-picon-database} \e$B$+$i%f!<%6$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#%l%/\e(B
+\e$B%H%j!<$N%j%9%H$G$9!#\e(B@code{("local" "users" "usenix" "misc")} \e$B$,%G%#%U%)\e(B
+\e$B%k%H$G$9!#\e(B
+
+@item gnus-picon-domain-directories
+@vindex gnus-picon-domain-directories
+@code{gnus-picon-database} \e$B$+$i%I%a%$%sL>$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#\e(B
+\e$B%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{("domains")} \e$B$G$9!#$3$N%j%9\e(B
+\e$B%H$K\e(B @samp{"unknown"} \e$B$rDI2C$7$F$*$-$?$/$J$k?M$b$$$k$G$7$g$&!#\e(B
+
+@item gnus-picon-file-types
+@vindex gnus-picon-file-types
+Picon \e$B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"\e(B
+@code{("xpm" "gif" "xbm")} \e$B$+$i\e(B Emacs \e$B$KAH$_9~$^$l$F$$$J$$$b$N$r=|30$7$?\e(B
+\e$B$b$N$G$9!#\e(B
+@end table
+
 @node XVarious
 @subsection \e$B$5$^$6$^$J\e(B XEmacs \e$BJQ?t\e(B
 
@@ -21036,8 +21260,8 @@ Gnus \e$B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"\e(B
 * 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
-* Filtering Spam Using The Spam ELisp Package::  
-* Filtering Spam Using Statistics with spam-stat::  
+* Filtering Spam Using The Spam ELisp Package::
+* Filtering Spam Using Statistics with spam-stat::
 @end menu
 
 @node The problem of spam
@@ -21084,14 +21308,14 @@ Spam \e$B$N=|5n\e(B (filtering) \e$B$X$N:G$bC1=c$J<h$jAH$_$O_I2a$9$k$3\e(B
 \e$B$b$&0l$D$NEE;R%a!<%k_I2a$X$N<h$jAH$_$OJ,;67?\e(B spam \e$B=hM}$G!"\e(BDCC (\e$BLuCm\e(B:
 Distributed Checksum Clearinghouse --
 @uref{http://www.rhyolite.com/anti-spam/dcc/}) \e$B$,$=$N$h$&$J%7%9%F%`$rF3\e(B
-\e$BF~$7$F$$$^$9!#K\<AE*$K$O!"@$3&Cf$N\e(B @code{N} \e$B8D$N%7%9%F%`$,!"Cf9q!"%,!<%J\e(B
-\e$B$"$k$$$O%+%j%U%)%k%K%"$K$"$k%^%7%s\e(B @samp{X} \e$B$,\e(B spam \e$BEE;R%a!<%k$rAw=P$7$F\e(B
-\e$B$$$k$3$H$rG'$a$?$i!"$=$l$i\e(B @code{N} \e$B8D$N%7%9%F%`$O\e(B @samp{X} \e$B$^$?\e(B
-\e$B$O\e(B @samp{X} \e$B$+$i$d$C$FMh$?\e(B spam \e$B%a!<%k$r%G!<%?%Y!<%9$K5-F~$7$^$9!#\e(B
-Spam \e$B8!=P$N4p=`$OJQ$o$j$^$9!#$=$l$OAw$i$l$?%a%C%;!<%8$N?t$d%a%C%;!<%8$N\e(B
-\e$BFbMF$J$I$G$"$k$+$b$7$l$^$;$s!#%a%C%;!<%8$,\e(B spam \e$B$+$I$&$+$rJ,;6=hM}%7%9%F\e(B
-\e$B%`$N%f!<%6$,CN$j$?$$>l9g!"H`$O$=$l$i$N\e(B @code{N} \e$B8D$N%7%9%F%`$N$&$A$N0l$D\e(B
-\e$B$rD4$Y$^$9!#\e(B
+\e$BF~$7$F$$$^$9!#K\<AE*$K$O!"@$3&Cf$N\e(B @var{N} \e$B8D$N%7%9%F%`$,!"Cf9q!"%,!<%J\e(B
+\e$B$"$k$$$O%+%j%U%)%k%K%"$K$"$k%^%7%s\e(B @var{X} \e$B$,\e(B spam \e$BEE;R%a!<%k$rAw=P$7$F\e(B
+\e$B$$$k$3$H$rG'$a$?$i!"$=$l$i\e(B @var{N} \e$B8D$N%7%9%F%`$O\e(B @var{X} \e$B$^$?\e(B
+\e$B$O\e(B @var{X} \e$B$+$i$d$C$FMh$?\e(B spam \e$B%a!<%k$r%G!<%?%Y!<%9$K5-F~$7$^$9!#\e(BSpam \e$B8!\e(B
+\e$B=P$N4p=`$OJQ$o$j$^$9!#$=$l$OAw$i$l$?%a%C%;!<%8$N?t$d%a%C%;!<%8$NFbMF$J$I\e(B
+\e$B$G$"$k$+$b$7$l$^$;$s!#%a%C%;!<%8$,\e(B spam \e$B$+$I$&$+$rJ,;6=hM}%7%9%F%`$N%f!<\e(B
+\e$B%6$,CN$j$?$$>l9g!"H`$O$=$l$i$N\e(B @var{N} \e$B8D$N%7%9%F%`$N$&$A$N0l$D$rD4$Y$^\e(B
+\e$B$9!#\e(B
 
 \e$BJ,;67?\e(B spam \e$B=hM}$OF1;~$KB?$/$N%a%C%;!<%8$rAw$k\e(B spammers \e$B$HHs>o$K$h$/@o$C\e(B
 \e$B$F$/$l$^$9$,!"$=$l$O%f!<%6!<$,$+$J$jJ#;($J%A%'%C%/$r@_Dj$9$k$3$H$r5a$a$^\e(B
@@ -21135,14 +21359,12 @@ 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$9\e(B (@pxref{Fancy Mail Splitting})\e$B!#\e(B
 
 @lisp
-(
- ...
+(...
  (to "larsi@@trym.ifi.uio.no"
-      (| ("subject" "re:.*" "misc")
-         ("references" ".*@@.*" "misc")
-         "spam"))
- ...
-)
+     (| ("subject" "re:.*" "misc")
+        ("references" ".*@@.*" "misc")
+        "spam"))
+ ...)
 @end lisp
 
 \e$B$3$N0UL#$O!"$3$N%"%I%l%9$KFO$$$?A4$F$N%a!<%k$r$^$:5?$$$^$9$,!"\e(B
@@ -21199,12 +21421,14 @@ Spam \e$B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(B
       '((file :prescript "formail -bs spamassassin < /var/mail/%u")
         (pop :user "jrl"
              :server "pophost"
-             :postscript "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t")))
+             :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:
+\e$B$$$C$?$s!"%a!<%k$r<u$1$k%9%W!<%k$r$I$&$K$+$7$F=hM}$9$k!"Nc$($P\e(B@: \e$B%a!<%k\e(B
+\e$B$K\e(B spam \e$B$G$"$k$3$H$rI=<($9$k%X%C%@!<$r4^$a$k!"$h$&$K$9$l$P!"$=$l$r$U$k$$\e(B
+\e$BMn$H$9=`Hw$O40N;$G$9!#;H$&$N$OIaDL$NJ,3dJ}<0\e(B (@pxref{Splitting Mail}) \e$B$G\e(B
+\e$B$9\e(B:
 
 @lisp
 (setq nnmail-split-methods '(("spam"  "^X-Spam-Flag: YES")
@@ -21230,16 +21454,17 @@ Spam \e$B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(B
                              ...))
 (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")))))
+    (widen)
+    (if (eq 1 (call-process-region (point-min) (point-max)
+                                   "spamc" nil nil nil "-c"))
+        "spam")))
 @end lisp
 
+\e$B$5$i$K\e(B nnimap \e$B%P%C%/%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<\e(B
+\e$B%I$5$l$J$$$3$H$KCm0U$7$F2<$5$$!#$=$l$r$9$k$?$a$K$O!"\e(B
+@code{nnimap-split-download-body} \e$B$r\e(B t \e$B$K@_Dj$9$kI,MW$,$"$j$^\e(B
+\e$B$9\e(B (@pxref{Splitting in IMAP})\e$B!#\e(B
+
 \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:
@@ -21290,7 +21515,7 @@ Spam \e$B$H@o$&$?$a$N?7$7$$5;K!$O!"%a%C%;!<%8$rAw?.$9$k:]$K$$$/$P$/$+$NIiC4\e(B
 (add-hook 'message-send-hook 'mail-add-payment)
 @end lisp
 
-@code{hashcash.el} \e$B%i%$%V%i%j\e(B
+@file{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
 
@@ -21327,14 +21552,27 @@ Spam \e$B$H@o$&$?$a$N?7$7$$5;K!$O!"%a%C%;!<%8$rAw?.$9$k:]$K$$$/$P$/$+$NIiC4\e(B
 @cindex spam filtering
 @cindex spam
 
-@code{spam.el} \e$B$N??$NL\E*$O\e(B spam \e$B8!=P$H_I2a$N$?$a$N41@)%;%s%?!<\e(B
-\e$B$r\e(B gnus \e$B$NCf$K;}$D$3$H$G$9!#$=$N$?$a$K\e(B @code{spam.el} \e$B$OFs$D$N$3$H$r9T$J\e(B
+@file{spam.el} \e$B$N??$NL\E*$O\e(B spam \e$B8!=P$H_I2a$N$?$a$N41@)%;%s%?!<\e(B
+\e$B$r\e(B gnus \e$B$NCf$K;}$D$3$H$G$9!#$=$N$?$a$K\e(B @file{spam.el} \e$B$OFs$D$N$3$H$r9T$J\e(B
 \e$B$$$^$9\e(B: \e$BF~$C$F$/$k%a!<%k$r_I2a$7!"\e(Bspam \e$B$^$?$O\e(B ham \e$B$H$7$FCN$i$l$k%a!<%k$r\e(B
-\e$BJ,@O$9$k$3$H$G$9!#\e(B@emph{Ham} \e$B$O\e(B @code{spam.el} \e$B$N$$$?$k=j$G\e(B spam \e$B$G$O$J\e(B
-\e$B$$%a%C%;!<%8$r<($9$?$a$K;H$&L>A0$G$9!#\e(B
+\e$BJ,@O$9$k$3$H$G$9!#\e(B@dfn{Ham} \e$B$O\e(B @file{spam.el} \e$B$N$$$?$k=j$G\e(B spam \e$B$G$O$J$$\e(B
+\e$B%a%C%;!<%8$r<($9$?$a$K;H$&L>A0$G$9!#\e(B
+
+\e$BBh0l$K!"\e(B@code{spam.el} \e$B$r<+F0FI$_9~$_\e(B (autoload) \e$B$7$F\e(B @code{spam.el} \e$B$N\e(B
+\e$B3F%U%C%/$r%$%s%9%H!<%k$9$k$?$a$K!"4X\e(B
+\e$B?t\e(B @code{spam-initialize} \e$B$r\e(B @strong{\e$B<B9T$7$J$1$l$P$J$j$^$;$s\e(B}\e$B!#0l$DNc30\e(B
+\e$B$,$"$j$^$9\e(B: \e$B$b$7\e(B @code{spam-use-stat} \e$B$N@_Dj$r;H$&\e(B (@pxref{spam-stat
+spam filtering}) \e$B$N$G$"$l$P!"$=$l$r\e(B @code{spam-initialize} \e$B$h$jA0\e(B
+\e$B$K\e(B on \e$B$K$7$F$*$+$J$1$l$P$J$j$^$;$s\e(B:
+
+@example
+(setq spam-use-stat t) ;; \e$BI,MW$J$i\e(B
+(spam-initialize)
+@end example
 
-\e$B$G$O\e(B @code{spam.el} \e$B$r\e(B load \e$B$9$k$H2?$,5/$-$k$G$7$g$&$+\e(B?  \e$BBh0l$K!"0J2<$N\e(B
-\e$B%-!<%\!<%IL?Na$,;H$($k$h$&$K$J$j$^$9\e(B:
+\e$B$G$O\e(B @file{spam.el} \e$B$rFI$_9~$`$H2?$,5/$-$k$G$7$g$&$+\e(B?
+
+\e$B0J2<$N%-!<%\!<%IL?Na$,;H$($k$h$&$K$J$j$^$9\e(B:
 
 @table @kbd
 @item M-d
@@ -21361,12 +21599,12 @@ Spam \e$B5-;v$r8+$?$H$-$O$$$D$G$b!"%0%k!<%W$rH4$1$kA0$KI,$:\e(B @kbd{M-d} \e$B$G$=$
 \e$B$3$N%3%^%s%I$,$A$c$s$HF/$/$?$a$K$O\e(B Bogofilter \e$B$r%$%s%9%H!<%k$7$J$1$l$P$J\e(B
 \e$B$j$^$;$s!#\e(B
 
-@xref{Bogofilter}\e$B!#\e(B
+@xref{Bogofilter}.
 
 @end table
 
-\e$B$^$?!"\e(B@code{spam.el} \e$B$r\e(B load \e$B$9$k$H!"$=$NJQ?t72$r%+%9%?%^%$%:$9$k$3$H$,\e(B
-\e$B$G$-$k$h$&$K$J$j$^$9!#\e(B@samp{spam} \e$BJQ?t%0%k!<%W$K$D$$\e(B
+\e$B$^$?!"\e(B@file{spam.el} \e$B$rFI$_9~$`$H!"$=$NJQ?t72$r%+%9%?%^%$%:$9$k$3$H$,$G\e(B
+\e$B$-$k$h$&$K$J$j$^$9!#\e(B@samp{spam} \e$BJQ?t%0%k!<%W$K$D$$\e(B
 \e$B$F\e(B @code{customize-group} \e$B$r;n$7$F$_$F2<$5$$!#\e(B
 
 @vindex gnus-spam-process-newsgroups
@@ -21450,26 +21688,44 @@ Spam \e$B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,\e(B spam \e$B$G$"$k$H2r<a
 \e$B$+\e(B @code{gnus-ham-process-destinations} \e$BJQ?t$N$I$A$i$+$K9gCW$9$k>l=j$K0\\e(B
 \e$B$5$l$^$9!#$=$l$i$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$N%j%9%H$G\e(B
 \e$B$9\e(B (@code{customize-variable gnus-ham-process-destinations} \e$B$K$h$C$F$3$N\e(B
-\e$BJQ?t$r%+%9%?%^%$%:$9$k$N$,:G$b4JC1$G$9\e(B)\e$B!#:G=*E*$J>l=j$O%0%k!<%WL>$G$9!#\e(B
-@code{ham-process-destination} \e$B%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(Bham \e$B5-;v\e(B
-\e$B$O$=$3$KN1$aCV$+$l$^$9!#\e(B
+\e$BJQ?t$r%+%9%?%^%$%:$9$k$N$,:G$b4JC1$G$9\e(B)\e$B!#JQ?t$r<j$G%+%9%?%^%$%:$9$kJ}$,\e(B
+\e$B9%$-$J?M$N$?$a$K8@$C$F$*$/$H!"$=$l$i$OIaDL$N\e(B Lisp \e$B$N\e(B list \e$B$G!"$=$l$>$l$N\e(B
+\e$B%K%e!<%9%0%k!<%W$N;EMM@_Dj$O\e(B @code{(REGEXP PROCESSOR)} \e$B$N7A<0$NCM$r;}$A\e(B
+\e$B$^$9!#:G=*E*$J>l=j$O%0%k!<%WL>$G$9!#\e(B@code{ham-process-destination} \e$B%Q%i\e(B
+\e$B%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(Bham \e$B5-;v$O$=$3$KN1$aCV$+$l$^$9!#\e(B
 @code{spam-mark-ham-unread-before-move-from-spam-group} \e$B%Q%i%a!<%?$,@_Dj\e(B
 \e$B$5$l$F$$$k$H!"\e(Bham \e$B5-;v$O0\F0$5$;$i$l$kA0$KL$FI$N0u$,IU$1$i$l$^$9!#\e(B
 
 @emph{Ham} \e$B%0%k!<%W$rH4$1$k$H$-$K!"\e(Bham \e$B0u$,IU$$$F$$$k$9$Y$F$N5-;v\e(B
 \e$B$O\e(B ham \e$B%W%m%;%C%5!<$KAw$i$l!"$=$l$i$r\e(B spam \e$B$G$O$J$$I8K\$H$7$F3X=,$7$^$9!#\e(B
 
+@vindex spam-process-ham-in-spam-groups
+\e$BJQ?t\e(B @code{spam-process-ham-in-spam-groups} \e$B$O%G%#%U%)%k%H$G\e(B
+\e$B$O\e(B @code{nil} \e$B$G$9!#\e(BSpam \e$B%0%k!<%W$G8+$D$+$C$?\e(B ham \e$B$,%W%m%;%C%5!<$KAw$i$l\e(B
+\e$B$k$h$&$K$7$?$$>l9g$O\e(B @code{t} \e$B$K$7$F2<$5$$!#DL>o$3$l$O9T$J$o$l$^$;$s!#$"\e(B
+\e$B$J$?$,<+J,$G\e(B ham \e$B5-;v$r\e(B ham \e$B%0%k!<%W$KAw$C$F!"$=$3$G=hM}$9$k$3$H$,4|BT$5\e(B
+\e$B$l$F$$$^$9!#\e(B
+
+@vindex spam-process-ham-in-nonham-groups
+\e$BJQ?t\e(B @code{spam-process-ham-in-nonham-groups} \e$B$O%G%#%U%)%k%H$G\e(B
+\e$B$O\e(B @code{nil} \e$B$G$9!#\e(BHam \e$B$G$O$J$$\e(B (spam \e$B$^$?$OL$J,N`$N\e(B) \e$B%0%k!<%W$G8+$D$+$C\e(B
+\e$B$?\e(B ham \e$B$,%W%m%;%C%5!<$KAw$i$l$k$h$&$K$7$?$$>l9g$O\e(B @code{t} \e$B$K$7$F2<$5$$!#\e(B
+\e$BDL>o$3$l$O9T$J$o$l$^$;$s!#$"$J$?$,<+J,$G\e(B ham \e$B5-;v$r\e(B ham \e$B%0%k!<%W$KAw$C$F!"\e(B
+\e$B$=$3$G=hM}$9$k$3$H$,4|BT$5$l$F$$$^$9!#\e(B
+
 @vindex gnus-spam-process-destinations
 @emph{Ham} \e$B$^$?$O\e(B @emph{\e$BL$J,N`\e(B} \e$B%0%k!<%W$rH4$1$k$H$-$K!"$9$Y$F\e(B
 \e$B$N\e(B @strong{spam} \e$B5-;v$O!"\e(B@code{spam-process-destination} \e$B%0%k!<%W%Q%i%a!<\e(B
 \e$B%?$+\e(B @code{gnus-spam-process-destinations} \e$BJQ?t$N$I$A$i$+$K9gCW$9$k>l=j\e(B
 \e$B$K0\$5$l$^$9!#$=$l$i$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$N%j%9%H$G\e(B
 \e$B$9\e(B (@code{customize-variable gnus-spam-process-destinations} \e$B$K$h$C$F$3\e(B
-\e$B$NJQ?t$r%+%9%?%^%$%:$9$k$N$,:G$b4JC1$G$9\e(B)\e$B!#:G=*E*$J>l=j$O%0%k!<%WL>$G$9!#\e(B
-@code{spam-process-destination} \e$B%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(Bspam \e$B5-\e(B
-\e$B;v$OC1$K4|8B@Z$l>C5n$5$l$^$9!#\e(B
+\e$B$NJQ?t$r%+%9%?%^%$%:$9$k$N$,:G$b4JC1$G$9\e(B)\e$B!#JQ?t$r<j$G%+%9%?%^%$%:$9$kJ}\e(B
+\e$B$,9%$-$J?M$N$?$a$K8@$C$F$*$/$H!"$=$l$i$OIaDL$N\e(B Lisp \e$B$N\e(B list \e$B$G!"$=$l$>$l\e(B
+\e$B$N%K%e!<%9%0%k!<%W$N;EMM@_Dj$O\e(B @code{(REGEXP PROCESSOR)} \e$B$N7A<0$NCM$r;}\e(B
+\e$B$A$^$9!#:G=*E*$J>l=j$O%0%k!<%WL>$G$9!#\e(B@code{spam-process-destination} \e$B%Q\e(B
+\e$B%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(Bspam \e$B5-;v$OC1$K4|8B@Z$l>C5n$5$l$^$9!#\e(B
 
-\e$BF~$C$F$/$k%a!<%k$r_I2a$9$kL\E*$G\e(B @code{spam.el} \e$B$r;H$&$K$O!"FC5iJ,3d%j%9\e(B
+\e$BF~$C$F$/$k%a!<%k$r_I2a$9$kL\E*$G\e(B @file{spam.el} \e$B$r;H$&$K$O!"FC5iJ,3d%j%9\e(B
 \e$B%H\e(B @code{nnmail-split-fancy} \e$B$^$?$O\e(B @code{nnimap-split-fancy} \e$B$K0J2<$rDI\e(B
 \e$B2C$7$J$1$l$P$J$j$^$;$s\e(B:
 
@@ -21485,20 +21741,27 @@ Spam \e$B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,\e(B spam \e$B$G$"$k$H2r<a
 \e$B$rJQ?t\e(B @code{spam-split-group} \e$B$GM?$($i$l$kL>A0$N%0%k!<%W$KAw$j$^$9!#%G%#\e(B
 \e$B%U%)%k%H$G$O$=$N%0%k!<%WL>$O\e(B @samp{spam} \e$B$G$9$,!"\e(B
 @code{spam-split-group} \e$B$r%+%9%?%^%$%:$9$k$3$H$,2DG=$G$9!#\e(B
+@code{spam-split-group} \e$B$NFbMF$,\e(B @emph{\e$B@dBP\e(B} \e$B%0%k!<%WL>$G$"$k$3$H!"Nc$(\e(B
+\e$B$P\e(B @samp{your-server} \e$B$H$$$&\e(B @code{nnimap} \e$B%5!<%P!<$N>l9g$O!"\e(B
+@samp{spam} \e$BJQ?t$,:G=*E*$K\e(B @samp{nnimap+your-server:spam} \e$B$K$J$k$3$H$r3N\e(B
+\e$B$+$a$F2<$5$$!#=>$C$F\e(B @samp{nnimap+server:spam} \e$B$H$$$&CM$O4V0c$$$G!"$=$l\e(B
+\e$B$O<B:]$K$O\e(B @samp{nnimap+your-server:nnimap+server:spam} \e$B$H$$$&%0%k!<%W$K\e(B
+\e$B$J$j!"$=$l$,F/$/$+F/$+$J$$$+$O!"$"$J$?$N%5!<%P!<$,4qL/$J%0%k!<%WL>$KBP$7\e(B
+\e$B$F42MF$+$I$&$+$K0MB8$9$k$G$7$g$&!#\e(B
 
 \e$B$^$?!"\e(B@code{spam-split} \e$B$K%Q%i%a!<%?!"Nc$(\e(B
-\e$B$P\e(B @samp{spam-use-regex-headers} \e$B$rM?$($k$3$H$b$G$-$^$9!#$J$<$3$l$,M-MQ\e(B
-\e$B$J$N$G$7$g$&$+\e(B?
+\e$B$P\e(B @samp{spam-use-regex-headers} \e$B$^$?$O\e(B @samp{"maybe-spam"} \e$B$rM?$($k$3$H\e(B
+\e$B$b$G$-$^$9!#$J$<$3$l$,M-MQ$J$N$G$7$g$&$+\e(B?
 
 \e$B$3$l$i$N\e(B (@code{spam-use-regex-headers} \e$B$H\e(B @code{spam-use-blackholes} \e$B$N\e(B
 \e$B@_Dj$K$h$k\e(B) \e$BJ,3d$N5,B'$r8+$F2<$5$$\e(B:
 
 @example
  nnimap-split-fancy '(|
-                     (any "ding" "ding")
-                     (: spam-split)
-                     ;; default mailbox
-                     "mail")
+                      (any "ding" "ding")
+                      (: spam-split)
+                      ;; default mailbox
+                      "mail")
 @end example
 
 \e$B$5$F!"LdBj$O\e(B ding \e$B08$F$N%a%C%;!<%8$r$9$Y$F\e(B ding \e$B%U%)%k%@!<$KF~$l$h$&$H$7\e(B
@@ -21514,25 +21777,28 @@ SpamAssassin \e$B%X%C%@!<$K\e(B ding \e$B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 
 @example
  nnimap-split-fancy '(|
-                     (: spam-split 'spam-use-regex-headers)
-                     (any "ding" "ding")
-                     (: spam-split)
-                     ;; default mailbox
-                     "mail")
+;;; spam-use-regex-headers \e$B$G8!=P$5$l$?$9$Y$F$N\e(B spam \e$B$O\e(B "regex-spam" \e$B$X!#\e(B
+                      (: spam-split "regex-spam" 'spam-use-regex-headers)
+                      (any "ding" "ding")
+;;; spam-split \e$B$G8!=P$5$l$?B>$N$9$Y$F$N\e(B spam \e$B$O\e(B spam-split-group \e$B$X!#\e(B
+                      (: spam-split)
+                      ;; default mailbox
+                      "mail")
 @end example
 
 \e$B4pK\E*$K!"$3$l$OFC$K$"$J$?$NI,MW$K0MB8$7$?FCDj$N\e(B @code{spam-split} \e$B8!\e(B
-\e$B::$r5/F0$5$;$^$9!#$9$Y$F$N%a!<%k$r$9$Y$F$N\e(B spam \e$B%F%9%H$KEj$2$kI,MW$O$"$j\e(B
-\e$B$^$;$s!#$3$l$,NI$$JL$NM}M3$O!"5,B'$r;}$C$F$$$k%a!<%j%s%0%j%9%H$X$N%a%C%;!<\e(B
-\e$B%8$KBP$7$F!";q8;=8LsE*$J%V%i%C%/%[!<%k!&%A%'%C%/$r<B9T$9$kI,MW$,$J$$$H$$\e(B
-\e$B$&$3$H$G$9!#$5$i$K\e(B nnmail \e$BJ,3d$KBP$7$F\e(B nnimap \e$BJ,3d$N$?$a$N!"0[$J$k\e(B spam
-\e$B8!::$r;XDj$9$k$3$H$b$G$-$^$9!#5$$,68$&!<!#\e(B
+\e$B::$r5/F0$5$;!"$=$l$i$N8!::$N7k2L$OFCDj$N\e(B spam \e$B%0%k!<%W$r;X$7<($7$^$9!#$9\e(B
+\e$B$Y$F$N%a!<%k$r$9$Y$F$N\e(B spam \e$B%F%9%H$KEj$2$kI,MW$O$"$j$^$;$s!#$3$l$,NI$$JL\e(B
+\e$B$NM}M3$O!"5,B'$r;}$C$F$$$k%a!<%j%s%0%j%9%H$X$N%a%C%;!<%8$KBP$7$F!";q8;=8\e(B
+\e$BLsE*$J%V%i%C%/%[!<%k!&%A%'%C%/$r<B9T$9$kI,MW$,$J$$$H$$$&$3$H$G$9!#$5$i\e(B
+\e$B$K\e(B nnmail \e$BJ,3d$KBP$7$F\e(B nnimap \e$BJ,3d$N$?$a$N!"0[$J$k\e(B spam \e$B8!::$r;XDj$9$k$3\e(B
+\e$B$H$b$G$-$^$9!#5$$,68$&!<!#\e(B
 
 \e$B8!::$HF1;~$KL@$i$+$K\e(B @code{spam-split} \e$B$r<B9T$9$k$H$7$F$b!":#$^$G$H$*\e(B
-\e$B$j\e(B @code{spam-use-regex-headers} \e$B$r\e(B t \e$B$K@_Dj$9$k$h$&$J8!::$r9T$C$F$$$J$1\e(B
-\e$B$l$P$J$j$^$;$s!#$J$<$J$i\e(B @file{spam.el} \e$B$rFI$_9~$`$H$-$K!"$"$J$?$,2?\e(B
-\e$B$N\e(B @code{spam-use-xyz} \e$BJQ?t$r@_Dj$7$F$$$k$+$K1~$8$?!"$$$/$D$+$N>r7oIU$-\e(B
-\e$B$NFI$_9~$_$,9T$o$l$k$+$i$G$9!#\e(B
+\e$B$j\e(B @code{spam-use-regex-headers} \e$B$r\e(B @code{t} \e$B$K@_Dj$9$k$h$&$J8!::$r9T$C\e(B
+\e$B$F$$$J$1$l$P$J$j$^$;$s!#$J$<$J$i\e(B @file{spam.el} \e$B$rFI$_9~$`$H$-$K!"$"$J$?\e(B
+\e$B$,2?$N\e(B @code{spam-use-xyz} \e$BJQ?t$r@_Dj$7$F$$$k$+$K1~$8$?!"$$$/$D$+$N>r7o\e(B
+\e$BIU$-$NFI$_9~$_$,9T$o$l$k$+$i$G$9!#\e(B
 
 @emph{@acronym{IMAP} \e$BMxMQ<T$X$NCm0U\e(B}
 
@@ -21559,16 +21825,17 @@ SpamAssassin \e$B%X%C%@!<$K\e(B ding \e$B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 \e$BK!$H!"$=$l$i$KBP1~$9$k\e(B spam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$G$9\e(B:
 
 @menu
-* Blacklists and Whitelists::   
-* BBDB Whitelists::             
-* Gmane Spam Reporting::        
-* Anti-spam Hashcash Payments::  
-* Blackholes::                  
-* Regular Expressions Header Matching::  
-* Bogofilter::                  
-* ifile spam filtering::        
-* spam-stat spam filtering::    
-* Extending the spam elisp package::  
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the spam elisp package::
 @end menu
 
 @node Blacklists and Whitelists
@@ -21695,10 +21962,21 @@ SpamAssassin \e$B%X%C%@!<$K\e(B ding \e$B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 
 \e$B%0%k!<%W%Q%i%a!<%?$+JQ?t\e(B @code{gnus-spam-process-newsgroups} \e$B$r%+%9%?%^\e(B
 \e$B%$%:$7$F!"$3$N%7%s%\%k$r%0%k!<%W$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$(\e(B
-\e$B$F2<$5$$!#$3$l$,2C$($i$l$k$H!"\e(Bspam \e$B0u$,IU$$$?5-;v$N%0%k!<%W$,\e(B Gmane \e$B$N4I\e(B
-\e$BM}<T$KJs9p$5$l$^$9!#\e(B(\e$BLuCm\e(B: gmane \e$B%K%e!<%9%0%k!<%W$rFI$s$G$$$k$H$-$K8+$D\e(B
-\e$B$+$C$?\e(B spam \e$B$N5-;vHV9f$H%0%k!<%WL>$r\e(B http \e$B7PM3$GEA$($^$9!#\e(B
-@file{spam-report.el} \e$B;2>H!#\e(B)
+\e$B$F2<$5$$!#$3$l$,2C$($i$l$k$H!"\e(Bspam \e$B0u$,IU$$$?5-;v$N%0%k!<%W$,\e(B HTTP \e$B7PM3\e(B
+\e$B$G\e(B Gmane \e$B$N4IM}<T$KJs9p$5$l$^$9!#\e(B
+
+Gmane \e$B$O\e(B @uref{http://gmane.org} \e$B$G8+$D$1$k$3$H$,$G$-$^$9!#\e(B
+
+@end defvar
+
+@defvar spam-report-gmane-use-article-number
+
+\e$B$3$NJQ?t$O%G%#%U%)%k%H$G\e(B @code{t} \e$B$G$9!#$"$J$?<+?H$,%K%e!<%9%5!<%P!<$r1?\e(B
+\e$B1D$7$F$$$k!"$9$J$o$A%m!<%+%k$J5-;vHV9f$,\e(B Gmane \e$B$N5-;vHV9f$H9g$o$J$$>l9g\e(B
+\e$B$O!"\e(B@code{nil} \e$B$K@_Dj$7$F2<$5$$!#\e(B
+@code{spam-report-gmane-use-article-number} \e$B$,\e(B @code{nil} \e$B$G$"$k$H!"\e(B
+@file{spam-report.el} \e$B$O\e(B Gmane \e$B$,Ds6!$9$k\e(B @code{X-Report-Spam} \e$B%X%C%@!<\e(B
+\e$B$r;H$$$^$9!#\e(B
 
 @end defvar
 
@@ -21735,9 +22013,9 @@ Hashcash \e$B0u$,L5$$%a%C%;!<%8$O<!$N\e(B spam-\e$BJ,3d\e(B (spam-split) \e$B5,B'$KAw
 \e$B$J$j9-HO0O$KEO$C$F$$$^$9$,!"$b$7;~BeCY$l$J%5!<%P!<$r4^$s$G$$$?$i;d$?$A$K\e(B
 \e$BCN$i$;$k$?$a$K!"3NG'$7$F2<$5$$!#\e(B
 
-\e$B%V%i%C%/%[!<%k!&%A%'%C%/$O\e(B @code{dig.el} \e$B%Q%C%1!<%8$r;H$$$^$9!#$7$+\e(B
+\e$B%V%i%C%/%[!<%k!&%A%'%C%/$O\e(B @file{dig.el} \e$B%Q%C%1!<%8$r;H$$$^$9!#$7$+\e(B
 \e$B$7\e(B @code{spam-use-dig} \e$B$r\e(B @code{nil} \e$B$K@_Dj$9$l$P!"$h$jNI$$@-G=$N$?$a\e(B
-\e$B$K\e(B @code{dns.el} \e$B$rBe$o$j$K;H$&$3$H$r\e(B @code{spam.el} \e$B$K;X<($9$k$3$H$,$G\e(B
+\e$B$K\e(B @file{dns.el} \e$B$rBe$o$j$K;H$&$3$H$r\e(B @file{spam.el} \e$B$K;X<($9$k$3$H$,$G\e(B
 \e$B$-$^$9!#8=>u$G$O\e(B @code{spam-use-dig} \e$B$r\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$O!"$$\e(B
 \e$B$/?M$+$N%f!<%6!<$,;H$($J$$$+$b$7$l$J$$$N$G!"$=$l$,2DG=$J@-G=2~A1$G$"$k$K\e(B
 \e$B$b$+$+$o$i$:?d>)$5$l$^$;$s!#$7$+$7!"$=$l$,F0$/$+$I$&$+$r3N$+$a$k$3$H$O$G\e(B
@@ -21760,7 +22038,7 @@ Hashcash \e$B0u$,L5$$%a%C%;!<%8$O<!$N\e(B spam-\e$BJ,3d\e(B (spam-split) \e$B5,B'$KAw
 
 @defvar spam-use-dig
 
-@code{dns.el} \e$B%Q%C%1!<%8$NBe$o$j$K\e(B @code{dig.el} \e$B%Q%C%1!<%8$r;H$$$^$9!#\e(B
+@file{dns.el} \e$B%Q%C%1!<%8$NBe$o$j$K\e(B @file{dig.el} \e$B%Q%C%1!<%8$r;H$$$^$9!#\e(B
 \e$B%G%#%U%)%k%H$N@_Dj$G$"$k\e(B @code{t} \e$B$,?d>)$5$l$^$9!#\e(B
 
 @end defvar
@@ -21820,8 +22098,9 @@ Spam \e$B5-;v$@$1$N\e(B @samp{$} \e$B0u$r4XO"IU$1$k:G>.$N@$OC$K$h$C$F!"\e(BBogofilte
 \e$B$N5-;v$N\e(B @emph{spamicity} (\e$BLuCm\e(B: spam \e$BEY\e(B?) \e$B%9%3%"\e(B (0.0\e$B!A\e(B1.0) \e$B$rI=<($7$^\e(B
 \e$B$9!#\e(B
 
-Bogofilter \e$B$O!"%3%s%Q%$%k;~$K@_Dj$5$l$kFbIt$NogCM$K4p$E$$$F!"%a%C%;!<%8\e(B
-\e$B$,\e(B spam \e$B$+$I$&$+$r7hDj$7$^$9!#ogCM$O%+%9%?%^%$%:$G$-$^$;$s!#\e(B
+Bogofilter \e$B$O!"$"$k0lDj$NogCM$K4p$E$$$F!"%a%C%;!<%8$,\e(B spam \e$B$+$I$&$+$r8+\e(B
+\e$B6K$a$^$9!#ogCM$O%+%9%?%^%$%:$G$-$^$9!#\e(BBogofilter \e$B$N%I%-%e%a%s%H$rD4$Y$F\e(B
+\e$B2<$5$$!#\e(B
 
 Path \e$B$K\e(B @code{bogofilter} \e$B$N<B9T%U%!%$%k$,L5$$>l9g!"\e(BBogofilter \e$B$N=hM}$O\e(B
 \e$B<h$j>C$5$l$^$9!#\e(B
@@ -21870,10 +22149,10 @@ Path \e$B$K\e(B @code{bogofilter} \e$B$N<B9T%U%!%$%k$,L5$$>l9g!"\e(BBogofilter \e$B$N
 
 @end defvar
 
-Bogofilter \e$B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G\e(B ifile \e$B$K;w$F$$$^$9!#\e(B
-Spam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$,Ds6!$5$l!"2C$($F\e(B spam-\e$BJ,3d\e(B (spam-split) \e$B$K\e(B
-\e$B$b\e(B Bogofilter \e$B$,;H$o$l$k$Y$-$G$"$k$3$H!"$^$?$O$9$G$K5-;v$K;H$o$l$?$3$H$r\e(B
-\e$B<($9\e(B @code{spam-use-bogofilter} \e$B$*$h\e(B
+Bogofilter \e$B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G\e(B @command{ifile} \e$B$K;w$F$$$^\e(B
+\e$B$9!#\e(BSpam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$,Ds6!$5$l!"2C$($F\e(B spam-\e$BJ,\e(B
+\e$B3d\e(B (spam-split) \e$B$K$b\e(B Bogofilter \e$B$,;H$o$l$k$Y$-$G$"$k$3$H!"$^$?$O$9$G$K5-\e(B
+\e$B;v$K;H$o$l$?$3$H$r<($9\e(B @code{spam-use-bogofilter} \e$B$*$h\e(B
 \e$B$S\e(B @code{spam-use-bogofilter-headers} \e$BJQ?t$,Ds6!$5$l$^$9!#$3$N5!G=$r8!::\e(B
 \e$B$9$k$?$a$K\e(B Bogofilter \e$B$N%P!<%8%g%s\e(B 0.9.2.1 \e$B$,;H$o$l$^$7$?!#\e(B
 
@@ -21885,8 +22164,9 @@ Spam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$,Ds6!$5$l!"2C$($F\e(B spam-\e$BJ,3d\e(B (spam-s
 
 @defvar spam-use-ifile
 
-Bogofilter \e$B$K;w$?E}7WJ,@O4o$G$"$k\e(B ifile \e$B$r\e(B @code{spam-split} \e$B$K;H$$$?$$\e(B
-\e$B>l9g$O!"$3$NJQ?t$rM-8z$K$7$F2<$5$$!#\e(B
+Bogofilter \e$B$K;w$?E}7WJ,@O4o$G$"\e(B
+\e$B$k\e(B @command{ifile} \e$B$r\e(B @code{spam-split} \e$B$K;H$$$?$$>l9g$O!"$3$NJQ?t$rM-8z\e(B
+\e$B$K$7$F2<$5$$!#\e(B
 
 @end defvar
 
@@ -21952,12 +22232,117 @@ Emacs Lisp \e$B$K$h$kE}7WJ,@O4o$G$"$k\e(B spam-stat.el \e$B$r\e(B @code{spam-split}
 \e$B%W$K$O8z2L$r5Z$\$5$J$$$3$H$KCm0U$7$F2<$5$$!#\e(B
 @end defvar
 
-\e$B$3$l$O\e(B spam.el \e$B$,\e(B spam-stat.el \e$B$HF/$-9g$&$3$H$r2DG=$K$7$^$9!#\e(B
-spam-stat.el \e$B$O\e(B (Lisp \e$B$@$1$N\e(B) spam \e$BFbIt%G!<%?%Y!<%9$rDs6!$7$^$9$,!"$=$l\e(B
-\e$B$O\e(B ifile \e$B$d\e(B Bogofilter \e$B$H0c$C$F30It%W%m%0%i%`$rI,MW$H$7$^$;$s!#\e(B
+\e$B$3$l$O\e(B @file{spam.el} \e$B$,\e(B @file{spam-stat.el} \e$B$HF/$-9g$&$3$H$r2DG=$K$7$^\e(B
+\e$B$9!#\e(B@file{spam-stat.el} \e$B$O\e(B (Lisp \e$B$@$1$N\e(B) spam \e$BFbIt%G!<%?%Y!<%9$rDs6!$7$^\e(B
+\e$B$9$,!"$=$l$O\e(B ifile \e$B$d\e(B Bogofilter \e$B$H0c$C$F30It%W%m%0%i%`$rI,MW$H$7$^$;$s!#\e(B
 Spam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$H\e(B @code{spam-split} \e$B$N$?$a\e(B
 \e$B$N\e(B @code{spam-use-stat} \e$BJQ?t$,Ds6!$5$l$^$9!#\e(B
 
+@node SpamOracle
+@subsubsection Gnus \e$B$G\e(B SpamOracle \e$B$r;H$&$K$O\e(B
+@cindex spam filtering
+@cindex SpamOracle
+@cindex spam
+
+\e$B5$7Z$K\e(B spam \e$B$r_I2a$9$k0l$D$N$d$jJ}$O\e(B SpamOracle \e$B$r;H$&$3$H$G$9!#E}7WE*$K\e(B
+\e$B%a!<%k$r_I2a$9$k$?$a$NF;6q$G$"$k\e(B SpamOracle \e$B$O!"\e(BXavier Leroy \e$B$K$h$C$F=q\e(B
+\e$B$+$l$^$7$?!#$3$l$OJL$K%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B
+
+Gnus \e$B$G\e(B SpamOracle \e$B$r;H$&$K$O!"$$$/$D$+$N$d$jJ}$,$"$j$^$9!#$9$Y$F$N>l9g\e(B
+\e$B$K!"%a!<%k$O\e(B @emph{mark} \e$B%b!<%I$GF0:n$7$F$$$k\e(B SpamOracle \e$B$K%Q%$%W$5$l$^\e(B
+\e$B$9!#$9$k$H\e(B SpamOracle \e$B$O!"$=$N%a!<%k$r\e(B spam \e$B$@$H8+$J$7$?$+$I$&$+$r<(\e(B
+\e$B$9\e(B @samp{X-Spam} \e$B%X%C%@!<$r5-F~$7$^$9!#\e(B
+
+\e$B<B8=2DG=$J0l$D$O!"\e(BSpamOracle \e$B$r\e(B @code{:prescript} \e$B$H$7$F\e(B @ref{Mail
+Source Specifiers} \e$B$+$iAv$i$;$k$3$H$G$9!#$3$NJ}K!$K$O!"%f!<%6\e(B
+\e$B$,\e(B @emph{X-Spam} \e$B%X%C%@!<$r8+$k$3$H$,$G$-$k$H$$$&MxE@$,$"$j$^$9!#\e(B
+
+\e$B$b$C$H$b<j7Z$JJ}K!$O!"\e(B@file{spam.el} (@pxref{Filtering Spam Using The
+Spam ELisp Package}) \e$B$,\e(B SpamOracle \e$B$r8F$V$h$&$K$9$k$3$H$G$9!#\e(B
+
+@vindex spam-use-spamoracle
+@file{spam.el} \e$B$,\e(B SpamOracle \e$B$r;H$($k$h$&$K$9$k$K$O!"JQ\e(B
+\e$B?t\e(B @code{spam-use-spamoracle} \e$B$r\e(B @code{t} \e$B$K$7$F!"\e(B@ref{Filtering Spam
+Using The Spam ELisp Package} \e$B$N9`$G=R$Y$i$l$F$$$k$h$&\e(B
+\e$B$K\e(B @code{nnmail-split-fancy} \e$B$+\e(B @code{nnimap-split-fancy} \e$B$r@_Dj$7$F2<$5\e(B
+\e$B$$!#$3$NNc$G$O\e(B @code{nnimap} \e$B%5!<%P!<$N\e(B @samp{INBOX} \e$B$,\e(B SpamOracle \e$B$K$h$C\e(B
+\e$B$F_I2a$5$l$^$9!#\e(BSpam \e$B$@$H8+$J$5$l$?%a!<%k$O\e(B @code{spam-split-group}\e$B!"$3\e(B
+\e$B$N>l9g$O\e(B @samp{Junk} \e$B$K0\F0$5$;$i$l$^$9!#\e(BHam \e$B$J%a%C%;!<%8\e(B
+\e$B$O\e(B @samp{INBOX} \e$B$K;D$j$^$9\e(B:
+
+@example
+(setq spam-use-spamoracle t
+      spam-split-group "Junk"
+      nnimap-split-inbox '("INBOX")
+      nnimap-split-rule 'nnimap-split-fancy
+      nnimap-split-fancy '(| (: spam-split) "INBOX"))
+@end example
+
+@defvar spam-use-spamoracle
+Gnus \e$B$K\e(B SpamOracle \e$B$r;H$C$F\e(B spam \e$B$N_I2a$r$5$;$?$$>l9g$K\e(B @code{t} \e$B$K$7$F\e(B
+\e$B2<$5$$!#\e(B
+@end defvar
+
+@defvar spam-spamoracle-binary
+Gnus \e$B$O%f!<%6$N\e(B PATH \e$B$G8+$D$+$C$?\e(B @file{spamoracle} \e$B$H$$$&\e(B SpamOracle \e$B$N\e(B
+\e$B%P%$%J%j$r;H$$$^$9!#$3$l$K$O%+%9%?%^%$%:2DG=$JJQ\e(B
+\e$B?t\e(B @code{spam-spamoracle-binary} \e$B$r;H$$$^$9!#\e(B
+@end defvar
+
+@defvar spam-spamoracle-database
+SpamOracle \e$B$O$=$N2r@O7k2L$r%G!<%?%Y!<%9$H$7$F3JG<$9$k$?$a$K!"%G%#%U%)%k\e(B
+\e$B%H$G\e(B @file{~/.spamoracle.db} \e$B%U%!%$%k$r;H$$$^$9!#$3$l$OJQ\e(B
+\e$B?t\e(B @code{spam-spamoracle-database} \e$B$G@)8f$5$l!"%G%#%U%)%k%H\e(B
+\e$B$O\e(B @code{nil} \e$B$G$9!#$=$l$O!"%G%#%U%)%k%H$N\e(B SpamOracle \e$B%G!<%?%Y!<%9$,;H$o\e(B
+\e$B$l$k$3$H$r0UL#$7$^$9!#%G!<%?%Y!<%9$,$I$3$+FCJL$J>l=j$K$"$k>l9g$O!"\e(B
+@code{spam-spamoracle-database} \e$B$r$=$N%Q%9$K@_Dj$7$F2<$5$$!#\e(B
+@end defvar
+
+SpamOracle \e$B$O%a%C%;!<%8$,\e(B spam \e$B$+\e(B ham \e$B$+$r8+6K$a$k$?$a$KE}7WE*$J<jK!$r;H\e(B
+\e$B$$$^$9!#4V0c$$$d8+F($7$N>/$J$$NI$$7k2L$rF@$k$?$a$K!"\e(BSpamOracle \e$B$O71N}$r\e(B
+\e$BI,MW$H$7$^$9!#\e(BSpamOracle \e$B$O\e(B spam \e$B%a!<%k$NFCD'$r3X$S$^$9!#\e(B@emph{add} \e$B%b!<\e(B
+\e$B%I\e(B (\e$B71N}%b!<%I\e(B) \e$B$r;H$C$F!"NI$$%a!<%k\e(B (ham) \e$B$H\e(B spam \e$B$r\e(B SpamOracle \e$B$KM?$(\e(B
+\e$B$J$1$l$P$J$j$^$;$s!#$3$l$O!"35N,%P%C%U%!$G\e(B @kbd{|} \e$B$r2!$9$3$H$K$h$C$F%a!<\e(B
+\e$B%k$r\e(B SpamOracle \e$B$N%W%m%;%9$K%Q%$%W$9$k$+!"$^$?\e(B
+\e$B$O\e(B @file{spam.el} \e$B$N\e(B spam \e$B$*$h$S\e(B ham \e$B%W%m%;%C%5!<$r;H$&$3$H$K$h$C$F9T$J\e(B
+\e$B$&$3$H$,$G$-$^$9!"\e(B@xref{Filtering Spam Using The Spam ELisp Package}.
+
+@defvar gnus-group-spam-exit-processor-spamoracle
+\e$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W\e(B
+\e$B$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$($k$+!"$^$?\e(B
+\e$B$O\e(B @code{gnus-spam-process-newsgroups} \e$BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k\e(B
+\e$B$,%0%k!<%W$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$($i$l$k$H!"\e(Bspam \e$B0u$,IU$$\e(B
+\e$B$?5-;v$,\e(B spam \e$B$N%5%s%W%k$H$7$F\e(B SpamOracle \e$B$KAw$i$l$^$9!#\e(B
+@end defvar
+
+@defvar gnus-group-ham-exit-processor-spamoracle
+\e$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W\e(B
+\e$B$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$($k$+!"$^$?\e(B
+\e$B$O\e(B @code{gnus-spam-process-newsgroups} \e$BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k\e(B
+\e$B$,%0%k!<%W$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$($i$l$k$H!"\e(B@emph{ham} \e$B%0\e(B
+\e$B%k!<%W$K$"$k\e(B ham \e$B0u$,IU$$$?5-;v$,\e(B ham \e$B$N5-;v$N%5%s%W%k$H$7\e(B
+\e$B$F\e(B SpamOracle \e$B$KAw$i$l$^$9!#$3$N\e(B ham \e$B%W%m%;%C%5!<\e(B
+\e$B$O\e(B @emph{spam} \e$B$+\e(B @emph{\e$BL$J,N`\e(B} \e$B%0%k!<%W$K$O8z2L$r5Z$\$5$J$$$3$H$KCm0U$7\e(B
+\e$B$F2<$5$$!#\e(B
+@end defvar
+
+@emph{\e$BNc\e(B:} \e$B$3$l$i$O\e(B ham \e$B%0%k!<%W$H$7$FJ,N`$5$l$?!"$D$^$j\e(B ham \e$B$N5-;v$7$+\e(B
+\e$B$J$$%0%k!<%W$N%0%k!<%W%Q%i%a!<%?$G$9!#\e(B
+
+@example
+ ((spam-contents gnus-group-spam-classification-ham)
+  (spam-process
+   (gnus-group-spam-exit-processor-spamoracle)))
+@end example
+
+\e$B$3$N%0%k!<%W$G$O\e(B @code{gnus-group-spam-exit-processor-spamoracle} \e$B$,;E;v\e(B
+\e$B$r$7$^$9!#$3$N%0%k!<%W$K\e(B spam \e$B5-;v$,$"$C$F\e(B (SpamOracle \e$B$,==J,$J%5%s%W%k\e(B
+\e$B$r?)$Y$5$;$F$b$i$C$F$$$J$1$l$P!"$=$&$J$j$^$9$M\e(B)\e$B!"$+$D%f!<%6$,$$$/$D$+$N\e(B
+\e$B5-;v$K\e(B spam \e$B$N0u$rIU$1$?$J$i$P!"$=$l$i$N5-;v\e(B
+\e$B$O\e(B @code{gnus-group-spam-exit-processor-spamoracle} \e$B$K$h$C$F=hM}$5$l$^$9!#\e(B
+\e$B$3$N%W%m%;%C%5!<$O!"?7$7$$\e(B spam \e$B$N%5%s%W%k$H$7$F\e(B SpamOracle \e$B$K5-;v$rAw$j\e(B
+\e$B$^$9!#\e(B
+
 @node Extending the spam elisp package
 @subsubsection Spam elisp \e$B%Q%C%1!<%8$N3HD%\e(B
 @cindex spam filtering
@@ -21978,9 +22363,11 @@ Spam \e$B$H\e(B ham \e$B$N%W%m%;%C%5!<$H\e(B @code{spam-split} \e$B$N$?$a\e(B
 @end lisp
 
 @code{spam-list-of-checks} \e$B$K\e(B
+
 @example
     (spam-use-blackbox . spam-check-blackbox)
 @end example
+
 \e$B$rDI2C!#\e(B
 
 @item
@@ -22028,7 +22415,7 @@ Spam \e$B$G$O$J$$\e(B (\e$BL$J,N`$^$?$O\e(B ham) \e$B%0%k!<%W$@$1$KE,MQ$5$l$k!#\e(B")
    (lambda (article)
      (let ((from (spam-fetch-field-from-fast article)))
        (when (stringp from)
-          (blackbox-do-something-with-this-spammer from))))
+           (blackbox-do-something-with-this-spammer from))))
    ;; @r{ham \e$BMQ$N4X?t\e(B}
    nil))
 
@@ -22040,7 +22427,7 @@ Spam \e$B$G$O$J$$\e(B (\e$BL$J,N`$^$?$O\e(B ham) \e$B%0%k!<%W$@$1$KE,MQ$5$l$k!#\e(B")
    (lambda (article)
      (let ((from (spam-fetch-field-from-fast article)))
        (when (stringp from)
-          (blackbox-do-something-with-this-ham-sender from))))))
+           (blackbox-do-something-with-this-ham-sender from))))))
 @end lisp
 
 \e$B4X?t\e(B @code{blackbox-do-something-with-this-ham-sender} \e$B$*$h\e(B
@@ -22086,9 +22473,9 @@ gnus \e$B$O$3$N<o$N_I2a$r%5%]!<%H$7$^$9!#$7$+$7$=$l$K$O$$$/$D$+$N@_Dj$,I,MW\e(B
 \e$B$N<-=q$r;H$C$F2<$5$$!#\e(B
 
 @menu
-* Creating a spam-stat dictionary::  
-* Splitting mail using spam-stat::  
-* Low-level interface to the spam-stat dictionary::  
+* Creating a spam-stat dictionary::
+* Splitting mail using spam-stat::
+* Low-level interface to the spam-stat dictionary::
 @end menu
 
 @node Creating a spam-stat dictionary
@@ -22126,7 +22513,7 @@ nnml \e$B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r\e(B
 \e$B%-%c%C%7%e$9$k$3$H$G$9!#$=$&$9$l\e(B
 \e$B$P\e(B @code{spam-stat-process-spam-directory} \e$B$H$7\e(B
 \e$B$F\e(B @file{"~/News/agent/nnimap/mail.yourisp.com/personal_spam"} \e$B$N$h$&$J\e(B
-\e$B$b$N$,;H$($^$9!#\e(B@xref{Agent as Cache}\e$B!#\e(B
+\e$B$b$N$,;H$($^$9!#\e(B@xref{Agent as Cache}.
 
 @defvar spam-stat
 \e$B$3$NJQ?t$O$9$Y$F$NE}7W$N%O%C%7%e%F!<%V%k\e(B -- \e$B2f!9$,<-=q$H8@$C$F$$$k$b\e(B
@@ -22188,7 +22575,7 @@ nnml \e$B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r\e(B
 @lisp
 (setq nnmail-split-fancy
       `(| (: spam-stat-split-fancy)
-         "mail.misc"))
+          "mail.misc"))
 @end lisp
 
 @defvar spam-stat-split-fancy-spam-group
@@ -22202,8 +22589,8 @@ Spam \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(B
 @lisp
 (setq nnmail-split-fancy
       `(| ("Subject" "\\bspam-stat\\b" "mail.emacs")
-         (: spam-stat-split-fancy)
-         "mail.misc"))
+          (: spam-stat-split-fancy)
+          "mail.misc"))
 @end lisp
 
 \e$B:G=i$K\e(B spam \e$B$N_I2a$r$7$?$$>l9g!"<-=q$r:n$k$H$-$K==J,$KCm0U$7$J$1$l$P$J$j\e(B
@@ -22217,7 +22604,7 @@ Spam \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(B
 (setq nnmail-split-fancy
       `(| (: spam-stat-split-fancy)
           ("Subject" "\\bspam-stat\\b" "mail.emacs")
-         "mail.misc"))
+          "mail.misc"))
 @end lisp
 
 \e$B$3$l$rEAE}E*$J_I2a$HAH$_9g$o$;$k$3$H$b$G$-$^$9!#$3$3$G$O2f!9$O$9$Y$F\e(B
@@ -22229,9 +22616,9 @@ Spam \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(B
 @lisp
 (setq nnmail-split-fancy
       `(| ("Content-Type" "text/html" "mail.spam.filtered")
-         (: spam-stat-split-fancy)
+          (: spam-stat-split-fancy)
           ("Subject" "\\bspam-stat\\b" "mail.emacs")
-         "mail.misc"))
+          "mail.misc"))
 @end lisp
 
 @node Low-level interface to the spam-stat dictionary
@@ -22785,7 +23172,7 @@ RFC 1731 \e$B$O\e(B @acronym{IMAP} \e$B$N\e(B GSSAPI/Kerberos4 \e$B$N<jK!$K$D$$$F=R$Y
 @cindex Mule
 @cindex Emacs
 
-Gnus \e$B$O0J2<$N$b$N$GF0:n$7$^$9\e(B:
+T-gnus \e$B$O0J2<$N$b$N$GF0:n$7$^$9\e(B:
 
 @itemize @bullet
 
@@ -22882,7 +23269,7 @@ Luis Fernandes---\e$B%G%6%$%s$H%0%i%U%#%C%/!#\e(B
 Joe Reiss---\e$B%9%^%$%j!<$N4i$N:n<T!#\e(B
 
 @item
-Justin Sheehy--@acronym{FAQ} \e$B$N%a%$%s%F%$%J!<!#\e(B
+Justin Sheehy---@acronym{FAQ} \e$B$N%a%$%s%F%$%J!<!#\e(B
 
 @item
 Erik Naggum---\e$B1g=u!"9M$(!"%5%]!<%H!"%3!<%I$H$=$NB>!#\e(B
@@ -23045,8 +23432,8 @@ Richard Hoskins,
 Brad Howes,
 Miguel de Icaza,
 Fran\e,Ag\e(Bois Felix Ingrand,
-\e$B;T@n\e(B \e$BC#:H\e(B,
-\e$B@P@n\e(B \e$B0lO:\e(B,
+\e$B;T@n\e(B \e$BC#\e(B
+\e$B:H\e(B, \e$B@P@n\e(B \e$B0lO:\e(B,
 Lee Iverson,
 \e$B4d<<\e(B \e$B85E5\e(B,
 Rajappa Iyer,
@@ -23091,8 +23478,8 @@ Fred Oberhauser,
 C. R. Oldham,
 Alexandre Oliva,
 Ken Olstad,
-\e$BBg@>\e(B \e$B2m@2\e(B,
-\e$B>.Ln\e(B \e$B=(5.\e(B,
+\e$BBg@>\e(B \e$B2m\e(B
+\e$B@2\e(B, \e$B>.Ln\e(B \e$B=(5.\e(B,
 Ettore Perazzoli,
 William Perry,
 Stephen Peters,
@@ -23705,7 +24092,7 @@ Gnus 5.6 \e$B$N?7$7$$5!G=\e(B:
 @item
 Gnus \e$B$r%*%U%i%$%s%K%e!<%9%j!<%@!<$H$7$F;H$&?75!G=$,2C$($i$l$^$7$?!#2a>j\e(B
 \e$B$J$[$I$N?7$7$$L?Na$H%b!<%I$,DI2C$5$l$^$7$?!#40A4$JOC$KIU$$$F\e(B
-\e$B$O\e(B @pxref{Gnus Unplugged} \e$B$r8+$F2<$5$$!#\e(B
+\e$B$O\e(B @ref{Gnus Unplugged} \e$B$r8+$F2<$5$$!#\e(B
 
 @item
 @code{nndraft} \e$B%P%C%/%(%s%I$,La$C$F$-$^$7$?$,!"0MA3$H$O0c$&$h$&$KF0:n$9\e(B
@@ -23737,12 +24124,12 @@ Gnus \e$B$r%*%U%i%$%s%K%e!<%9%j!<%@!<$H$7$F;H$&?75!G=$,2C$($i$l$^$7$?!#2a>j\e(B
 \e$B%$%i%$%H$r6X;_$9$k$h$&$K$J$j$^$7$?!#\e(B
 
 @item
-@code{gnus-boring-article-headers} \e$B$K?7$7$$MWAG$,$"$j$^$9\e(B---
-@code{long-to}\e$B!#\e(B
+@code{gnus-boring-article-headers} \e$B$K?7$7$$MWAG$,$"$j$^\e(B
+\e$B$9\e(B---@code{long-to}\e$B!#\e(B
 
 @item
-@kbd{M-i} \e$B%7%s%\%k@\F,0z?tL?Na$,$"$j$^$9!#>\:Y$O\e(B ``Symbolic
-Prefixes'' \e$B$NItJ,$r8+$F2<$5$$!#\e(B
+@kbd{M-i} \e$B%7%s%\%k@\F,0z?tL?Na$,$"$j$^$9!#>\:Y\e(B
+\e$B$O\e(B @ref{Symbolic Prefixes} \e$B$r8+$F2<$5$$!#\e(B
 
 @item
 \e$B35N,%P%C%U%!$N\e(B @kbd{L} \e$B$H\e(B @kbd{I} \e$B$O\e(B @file{all.SCORE} \e$B%U%!%$%k$K%9%3%"K!\e(B
@@ -23907,8 +24294,13 @@ T-gnus \e$B$O\e(B @acronym{SEMI} \e$B$d\e(B @acronym{FLIM} \e$B$KMj$C$F$$$^$9!#$7$?$,
 @itemize @bullet
 
 @item
+\e$B%I%i%U%H!&%0%k!<%W$G\e(B @kbd{e} \e$B%-!<$,\e(B @code{gnus-draft-edit-message} \e$B%3%^\e(B
+\e$B%s%I$K3d$jEv$F$i$l$^$7$?!#\e(B@code{gnus-summary-edit-article} \e$B%3%^%s%I$K$O!"\e(B
+\e$BBe$o$j$K\e(B @kbd{B w} \e$B%-!<$r;H$C$F2<$5$$!#\e(B
+
+@item
 \e$B2~Dj$5$l$?\e(B Gnus @acronym{FAQ} \e$B$,%^%K%e%"%k$K4^$^$l$F$$$^$9!#\e(B
-@xref{Frequently Asked Questions}\e$B!#\e(B(\e$BLuCm\e(B: T-gnus \e$B$N$?$a\e(B
+@xref{Frequently Asked Questions}. (\e$BLuCm\e(B: T-gnus \e$B$N$?$a\e(B
 \e$B$N\e(B @acronym{FAQ} \e$B$O1J$i$/2~Dj$5$l$F$$$^$;$s!#\e(B)
 
 @item
@@ -23929,9 +24321,9 @@ Oort (\e$B$3$N%j%j!<%9$K@hN)$D0BDj$G$O$J$$\e(B Gnus \e$B$N;^\e(B) \e$B$r;H$C$F$_$?$b$
 
 URL\e$B!"%a!<%k%"%I%l%9!"\e(BMessage-ID\e$B!"\e(BInfo \e$B$X$N%j%s%/!"\e(Bman \e$B%Z!<%8$H\e(B Emacs \e$B$^\e(B
 \e$B$?$O\e(B Gnus \e$B$K4XO"$7$?;29MJ88%$N$?$a$N!"$h$jB?$/$N%\%?%s!#\e(B@xref{Article
-Buttons}\e$B!#$9$Y$F$N5-;v$N%\%?%s$N8+1I$($r@)8f$9$k$?$a\e(B
+Buttons}. \e$B$9$Y$F$N5-;v$N%\%?%s$N8+1I$($r@)8f$9$k$?$a\e(B
 \e$B$K\e(B @code{gnus-button-@var{*}-level} \e$BJQ?t$r;H$&$3$H$,$G$-$^$9!#\e(B
-@xref{Article Button Levels}\e$B!#\e(B
+@xref{Article Button Levels}.
 
 @item
 Dired \e$B$NE}9g\e(B
@@ -23947,7 +24339,7 @@ Dired \e$B$NE}9g\e(B
 
 @item
 Gnus \e$B$O\e(B RSS \e$B$N%K%e!<%9G[Aw$r!"%K%e!<%9%0%k!<%W$H$7$FI=<($7$^$9!#\e(B
-@xref{RSS}\e$B!#\e(B
+@xref{RSS}.
 
 @item
 \e$BC10l$N\e(B yenc \e$B$G%(%s%3!<%I$5$l$?E:IU%Q!<%H$,%G%3!<%I$G$-$^$9!#\e(B
@@ -23960,7 +24352,7 @@ Picon \e$B$N%3!<%I$,!"\e(BGNU Emacs \e$B$GF0:n$5$;$k$?$a$K:F<BAu$5$l$^$7$?!#0JA0$N$
 
 Picon \e$B$O!"%f!<%6!<!"%I%a%$%s!"$=$l$K%K%e!<%9%0%k!<%W$rI=8=$9$k$?$a$N!V8D\e(B
 \e$B?ME*$J%"%$%3%s\e(B (personal icons)\e$B!W$G!"5-;v%P%C%U%!$KI=<($9$k$3$H$,$G$-$^\e(B
-\e$B$9!#\e(B@xref{Picons}\e$B!#\e(B
+\e$B$9!#\e(B@xref{Picons}.
 
 @item
 \e$B?7$7$$%*%W%7%g%s\e(B @code{gnus-treat-body-boundary} \e$B$rHs\e(B-@code{nil} \e$B$K$9$k\e(B
@@ -23977,7 +24369,7 @@ Picon \e$B$O!"%f!<%6!<!"%I%a%$%s!"$=$l$K%K%e!<%9%0%k!<%W$rI=8=$9$k$?$a$N!V8D\e(B
 
 Message \e$B%P%C%U%!$K$*$1$k\e(B @kbd{C-c C-j} \e$B$G!"%a%C%;!<%8$NAw?.$rCY$i$;$k$3\e(B
 \e$B$H$,$G$-$^$9!#%a%C%;!<%8$O;XDj$5$l$?;~9o$KG[Aw$5$l$^$9!#$3$l$O$"$J$?<+?.\e(B
-\e$B$N$?$a$NK:HwO?$H$7$FLr$KN)$D$G$7$g$&!#\e(B@xref{Delayed Articles}\e$B!#\e(B
+\e$B$N$?$a$NK:HwO?$H$7$FLr$KN)$D$G$7$g$&!#\e(B@xref{Delayed Articles}.
 
 @item
 @code{auto-compression-mode} \e$B$,M-8z$K$J$C$F$$$k$H!"E:IU%U%!%$%k$r8+$k$H\e(B
@@ -24021,16 +24413,16 @@ nndoc \e$B%P%C%/%(%s%I$O!"\e(Bmailman \e$B$N$^$H$aAw$j$H\e(B exim \e$B$,CF$$$?%a%C%;!
 @item
 Gnus \e$B$O\e(B RFC 2369 \e$B$N%a!<%j%s%0%j%9%H$N%X%C%@!<$r%5%]!<%H$7$^$9!#$^$?!"%a!<\e(B
 \e$B%j%s%0%j%9%H$N%0%k!<%WMQ$K?t!9$N%3%^%s%I$rMQ0U$7$^$7$?!#\e(B@xref{Mailing
-List}\e$B!#\e(B
+List}.
 
 @item
 \e$BF|IU%X%C%@!<$r!"1Q8l$GH/2;$G$-$k7A<0$GI=<($9$k$3$H$,$G$-$^$9!#\e(B
-@xref{Article Date}\e$B!#\e(B
+@xref{Article Date}.
 
 @item
 Sendmail \e$B$r;H$&$H$-$N%(%s%Y%m!<%WAw?.<T\e(B (envelope sender) \e$B$N%"%I%l%9$,!"\e(B
 \e$B%+%9%?%^%$%:$G$-$k$h$&$K$J$j$^$7$?!#\e(B@xref{Mail Variables, Mail
-Variables,, message, Message Manual}\e$B!#\e(B
+Variables,, message-ja, Message Manual}.
 
 @item
 @code{mm-uu-diff-groups-regexp} \e$B$K9gCW$9$k%0%k!<%W$G$O!":9J,\e(B (diffs) \e$B$,\e(B
@@ -24112,10 +24504,10 @@ Message \e$B$O\e(B From:, To: \e$B$*$h$S\e(B Cc: \e$B$K$"$kHs\e(B-@acronym{ASCII} \e$B%
 @lisp
 (setq gnus-parameters
       '(("mail\\..*"
-        (gnus-show-threads nil)
-        (gnus-use-scoring nil))
-       ("^nnimap:\\(foo.bar\\)$"
-        (to-group . "\\1"))))
+         (gnus-show-threads nil)
+         (gnus-use-scoring nil))
+        ("^nnimap:\\(foo.bar\\)$"
+         (to-group . "\\1"))))
 @end lisp
 
 @item
@@ -24162,12 +24554,15 @@ Gnus \e$B$OHs>o$KJQ2=$KIY$s$@%W%m%0%i%`$H_I2a$N5,B'$r;H$C$F!"%a!<%k$d%K%e!<\e(B
 \e$B%9$NK[N.$+$i\e(B spam \e$B$rH4$-<h$C$F$7$^$&$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#BP1~$7\e(B
 \e$B$F$$$kJ}<0$O!"\e(BRBL blocklists\e$B!"\e(Bbogofilter \e$B$=$l$K%[%o%$%H\e(B/\e$B%V%i%C%/%j%9%H$G\e(B
 \e$B$9!#$^$?\e(B SpamAssassin \e$B$d\e(B Hashcash \e$B$N$h$&$J30It%Q%C%1!<%8$r4JC1$K;H$&$?$a\e(B
-\e$B$N\e(B hook \e$B$b?7$7$/$J$j$^$7$?!#\e(B@xref{Thwarting Email Spam}\e$B!#\e(B
+\e$B$N\e(B hook \e$B$b?7$7$/$J$j$^$7$?!#\e(B@xref{Thwarting Email Spam}.
 
 @item
 X-Faces \e$B%X%C%@!<$NA^F~$,4JC1$K$J$j$^$7$?!#\e(B
 
 @item
+Face \e$B%X%C%@!<$r07$($k$h$&$K$J$j$^$7$?!#\e(B
+
+@item
 \e$B35N,%P%C%U%!$K!"?7$7$$%3%^%s%I\e(B @kbd{/ N} \e$B$O?7Ce%a%C%;!<%8$rA^F~$7!"\e(B
 @kbd{/ o} \e$B$O8E$$%a%C%;!<%8$rA^F~$7$^$9!#\e(B
 
@@ -24309,7 +24704,7 @@ Gnus \e$B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#\e(B
 \e$B2<5-$N$h$&$J8E$$MM<0$O;~BeCY$l$K$J$j$^$7$?$,!"$^$@<u$1F~$l$i$l$^$9!#\e(B
 @lisp
 (header "to" "larsi.*org"
-       (Organization "Somewhere, Inc."))
+        (Organization "Somewhere, Inc."))
 @end lisp
 
 @item
@@ -24342,7 +24737,7 @@ Gnus \e$B$O\e(B RFC 2298 \e$B$N3+Iu3NG'MW5a$N@8@.$r%5%]!<%H$7$^$9!#\e(B
 Gnus \e$B$O\e(B Maildir \e$B%0%k!<%W$r%5%]!<%H$7$^$9!#\e(B
 
 Gnus \e$B$O?7%P%C%/%(%s%I$G$"$k\e(B @file{nnmaildir.el} \e$B$r4^$s$G$$$^$9!#\e(B
-@xref{Maildir}\e$B!#\e(B
+@xref{Maildir}.
 
 @item
 \e$B0u:~$N@-G=$,8~>e$7$^$7$?!#\e(B
@@ -24377,7 +24772,7 @@ Gnus \e$B$O\e(B Sieve \e$B$r;H$C$?%5!<%P!<B&$G$N%a!<%k$N_I2a$r%5%]!<%H$7$^$9!#\e(B
 Sieve \e$B$N5,B'$O%0%k!<%W%Q%i%a!<%?$H$7$F2C$($k$3$H$,$G$-!"%0%k!<%W%P%C%U%!\e(B
 \e$B$G\e(B @kbd{D g} \e$B$r;H$&$H40A4$J\e(B Sieve \e$B%9%/%j%W%H$,@8@.$5$l$^$9!#$=$&$7$?$i!"\e(B
 \e$B@8@.$5$l$?\e(B Sieve \e$B%P%C%U%!$G\e(B @kbd{C-c C-l} \e$B$r;H$C$F!"%5!<%P!<$K%"%C%W%m!<\e(B
-\e$B%I$7$F2<$5$$!#\e(B@xref{Sieve Commands}\e$B!"$=$l$K?7$7$$\e(B Sieve \e$B$N%^%K%e%"\e(B
+\e$B%I$7$F2<$5$$!#\e(B@ref{Sieve Commands}\e$B!"$=$l$K?7$7$$\e(B Sieve \e$B$N%^%K%e%"\e(B
 \e$B%k\e(B (@pxref{Top, , Top, sieve, Emacs Sieve}) \e$B$r;2>H$7$F2<$5$$!#\e(B
 
 @item
@@ -24436,8 +24831,8 @@ Gnus \e$B$O\e(B @file{~/.newsrc.eld} \e$B$K$"$k>pJs$NBe$o$j$K!"<+F0E*\e(B
 @item
 Message mode \e$B$G\e(B ``@acronym{MML}'' \e$B$HL>IU$1$i$l$?%a%K%e!<9`L\$O!"\e(B
 ``Attachments'' \e$B$K2~L>$5$l$^$7$?!#$3$N%a%K%e!<$O!"=pL>$H0E9f\e(B
-\e$B2=\e(B (@pxref{Security, Security,, message, Message Manual}) \e$B$N$h$&$J!"J]0B\e(B
-\e$B$K4XO"$7$?$b$N$b4^$s$G$$$k$3$H$KCeL\$7$F2<$5$$!#\e(B
+\e$B2=\e(B (@pxref{Security, Security,, message-ja, Message Manual}) \e$B$N$h$&$J!"\e(B
+\e$BJ]0B$K4XO"$7$?$b$N$b4^$s$G$$$k$3$H$KCeL\$7$F2<$5$$!#\e(B
 
 @item
 @code{gnus-group-charset-alist} \e$B$H\e(B @code{gnus-group-ignored-charsets-alist}\e$B!#\e(B
@@ -24468,6 +24863,15 @@ C-m} \e$B$KJQ$o$j$^$7$?!#\e(B
 
 \e$B$3$NJQ99$K$h$C$F!"I8=`%-!<3d$jEv$F$N\e(B @code{back-to-indentation} \e$B$H$N>WFM\e(B
 \e$B$,2sHr$5$l$^$7$?!#$3$N%3%^%s%I$b$^$?!"%a%C%;!<%8%b!<%I$G$OLr$KN)$D$N$G$9!#\e(B
+
+@item
+@code{message-forward-show-mml} \e$B$N%G%#%U%)%k%H$,\e(B @code{best} \e$B$KJQ$o$j$^\e(B
+\e$B$7$?!#\e(B
+
+\e$BCM\e(B @code{best} \e$B$N?6$kIq$$$O!"$=$l$,$U$5$o$7$$>l9g$O\e(B @acronym{MML} \e$B$rI=<(\e(B
+\e$B$9$k\e(B (\e$B$9$J$o$A\e(B @acronym{MIME} \e$B$KJQ49$9$k\e(B) \e$B$3$H$G$9!#JQ49$,%G%#%8%?%k=pL>\e(B
+\e$B$rL58z$K$7$F$7$^$&$N$G!"=pL>$5$l$?!"$^$?$O0E9f2=$5$l$?%a%C%;!<%8$rE>Aw$9\e(B
+\e$B$k$H$-$O\e(B @acronym{MML} \e$B$O;H$o$l$^$;$s!#\e(B
 @end itemize
 
 @iftex
@@ -24583,27 +24987,27 @@ gnus \e$B$O%a!<%k$H%K%e!<%9$,$[$H$s$IF1$8$@$H$_$J$7$^$9!#K\Ev$K!#0c$$$O<B:]\e(B
 \e$B$N5-;v$K$I$N$h$&$K%"%/%;%9$9$k$+$@$1$G$9!#%a!<%k%a%C%;!<%8$O%m!<%+%k%G%#\e(B
 \e$B%9%/$N%U%!%$%k$+$iFI$a$k$N$KBP$7$F!"%K%e!<%95-;v$O0lHL\e(B
 \e$B$K\e(B @acronym{NNTP} \e$B%W%m%H%3%k$G<hF@$7$^$9!#\e(Bgnus \e$B$NFbIt9=B$$O!"$=$l$i$N$?\e(B
-\e$B$a$K\e(B `\e$B%U%m%s%H%(%s%I\e(B' \e$B$H?t!9$N\e(B `\e$B%P%C%/%(%s%I\e(B' \e$B$+$i@.$jN)$C$F$$$^$9!#FbIt\e(B
-\e$BE*$K!"$"$J$?$,%0%k!<%W$KF~$k\e(B (\e$B$=$&!"\e(B@key{RET} \e$B$r$?$?$/\e(B) \e$B$H$-!"$=$N$?$a\e(B
-\e$B$K\e(B gnus \e$B$N%U%m%s%H%(%s%I$N5!G=$r8F$S=P$7$^$9!#%U%m%s%H%(%s%I$O$=$3$G%P%C\e(B
+\e$B$a$K\e(B ``\e$B%U%m%s%H%(%s%I\e(B'' \e$B$H?t!9$N\e(B ``\e$B%P%C%/%(%s%I\e(B'' \e$B$+$i@.$jN)$C$F$$$^$9!#\e(B
+\e$BFbItE*$K!"$"$J$?$,%0%k!<%W$KF~$k\e(B (\e$B$=$&!"\e(B@key{RET} \e$B$r$?$?$/\e(B) \e$B$H$-!"$=$N$?\e(B
+\e$B$a$K\e(B gnus \e$B$N%U%m%s%H%(%s%I$N5!G=$r8F$S=P$7$^$9!#%U%m%s%H%(%s%I$O$=$3$G%P%C\e(B
 \e$B%/%(%s%I$K!V\e(Bfoo \e$B%0%k!<%W$N5-;v$N%j%9%H$r$/$l!W$H$+!V\e(B4711 \e$BHV$N5-;v$r8+$;\e(B
-\e$B$F$h!W$H\e(B `\e$BOC$9\e(B' \e$B$N$G$9!#\e(B
+\e$B$F$h!W$H\e(B ``\e$BOC$9\e(B'' \e$B$N$G$9!#\e(B
 
 \e$B$=$&$$$&$o$1$G!"%P%C%/%(%s%I$O<g$K%W%m%H%3%k$+!"%U%!%$%k$N7A<0$H%G%#%l%/\e(B
 \e$B%H%j$NG[CV$rDj5A$7$^$9!#A0<T$O\e(B @code{nntp} \e$B%P%C%/%(%s%I\e(B
 \e$B$,\e(B @acronym{NNTP} \e$B$G%K%e!<%9$K%"%/%;%9$7$?$j\e(B @code{nnimap} \e$B%P%C%/%(%s%I\e(B
 \e$B$,\e(B @acronym{IMAP} \e$B$G%a!<%k$K%"%/%;%9$9$k$3$H$r;X$7$^$9!#$^$?!"8e<T\e(B
-\e$B$O\e(B @code{nnspool} \e$B%P%C%/%(%s%I$,6&DL$N\e(B `\e$B%9%W!<%k%G%#%l%/%H%j\e(B' \e$B7A<0$K%"%/\e(B
-\e$B%;%9$7$?$j!"$=$l$H$H$F$b$h$/;w$?\e(B @code{nnml} \e$B%P%C%/%(%s%I$,%U%!%$%k$N7A\e(B
-\e$B<0$H%G%#%l%/%H%j$NG[CV$K$h$C$F%a!<%k$K%"%/%;%9$9$k$3$H$r;X$7$^$9!#\e(B
+\e$B$O\e(B @code{nnspool} \e$B%P%C%/%(%s%I$,6&DL$N\e(B ``\e$B%9%W!<%k%G%#%l%/%H%j\e(B'' \e$B7A<0$K%"\e(B
+\e$B%/%;%9$7$?$j!"$=$l$H$H$F$b$h$/;w$?\e(B @code{nnml} \e$B%P%C%/%(%s%I$,%U%!%$%k$N\e(B
+\e$B7A<0$H%G%#%l%/%H%j$NG[CV$K$h$C$F%a!<%k$K%"%/%;%9$9$k$3$H$r;X$7$^$9!#\e(B
 
 gnus \e$B$O4pK\E*$J%a%G%#%"$r07$$$^$;$s!#$9$Y$F$O%P%C%/%(%s%I$K$h$C$F9T$J$o\e(B
 \e$B$l$k$H8@$&$3$H$,$G$-$^$9!#%P%C%/%(%s%I$O5-;v$K%"%/%;%9$9$k$?$a$N5!G=$N=8\e(B
 \e$B@.$G$9!#\e(B
 
-\e$B$7$+$7!"\e(B`\e$B%P%C%/%(%s%I\e(B' \e$B$H$$$&MQ8l$O$7$P$7$P\e(B `\e$B%5!<%P!<\e(B' \e$B$H$$$&0UL#$G$b;H\e(B
-\e$B$o$l$F$-$^$7$?!#$=$7$F\e(B `\e$BA*BrJ}K!\e(B' (`select method') \e$B$bF1$80UL#$G;H$&$3$H\e(B
-\e$B$,$G$-$^$9!#$+$h$&$K!"\e(Bgnus \e$B$NMQ8l$O$H$F$b:.Mp$7$F$$$^$9!#\e(B
+\e$B$7$+$7!"\e(B``\e$B%P%C%/%(%s%I\e(B'' \e$B$H$$$&MQ8l$O$7$P$7$P\e(B ``\e$B%5!<%P!<\e(B'' \e$B$H$$$&0UL#$G\e(B
+\e$B$b;H$o$l$F$-$^$7$?!#$=$7$F\e(B ``\e$BA*BrJ}K!\e(B'' (``select method'') \e$B$bF1$80UL#$G\e(B
+\e$B;H$&$3$H$,$G$-$^$9!#$+$h$&$K!"\e(Bgnus \e$B$NMQ8l$O$H$F$b:.Mp$7$F$$$^$9!#\e(B
 
 @item \e$B4pK\\e(B (native)
 @cindex native
@@ -24750,6 +25154,13 @@ 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
 @cindex digest
 \e$BJ#?t$N%a%C%;!<%8$r0l$D$N%U%!%$%k$K=8$a$?$b$N$G$9!#$b$C$H$bIaDL$N=8G[MM<0\e(B
 \e$B$O\e(B RFC1153 \e$B$G;XDj$5$l$F$$$^$9!#\e(B
+
+@item \e$BJ,3d\e(B (splitting)
+@cindex splitting, terminolgy
+@cindex mail sorting
+@cindex mail filtering (splitting)
+\e$B$"$k5,B'$K$h$C$F%a!<%k$rJ,N`$9$k9T0Y$G$9!#$H$-$I$-4V0c$C$F%a!<%k$N_I\e(B
+\e$B2a\e(B (mail filtering) \e$B$H8F$P$l$^$9!#\e(B
 @end table
 
 @page
@@ -24897,9 +25308,8 @@ Gnus \e$B$OH"$+$i=P$7$F$9$0$K\e(B @emph{\e$BHs>o$K\e(B} \e$B$h$/F0:n$7$^$9\e(B---\e$B2?
 @kbd{M-x gnus-version} \e$B$r;n$7$F2<$5$$!#$b$7!"\e(B
 @samp{T-gnus 6.16.* (based on Gnus v5.10.*; for SEMI 1.1*, FLIM
 1.1*)} \e$B$N$h$&$J$b$N$,=P$F$-$?$J$i!"@5$7$$%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#\e(B
-\e$B$b$7!"\e(B@samp{NNTP 3.x} \e$B$d\e(B @samp{nntp flee} \e$B$N$h$&$J$b$N$,=P$F$-$?$H$-$O!"\e(B
-\e$B$=$3$K$"$k$$$/$D$+$N8E$$\e(B @file{.el} \e$B%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$=$l$i\e(B
-\e$B$r>C$7$F2<$5$$!#\e(B
+\e$B$=$&$J$i$J$$>l9g$O!"8E$$\e(B @file{.el} \e$B%U%!%$%k$,;6$i$+$C$F$$$^$9!#$=$l$i$r\e(B
+\e$B>C$7$F2<$5$$!#\e(B
 
 @item
 @acronym{FAQ} \e$B$H\e(B how-to \e$B$rFI$`$?$a$K%X%k%W%0%k!<%W\e(B (\e$B%0%k!<%W%P%C%U%!\e(B
@@ -25192,20 +25602,20 @@ Gnus \e$B$,%P%C%/%(%s%I\e(B --- \e$BNc$($P\e(B @code{nntp} --- \e$B$K2?$+$N>pJs$rMW5a
 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$B$l$i5-;vHV9f$K4X$9$k$A$g$C$H$7$?@bL@$r$9$k$3$H$OM-1W$+$b$7$l$^$;$s!#$^$:\e(B
 \e$BBh0l$K!"$=$N?t;z$O@5$N@0?t$G$9!#BhFs$K!"\e(BGnus \e$B$r:.Mp$5$;$k$3$H$J$/8E$$5-\e(B
-\e$B;vHV9f$r8e$G:F;HMQ$9$k$3$H$OIaDL$O$G$-$^$;$s!#$=$l$O!"$b$7$"$k%0%k!<%W$,\e(B
-\e$B$+$D$F\e(B 42 \e$BHV$N5-;v$r;}$C$F$$$?$H$7$?$i!"$=$NHV9f$GB>$N5-;v$r;}$D$3$H$O$G\e(B
-\e$B$-$J$$$+!"$^$?$O\e(B Gnus \e$B$,:.Mp$7$F$7$^$&$+$b$7$l$J$$$H$$$&$3$H$G$9!#\e(B
+\e$B;vHV9f$r8e$G\e(B ``\e$B:F;HMQ\e(B'' \e$B$9$k$3$H$OIaDL$O$G$-$^$;$s!#$=$l$O!"$b$7$"$k%0%k!<\e(B
+\e$B%W$,$+$D$F\e(B 42 \e$BHV$N5-;v$r;}$C$F$$$?$H$7$?$i!"$=$NHV9f$GB>$N5-;v$r;}$D$3$H\e(B
+\e$B$O$G$-$J$$$+!"$^$?$O\e(B Gnus \e$B$,:.Mp$7$F$7$^$&$+$b$7$l$J$$$H$$$&$3$H$G$9!#\e(B
 @footnote{See the function @code{nnchoke-request-update-info},
 @ref{Optional Back End Functions}\e$B!#\e(B} \e$BBh;0$K!"5-;vHV9f$O$=$N%0%k!<%W$G$N\e(B
 \e$BE~Ce=g$K$J$C$F$$$J$1$l$P$J$i$J$$$3$H$G$9!#$H$O8@$(%a%C%;!<%8$NF|IU$bE~Ce\e(B
 \e$B=g$G$"$kI,MW$O$"$j$^$;$s$,!#\e(B
 
 \e$B$9$G$KA0$N@a$G!"5-;vHV9f$O0l2s;H$o$l$?$@$1$GLrL\$r=*$o$i$J$1$l$P$J$i$J\e(B
-\e$B$$\e(B `\e$B87$7$$\e(B' \e$B@)8B$K$D$$$F@bL@$7$^$7$?!#$7$+$7!"5-;vHV9f$NJB$S$KH4$1$,$"$k\e(B
-\e$B$H\e(B Gnus \e$B$O$H$F$b:.Mp$7$F$7$^$&$N$G!"\e(B@emph{\e$BDL$7\e(B} \e$BHV9f$rIU$1$k$3$H$,M-MQ$J\e(B
-\e$B$N$+$b$7$l$^$;$s!#$?$@$7\e(B `\e$B:F;HMQIT2D\e(B' \e$B$N@)8B$,$"$k$N$G!"$$$D$G$bHV9f$NH4\e(B
-\e$B$1$r2sHr$G$-$k$H$O8B$j$^$;$s!#$^$?!"2DG=$J8B$j5-;vHV9f$r\e(B 1 \e$B$+$i;O$a$k$3\e(B
-\e$B$H$O!"HV9f$r;H$$@Z$C$F$7$^$&$3$H$rHr$1$k$?$a$KLrN)$A$^$9!#\e(B
+\e$B$$\e(B ``\e$B87$7$$\e(B'' \e$B@)8B$K$D$$$F@bL@$7$^$7$?!#$7$+$7!"5-;vHV9f$NJB$S$KH4$1$,$"\e(B
+\e$B$k$H\e(B Gnus \e$B$O$H$F$b:.Mp$7$F$7$^$&$N$G!"\e(B@emph{\e$BDL$7\e(B} \e$BHV9f$rIU$1$k$3$H$,M-MQ\e(B
+\e$B$J$N$+$b$7$l$^$;$s!#$?$@$7\e(B ``\e$B:F;HMQIT2D\e(B'' \e$B$N@)8B$,$"$k$N$G!"$$$D$G$bHV9f\e(B
+\e$B$NH4$1$r2sHr$G$-$k$H$O8B$j$^$;$s!#$^$?!"2DG=$J8B$j5-;vHV9f$r\e(B 1 \e$B$+$i;O$a\e(B
+\e$B$k$3$H$O!"HV9f$r;H$$@Z$C$F$7$^$&$3$H$rHr$1$k$?$a$KLrN)$A$^$9!#\e(B
 
 \e$B47Nc$H$7$F!"%P%C%/%(%s%I$O\e(B @code{nn\e$B$J$s$?$i\e(B} \e$B$HL>IU$1$i$l$^$9$,!"\e(B
 gnus \e$B$K$O\e(B @file{nnheader.el}\e$B!"\e(B@file{nnmail.el} \e$B$*$h$S\e(B @file{nnoo.el} \e$B$N\e(B
@@ -25295,7 +25705,7 @@ field      = <text except TAB>
 @end example
 
 \e$B$3$l$i$NMs$K$I$N$h$&$J$b$N$,4^$^$l$k$+$r$h$j>\$7$/8+$?$1$l$P!"\e(B
-@pxref{Headers} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+@ref{Headers} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 
 @item (nnchoke-open-server SERVER &optional DEFINITIONS)
 
@@ -25575,14 +25985,14 @@ description-buffer = *description-line
 \e$B?t\e(B @code{message-make-date} \e$B$+$iJV$5$l$?$b$N\e(B) \e$B$G$9!#%G!<%?$O\e(B active \e$B%P%C\e(B
 \e$B%U%!$N7A<0$G$J$1$l$P$J$j$^$;$s!#\e(B
 
-\e$B$3$N4X?t$,B?$9$.$k%0%k!<%W$rJV$7$F$b%*!<%1%$$G$9!#$$$/$D$+$N%P%C%/%(%s%I\e(B
-\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 @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
+\e$B$3$N4X?t$,\e(B ``\e$BB?$9$.$k\e(B'' \e$B%0%k!<%W$rJV$7$F$b%*!<%1%$$G$9!#$$$/$D$+$N%P%C%/\e(B
+\e$B%(%s%I$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$r\e(B
+\e$BJV$9$+$b$7$l$^$;$s!#$7$+$7%P%C%/%(%s%I$,JV$9B?$/$N%0%k!<%W$KBP$7$F$3\e(B
+\e$B$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!<\e(B
+\e$B<+?H$,:n$C$?%0%k!<%W$J$i$PB?$9$.$k$3$H$O$J$$$G$7$g$&!#$G$9$+\e(B
+\e$B$i\e(B @code{nnml} \e$B$H$=$l$KN`$9$k$b$N$O$?$V$s?4G[$"$j$^$;$s!#$7$+\e(B
+\e$B$7\e(B @code{nntp} \e$B$N$h$&$J%P%C%/%(%s%I$G$O%0%k!<%W$O%5!<%P!<$K$h$C$F:n$i$l\e(B
+\e$B$F$$$^$9$+$i!"B?$/$N%0%k!<%W$,JV$C$F$/$k$3$H$,$"$j$($^$9!#\e(B
 
 @item (nnchoke-request-create-group GROUP &optional SERVER)
 
@@ -25693,8 +26103,8 @@ description-buffer = *description-line
 @code{nnml} \e$B$O\e(B @code{nnspool} \e$B$K$H$F$b;w$F$$$^$9$,!"%5!<%P!<>e$N5-;v$rJT\e(B
 \e$B=8$9$k$3$H$,$G$-$^$9!#\e(B@code{nnmh} \e$B$O\e(B @code{nnml} \e$B$K$H$F$b;w$F$$$^$9$,!"\e(B
 \e$B$3$l$O%"%/%F%#%V%U%!%$%k$r;H$o$:!"35MW%G!<%?%Y!<%9$bJ];}$7$^$;$s!#\e(B
-@code{nndir} \e$B$O\e(B @code{nnml} \e$B$K$H$F$b;w$F$$$^$9$,!"$3$l$K$O\e(B ``\e$B%0%k!<%W\e(B''
-\e$B$N35G0$O$J$/!"5-;v$N=$@5$O$G$-$^$;$s!#\e(B
+@code{nndir} \e$B$O\e(B @code{nnml} \e$B$K$H$F$b;w$F$$$^$9$,!"$3$l$K\e(B
+\e$B$O\e(B ``\e$B%0%k!<%W\e(B'' \e$B$N35G0$O$J$/!"5-;v$N=$@5$O$G$-$^$;$s!#\e(B
 
 \e$B?7$7$$%P%C%/%(%s%I$r=q$/$H$-$KB>$N%P%C%/%(%s%I$+$i4X?t$r\e(B ``\e$B7Q>5\e(B'' \e$B$9$k$3\e(B
 \e$B$H$,2DG=$G$"$C$F$[$7$$!"$H;W$&$N$OM}$KE,$C$F$$$^$9!#$=$7$F$^$5$K!"$"$J$?\e(B