From 9842cbd6087de4a647868f190951c4e6c7067806 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 29 Sep 2005 12:25:59 +0000
Subject: [PATCH] Fix translations.

---
 gnus-ja.texi |  642 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 320 insertions(+), 322 deletions(-)

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 25d785f..11cb1db 100644
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -658,7 +658,7 @@ Getting News
 
 Getting Mail
 
-* Mail in a Newsreader::        $B%K%e!<%9%j!<%@$G%a!<%k(B ($BBg;v$JA0CV$-(B)
+* Mail in a Newsreader::        $B%K%e!<%9%j!<%@!<$G%a!<%k(B ($BBg;v$JA0CV$-(B)
 * Getting Started Reading Mail::  $B4JC1$JNAM}K\$N$h$&$JNc(B
 * Splitting Mail::              $B%a!<%k%0%k!<%W$N:n$jJ}(B
 * Mail Sources::                $B$I$3$+$i%a!<%k$r<h$C$F$/$k$+$r(B Gnus $B$KCN$i$;$kJ}K!(B
@@ -674,9 +674,9 @@ Getting Mail
 
 Mail Sources
 
-* Mail Source Specifiers::      $B%a!<%k$N85$,$I$3$+$r;XDj$9$k(B
-* Mail Source Customization::   $B@$$NCf$K1F6A$9$k$$$/$D$+$NJQ?t(B
-* Fetching Mail::               $B%a!<%k%=!<%9;X<(;R$r;HMQ$9$k(B
+* Mail Source Specifiers::      $B%a!<%k$N%=!<%9$,$I$3$+$r;XDj$9$k(B
+* Mail Source Customization::   $B$b$N$4$H$K1F6A$9$k$$$/$D$+$NJQ?t(B
+* Fetching Mail::               $B%a!<%k%=!<%9;X<(;R$r;H$&(B
 
 Choosing a Mail Back End
 
@@ -1001,8 +1001,8 @@ Emacs for Heathens
 $BK!(B (native method) $B$K$J$j$^$9!#$3$NJ}K!$G<h$C$F$3$J$$%0%k!<%W$O$9$Y$F30(B
 $BIt(B (foreign) $B%0%k!<%W$G$9!#(B
 
-$B$?$H$($P!"(B@acronym{NNTP} $B%5!<%P!<(B @samp{news.somewhere.edu} $B$+$iKhF|(B ($BLt(B
-$B$N$h$&$K(B) $B0lDj$NNL$N%K%e!<%9$r@]<h$7$?$$$N$G$"$l$P!"(B
+$BNc$($P(B @acronym{NNTP} $B%5!<%P!<(B @samp{news.somewhere.edu} $B$+$iKhF|(B ($BLt$N(B
+$B$h$&$K(B) $B0lDj$NNL$N%K%e!<%9$r@]<h$7$?$$$N$G$"$l$P!"(B
 
 @lisp
 (setq gnus-select-method '(nntp "news.somewhere.edu"))
@@ -1070,8 +1070,8 @@ Gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P
 $B$7MW5a$5$l$F$$$l$P(B)$B!"$3$l$i$N%5!<%P!<>e$K$G$-$??7$7$$%K%e!<%9%0%k!<%W$O(B
 $B85!9$N%0%k!<%W$HF1$8$h$&$K9XFI$5$l$^$9(B ($B$b$7$/$O!"$5$l$^$;$s(B)$B!#(B
 
-$B$?$H$($P!"%a!<%k$rFI$`$?$a$K(B @code{nnmbox} $B%P%C%/%(%s%I(B (back end) $B$r;H(B
-$B$$$?$$$H$-$O!"IaDL!"$3$NJQ?t$r!"(B
+$BNc$($P%a!<%k$rFI$`$?$a$K(B @code{nnmbox} $B%P%C%/%(%s%I(B (back end) $B$r;H$$$?(B
+$B$$$H$-$O!"IaDL$3$NJQ?t$r!"(B
 
 @lisp
 (setq gnus-secondary-select-methods '((nnmbox "")))
@@ -10763,8 +10763,8 @@ Gnus $B$O%X%C%@!<$NJB$YBX$((B (sort) $B$b9T$J$$$^$9(B ($B$3$l$O%G%#%U%)%k%H
 $B%Q%s%H%^%$%`(B (mime) $B$O!"4Q5R$,$"$/$S$r$7$J$,$i$\$s$d$j$7$F$$$k$N$K$b$+$+(B
 $B$o$i$:!"0UL#$bL5$/6uCf$G<j$r?6$k$b$N$NI8=`$H$7$F9-$/CN$i$l$F$$$^$9!#(B
 
-$B0lJ}(B @acronym{MIME} $B$O!"$=$N$?$a$K$9$Y$F$N%K%e!<%9%j!<%@$,62I]$G;`$s$G$7(B
-$B$^$&$N$K$b$+$+$o$i$:!"0UL#$bL5$/5-;v$r%(%s%3!<%I$9$kI8=`$G$9!#(B
+$B0lJ}(B @acronym{MIME} $B$O!"$=$N$?$a$K$9$Y$F$N%K%e!<%9%j!<%@!<$,62I]$G;`$s$G(B
+$B$7$^$&$N$K$b$+$+$o$i$:!"0UL#$bL5$/5-;v$r%(%s%3!<%I$9$kI8=`$G$9!#(B
 
 @acronym{MIME} $B$O5-;v$,$I$s$JJ8;z%;%C%H$r;H$&$+!"J8;z$r$I$&%(%s%3!<%I$9(B
 $B$k$+$r;XDj$9$k$3$H$,$G$-!"$5$i$K$O3($d$=$NB>$N$_$@$i$J$b$N$rL5<Y5$$J3J9%(B
@@ -12934,7 +12934,7 @@ A $B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<(B
 @cindex news spool
 
 $B%m!<%+%k%9%W!<%k$+$i30It%0%k!<%W$r9XFI$9$k$3$H$O6K$a$F4JC1$@$7JXMx$+$b$7(B
-$B$l$^$;$s!#$?$H$($P!"Hs>o$KBg$-$J5-;v$,$"$k%0%k!<%W(B---$BNc$((B
+$B$l$^$;$s!#Hs>o$KBg$-$J5-;v$,$"$k%0%k!<%W(B---$BNc$((B
 $B$P(B @samp{alt.binaries.pictures.furniture} $B$rFI$`B.EY$,B.$/$J$j$^$9!#(B
 
 $B$H$K$+$/!"(B@code{nnspool} $B$rA*BrJ}K!$H$7$F!"$+$D(B @code{""} ($B$b$7$/$O2?$G(B
@@ -13008,7 +13008,7 @@ A $B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<(B
 $B$-$k$N$G$9$,!#(B
 
 @menu
-* Mail in a Newsreader::        $B%K%e!<%9%j!<%@$G%a!<%k(B ($BBg;v$JA0CV$-(B)
+* Mail in a Newsreader::        $B%K%e!<%9%j!<%@!<$G%a!<%k(B ($BBg;v$JA0CV$-(B)
 * Getting Started Reading Mail::  $B4JC1$JNAM}K\$N$h$&$JNc(B
 * Splitting Mail::              $B%a!<%k%0%k!<%W$N:n$jJ}(B
 * Mail Sources::                $B$I$3$+$i%a!<%k$r<h$C$F$/$k$+$r(B Gnus $B$KCN$i$;$kJ}K!(B
@@ -13024,43 +13024,47 @@ A $B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<(B
 @end menu
 
 @node Mail in a Newsreader
-@subsection $B%K%e!<%9%j!<%@$G%a!<%k(B
+@subsection $B%K%e!<%9%j!<%@!<$G%a!<%k(B
 
-$B;H$$47$l$?EAE}E*$J%a!<%k%j!<%@$+$i(B Gnus $B$K>h$j49$($k$3$H$r7hCG$7$?$J$i$P!"(B
-$B$+$J$j$N%+%k%A%c!<%7%g%C%/$r7P83$9$k$3$H$K$J$k$G$7$g$&!#(B
+$B;H$$47$l$?EAE}E*$J%a!<%k%j!<%@!<$+$i(B Gnus $B$K>h$j49$($k$3$H$r7hCG$7$?$J$i(B
+$B$P!"$+$J$j$N%+%k%A%c!<%7%g%C%/$r7P83$9$k$3$H$K$J$k$G$7$g$&!#(B
 
-Gnus $B$OEAE}E*$J%a!<%k%j!<%@$N$h$&$J$U$k$^$$$r$7$^$;$s!#$"$J$?$,K>$`$J(B
+Gnus $B$OEAE}E*$J%a!<%k%j!<%@!<$N$h$&$J$U$k$^$$$r$7$^$;$s!#$"$J$?$,K>$`$J(B
 $B$i$=$N$h$&$K$b$G$-$^$9$,!"$=$l$O9|@^$jB;$N$/$?$S$lLY$1$G$9!#(B
 
 Gnus $B$O$U$D$&F1$8<jK!$G$9$Y$F$N%0%k!<%W$r07$$$^$9!#$"$k%0%k!<%W$rA*$s$G(B
-$B?7$7$$(B/$BL$FI$N%a%C%;!<%8$rFI$`$H!"FI$s$@5-;v$K$O4{FI$N0u$,IU$1$i$l!"(B($B0U?^(B
-$BE*$KMW5a$7$J$1$l$P(B) $B0J8e$O$=$l$i$rL\$K$9$k$3$H$O$"$j$^$;$s!#$3$l$C$F$H$F(B
-$B$b%K%e!<%9%j!<%@E*$G$7$g!#(B
+$B?7$7$$!"$^$?$OL$FI$N%a%C%;!<%8$rFI$`$H!"$=$l$i$K$O4{FI$N0u$,IU$1$i$l!"(B
+($B0U?^E*$KMW5a$7$J$1$l$P(B) $B0J8e$O$=$l$i$rL\$K$9$k$3$H$O$"$j$^$;$s!#$3$l$C(B
+$B$F$H$F$b%K%e!<%9%j!<%@!<E*$G$7$g!#(B
 
-$B$"$J$?$O5-;v$r>C$9$?$a$KFCJL$JA`:n$O$7$^$;$s!#(B
+$B%a%C%;!<%8$r>C$9$?$a$K!"<h$jN)$F$F2?$+$r9T$J$&$3$H$O$"$j$^$;$s!#(B
 
-$B$3$N$3$H$O4{FI$N5-;v$O$9$Y$F>C$5$l$F$7$^$&$3$H$r0UL#$9$k$N$+$C$F(B? $B$=$j$c(B
-$B$"$s$^$j$G$9$h$M(B!
+$B$3$N$3$H$O4{FI$N%a%C%;!<%8$O$9$Y$F>C$5$l$F$7$^$&$3$H$r0UL#$9$k$N$+$C(B
+$B$F(B? $B$=$j$c$"$s$^$j$G$9$h$M(B!
 
-$B$=$&$G$O$"$j$^$;$s!#8E$$5-;v$O$$$m$s$J;EAH$_$K$h$C$F(B @dfn{expire} $B$5$l(B
-$B$k$N$G$9!#%K%e!<%95-;v$O%K%e!<%9$N4IM}?M(B ($B$,4IM}$7$F$$$k%5!<%P!<(B) $B$K$h$C(B
-$B$F(B expire $B$N=hM}$,@)8f$5$l!"%a!<%k$N(B expire $B$N=hM}$O$"$J$?$,@)8f$7$^$9!#(B
-$B%a!<%k$N(B expire $B$K$D$$$F$O(B @ref{Expiring Mail} $B$r;2>H$7$F2<$5$$!#(B
+$B$7$+$7!"$=$&$G$O$"$j$^$;$s!#8E$$%a%C%;!<%8$O$$$m$s$J;EAH$_$K$h$C$F4|8B@Z(B
+$B$l>C5n(B (@dfn{expire}) $B$5$l$k$N$G$9!#%K%e!<%9$N%a%C%;!<%8$O%K%e!<%9$N4IM}(B
+$B?M(B ($B$,4IM}$7$F$$$k%5!<%P!<(B) $B$K$h$C$F4|8B@Z$l>C5n$N=hM}$,@)8f$5$l!"%a!<%k(B
+$B$N4|8B@Z$l>C5n$N=hM}$O$"$J$?$,@)8f$7$^$9!#%a!<%k$N4|8B@Z$l>C5n$K$D$$$F$O!"(B
+@ref{Expiring Mail} $B$GE0DlE*$KLVMe$5$l$F$$$^$9!#(B
 
-$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[(B
-$BAw$N5!9=$,9T$J$&$3$H$O$o$:$+$G$"$k$3$H$K5$$,IU$-$^$9!#(B
+$BB?$/$N(B Gnus $B$NMxMQ<T$,!"$=$l$r%K%e!<%9$H%a!<%k$NN>J}$G$7$P$i$/;H$C$F$_$?(B
+$B8e$G5$$,IU$/$N$O!"$=$NG[Aw$N5!9=$,%a%C%;!<%8$N07$$J}$K4X$7$F9T$J$&$3$H$,!"(B
+$B$[$s$N>/$7$7$+L5$$$3$H$G$9!#(B
 
-$BB?$/$N?M$?$A$OJ#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i(B
-$B$O(B @acronym{SMTP} $B$GG[Aw$5$l$k!"%a!<%k!"$G$9!#$=$l$i$N5-;v$r$H$F$bCm0U?<(B
-$B$/FI$s$G$$$k$K$b$+$+$o$i$:!"2?=54V$bJV;v$,L5$$$3$H$,$"$k$G$7$g$&!#;d$?$A(B
-$B$O$=$&$$$&5-;v$r%;!<%V$9$kI,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW(B
-$B$,@8$8$F$b!"$=$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#(B
+$BB?$/$N?M$?$A$,J#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i(B
+$B$O(B @acronym{SMTP} $B$GG[Aw$5$l$k$b$N!"$9$J$o$A%a!<%k$G$9!#$=$l$i$N%a%C%;!<(B
+$B%8$KJVEz$r$7$J$$$^$^!"$"$k$$$O$5$i$K!"$=$l$i$rHs>o$KCm0U?<$/$OFI$^$J$$$^(B
+$B$^$K!";d$?$A$O2?=54V$b2a$4$9$+$b$7$l$^$;$s!#$G$b!"$=$&$$$&%a%C%;!<%8$rJ](B
+$BB8$7$F$*$/I,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW$,@8$8$?$H$7$F$b!"(B
+$B$=$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#(B
 
 $B$"$k?M$?$A$O>.?M?t$KMxMQ$5$l$F$$$k%m!<%+%k%K%e!<%9%0%k!<%W$r9VFI$7$F$$$^(B
-$B$9!#$=$l$i$O(B @acronym{NNTP} $B$GG[Aw$5$l$k!"%K%e!<%9!"$G$9!#;d$?$A$O<+J,$N(B
-$B;E;v$KLrN)$F$k$?$a$K!"$=$l$i$NKDBg$J5-;v$NCGJR$rFI$s$@$jJV;v$r$7$J$1$l$P(B
-$B$J$j$^$;$s!#$=$7$F$=$l$i$OJ]B8$5$l$F$$$J$$$+$b$7$l$^$;$s$+$i!"6=L#$N$"$k(B
-$B5-;v$r8D?M%a!<%k$HF1$8$h$&$KJ]B8$7$J$1$l$P$J$i$J$$$G$7$g$&!#(B
+$B$9!#$=$l$i$O(B @acronym{NNTP} $B$GG[Aw$5$l$k$b$N!"$9$J$o$A%K%e!<%9$G$9!#;d$?(B
+$B$A$O<+J,$N;E;v$KLrN)$F$k$?$a$K!"$=$l$i$NKDBg$J%a%C%;!<%8$NCGJR$rFI$s$@$j(B
+$BJV;v$r$7$J$1$l$P$J$j$^$;$s!#$7$+$b$=$l$i$,$I$3$+$KJ]B8$5$l$F$$$k$H$O8B$i(B
+$B$J$$$N$G!"6=L#$N$"$k%a%C%;!<%8$r8D?M%a!<%k$HF1$8$h$&$KJ]B8$7$J$1$l$P$J$j(B
+$B$^$;$s!#(B
 
 $BG[Aw$N;EAH$_$N0c$$$O$I$&$G$b$h$$$3$H$G!"Bg;v$J$N$O$$$+$K<gBj$K6=L#$r;}$C(B
 $B$F$$$k$+$H!"$b$&0lEYFI$_$?$$$H$-$K$$$+$K4JC1$K8F$S=P$;$k$+$J$N$G$9!#(B
@@ -13068,43 +13072,41 @@ Gnus $B$O$U$D$&F1$8<jK!$G$9$Y$F$N%0%k!<%W$r07$$$^$9!#$"$k%0%k!<%W$rA*$s$G(B
 Gnus $B$O%a!<%k$r%K%e!<%9%0%k!<%W$N$h$&$K(B ``$B%0%k!<%W(B'' $B$KJB$YJQ$($F!"3F!9(B
 $B$N%0%k!<%W(B ($B%a!<%k$+%K%e!<%9(B) $B$rJL8D$K07$&$?$a$NK-IY$J5!G=$rDs6!$7$^$9!#(B
 
-$B$"$k?M$?$A$O(B Gnus ($B$($C$X$s(B) $B$N$d$j$+$?$KK~B-$G$-$J$/$F!"(BGnus $B$,%a!<%k(B
-$B%j!<%@$K$J$k$3$H$rM_$7$^$9!#(BGnus $B$r$b$C$H%a!<%k%j!<%@E*$J$b$N$K$9$k$?(B
-$B$a$KJ\BG$D$3$H$O2DG=$G$O$"$k$N$G$9$,!"A0$K$b8@$C$?$h$&$K4JC1$G$O$"$j$^(B
-$B$;$s!#$$$o$f$k%a!<%k%j!<%@$,9%$_$J$i$P(B @sc{vm} $B$r;H$$$^$7$g$&!#$3$l$O(B
-$BM%=($J!"87L)$J0UL#$G$N%a!<%k%j!<%@$G$9!#(B
-
-$B6<$+$9$o$1$G$O$J$$$N$G$9$,!"$O$C$-$j$5$;$F$*$-$?$$$N$O!"$"$J$?$K5-;v$K(B
-$B$D$$$F$N?7$7$$$d$jJ}$r=$F@$7$FM_$7$$$H$$$&$3$H$G$9!#$"$J$?$,(B Gnus $B$N$d(B
-$B$jJ}$r<u$1F~$l$F$/$l$?6G$K$O!"$-$C$H$"$J$?$O(B Gnus $B$,9%$-$K$J$k$3$H@A$1(B
-$B9g$$$G$9!#(B
+$B$"$k?M$?$A$O(B Gnus ($B$($C$X$s(B) $B$N$d$j$+$?$KK~B-$G$-$J$/$F!"(BGnus $B$,(B
+$BCK(B (male) $B$K$J$k$3$H!"$b$H$$!"%a!<%k%j!<%@!<$K$J$k$3$H$rM_$7$^$9!#(B
+Gnus $B$r$b$C$H%a!<%k%j!<%@!<E*$J$b$N$K$9$k$?$a$KJ\BG$D$3$H$O2DG=$G$O$"$k(B
+$B$N$G$9$,!"A0$K$b8@$C$?$h$&$K4JC1$G$O$"$j$^$;$s!#$$$o$f$k%a!<%k%j!<%@!<$,(B
+$B9%$_$J$i$P(B @sc{vm} $B$r;H$$$^$7$g$&!#$3$l$OM%=($J!"87L)$J0UL#$G$N%a!<%k%j!<(B
+$B%@!<$G$9!#(B
 
-($B>/$/$H$b!";d$,(B Gnus $B$KF~$l$?!"(BEmacs $B$N%5%V%j%_%J%kG>L#A9@vBu4X?t$rGd$C(B
-$B$F$/$l$??M$O$=$l$rJ]>Z$7$F$$$^$9!#$"$J$?$bF12=$7$^$9!#$"$J$?$O(B Gnus $B$r0&(B
-$B$7$^$9!#$"$J$?$O(B Gnus $B$G$N%a!<%k$NJ}K!$r0&$7$^$9!#@dBP$K!#(B)
+$B6<$+$9$o$1$G$O$J$$$N$G$9$,!"$O$C$-$j$5$;$F$*$-$?$$$N$O!"$"$J$?$K%a%C%;!<(B
+$B%8$K$D$$$F$N?7$7$$$d$jJ}$r=$F@$7$FM_$7$$$H$$$&$3$H$G$9!#$"$J$?$,(B Gnus $B$N(B
+$B$d$jJ}$r<u$1F~$l$F$/$l$?6G$K$O!"$-$C$H$"$J$?$O(B Gnus $B$,9%$-$K$J$k$G$7$g$&!#(B
+$B@A$19g$$$^$9$h!#(B($B>/$/$H$b!";d$,(B Gnus $B$KF~$l$?(B Emacs $B$N%5%V%j%_%J%kG>L#A9(B
+$B@vBu4X?t$rGd$C$F$/$l$??M$O$=$l$rJ]>Z$7$F$$$^$9!#$"$J$?$bF12=$7$^$9!#$"$J(B
+$B$?$O(B Gnus $B$r0&$7$^$9!#$"$J$?$O(B Gnus $B$G$N%a!<%k$NJ}K!$r0&$7$^$9!#@dBP$K!#(B)
 
 @node Getting Started Reading Mail
 @subsection $B%a!<%k$rFI$`$3$H$r;O$a$k(B
 
-Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C(B
-$B%/%(%s%I$N$"$J$?$NA*Br$r(B @code{gnus-secondary-select-methods} $B$KJ|$j9~$`(B
-$B$@$1$G!"$"$H$N$3$H$O<+F0E*$K5/$3$j$^$9!#(B
+Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$O$^$C$?$/4JC1$G$9!#$"$J$?$,A*$s$@%a!<(B
+$B%k%P%C%/%(%s%I$r(B @code{gnus-secondary-select-methods} $B$KJ|$j9~$`$@$1$G!"(B
+$B<+F0E*$KFI$`$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
-$BNc$($P!"(B@code{nnml} ($B$3$l$O(B ``$B0l%a!<%k0l%U%!%$%k(B'' $B%P%C%/%(%s%I$G$9(B) $B$r(B
-$B;H$$$?$$$J$i!"<!$N$b$N$r$"$J$?$N(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$k$3$H(B
-$B$,$G$-$^$9!#(B
+$BNc$($P(B @code{nnml} ($B$3$l$O!V0l%a!<%k$K$D$-0l%U%!%$%k!W$N%P%C%/%(%s%I$G(B
+$B$9(B) $B$r;H$$$?$$$J$i!"<!$N$b$N$r(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$l$PNI$$(B
+$B$G$7$g$&(B:
 
 @lisp
 (setq gnus-secondary-select-methods '((nnml "")))
 @end lisp
 
-$B:#$d!"<!$K(B Gnus $B$r5/F0$7$?$H$-$K$O!"$3$N%P%C%/%(%s%I$O?7$7$$5-;v$r5a$a!"(B
-$B$=$l$O$"$J$?$N%9%W!<%k%U%!%$%k$+$i$9$Y$F$N%a%C%;!<%8$r%G%#%l%/%H%j!<!"%G%#(B
-$B%U%)%k%H$G$O(B @file{~/Mail/} $B$K0\F0$7$^$9!#:n@.$5$l$??7$7$$%0%k!<(B
-$B%W(B (@samp{mail.misc}) $B$,9XFI$5$l!"B>$N%0%k!<%W$HF1$8$h$&$KFI$`$3$H$,$G$-(B
-$B$^$9!#(B
+$B$=$&$9$k$H!"<!$K(B Gnus $B$r5/F0$7$?$H$-$K$3$N%P%C%/%(%s%I$O?7$7$$5-;v$r5a$a!"(B
+$B$9$Y$F$N%a%C%;!<%8$r%9%W!<%k%U%!%$%k$+$i$=$N%G%#%l%/%H%j!<(B ($B%G%#%U%)%k%H(B
+$B$G$O(B @file{~/Mail/}) $B$K0\$7$^$9!#?7$7$$%0%k!<%W(B (@samp{mail.misc}) $B$,:n(B
+$B$i$l$F!"B>$N%0%k!<%W$HF1$8$h$&$KFI$`$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
-$B$"$J$?$O$*$=$i$/%a!<%k$r$$$/$D$+$N%0%k!<%W$KJ,3d$7$?$$$G$7$g$&$1$I(B:
+$B$?$V$s%a!<%k$r$$$/$D$+$N%0%k!<%W$KJ,3d$7$?$$$G$7$g$&$1$l$I(B:
 
 @lisp
 (setq nnmail-split-methods
@@ -13113,13 +13115,14 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C(B
         ("other" "")))
 @end lisp
 
-$B$3$l$O7k2L$H$7$F;0$D$N?7$7$$(B @code{nnml} $B%a!<%k%0%k!<%W$r:n$j$^(B
-$B$9(B: @samp{nnml:junk}, @samp{nnml:crazy}, @samp{nnml:other} $B$G$9!#:G=i(B
-$B$NFs$D$N%0%k!<%W$K9g$o$J$$%a!<%k$O$9$Y$F:G8e$N%0%k!<%W$KF~$l$i$l$^$9!#(B
+$B$3$l$O;0$D$N?7$7$$(B @code{nnml} $B%a!<%k%0%k!<%W(B @samp{nnml:junk},
+@samp{nnml:crazy} $B$*$h$S(B @samp{nnml:other} $B$r:n$k$3$H$K$J$j$^$9!#=i$a$N(B
+$BFs$D$N%0%k!<%W$K$U$5$o$7$/$J$$$9$Y$F$N%a!<%k$O!":G8e$N%0%k!<%W$KCV$+$l$^(B
+$B$9!#(B
 
-$B$3$l$O(B Gnus $B$G%a!<%k$rFI$`$?$a$K=<J,$G$"$k$O$:$G$9!#%^%K%e%"%k$N$3$NItJ,(B
-$B$NB>$N9`$r=OFI$9$kI,MW$,$"$k$+$b$7$l$^$;$s$,!#FC(B
-$B$K(B @ref{Choosing a Mail Back End} $B$H(B @ref{Expiring Mail} $B$r!#(B
+Gnus $B$G%a!<%k$rFI$`$K$O$3$l$G==J,$J$O$:$G$9!#%^%K%e%"%k$N$3$N>O$NB>$N9`(B
+$B$r=OFI$9$kI,MW$,$"$k$+$b$7$l$^$;$s$,!#FC$K(B @ref{Choosing a Mail Back
+End} $B$H(B @ref{Expiring Mail} $B$r!#(B
 
 @node Splitting Mail
 @subsection $B%a!<%k$NJ,3d(B
@@ -13138,12 +13141,12 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C(B
     ("mail.other" "")))
 @end lisp
 
-$B$3$NJQ?t$O%j%9%H$N%j%9%H$G!"$3$l$i$N%j%9%H$N:G=i$N$=$l$>$l$NMWAG$,%a!<%k(B
-$B%0%k!<%W$NL>A0$G(B ($B$H$3$m$G!"$=$l$i$O(B @samp{mail} $B$G;O$^$kI,MW$O$"$j$^$;(B
-$B$s(B)$B!"Fs$D$a$NMWAG$,$=$l$>$l$N%a!<%k$N%X%C%@!<$+$i$=$l$,$I$N%0%k!<%W$KB0(B
-$B$9$k$+$r7hDj$9$k@55,I=8=$G$9!#:G=i$NJ8;zNs$O!"(B@code{replace-match} $B$K$h$C(B
-$B$F!"9gCW$7$?J8>O$+$i$NI{I=8=$rA^F~$9$k$?$a$K;H$o$l$k$h$&$J!"(B
-@code{samp\\1} $B$NMM<0$r4^$`$+$b$7$l$^$;$s!#$?$H$($P(B:
+$B$3$NJQ?t$O%j%9%H$N%j%9%H$G!"$=$l$>$l$N%j%9%H$N:G=i$NMWAG$O%a!<%k%0%k!<%W(B
+$B$NL>A0!"Fs$D$a$NMWAG$O$=$l$>$l$N%a!<%k$,$=$N%0%k!<%W$KB0$9$k$+$I$&$+$r%X%C(B
+$B%@!<$GH=Dj$9$k$?$a$K;H$&@55,I=8=$G$9(B ($B$H$3$m$G!"%a!<%k%0%k!<%W$NL>A0(B
+$B$,(B @samp{mail} $B$G;O$^$kI,MW$O$"$j$^$;$s(B)$B!#:G=i$NJ8;zNs$O!"(B
+@code{replace-match} $B$,9gCW$7$?J8>O$+$i<h$j=P$7$?I{I=8=$rA^F~$9$k$?$a$K(B
+$B;H$o$l$k$h$&$J!"(B@code{samp\\1} $B$NMM<0$r4^$`$+$b$7$l$^$;$s!#Nc$($P(B:
 
 @lisp
 ("list.\\1" "From:.* \\(.*\\)-list@@majordomo.com")
@@ -13154,40 +13157,39 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C(B
 $B$r(B @code{nnmail-split-lowercase-expanded} $B$,@)8f$7$^$9!#(B@xref{Fancy Mail
 Splitting}.
 
-$BFsHVL\$NMWAG$O4X?t$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g$O!"$=$l$OK!B'$N:G=i$NMW(B
-$BAG$r0z?t$H$7$F!"%X%C%@!<$KHO0O$r69$a$F(B (narrowed to headers) $B8F$P$l$^$9!#(B
-$B$=$l$O!"%a!<%k$,$=$N%0%k!<%W$KB0$9$k$H9M$($k$N$G$"$l$P!"(B@code{nil} $B$G$J(B
-$B$$CM$r5"$9I,MW$,$"$j$^$9!#(B
+$BFsHVL\$NMWAG$O4X?t$G$b9=$$$^$;$s!#$=$N>l9g!"$=$l$O5,B'$N:G=i$NMWAG(B ($B%a!<(B
+$B%k%0%k!<%W$NL>A0(B) $B$r0z?t$H$7$F!"%X%C%@!<$@$1$KHO0O$r69$a$i$l$?%P%C%U%!!<(B
+$B$G8F$P$l$^$9!#%a!<%k$,$=$N%0%k!<%W$KB0$9$k$HH=CG$7$?$i!"$=$N4X?t(B
+$B$O(B @code{nil} $B$G$J$$CM$rJV$9I,MW$,$"$j$^$9!#(B
 
 @cindex @samp{bogus} group
-$B$3$l$i$N%0%k!<%W$N:G8e$O>o$KAm9gE*$J$b$N$G$"$k$Y$-$G!"B>$N@55,I=8=$K9gCW(B
-$B$7$J$$%a!<%k$K9gCW$9$k$?$a$K!"$3$N@55,I=8=$O(B @emph{$B$$$D$b(B} @samp{""} $B$G(B
-$B$"$k$Y$-$G$9!#(B($B$3$l$i$NK!B'$OO"A[%j%9%H$N=i$a$+$i=*$o$j$^$G=gHV$K<B9T$5(B
-$B$l$^$9!#%/%m%9%]%9%H$r;HMQ2DG=$K$7$F$$$J$$8B$j!":G=i$N9gCW$7$?K!B'(B
-$B$,(B ``$B>!$A$^$9(B''$B!#%/%m%9%]%9%H$r;HMQ2DG=$K$7$F$$$k>l9g!"$9$Y$F$N9gCW$7$?(B
-$BK!B'$,(B ``$B>!$A$^$9(B''$B!#(B)  $B9gCW$9$k5,B'$,$J$+$C$?$i!"%a!<%k$O:G8e(B
-$B$K(B @samp{bogus} $B%0%k!<%W$G=*$o$j$^$9!#%a!<%kJ,3d$K$h$C$F?7$7$$%0%k!<%W$,(B
-$B:n$i$l$?>l9g$O!"$=$l$i$r8+$k$?$a$K(B @code{gnus-group-find-new-groups} $B$r(B
-$B<B9T$9$kI,MW$,$"$k$G$7$g$&!#$3$l$O(B @samp{bogus} $B%0%k!<%W$K$bEv$F$O$^$j$^(B
-$B$9!#(B
-
-$B$b$7$"$J$?<+?H$G$3$l$r$$$8$/$j$^$o$7$?$$$H$-$O!"$"$J$?$NA*$s$@4X?t$r$3$N(B
-$BJQ?t$K@_Dj$9$k$3$H$,$G$-$^$9!#$3$N4X?t$OF~$C$FMh$?%a!<%k%a%C%;!<%8$N%X%C(B
-$B%@!<$KHO0O$r69$a$i$l$?%P%C%U%!!<$G0z?t$J$7$G8F$P$l$^$9!#$3$N4X?t$O!"$=$l(B
-$B$,$3$N%a!<%k%a%C%;!<%8$r1?$V$Y$-$G$"$k!"$H9M$($k%0%k!<%WL>$N%j%9%H$rJV$9(B
-$B$Y$-$G$9!#(B
+$B$3$l$i$N%0%k!<%W$N:G8e$O>o$KAm9gE*$J$b$N$G$"$k$Y$-$G!"$=$N@55,I=8=$OB>$N(B
+$B@55,I=8=$K9gCW$7$J$+$C$?%a!<%k$K9gCW$9$k$?$a$K!"(B
+@emph{$B$$$D$b(B} @samp{""} $B$G$J$1$l$P$J$j$^$;$s!#(B($B$3$l$i$N5,B'$OO"A[%j%9%H(B
+$B$N=i$a$+$i=*$o$j$^$G=gHV$K=hM}$5$l$^$9!#%/%m%9%]%9%H$rM-8z$K$7$F$$$J$$8B(B
+$B$j!":G=i$K9gCW$7$?K!B'$,!V>!$A!W$^$9!#%/%m%9%]%9%H$rM-8z$K$7$F$$$k>l9g$O!"(B
+$B$9$Y$F$N9gCW$7$?K!B'$,!V>!$A!W$^$9!#(B)  $B9gCW$9$k5,B'$,$J$+$C$?$i!"%a!<%k(B
+$B$O:G8e$K(B @samp{bogus} $B%0%k!<%W$G=*$o$j$^$9!#%a!<%kJ,3d$K$h$C$F?7$7$$%0%k!<(B
+$B%W$,:n$i$l$?>l9g$O!"$=$l$i$r8+$k$?$a(B
+$B$K(B @code{gnus-group-find-new-groups} $B$r<B9T$9$kI,MW$,$"$k$G$7$g$&!#$3$l(B
+$B$O(B @samp{bogus} $B%0%k!<%W$K$bEv$F$O$^$j$^$9!#(B
+
+$B$"$J$?<+?H$G$3$l$r$$$8$/$j$^$o$7$?$$$H$-$O!"$"$J$?$NA*$s$@4X?t$r$3$NJQ?t(B
+$B$K@_Dj$9$k$3$H$,$G$-$^$9!#$3$N4X?t$OF~$C$FMh$?%a!<%k%a%C%;!<%8$N%X%C%@!<(B
+$B$KHO0O$r69$a$i$l$?%P%C%U%!!<$G!"0z?tL5$7$G8F$P$l$^$9!#$3$N4X?t$O!"$=$N%a!<(B
+$B%k%a%C%;!<%8$r$,9T$/$Y$-$@$HH=CG$9$k%0%k!<%WL>$N%j%9%H$rJV$5$J$1$l$P$J$j(B
+$B$^$;$s!#(B
 
-$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"F~$C$FMh$?IOK3$G=c?h$J%X%C%@!<$rMpK=$K07$C(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"F~$C$FMh$?5$$NFG$JL5<B$N%X%C%@!<$rMpK=$K07$C(B
 $B$F$bNI$$$3$H$KCm0U$7$F2<$5$$!#$=$l$i$O$9$Y$F(B @code{Lines} $B%X%C%@!<$rDI2C(B
 $B$7$^$9!#$$$/$D$+$O(B @code{X-Gnus-Group} $B%X%C%@!<$r2C$($^$9!#$?$$$F$$$N$b(B
-$B$N$O(B Unix $B$N(B mbox $B$N(B @code{From<SPACE>} $B9T$r2?$+JL$NL>A0$KJQ$($^$9!#(B
+$B$N$O(B Unix $B$N(B mbox $B$N(B @code{From<SPACE>} $B9T$r2?$+JL$N$b$N$KJQ$($^$9!#(B
 
 @vindex nnmail-crosspost
-$B%a!<%k%P%C%/%(%s%I$O$9$Y$F%/%m%9%]%9%H$N5!G=$rDs6!$7$F$$$^$9!#$$$/$D$+$N(B
-$B@55,I=8=$,9gCW$9$k$H!"%a!<%k$O$9$Y$F$N%0%k!<%W$K(B ``$B%/%m%9%]%9%H(B'' $B$5$l$^(B
-$B$9!#(B@code{nnmail-crosspost} $B$O$3$N5!G=$r;H$&$+$I$&$+$r;XDj$7$^$9!#$I$N5-(B
-$B;v$bAm9g$N(B (@samp{""}) $B%0%k!<%W$K%/%m%9%]%9%H$5$l$J$$$3$H$KCm0U$7$F2<$5(B
-$B$$!#(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O%/%m%9%]%9%H$r%5%]!<%H$7$^$9!#J#?t$N@55,I=8=(B
+$B$,9gCW$9$k$H!"%a!<%k$O$=$l$i$9$Y$F$N%0%k!<%W$K!V%/%m%9%]%9%H!W$5$l$^$9!#(B
+@code{nnmail-crosspost} $B$O$3$N5!G=$r;H$&$+$I$&$+$r;XDj$7$^$9!#$I$N5-;v$b(B
+$BAm9g$N(B (@samp{""}) $B%0%k!<%W$K%/%m%9%]%9%H$5$l$J$$$3$H$KCm0U$7$F2<$5$$!#(B
 
 @vindex nnmail-crosspost-link-function
 @cindex crosspost
@@ -13201,11 +13203,11 @@ Splitting}.
 
 @kindex M-x nnmail-split-history
 @findex nnmail-split-history
-$BA0$N%a!<%kJ,3d$,%a%C%;!<%8$r$I$3$KF~$l$?$+$r8+$?$$>l9g$O!"(B
-@kbd{M-x nnmail-split-history} $BL?Na$r;H$&$3$H$,$G$-$^$9!#$3$l$+$i%9%W!<(B
-$B%k$7D>$=$&$H$9$k%a%C%;!<%8$,$I$3$KF~$k$+$r8+$?$$>l9g$O!"(B
-@code{gnus-summary-respool-trace} $B$H4XO"$9$kL?(B
-$BNa(B (@pxref{Mail Group Commands}) $B$r;H$&$3$H$,$G$-$^$9!#(B
+$B0JA0$K9T$J$o$l$?%a!<%kJ,3d$,%a%C%;!<%8$r$I$3$KF~$l$?$+$r8+$?$$>l9g$O!"(B
+@kbd{M-x nnmail-split-history} $BL?Na$r;H$C$F2<$5$$!#$3$l$+$i%9%W!<%k$7D>(B
+$B$=$&$H$9$k%a%C%;!<%8$,$I$3$KF~$k$+$r8+$?$$>l9g$O!"(B
+@code{gnus-summary-respool-trace} $B$*$h$S4XO"$9$kL?Na(B (@pxref{Mail Group
+Commands}) $B$r;H$C$F2<$5$$!#(B
 
 @vindex nnmail-split-header-length-limit
 @code{nnmail-split-header-length-limit} $B$N@)8B$h$jD9$$%X%C%@!<9T$O!"J,3d(B
@@ -13213,47 +13215,43 @@ Splitting}.
 
 @vindex nnmail-mail-splitting-charset
 @vindex nnmail-mail-splitting-decodes
-($BLuCm(B: $B%*%j%8%J%k$N(B Gnus $B$H$O;EMM$,HyL/$K0[$J$k$3$H$KCm0U$7$F2<$5$$(B) $B%G%#(B
-$B%U%)%k%H$G$OJ,3d%3!<%I$O(B @acronym{MIME} $B%(%s%3!<%I$5$l$?%X%C%@!<$r%G%3!<(B
-$B%I$9$k$N$G!"Hs(B-@acronym{ASCII} $BJ8;zNs$K9gCW$5$;$k$3$H$,$G$-$^$9!#JQ(B
-$B?t(B @code{nnmail-mail-splitting-charset} $B$,(B @acronym{MIME} $BJ8;z%;%C(B
-$B%H(B (mime-charset) $B$G$"$C$?$i$=$l!"(B@acronym{MIME} $BJ8;z%;%C%H$G$O$J$$(B
-$BHs(B-@code{nil} $B$JCM$@$C$?$i$=$N$H$-$N(B @code{default-mime-charset} $B$NCM$G!"(B
-(@acronym{MIME} $B%(%s%3!<%I$5$l$?$b$N$G$O$J$$(B) $BHs(B-@acronym{ASCII} $B%S%C%H(B
-$B%Q%?!<%s$b%G%3!<%I$7$^$9!#$3$NF0:n(B
-$B$O(B @code{nnmail-mail-splitting-decodes} $B$r(B @code{nil} $B$K$9$k$3$H$K$h$C$F(B
-$B40A4$K;_$a$k$3$H$,$G$-!"@8$N%X%C%@!<$N%G!<%?$r85$K5-;v$K9gCW$5$;$?$$>l9g(B
-$B$K$OM-8z$G$7$g$&!#(B
+$B%G%#%U%)%k%H$G$OJ,3d$N=hM}$K$*$$$F%X%C%@!<$r(B @acronym{MIME} $B%G%3!<%I$9$k(B
+$B$N$G!"Hs(B-@acronym{ASCII} $BJ8;zNs$K9gCW$5$;$k$3$H$,$G$-$^$9!#JQ(B
+$B?t(B @code{nnmail-mail-splitting-charset} $B$G!"%G%3!<%I$9$k$H$-$N%G%#%U%)%k(B
+$B%H$NJ8;z%;%C%H$r;XDj$7$^$9!#(B
+@code{nnmail-mail-splitting-decodes} $B$r(B @code{nil} $B$KB+G{$9$k$3$H$K$h$C(B
+$B$F$^$C$?$/%G%3!<%I$r9T$J$o$J$$$h$&$K$9$k$3$H$,$G$-!"$=$l$O!"@8$N%X%C%@!<(B
+$B$N%G!<%?$r85$K5-;v$N9gCW$rH=Dj$7$?$$>l9g$K$OLrN)$D$G$7$g$&!#(B
 
 @vindex nnmail-resplit-incoming
-$B%G%#%U%)%k%H$G$OF~$C$F$/$k$9$Y$F$N%a%C%;!<%8$KBP$7$FJ,3d$,F/$-$^$9!#$b(B
-$B$7(B @code{mail-sources} $BJQ(B
-$B?t(B (@pxref{Mail Source Specifiers}) $B$K(B @code{directory} $B$N9`$r@_Dj$7$F$b!"(B
-$B$7$+$7!"%G%#%U%)%k%H$G$OJ,3d$O(B @emph{$B5/$3$j$^$;$s(B}$B!#JQ(B
-$B?t(B @code{nnmail-resplit-incoming} $B$rHs(B-@code{nil} $B$JCM$K@_Dj$9$k$3$H$K$h$C(B
-$B$F!"$3$N>l9g$G$bJ,3d$r5/$3$5$;$k$3$H$,$G$-$^$9!#(B($B$3$NJQ?t$OB>$N<oN`$N9`(B
-$BL\$KBP$7$F$O8z2L$,$"$j$^$;$s!#(B)
-
-Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$k$9$Y$F$N5!2q$r(B
-$BDs6!$7$^$9!#Nc$($P!"$"$J$?$N>e;J$+$i$/$k$9$Y$F$N%a!<%k$r4^$s$@%0%k!<%W$r(B
-$B:n$C$?$H$7$^$7$g$&!#$=$l$+$i!"6vH/E*$K$=$N%0%k!<%W$N9XFI<h$j;_$a$,5/$3$C(B
-$B$?$H$7$^$9!#(BGnus $B$O$=$l$G$b>e;J$+$i$N$9$Y$F$N%a!<%k$rL$9XFI$N%0%k!<%W$K(B
-$BF~$l$k$N$G!">e;J$,(B ''$B7nMKF|$^$G$K$=$NJs9p=q$r=`Hw$7$J$$$H<s$@(B!'' $B$H$$$&(B
-$B%a!<%k$r$"$J$?$KAw$C$F$b!"$"$J$?$O$=$l$r8+$k$3$H$O$J$/!"2PMKF|$K$J$C$FK\(B
-$BEv$OMb7n$N2HDB$rJ'$&$?$a$K6u$N%\%H%k$r=8$a$k$Y$-$G$"$C$F$b!"$^$@M-5k$G8[(B
-$B$o$l$F$$$k$H?.$8$F$$$k$+$b$7$l$^$;$s!#(B
+$B%G%#%U%)%k%H$G$OF~$C$F$/$k$9$Y$F$N%a%C%;!<%8$KBP$7$FJ,3d$N=hM}$,9T$J$o$l(B
+$B$^$9!#$7$+$7!"$b$7(B @code{mail-sources} $BJQ?t(B (@pxref{Mail Source
+Specifiers}) $B$K(B @code{directory} $B$N9`L\$r@_Dj$9$k$H!"%G%#%U%)%k%H$G$OJ,(B
+$B3d$O(B @emph{$B9T$J$o$l$^$;$s(B}$B!#JQ(B
+$B?t(B @code{nnmail-resplit-incoming} $B$r(B @code{nil} $B$G$O$J$$CM$K@_Dj$9$l$P!"(B
+$B$3$N>l9g$G$bJ,3d$r5/$3$5$;$k$3$H$,$G$-$^$9!#(B($B$3$NJQ?t$OB>$N<oN`$N9`L\$K(B
+$BBP$7$F$O8z2L$,$"$j$^$;$s!#(B)
+
+Gnus $B$O$"$J$?<+?H$K:R$$$,5Z$V2DG=@-$"$C$F$b!"$"$J$?$,K>$`$9$Y$F$N5!2q$r(B
+$BDs6!$7$^$9!#Nc$($P!"$"$J$?$N>e;J$+$i$/$k$9$Y$F$N%a!<%k$rF~$l$k%0%k!<%W$r(B
+$B:n$C$?$H$7$^$7$g$&!#$=$N8e!"6vH/E*$K$=$N%0%k!<%W$N9XFI$r$d$a$F$7$^$&$H$I(B
+$B$&$J$k$G$7$g$&!#$=$l$G$b(B Gnus $B$O>e;J$+$i$N$9$Y$F$N%a!<%k$rL$9XFI$N%0%k!<(B
+$B%W$KF~$l$k$N$G!">e;J$,!V7nMKF|$^$G$K$=$NJs9p=q$r=`Hw$7$J$$$H<s$@(B!$B!W$H$$(B
+$B$&%a!<%k$r$"$J$?$KAw$C$F$b!"$"$J$?$O$=$l$r8+$k$3$H$O$J$/!"2PMKF|$K$J$C$F(B
+$BK\Ev$OMb7n$N2HDB$rJ'$&$?$a$K6u$N%\%H%k$r=8$a$k$Y$-$G$"$C$F$b!"$^$@M-5k$G(B
+$B8[$o$l$F$$$k$H?.$8$F$$$k$+$b$7$l$^$;$s!#(B
 
 @node Mail Sources
-@subsection Mail Sources
+@subsection $B%a!<%k%=!<%9(B
 
-$B$$$m$s$J$H$3$m$+$i%a!<%k$r<hF@$9$k$3$H$,$G$-$^$9(B---$B%a!<%k%9%W!<%k!"(B
-@acronym{POP} $B%a!<%k%5!<%P!<!"(Bprocmail $B%G%#%l%/%H%j!<!"(Bmaildir $B$J$I$,Nc(B
-$B$H$7$F$"$j$^$9!#(B
+$B%a!<%k$O$?$/$5$s$NJL$N%=!<%9(B (source) $B$+$i<hF@$9$k$3$H$,$G$-$^$9(B---$BNc$((B
+$B$P%a!<%k%9%W!<%k$+$i!"(B@acronym{POP} $B%a!<%k%5!<%P!<$+$i!"(Bprocmail $B%G%#%l(B
+$B%/%H%j!<$+$i!"(Bmaildir $B$+$i!#(B
 
 @menu
-* Mail Source Specifiers::      $B%a!<%k$N85$,$I$3$+$r;XDj$9$k(B
-* Mail Source Customization::   $B@$$NCf$K1F6A$9$k$$$/$D$+$NJQ?t(B
-* Fetching Mail::               $B%a!<%k%=!<%9;X<(;R$r;HMQ$9$k(B
+* Mail Source Specifiers::      $B%a!<%k$N%=!<%9$,$I$3$+$r;XDj$9$k(B
+* Mail Source Customization::   $B$b$N$4$H$K1F6A$9$k$$$/$D$+$NJQ?t(B
+* Fetching Mail::               $B%a!<%k%=!<%9;X<(;R$r;H$&(B
 @end menu
 
 @node Mail Source Specifiers
@@ -13265,23 +13263,23 @@ Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$k$9$Y$F$N5!2q$r(B
 @cindex mail source
 
 @dfn{$B%a!<%k%=!<%9;X<(;R(B} $B$K(B @code{$B%a!<%k%=!<%9(B} (@pxref{Fetching Mail})
-$B$r@_Dj$9$k$3$H$G!"(BGnus $B$K%a!<%k$r<hF@$9$kJ}K!$r65$($k$3$H$,$G$-$^$9!#(B
+$B$r@_Dj$7$F!"(BGnus $B$K%a!<%k$r<hF@$9$kJ}K!$r;X<($7$^$7$g$&!#(B
 
-$B$3$l$ONc$G$9(B:
+$BNc$G$9(B:
 
 @lisp
 (pop :server "pop3.mailserver.com" :user "myname")
 @end lisp
 
-$B8fMw$NDL$j!"%a!<%k%=!<%9;X<(;R$O%j%9%H$G!":G=i$NMWAG$O(B @dfn{$B%a!<%k%=!<%9(B
-$B$N7?(B}$B!"$=$N<!$OG$0U$N?t$N(B @dfn{$B%-!<%o!<%I(B} $B$H$J$j$^$9!#L@<(E*$K;XDj$5$l(B
+$B$4Mw$N$h$&$K!"%a!<%k%=!<%9;X<(;R$O%j%9%H$G!":G=i$NMWAG$O(B @dfn{$B%a!<%k%=!<(B
+$B%9$N7?(B}$B!"$=$l$KG$0U$N?t$N(B @dfn{$B%-!<%o!<%I(B} $B$,B3$-$^$9!#L@<(E*$K;XDj$5$l(B
 $B$F$$$J$$%-!<%o!<%I$O%G%#%U%)%k%HCM$K$J$j$^$9!#(B
 
-$B0J2<$N%a!<%k%=!<%9$N7?$r;HMQ2DG=$G$9(B:
+$B0J2<$N%a!<%k%=!<%9$N7?$,;HMQ2DG=$G$9(B:
 
 @table @code
 @item file
-$BC1FH$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#IaDL$O%a!<%k%9%W!<%k$G$9!#(B
+$BC10l$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#IaDL$O%a!<%k%9%W!<%k$G$9!#(B
 
 $B%-!<%o!<%I(B:
 
@@ -13293,7 +13291,7 @@ Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$k$9$Y$F$N5!2q$r(B
 
 @item :prescript
 @itemx :postscript
-$B%a!<%k$r<hF@$9$kA08e$K<B9T$9$k%9%/%j%W%H$G$9!#(B
+$B$=$l$>$l$N%a!<%k$r<hF@$9$kA0$H8e$G<B9T$9$k%9%/%j%W%H$G$9!#(B
 @end table
 
 $B%U%!%$%k%a!<%k%=!<%9$NNc(B:
@@ -13313,7 +13311,7 @@ Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$k$9$Y$F$N5!2q$r(B
 $B$G$O(B ange-ftp $B$N%U%!%$%kL>$O;HMQ$G$-$^$;$s(B---$B%a!<%k$r0\F0$7$F$$$k$H$-$K(B
 $B%a!<%k%9%W!<%k$r%m%C%/$9$kJ}K!$,$"$j$^$;$s!#(B
 
-$BE,@Z$J%5!<%P!<$r@_CV$9$k$3$H$,IT2DG=$J$i!"JQ$o$j$K(B  ssh $B$r;H$&$3$H$,$G$-(B
+$BE,Ev$J%5!<%P!<$r@_CV$9$k$3$H$,IT2DG=$J$i!"JQ$o$j$K(B ssh $B$r;H$&$3$H$,$G$-(B
 $B$^$9!#(B
 
 @lisp
@@ -13321,7 +13319,7 @@ Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$k$9$Y$F$N5!2q$r(B
       '((file :prescript "ssh host bin/getmail >%t")))
 @end lisp
 
-@samp{getmail} $B%9%/%j%W%H$O0J2<$N$h$&$J$b$N$K$J$j$^$9(B:
+@samp{getmail} $B%9%/%j%W%H$O0J2<$N$h$&$J$b$N$K$J$k$G$7$g$&(B:
 
 @example
 #!/bin/sh
@@ -13333,45 +13331,48 @@ TMP=$HOME/Mail/tmp
 rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @end example
 
-$BL\E*$K9g$&$h$&$K;HMQ$7$?$$(B @samp{movemail} $B$K9g$o$;$F%9%/%j%W%H$r=q$-49(B
-$B$($F2<$5$$!#(B
+$B$"$J$?$,;H$$$?$$(B @samp{movemail} $B$K9g$o$;$F!"%9%/%j%W%H$r=q$-49$($F2<$5(B
+$B$$!#(B
 
 @item directory
 @vindex nnmail-scan-directory-mail-source-once
-$B%G%#%l%/%H%j!<Cf$NJ#?t$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#$3$l$OIaDL(B
-$B$O(B procmail $B$K?7$7$$%a!<%k$r$$$/$D$+$N%U%!%$%k$KJ,3d$5$;$F$$$k$H$-$K;HMQ(B
-$B$5$l$^$9!#$9$J$o$A!"$=$N%G%#%l%/%H%j!<$K$"$k%U%!%$%k$H%0%k!<%W$O0lBP0l$G(B
-$BBP1~$7$F$$$k$N$G!"(B@file{foo.bar.spool} $B%U%!%$%k$K$"$k%a!<%k$O!"(B
-@code{foo.bar} $B%0%k!<%W$KCV$+$l$^$9(B ($B%5%U%#%C%/%9(B @code{.spool} $B$OJQ992D(B
+$BFCDj$N%G%#%l%/%H%j!<$K$"$kJ#?t$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#$3$l$OIa(B
+$BDL$O(B procmail $B$K?7$7$$%a!<%k$r$$$/$D$+$N%U%!%$%k$KJ,3d$5$;$F$$$k$H$-$K;H(B
+$B$o$l$^$9!#$9$J$o$A!"$=$N%G%#%l%/%H%j!<$K$"$k%U%!%$%k$H%0%k!<%W$O0lBP0l$G(B
+$BBP1~$7$F$$$k$N$G!"(B@file{foo.bar.spool} $B%U%!%$%k$K$"$k%a!<%k(B
+$B$O(B @code{foo.bar} $B%0%k!<%W$KCV$+$l$^$9(B ($B@\Hx8l$N(B @code{.spool} $B$OJQ992D(B
 $BG=$G$9(B)$B!#(B@code{nnmail-scan-directory-mail-source-once} $B$r(B @code{nil} $B0J(B
-$B30$NCM$K$9$k$H!"(BGnus $B$O?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$k$h$&$K$J$j$^$9!#(B
-$B$3$l$O!";XDj$7$?%l%Y%k$N%a!<%k%0%k!<%W$@$1$rD4$Y$?$$$H$-$K!"$H$j$o$1JXMx(B
+$B30$NCM$K$9$k$H!"(BGnus $B$K?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$5$;$k$3$H$,$G$-(B
+$B$^$9!#$3$l$OFC$K!";XDj$7$?%l%Y%k$N%a!<%k%0%k!<%W$@$1$rD4$Y$?$$$H$-$KJXMx(B
 $B$G$9!#(B
 
 @vindex nnmail-resplit-incoming
 @code{nnmail-resplit-incoming} $B$H$$$&JQ?t$b$"$j!"$3$l$rHs(B-@code{nil} $B$K(B
-$B$9$k$HDL>o$NJ,3d=hM}$,%G%#%l%/%H%j!<Cf$N$9$Y$F$N%U%!%$%k$KBP$7$F9T$J$o$l(B
-$B$^$9(B (@pxref{Splitting Mail})$B!#(B
+$B$9$k$HDL>o$NJ,3d=hM}$,$=$N%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%U%!%$%k$KBP$7$F9T(B
+$B$J$o$l$^$9(B (@pxref{Splitting Mail})$B!#(B
 
 $B%-!<%o!<%I(B:
 
 @table @code
 @item :path
-$B%U%!%$%k$N$"$k%G%#%l%/%H%j!<$NL>A0$G$9!#$3$l$K$O%G%#%U%)%k%HCM$O$"$j$^$;(B
+$B%U%!%$%k$,$"$k%G%#%l%/%H%j!<$NL>A0$G$9!#$3$l$K$O%G%#%U%)%k%HCM$O$"$j$^$;(B
 $B$s!#(B
 
 @item :suffix
-$B$3$N@\Hx8l$G=*$o$k%U%!%$%k$@$1$,;HMQ$5$l$^$9!#%G%#%U%)%k%HCM(B
+$B$3$N@\Hx8l$G=*$o$kL>A0%U%!%$%k$@$1$,;H$o$l$^$9!#%G%#%U%)%k%HCM(B
 $B$O(B @samp{.spool} $B$G$9!#(B
 
 @item :predicate
-$B$3$N=R8l$,(B @code{nil} $B$G$J$$CM$rJV$9%U%!%$%k$N$_$G$9!#%G%#%U%)%k%HCM(B
-$B$O(B @code{identity} $B$G$9!#$3$l$ODI2C$NA*JL4o$H$7$F;HMQ$5$l$^$9(B---$B@5$7$$@\(B
-$BHx8l(B @emph{$B$H(B} $B$3$N=R8l$rK~B-$9$k%U%!%$%k$@$1$,9MN8$5$l$^$9!#(B
+$B$3$N=R8l$,(B @code{nil} $B$G$J$$CM$rJV$9%U%!%$%k$@$1$,;H$o$l$^$9!#%G%#%U%)%k(B
+$B%HCM$O(B @code{identity} $B$G$9!#$3$l$ODI2C$NA*JL4o$H$7$F;HMQ$5$l$^$9(B---$B@5$7(B
+$B$$@\Hx8l$G!"(B@emph{$B$+$D(B} $B$3$N=R8l$rK~B-$9$k%U%!%$%k$@$1$,BP>]$K$J$j$^$9!#(B
+
+$BLuCm(B: $B$3$N>l9g$N=R8l$O4X?t$G!"@5$7$$@\Hx8l$r;}$D%U%!%$%k$NL>A0$,0z?t$H$7(B
+$B$FEO$5$l$^$9!#(B
 
 @item :prescript
 @itemx :postscript
-$B%a!<%k$N<hF@$NA0(B/$B8e$K<B9T$5$l$k%9%/%j%W%H$G$9!#(B
+$B$=$l$>$l$N%a!<%k$r<hF@$9$kA0$H8e$G<B9T$9$k%9%/%j%W%H$G$9!#(B
 @end table
 
 $B%G%#%l%/%H%j!<%a!<%k%=!<%9$NNc$G$9(B:
@@ -13395,31 +13396,30 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @acronym{POP} $B%5!<%P!<$N%]!<%HHV9f$G$9!#$3$l$O?tCM(B ($BNc$((B
 $B$P(B @samp{:port 1234}) $B$+J8;zNs(B ($BNc$($P(B @samp{:port "pop3"}) $B$G$9!#$b$7J8(B
 $B;zNs$J$i(B Unix $B%7%9%F%`$K$*$1$k(B @file{/etc/services} $B$K:\$C$F$$$k%5!<%S%9(B
-$BL>$G$J$1$l$P$J$j$^$;$s!#%G%#%U%)%k%HCM$O(B @samp{pop3} $B$G$9!#%7%9%F%`$K$h$C(B
-$B$F$O(B @samp{"pop-3"} $B$H$7$J$1$l$P$J$i$J$$$+$b$7$l$^$;$s!#(B
+$BL>$G$J$1$l$P$J$j$^$;$s!#%G%#%U%)%k%HCM$O(B @samp{"pop3"} $B$G$9!#%7%9%F%`$K(B
+$B$h$C$F$O(B @samp{"pop-3"} $B$H$7$J$1$l$P$J$i$J$$$+$b$7$l$^$;$s!#(B
 
 @item :user
-@acronym{POP} $B%5!<%P!<$KM?$($kMxMQ<TL>$G$9!#%G%#%U%)%k%HCM$O%m%0%$%sL>$G(B
-$B$9!#(B
+@acronym{POP} $B%5!<%P!<$KM?$($kMxMQ<TL>$G$9!#%G%#%U%)%k%H$O%m%0%$%sL>$G$9!#(B
 
 @item :password
-@acronym{POP} $B%5!<%P!<$KM?$($k%Q%9%o!<%I$G$9!#;XDj$5$l$J$$>l9g$O!"MxMQ<T(B
-$B$OF~NO$r5a$a$i$l$^$9!#(B
+@acronym{POP} $B%5!<%P!<$KM?$($k%Q%9%o!<%I$G$9!#@_Dj$7$J$$$HMxMQ<T$OF~NO$r(B
+$B5a$a$i$l$^$9!#(B
 
 @item :program
 @acronym{POP} $B%5!<%P!<$+$i%a!<%k$r<hF@$9$k$?$a$K;HMQ$5$l$k%W%m%0%i%`$G$9!#(B
-$B$3$l$O(B @code{format} $B$N$h$&$JJ8;zNs$G$"$k$Y$-$G$9!#Nc$G$9(B:
+$B$3$l$O(B @code{format} $B$G;H$&$h$&$JJ8;zNs$G$J$1$l$P$J$j$^$;$s!#Nc$G$9(B:
 
 @example
 fetchmail %u@@%s -P %p %t
 @end example
 
-$BM-8z$J=q<0;HMQ;X<(J8;z$O(B:
+$BM-8z$J=qK!;EMM;X<(;R$O(B:
 
 @table @samp
 @item t
-$B%a!<%k$,0\F0$5$l$k%U%!%$%k$NL>A0$G$9!#$3$l$O>o$K$3$NJ8;zNs$K4^$^$l$F$$$J(B
-$B$1$l$P$J$j$^$;$s!#(B
+$B%a!<%k$,$=$3$K0\F0$5$;$i$l$k%U%!%$%k$NL>A0$G$9!#$3$l$O>o$K$3$NJ8;zNs$K4^(B
+$B$^$l$F$$$J$1$l$P$J$j$^$;$s!#(B
 
 @item s
 $B%5!<%P!<$NL>A0$G$9!#(B
@@ -13434,66 +13434,58 @@ fetchmail %u@@%s -P %p %t
 $B;HMQ$9$k%Q%9%o!<%I$G$9!#(B
 @end table
 
-$B$3$l$i$N;EMM$G;H$o$l$kCM$OBP1~$9$k%-!<%o!<%I$KM?$($?CM$+$i<h$i$l$^$9!#(B
+$B$3$l$i$N;EMM$G;H$o$l$kCM$O!"BP1~$9$k%-!<%o!<%I$KM?$($?CM$+$i<h$i$l$^$9!#(B
 
 @item :prescript
 $B%a!<%k$r<hF@$9$kA0$K<B9T$5$l$k%9%/%j%W%H$G$9!#9=J8$O(B @code{:program} $B%-!<(B
 $B%o!<%I$HF1$8$G$9!#$3$l$O<B9T$5$l$k4X?t$G$"$k$3$H$b$G$-$^$9!#(B
 
 @item :postscript
-$B%a!<%k$r<hF@$7$?8e$K<B9T$5$l$k%9%/%j%W%H$G$9!#9=J8$O(B @code{:program} $B%-!<(B
+$B%a!<%k$r<hF@$7$?8e$G<B9T$5$l$k%9%/%j%W%H$G$9!#9=J8$O(B @code{:program} $B%-!<(B
 $B%o!<%I$HF1$8$G$9!#$3$l$O<B9T$5$l$k4X?t$G$"$k$3$H$b$G$-$^$9!#(B
 
 @item :function
 @acronym{POP} $B%5!<%P!<$+$i%a!<%k$r<hF@$9$k$?$a$K;H$&4X?t$G$9!#$=$N4X?t$O(B
-$B0l$D$N%Q%i%a!<%?!<$H$H$b$K8F$P$l$^$9(B---$B%a!<%k$,$=$3$X0\F0$5$l$k$Y$-%U%!(B
-$B%$%k$G$9!#(B
+$B0l$D$N%Q%i%a!<%?!<(B ($B%a!<%k$,$=$3$X0\F0$5$l$k$Y$-%U%!%$%k$NL>A0(B) $B$H$H$b$K(B
+$B8F$P$l$^$9(B
 
 @item :authentication
-$B$3$l$O(B @code{password} $B$+%7%s%\%k(B @code{apop} $B$G!"$I$NG'>ZJ}<0$r;H$&$+$r(B
-$B7h$a$k$b$N$N$I$A$i$+$G$9!#%G%#%U%)%k%HCM$O(B @code{password} $B$G$9!#(B
-
-@item :connection
-$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`$G!"(B@code{ssl}, @code{tls} $B$^$?$O(B
-$B$=$l0J30$r;XDj$G$-$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G!"0BA4$G$O$J$$@\B3$r(B
-$BMQ$$$^$9!#(BSSL/TLS $B$G$O30It%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KCm0U$7(B
-$B$F2<$5$$(B:
-
-@itemize @bullet
-@item
-@dfn{ssl:} @acronym{SSL} $B$r;H$$$^$9!#(BOpenSSL (@samp{openssl} $B%W%m%0%i(B
-$B%`(B) $B$+(B SSLeay (@samp{s_client}) $B$H30It%i%$%V%i%j(B @samp{ssl.el} $B$,I,MW$G(B
-$B$9!#(B
-@item
-@dfn{starttls:} STARTTLS (@acronym{SSL} $B$KN`;w(B) $B$r;H$$$^$9!#30It%i%$%V%i(B
-$B%j(B @samp{starttls.el} $B$H(B @samp{starttls} $B%W%m%0%i%`$,I,MW$G$9!#(B
-@samp{starttls}.
-@end itemize
-
-@item :leave
-$BHs(B-@code{nil} $B$G%a!<%k$r%5!<%P!<$K;D$7!"%a%C%;!<%8$N<hF@$K(B UIDL $B$r;H$$$^(B
-$B$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
+$B$3$l$O(B @code{password} $B$+%7%s%\%k(B @code{apop} $B$N$I$A$i$+$G!"2?$NG'>ZJ}<0(B
+$B$r;H$&$+$r;X<($7$^$9!#%G%#%U%)%k%HCM$O(B @code{password} $B$G$9!#(B
 @end table
 
 @vindex pop3-movemail
 @vindex pop3-leave-mail-on-server
-@code{:program} $B$H(B @code{:function} $B%-!<%o!<%I$,;XDj$5$l$F$$$J$$$H!"(B
-@code{pop3-movemail} $B$,;HMQ$5$l$^$9!#(B@code{pop3-movemail} $B$r;H$&>l9g!"(B
-@code{pop3-leave-mail-on-server} $B$,Hs(B-@code{nil} $B$@$C$?$i!"%a!<%k$O<hF@(B
-$B8e$G$b(B @acronym{POP} $B%5!<%P!<$K;D$5$l$^$9!#(B@acronym{POP} $B%5!<%P!<$O%;%C(B
-$B%7%g%sCf$N>uBV$N>pJs$r0];}$7$^$;$s!#%/%i%$%"%s%H$,?.Mj$G$-$k>pJs$O%/%i%$(B
-$B%"%s%H$=$N$b$N$K$"$j$^$9$,!"<B:]$K$=$3$K$"$k$b$N$O@5$7$/$J$$$+$b$7$l$J$$(B
-$B$3$H$KCm0U$7$F2<$5$$!#$=$l$i$,@5$7$/>pJs$r0];}$7$J$$>l9g$O!"$9$Y$F$,Jx2u(B
-$B$7$F!"$"$J$?$O2u$l$?%a!<%k%\%C%/%9$H$H$b$KCV$-5n$j$K$J$k2DG=@-$,$"$j$^$9!#(B
+@code{:program} $B$H(B @code{:function} $B%-!<%o!<%I$,;XDj$5$l$F$$$J$$>l9g(B
+$B$O(B @code{pop3-movemail} $B$,;H$o$l$^$9!#(B@code{pop3-movemail} $B$r;H$&>l9g(B
+$B$K(B @code{pop3-leave-mail-on-server} $B$,Hs(B-@code{nil} $B$@$C$?$i!"%a!<%k$O<h(B
+$BF@$7$?8e$G$b(B @acronym{POP} $B%5!<%P!<$K;D$5$l$^$9!#(B@acronym{POP} $B%5!<%P!<(B
+$B$O%;%C%7%g%s$H%;%C%7%g%s$N4V$N>uBV$N>pJs$r0];}$7$J$$$N$G!"$=$3$K$"$k%/%i(B
+$B%$%"%s%H$,?.Mj$G$-$k>pJs$H!"<B:]$K$=$3$K$"$k$b$N$O0lCW$7$J$$$+$b$7$l$J$$(B
+$B$3$H$KCm0U$7$F2<$5$$!#$=$l$i$,0lCW$7$J$$$H$9$Y$F$,Jx2u$7$F!"$"$J$?$O2u$l(B
+$B$?%a!<%k%\%C%/%9$H$H$b$KCV$-5n$j$K$5$l$k2DG=@-$,$"$j$^$9!#(B
+
+@quotation
+$BLuCm(B: Gnus $B$K4^$^$l$F$$$k(B @file{pop3.el} $B$r;H$&>l9g(B
+$B$K(B @code{pop3-leave-mail-on-server} $B$rHs(B-@code{nil} $B$K@_Dj$9$k$N$O!"$"$^(B
+$B$j0UL#$,$"$j$^$;$s!#%5!<%P!<$K;D$5$l$?%a!<%k$O!"<!2s$K(B ($B2?EY$G$b(B) $B:F$S<h(B
+$B$j9~$^$l$F$7$^$$$^$9!#0lEY<h$j9~$s$@%a!<%k$rFsEY$H<hF@$7$J$$$h$&$K$9$k5!(B
+$BG=$r;}$D(B @file{pop3.el} $B$O(B T-gnus $B$K4^$^$l$F$$$^$9!#$3$l$O(B XEmacs $BMQ$K3+(B
+$BH/$5$l$?$b$N$,85$K$J$C$F$$$^$9!#;DG0$J$,$iC/$,3+H/$7$?$+$,$o$+$j$^$;$s!#(B
+$B$7$?$,$C$F(B FSF $B$X$N@5<0$J8"Mx>yEO$,9T$J$o$l$F$$$J$$$N$G!"(BGnus $B$K4^$a$k$3(B
+$B$H$,$G$-$J$$$N$G$9!#(B
+@end quotation
+
+$B$$$/$D$+Nc$r5s$2$^$9(B:
 
-$B$3$l$O$$$/$D$+$NNc$G$9!#%G%#%U%)%k%H$NMxMQ<TL>$r;H$C$F!"%G%#%U%)%k%H(B
-$B$N(B @acronym{POP} $B%5!<%P!<$+$i<hF@$7!"%G%#%U%)%k%H$N<hF@J}K!$r;HMQ$7$^$9(B:
+$B%G%#%U%)%k%H$NMxMQ<TL>$r;H$C$F!"%G%#%U%)%k%H$N(B @acronym{POP} $B%5!<%P!<$+(B
+$B$i<hF@$7!"%G%#%U%)%k%H$N<hF@J}K!$r;HMQ$7$^$9(B:
 
 @lisp
 (pop)
 @end lisp
 
-$B;XL>$5$l$?%5!<%P!<$+$i;XL>$5$l$?MxMQ<T$H%Q%9%o!<%I$G<hF@$7$^$9(B:
+$B;XL>$7$?%5!<%P!<$+$i!";XL>$7$?MxMQ<T$H%Q%9%o!<%I$G<hF@$7$^$9(B:
 
 @lisp
 (pop :server "my.pop.server"
@@ -13507,9 +13499,9 @@ fetchmail %u@@%s -P %p %t
 @end lisp
 
 @item maildir
-Maildir $B$+$i%a!<%k$r<hF@$7$^$9!#$3$l$O8=:_(B qmail $B$H(B postfix $B$G$N$_$G%5%]!<(B
-$B%H$5$l$F$$$k(B mailbox $B7A<0$G!"FCJL$N%G%#%l%/%H%j!<$N$=$l$>$l$N%U%!%$%k$,(B
-$B@53N$K(B 1 $B%a!<%k$H$J$C$F$$$^$9!#(B
+Maildir $B$+$i%a!<%k$r<hF@$7$^$9!#$3$l$O>/$J$/$H$b(B qmail $B$H(B postfix $B$K$h$C(B
+$B$F%5%]!<%H$5$l$F$$$k%a!<%k%\%C%/%9$N7A<0$G!"FCJL$N%G%#%l%/%H%j!<$K$"$k$=(B
+$B$l$>$l$N%U%!%$%k$O!"87L)$K0lDL$N%a!<%k$r4^$s$G$$$^$9!#(B
 
 $B%-!<%o!<%I(B:
 
@@ -13522,10 +13514,10 @@ Maildir $B$N%5%V%G%#%l%/%H%j!<$G$9!#%G%#%U%)%k%HCM(B
 $B$O(B @samp{("new" "cur")} $B$G$9!#(B
 @c Gnus $B$G<hF@$9$kA0$K!"$H$-$I$-(B pop3 $B%G!<%b%s$G%a!<%k$rC5$9$J$i!"0J2<$N:G(B
 @c $B=i$NNc$N$h$&$K!"(Bmaildir $B$NCf$N(B @code{cur} $B%G%#%l%/%H%j!<$+$i$b%a!<%k$r<h(B
-@c $BF@$9$kI,MW$,$"$j$^$9!#(B
+@c $BF@$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
 
-$B%j%b!<%H%^%7%s$+$i%a!<%k$r<h$j4s$;$k$3$H$b=PMh$^$9!#(B
-($B$H$$$&$N$b!"(Bmaildir $B$O%m%C%/$NLdBj$r5$$K$;$:$K:Q$`$+$i!#(B)
+$B%j%b!<%H%^%7%s$+$i%a!<%k$r<h$j4s$;$k$3$H$b=PMh$^$9!#(B($B$H$$$&$N$b!"(B
+maildir $B$O%m%C%/$NLdBj$r5$$K$;$:$K:Q$`$+$i$G$9!#(B)
 @end table
 
 Maildir $B%a!<%k%=!<%9$NNc$r$U$?$D(B:
@@ -13541,11 +13533,12 @@ Maildir $B%a!<%k%=!<%9$NNc$r$U$?$D(B:
 @end lisp
 
 @item imap
-@acronym{IMAP} $B%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#2?$i$+$NM}M3(B
-$B$G(B @acronym{IMAP} $B$r0U?^$5$l$?$h$&$J%M%C%H%o!<%/>e$G%a!<%k$rFI$`%W%m%H%3(B
-$B%k$H$7$F07$$$?$/$J$$$H$-$O!"(BGnus $B$G$O(B @acronym{POP} $B%5!<%P!<$HF1MM$K07$&(B
-$B$3$H$,$G$-!"M?$($i$l$?(B @acronym{IMAP} $B%a!<%k%\%C%/%9$+$i5-;v$r<hF@$7$^$9!#(B
-$B>\$7$/$O(B @ref{IMAP} $B$r;2>H$7$F2<$5$$!#(B
+@acronym{IMAP} $B%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#2?$i$+$NM}M3$G!"(B
+@acronym{IMAP} $B$r$=$l$,0U?^$5$l$?$h$&$J%M%C%H%o!<%/>e$G%a!<%k$rFI$`%W%m(B
+$B%H%3%k$H$7$F$O(B ($B$9$J$o$A(B @code{nnimap} $B$G(B) $B;H$$$?$/$J$$$H$-$O!"(BGnus $B$G$O(B
+@acronym{POP} $B%5!<%P!<$HF1MM$K07$C$F!";XDj$5$l$?(B @acronym{IMAP} $B%a!<%k%\%C(B
+$B%/%9$+$i5-;v$r<hF@$9$k$3$H$,$G$-$^$9!#>\$7$/$O(B @ref{IMAP} $B$r;2>H$7$F2<$5(B
+$B$$!#(B
 
 Kerberos, GSSAPI, @acronym{TLS}/@acronym{SSL} $B$*$h$S(B STARTTLS $B$N$?$a$N30(B
 $BIt%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#(B@xref{IMAP}.
@@ -13567,7 +13560,7 @@ Kerberos, GSSAPI, @acronym{TLS}/@acronym{SSL} $B$*$h$S(B STARTTLS $B$N$?$a$N3
 
 @item :password
 @acronym{IMAP} $B%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$5$l$F$$$J$$$H$-$O!"Mx(B
-$BMQ<T$OF~NO$rB%$5$l$^$9!#(B
+$BMQ<T$OF~NO$9$k$3$H$rB%$5$l$^$9!#(B
 
 @item :stream
 $B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`!#(B@code{imap-stream-alist} $B$K$"$k(B
@@ -13576,21 +13569,22 @@ Kerberos, GSSAPI, @acronym{TLS}/@acronym{SSL} $B$*$h$S(B STARTTLS $B$N$?$a$N3
 @samp{shell} $B$^$?$O%G%#%U%)%k%HCM$N(B @samp{network} $B$K$J$j$^$9!#(B
 
 @item :authentication
-$B%5!<%P!<$G$NG'>Z$K$I$NG'>ZK!$r;H$&$+!#$3$l(B
-$B$O(B @code{imap-authenticator-alist} $B$N%7%s%\%k$N0l$D$r@_Dj$7$^$9!#8=>u$G(B
-$B$O(B @samp{gssapi}, @samp{kerberos4}, @samp{digest-md5}, @samp{cram-md5},
-@samp{anonymous} $B$^$?$O%G%#%U%)%k%HCM$N(B @samp{login} $B$K$J$j$^$9!#(B
+$B%5!<%P!<$G$NG'>Z$K$I$NG'>ZK!$r;H$&$+!#$3$l$K(B
+$B$O(B @code{imap-authenticator-alist} $B$GDj5A$5$l$F$$$k%7%s%\%k$N0l$D$r@_Dj(B
+$B$7$^$9!#8=>u$G$O(B @samp{gssapi}, @samp{kerberos4}, @samp{digest-md5},
+@samp{cram-md5}, @samp{anonymous} $B$^$?$O%G%#%U%)%k%HCM$N(B @samp{login} $B$K(B
+$B$J$j$^$9!#(B
 
 @item :program
 :stream $B$K(B `shell' $B$,@_Dj$5$l$F$$$k$H$-$O!"$3$NCM$,JQ(B
 $B?t(B @code{imap-shell-program} $B$K3d$jEv$F$i$l$^$9!#$3$l$O(B @code{format} $B$U(B
-$B$&$NJ8;zNs(B ($B$^$?$OJ8;zNs$N%j%9%H(B) $B$G$J$1$l$P$J$j$^$;$s!#Nc$r<($7$^$7$g$&!#(B
+$B$&$NJ8;zNs(B ($B$^$?$OJ8;zNs$N%j%9%H(B) $B$G$J$1$l$P$J$j$^$;$s!#Nc$r<($7$^$7$g$&(B:
 
 @example
 ssh %s imapd
 @end example
 
-$BM-8z$J(B format $B;X<(;R$O0J2<$NDL$j$G$9!#(B
+$BM-8z$J=qK!;EMM;X<(;R$O0J2<$NDL$j$G$9!#(B
 
 @table @samp
 @item s
@@ -13610,18 +13604,19 @@ ssh %s imapd
 $B$3$l$OIaDL$OF~$C$F$/$k%a!<%k$r<u$1<h$k%a!<%k%\%C%/%9$G$9!#(B
 
 @item :predicate
-$B<hF@$9$k5-;v$r7hDj$9$k$?$a$K;H$o$l$k=R8l!#%G%#%U%)%k%HCM$N!"(B@samp{UNSEEN
+$B<hF@$9$k5-;v$r8+$D$1$k$?$a$K;H$o$l$k=R8l!#%G%#%U%)%k%HCM$N!"(B@samp{UNSEEN
 UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
-$B$-(B @acronym{IMAP} $B%/%i%$%"%s%H$G%a!<%k%\%C%/%9$rGA$-!"$$$/$D$+$N5-;v$K4{(B
-$BFI(B ($B$b$7$/$O!"(BSEEN) $B$N0u$rIU$1$k$J$i!"(B@samp{1:*} $B$K@_Dj$9$kI,MW$,$"$k$+(B
-$B$b$7$l$^$;$s!#$=$&$9$l$P!"%a!<%k%\%C%/%9$N$9$Y$F$N5-;v$O0u$NG!2?$K4X$o$i(B
-$B$:<hF@$5$l$^$9!#=R8l$N40A4$J0lMw$O!"(BRFC2060 $B$N(B 6.4.4 $B@a$rFI$s$G2<$5$$!#(B
+$B$-(B @acronym{IMAP} $B%/%i%$%"%s%H$G%a!<%k%\%C%/%9$rGA$$$F!"$$$/$D$+$N5-;v$K(B
+$B4{FI(B ($B$^$?$O(B SEEN) $B$N0u$rIU$1$k$J$i!"$3$l$r(B @samp{1:*} $B$K@_Dj$9$kI,MW$,(B
+$B$"$k$+$b$7$l$^$;$s!#$=$&$9$l$P!"%a!<%k%\%C%/%9$N$9$Y$F$N5-;v$O0u$NG!2?$K(B
+$B4X$o$i$:<hF@$5$l$^$9!#=R8l$N40A4$J0lMw$O!"(BRFC2060 $B$N(B 6.4.4 $B@a$rFI$s$G2<(B
+$B$5$$!#(B
 
 @item :fetchflag
-$B%5!<%P!<$G!"<hF@$7$?5-;v$K0u$rIU$1$kJ}K!!#%G%#%U%)%k%HCM(B
-$B$N(B @samp{\Deleted} $B$O$=$l$i$K>C5n$N0u$rIU$1$^$9$,!"B>$K(B @samp{\Seen} $B$G(B
-$B$OC1$K4{FI$N0u$rIU$1$^$9!#$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u(B
-$B$b(B RFC2060 $B$N(B 2.3.2 $B@a$GDj5A$5$l$F$$$^$9!#(B
+$B%5!<%P!<$G!"<hF@$7$?5-;v$K%U%i%0$rIU$1$kJ}K!!#%G%#%U%)%k%HCM(B
+$B$N(B @samp{\Deleted} $B$O$=$l$i$K>C5n$N%U%i%0$rIU$1$^$9$,!"C1$K4{FI$N%U%i%0(B
+$B$rIU$1$k$?$a$N(B @samp{\Seen} $B$,Be0F$K$J$k$G$7$g$&!#$3$l$i$O:G$b$"$j$=$&$J(B
+$BFs$D$NA*Br$G$9$,!"B>$N%U%i%0$b(B RFC2060 $B$N(B 2.3.2 $B@a$GDj5A$5$l$F$$$^$9!#(B
 
 @item :dontexpunge
 @code{nil} $B$G$J$+$C$?$i!"5-;v$r<hF@$7$?8e$G!"$=$l$i$K>C5n$N0u$,IU$$$F$$(B
@@ -13651,18 +13646,18 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @table @code
 @item :subtype
 $B%&%'%V%a!<%k%5!<%P!<$N7?$G$9!#%G%#%U%)%k%HCM$O(B @code{hotmail} $B$G$9!#B>$N(B
-$B8uJd$O(B @code{netscape}, @code{netaddress}, @code{my-deja} $B$G$9!#(B
+$B8uJd$K$O(B @code{netscape}, @code{netaddress}, @code{my-deja} $B$,$"$j$^$9!#(B
 
 @item :user
-$B%&%'%V%a!<%k%5!<%P!<$NMxMQ<TL>$G$9!#%G%#%U%)%k%HCM$O%m%0%$%sL>$G$9!#(B
+$B%&%'%V%a!<%k%5!<%P!<$KEO$9MxMQ<TL>$G$9!#%G%#%U%)%k%HCM$O%m%0%$%sL>$G$9!#(B
 
 @item :password
-$B%&%'%V%a!<%k%5!<%P!<$N%Q%9%o!<%I$G$9!#;XDj$7$J$$>l9g$O!"MxMQ<T$KF~NO$rB%(B
-$B$7$^$9!#(B
+$B%&%'%V%a!<%k%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$7$J$$>l9g$O!"MxMQ<T$OF~NO(B
+$B$9$k$3$H$rB%$5$l$^$9!#(B
 
 @item :dontexpunge
-@code{nil} $B$G$J$+$C$?$i!"L$FI$N5-;v$@$1$r<hF@$7$F!"$=$l$i$r$4$_H"$N%U%)(B
-$B%k%@!<$K0\F0$7$^$;$s!#(B
+@code{nil} $B$G$J$+$C$?$i!"L$FI$N5-;v$@$1$r<hF@$7!"$+$D<hF@8e$K$=$l$i$r$4(B
+$B$_H"$N%U%)%k%@!<$K0\F0$7$^$;$s!#(B
 @end table
 
 $B%&%'%V%a!<%k$N%=!<%9$NNc$G$9(B:
@@ -13683,8 +13678,8 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @table @code
 @item :plugged
 @code{nil} $B$G$J$+$C$?$i!"(BGnus $B$,(B @dfn{unplugged} $B$G$"$C$F$b%a!<%k$r<hF@(B
-$B$7$^$9!#$b$7$"$J$?$,%G%#%l%/%H%j!<$r%a!<%k%=!<%9$K;H$C$F$$$k$J$i$P!"$3$N(B
-$BNc$N$h$&$K;XDj$9$k$3$H$,$G$-$^$9(B:
+$B$7$^$9!#%G%#%l%/%H%j!<$r%a!<%k%=!<%9$K;H$C$F$$$k$N$J$i$P!"$3$NNc$N$h$&$K(B
+$B;XDj$9$k$3$H$,$G$-$^$9(B:
 
 @lisp
 (setq mail-sources
@@ -13693,17 +13688,17 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
                    :plugged t)))
 @end lisp
 
-$B$"$J$?$,(B @dfn{unplugged} $B$G$"$C$F$b(B Gnus $B$O%a!<%k$r<hF@$7$^$9!#$3$l$O!"(B
-$B%m!<%+%k$N%a!<%k$H%K%e!<%9$r;H$&>l9g$KJXMx$G$9!#(B
+@dfn{unplugged} $B$G$"$C$F$b(B Gnus $B$O%a!<%k$r<hF@$7$^$9!#$3$l$O%m!<%+%k$N%a!<(B
+$B%k$H%K%e!<%9$r;H$&>l9g$KJXMx$G$9!#(B
 @end table
 @end table
 
 @subsubsection $B4X?t%$%s%?!<%U%'!<%9(B
 
 $B>e5-$N$$$/$D$+$N%-!<%o!<%I$O!"<B9T$9$k$?$a$N(B Lisp $B4X?t$r;XDj$7$^$9!#4X?t(B
-$B$,<B9T$5$l$F$$$k4V$@$1!"$=$l$>$l$N%-!<%o!<%I(B @code{:foo} $B$NCM$H$7(B
-$B$F(B Lisp $BJQ?t(B @code{foo} $B$,;H$o$l$^$9!#Nc$($P!"0J2<$N%a!<%k%=!<%9$N@_DjNc(B
-$B$K$D$$$F9M$($F$_$F2<$5$$!#(B
+$B$,<B9T$5$l$F$$$k4V$@$1!"$=$l$>$l$N%-!<%o!<%I(B @code{:foo} $B$KBP$7(B
+$B$F(B Lisp $BJQ?t(B @code{foo} $B$,!"$=$N%-!<%o!<%I$NCM$KB+G{$5$l$^$9!#Nc$($P!"0J(B
+$B2<$N%a!<%k%=!<%9$N@_DjNc$K$D$$$F9M$($F$_$F2<$5$$!#(B
 
 @lisp
 (setq mail-sources '((pop :user "jrl"
@@ -13711,36 +13706,36 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @end lisp
 
 $B4X?t(B @code{fetchfunc} $B$,<B9T$5$l$F$$$k$H$-!"(B@code{user} $B$H$$$&%7%s%\%k$N(B
-$BCM$O(B @code{"jrl"} $B$K$J$j!"(B@code{server} $B$H$$$&%7%s%\%k$NCM(B
-$B$O(B @code{"pophost"} $B$K$J$j$^$9!#(B
-@code{port}, @code{password}, @code{program}, @code{prescript},
-@code{postscript}, @code{function} $B$*$h$S(B @code{authentication} $B$NCM$b$^(B
-$B$?!"$=$l$i$N4{DjCM$K$J$j$^$9!#(B
+$BCM$O(B @code{"jrl"} $B$KB+G{$5$l!"(B@code{server} $B$H$$$&%7%s%\%k$NCM(B
+$B$O(B @code{"pophost"} $B$KB+G{$5$l$^$9!#(B@code{port}, @code{password},
+@code{program}, @code{prescript}, @code{postscript}, @code{function} $B$*(B
+$B$h$S(B @code{authentication} $B$NCM$b$^$?(B ($B$=$l$i$N%G%#%U%)%k%HCM$K(B) $BB+G{$5(B
+$B$l$^$9!#(B
 
-$B$=$l$>$l$N7?$N%a!<%k%=!<%9$N$?$a$N%-!<%o!<%I$N%j%9%H$K$D$$$F$O!">e5-$r;2(B
-$B>H$7$F2<$5$$!#(B
+$B$=$l$>$l$N7?$N%a!<%k%=!<%9$N$?$a$N%-!<%o!<%I$N%j%9%H$K$D$$$F$O!"A0=R$N@b(B
+$BL@$r;2>H$7$F2<$5$$!#(B
 
 @node Mail Source Customization
 @subsubsection $B%a!<%k%=!<%9$N%+%9%?%^%$%:(B
 
-$B0J2<$O%a!<%k$N<hF@J}K!$K1F6A$9$kJQ?t$N0lMw$G$9!#IaDL$O$3$l$i$O$I$l$b@_Dj(B
-$B$9$kI,MW$O$J$$$G$7$g$&!#(B
+$B0J2<$O%a!<%k$N<hF@J}K!$K1F6A$9$kJQ?t$N0lMw$G$9!#IaDL$O$3$l$i$N$I$l$b@_Dj(B
+$B$^$?$OJQ99$9$kI,MW$OL5$$$G$7$g$&!#(B
 
 @table @code
 @item mail-source-crash-box
 @vindex mail-source-crash-box
-$B%a!<%k$rA`:n$7$F$$$k4V$KJ]B8$5$l$F$$$k>l=j$G$9!#%G%#%U%)%k%HCM(B
-$B$O(B @file{~/.emacs-mail-crash-box} $B$G$9!#(B
+$B%a!<%k$,!"$=$l$r=hM}$7$F$$$k4|4VCf$K3JG<$5$l$F$$$k>l=j$G$9!#%G%#%U%)%k%H(B
+$BCM$O(B @file{~/.emacs-mail-crash-box} $B$G$9!#(B
 
 @item mail-source-delete-incoming
 @vindex mail-source-delete-incoming
-@code{nil} $B$G$J$1$l$P!"F~$C$FMh$?%U%!%$%k$O!"$=$l$r=hM}$7$?8e$K>C5n$5$l(B
-$B$^$9!#(B@code{t} $B$G$O%U%!%$%k$r$?$@$A$K>C5n$7!"(B@code{nil} $B$G$O$$$+$J$k%U%!(B
-$B%$%k$b>C$7$^$;$s!#@5$N?t$@$C$?>l9g$O!"$=$NF|?t0J>e$K8E$$%U%!%$%k$r>C5n$7(B
-$B$^$9(B ($B$3$l$O?7Ce%a!<%k$r<u$1<h$k$H$-$@$19T$J$o$l$^$9(B)$B!#(B
-@code{mail-source-delete-incoming} $B$r(B @code{nil} $B$K$7$F$*$$$F!"(B
-@code{mail-source-delete-old-incoming} $B$r%U%C%/$^$?$O<jF0$G8F$s$G$bNI$$(B
-$B$G$9!#(B
+@code{nil} $B$G$J$1$l$P!"F~$C$FMh$?%a!<%k$r0l;~E*$K3JG<$7$?%U%!%$%k$r!"$=(B
+$B$l$r=hM}$7$?8e$G>C5n$7$^$9!#(B@code{t} $B$G$O%U%!%$%k$r$?$@$A$K>C5n$7!"(B
+@code{nil} $B$G$O$$$+$J$k%U%!%$%k$b>C$7$^$;$s!#@5$N?t$@$C$?>l9g$O!"$=$NF|(B
+$B?t0J>e$K8E$$%U%!%$%k$r>C5n$7$^$9(B ($B>C5n$O?7Ce%a!<%k$r<u$1<h$k$H$-$@$19T$J(B
+$B$o$l$^$9(B)$B!#(B@code{mail-source-delete-incoming} $B$r(B @code{nil} $B$K$7$F$*$$$F!"(B
+@code{mail-source-delete-old-incoming} $B$r%U%C%/$G8F$V$+!"$^$?$OBPOCE*$K(B
+$B8F$V$3$H$b$G$-$^$9!#(B
 
 @item mail-source-delete-old-incoming-confirm
 @vindex mail-source-delete-old-incoming-confirm
@@ -13755,17 +13750,18 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 
 @item mail-source-directory
 @vindex mail-source-directory
-$BF~$C$F$-$?%a!<%k%=!<%9$N%U%!%$%k$,(B ($B$b$7$"$l$P(B) $BJ]B8$5$l$k%G%#%l%/%H%j!<(B
-$B$G$9!#%G%#%U%)%k%HCM$O(B @file{~/Mail/} $B$G$9!#8=;~E@$G$O!"$3$l$,;H$o$l$kM#(B
-$B0l$N$b$N$OJQ?t(B @code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?t(B
-$BCM$G$"$C$?>l9g!"F~$C$F$-$?%U%!%$%k$,J]B8$5$l$k>l=j$N;XDj$G$9!#(B
+$BF~$C$F$-$?%a!<%k%=!<%9$N%U%!%$%k$,(B ($B$b$7$"$l$P(B) $B3JG<$5$l$k%G%#%l%/%H%j!<(B
+$B$G$9!#%G%#%U%)%k%HCM$O(B @file{~/Mail/} $B$G$9!#8=;~E@$G$3$l$,;H$o$l$kM#0l$N(B
+$B$b$N$O!"JQ?t(B @code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?tCM(B
+$B$G$"$C$?>l9g$K!"F~$C$F$-$?%a!<%k$r3JG<$9$k%U%!%$%k$NCV$->l=j$N;XDj$G$9!#(B
 
 @item mail-source-incoming-file-prefix
 @vindex mail-source-incoming-file-prefix
-$BF~$C$F$-$?%a!<%k$rJ]B8$9$k%U%!%$%k$N@\F,8l$G$9!#%G%#%U%)%k%HCM(B
-$B$O(B @file{Incoming} $B$G!"$3$N>l9g%U%!%$%k(B
+$BF~$C$F$-$?%a!<%k$r0l;~E*$K3JG<$9$k%U%!%$%k$NL>A0$N@\F,8l$G$9!#%G%#%U%)%k(B
+$B%HCM$O(B @file{Incoming} $B$G!"$3$N>l9g%U%!%$%k(B
 $B$O(B @file{Incoming30630D_} $B$d(B @file{Incoming298602ZD} $B$N$h$&$K$J$j$^$9!#(B
-@code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?tCM$N>l9g$@$1$G(B
+$B$3$l$,K\Ev$K4X78$9$k$N(B
+$B$O(B @code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?tCM$N>l9g$@$1(B
 $B$9$,!#(B
 
 @item mail-source-default-file-modes
@@ -13775,8 +13771,9 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 
 @item mail-source-movemail-program
 @vindex mail-source-movemail-program
-$BHs(B-@code{nil} $B$@$C$?$i?7Ce%a!<%k$N<h$j9~$`$?$a$N%W%m%0%i%`$NL>A0!#(B
-@code{nil} $B$@$C$?$i(B @var{exec-directory} $B$K$"$k(B @code{movemail}$B!#(B
+@code{nil} $B$G$J$+$C$?$i!"?7Ce%a!<%k$r<h$j9~$`$?$a$N%W%m%0%i%`$NL>A0$G$"(B
+$B$k$H2r<a$5$l$^$9!#(B@code{nil} $B$@$C$?$i(B @code{exec-directory} $B$K$"(B
+$B$k(B @code{movemail} $B$,;H$o$l$^$9!#(B
 @end table
 
 @node Fetching Mail
@@ -13784,7 +13781,7 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 
 @vindex mail-sources
 @vindex nnmail-spool-file
-$B<B:]$K(B Gnus $B$K$I$3$+$i?7$7$$%a!<%k$r<hF@$9$k$+$r65$($k$K$O!"(B
+$B?7$7$$%a!<%k$r$I$3$+$i<hF@$9$k$+$r<B:]$K(B Gnus $B$K;X<($9$k<jCJ$O!"(B
 @code{mail-sources} $B$r%a!<%k%=!<%9;X<(;R$N%j%9%H$K@_Dj$9$k$3$H$G(B
 $B$9(B (@pxref{Mail Source Specifiers})$B!#(B
 
@@ -13801,7 +13798,8 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
              :password "secret")))
 @end lisp
 
-$B$b$7$/$O!"$3$l$i$N%-!<%o!<%I$N%G%#%U%)%k%HCM$r;H$$$?$/$J$1$l$P(B:
+$B$"$k$$$O!"$3$l$i$N%-!<%o!<%I$N$I$s$J%G%#%U%)%k%HCM$b;H$$$?$/$J$1$l$P!"$3(B
+$B$N$h$&$K$7$F2<$5$$(B:
 
 @lisp
 (setq mail-sources
@@ -13812,48 +13810,48 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
              :password "secret")))
 @end lisp
 
-$B%a!<%k%P%C%/%(%s%I$r;H$&$H$-$O!"(BGnus $B$O$9$Y$F$N%a!<%k$r(B inbox $B$+$i5[$$>e(B
-$B$2$F!"%[!<%`%G%#%l%/%H%j!<$KJ|$jEj$2$^$9!#$"$J$?$,%a!<%k%P%C%/%(%s%I$r;H$C(B
-$B$F$$$J$$>l9g$O!"(BGnus $B$O0lDL$b%a!<%k$r0\F0$7$^$;$s(B---$B:G=i$KKbK!$N8F$S=P$7(B
-$B$r$?$/$5$s$7$J$1$l$P$J$j$^$;$s!#$^$:8^3Q7A$rIA$-!"O9?$$K2P$rIU$1!";3MS$r(B
-$B@8$1lS$H$7$FJ{$2=*$($?8e$G!"(BGnus $B$,$"$J$?$N%a!<%k$r0\F0$7$F$bK\Ev$K$"$^(B
-$B$j6C$$$F$O$$$1$^$;$s!#(B
+$B$"$J$?$,%a!<%k%P%C%/%(%s%I$r;H$&$H$-!"(BGnus $B$O$9$Y$F$N%a!<%k$r(B inbox $B$+$i(B
+$B5[$$>e$2$F%[!<%`%G%#%l%/%H%j!<$KJ|$j9~$_$^$9!#$"$J$?$,%a!<%k%P%C%/%(%s%I(B
+$B$r;H$C$F$$$J$$$H$-$O!"(BGnus $B$O0lDL$b%a!<%k$r0\F0$7$^$;$s(B---$B$=$&$$$&>l9g$K(B
+$B$O!":G=i$K$?$/$5$s$NKbK!$r>'$($J$1$l$P$J$j$^$;$s!#$^$:8^K'@1$rIA$-!"O9?$(B
+$B$rEt$7!";3MS$r@8$1lS$H$7$FJ{$2=*$($?8e$K$O!"(BGnus $B$,$"$J$?$N%a!<%k$r0\F0(B
+$B$7$?$H$7$F$b!"$"$J$?$O<B:]$K$O$"$^$j6C$+$J$$$O$:$G$9!#(B
 
 @node Mail Back End Variables
 @subsection $B%a!<%k%P%C%/%(%s%IJQ?t(B
 
-$B$3$l$i$NJQ?t$O(B ($B$?$$$F$$$N>l9g(B) $B$9$Y$F$N0c$C$?%a!<%k%P%C%/%(%s%I$K4XO"$7(B
-$B$^$9!#(B
+$B$3$l$i$NJQ?t(B ($B$N$[$H$s$I(B) $B$O!"$9$Y$F$N$5$^$6$^$J%a!<%k%P%C%/%(%s%I$K4XO"(B
+$B$7$^$9!#(B
 
 @table @code
 @vindex nnmail-read-incoming-hook
 @item nnmail-read-incoming-hook
-$B%a!<%k%P%C%/%(%s%I$O?7$7$$%a!<%k$rFI$_9~$s$@8e$K$3$N%U%C%/$r8F$S$^$9!#$b(B
-$B$7$=$&$7$?$$$H;W$&$J$i!"$3$N%U%C%/$r%a!<%k4F;k%W%m%0%i%`$KCN$i$;$k$?$a$K(B
-$B;H$&$3$H$,$G$-$^$9!#(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"?7$7$$%a!<%k$rFI$_9~$s$@8e$K$3$N%U%C%/$r8F(B
+$B$S$^$9!#$=$&$7$?$1$l$P!"2?$+$N%a!<%k4F;k%W%m%0%i%`$KCN$i$;$k$?$a$K$3$N%U%C(B
+$B%/$r;H$&$3$H$,$G$-$^$9!#(B
 
 @vindex nnmail-split-hook
 @item nnmail-split-hook
 @findex gnus-article-decode-encoded-words
 @cindex RFC 1522 decoding
 @cindex RFC 2047 decoding
-$B$=$l$>$l$N%a%C%;!<%8$,$=$N%X%C%@!<$K4p$E$$$FJ,3d$,$J$5$l$kD>A0$K$=$l$,J](B
-$BB8$5$l$F$$$k%P%C%U%!!<$G<B9T$5$l$k%U%C%/$G$9!#$3$N%U%C%/$O$=$l$,E,9g$9$k(B
-$B$H9M$($k$h$&$K<+M3$K%P%C%U%!!<$NFbMF$rJT=8$9$k$3$H$,$G$-$^$9(B---$B%P%C%U%!!<(B
-$B$OJ,3d$,=*$o$C$?8e$G>C5n$5$l!"%P%C%U%!!<$G9T$J$o$l$?JQ99$O$I$N%U%!%$%k$K(B
-$B$b8=$l$^$;$s!#(B@code{gnus-article-decode-rfc1522} $B$,$3$N%U%C%/$K2C$($k$3(B
-$B$H$,E,@Z$J4X?t$N0l$D$G$9!#(B
+$B$=$l$>$l$N%a%C%;!<%8$,$=$N%X%C%@!<$K4p$E$$$FJ,3d$,$J$5$l$kD>A0$K!"$=$l$,(B
+$B3JG<$5$l$F$$$k%P%C%U%!!<$G<B9T$5$l$k%U%C%/$G$9!#$3$N%U%C%/$O!"$=$l$,$U$5(B
+$B$o$7$$$H9M$($i$l$k$h$&$K$9$k$?$a$K!"$I$s$J$d$jJ}$G$G$b<+M3$K%P%C%U%!!<$N(B
+$BFbMF$rJT=8$9$k$3$H$,$G$-$^$9(B---$B%P%C%U%!!<$OJ,3d$,=*$o$C$?8e$G<N$F$i$l!"(B
+$B%P%C%U%!!<$G9T$J$o$l$?JQ99$O$I$N%U%!%$%k$K$b8=$l$^$;$s!#(B
+@code{gnus-article-decode-rfc1522} $B$O!"$3$N%U%C%/$K2C$($i$l$k$3$H$,$"$j(B
+$B$=$&$J4X?t$N0l$D$G$9!#(B
 
 @vindex nnmail-pre-get-new-mail-hook
 @vindex nnmail-post-get-new-mail-hook
 @item nnmail-pre-get-new-mail-hook
 @itemx nnmail-post-get-new-mail-hook
-$B$3$l$i$OF~$C$F$/$k%a!<%k$r07$&$H$-$K<B9T$5$l$kLr$KN)$DFs$D$N%U%C%/$G(B
-$B$9(B---@code{nnmail-pre-get-new-mail-hook} ($B$3$l$O?7$7$$%a!<%k$r07$&D>A0$K(B
-$B8F$P$l$^$9(B) $B$H(B @code{nnmail-post-get-new-mail-hook} ($B$3$l$O%a!<%k$N07$$(B
-$B$,=*$o$C$?$H$-$K8F$P$l$^$9(B) $B$G$9!#<!$N$b$N$O!"$3$NFs$D$N%U%C%/$r;H$C$F?7(B
-$B$7$$%a!<%k%U%!%$%k$KM?$($i$l$k%G%#%U%)%k%H$N%U%!%$%k$N%b!<%I$rJQ99$9$kNc(B
-$B$G$9(B:
+$B$3$l$i$O!"F~$C$F$/$k%a!<%k$r=hM}$9$k$H$-$K<B9T$5$l$k!"M-MQ$JFs$D$N%U%C%/(B
+$B$G$9(B---@code{nnmail-pre-get-new-mail-hook} $B$O?7$7$$%a!<%k$r=hM}$9$kD>A0(B
+$B$K8F$P$l!"(B@code{nnmail-post-get-new-mail-hook} $B$O%a!<%k$N07$&=hM}$,=*$o$C(B
+$B$?$H$-$K8F$P$l$^$9!#0J2<$O$3$l$i$NFs$D$N%U%C%/$r;H$C$F!"?7$7$$%a!<%k$N%U%!(B
+$B%$%k$N%U%!%$%k%b!<%I$rJQ99$9$kNc$G$9(B:
 
 @lisp
 (add-hook 'nnmail-pre-get-new-mail-hook
@@ -16583,14 +16581,14 @@ Gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<(B
 @code{nneething} $B$K%G%#%l%/%H%j!<$rM?$($k$H!"$=$N%G%#%l%/%H%j!<$rAv::$7!"(B
 $B3F%U%!%$%k$K5-;vHV9f$r3d$jEv$F$^$9!#$3$N$h$&$J%0%k!<%W$KF~$C$?$H$-$O!"(B
 @code{nneething} $B$O(B Gnus $B$,;H$&(B ``$B%X%C%@!<(B'' $B$r:n$i$J$/$F$O$J$j$^$;$s!#(B
-$B$D$^$k$H$3$m!"(BGnus $B$O%K%e!<%9%j!<%@$J$s$G$9!#K:$l$F$k$+$b$7$l$J$$$N$GG0(B
-$B$N$?$a!#(B@code{nneething} $B$O$3$l$rFsCJ3,$G=hM}$7$^$9!#:G=i$K!"LdBj$H$J$k(B
-$B%U%!%$%k$r$=$l$>$lA':w$7$F$^$o$j$^$9!#$b$7$=$N%U%!%$%k$,5-;v$N$h$&$K8+$((B
-$B$?$J$i(B ($B$9$J$o$A!":G=i$N?t9T$,%X%C%@!<$N$h$&$K8+$($?$i(B) $B$=$l$r%X%C%@!<$H(B
-$B$7$F;H$$$^$9!#$b$7$=$l$,%X%C%@!<$N$J$$$?$@$NE,Ev$J%U%!%$%k(B ($BNc$($P(B C $B$N(B
-$B%=!<%9%U%!%$%k(B) $B$G$"$C$?$J$i!"(B@code{nneething} $B$O%X%C%@!<$r5u6u$+$i:n$j(B
-$B=P$7$^$9!#$3$l$O%U%!%$%k$N=jM-<T!"L>A0!"F|IU$r;H$$!"$3$l$i$NMWAG$KBP$7$F(B
-$B$G$-$k$3$H$r2?$G$b$d$j$^$9!#(B
+$B$D$^$k$H$3$m!"(BGnus $B$O%K%e!<%9%j!<%@!<$J$s$G$9!#K:$l$F$k$+$b$7$l$J$$$N$G(B
+$BG0$N$?$a!#(B@code{nneething} $B$O$3$l$rFsCJ3,$G=hM}$7$^$9!#:G=i$K!"LdBj$H$J(B
+$B$k%U%!%$%k$r$=$l$>$lA':w$7$F$^$o$j$^$9!#$b$7$=$N%U%!%$%k$,5-;v$N$h$&$K8+(B
+$B$($?$J$i(B ($B$9$J$o$A!":G=i$N?t9T$,%X%C%@!<$N$h$&$K8+$($?$i(B) $B$=$l$r%X%C%@!<(B
+$B$H$7$F;H$$$^$9!#$b$7$=$l$,%X%C%@!<$N$J$$$?$@$NE,Ev$J%U%!%$%k(B ($BNc$((B
+$B$P(B C $B$N%=!<%9%U%!%$%k(B) $B$G$"$C$?$J$i!"(B@code{nneething} $B$O%X%C%@!<$r5u6u$+(B
+$B$i:n$j=P$7$^$9!#$3$l$O%U%!%$%k$N=jM-<T!"L>A0!"F|IU$r;H$$!"$3$l$i$NMWAG$K(B
+$BBP$7$F$G$-$k$3$H$r2?$G$b$d$j$^$9!#(B
 
 $B$3$l$O$"$J$?$K$H$C$F$O$9$Y$F<+F0E*$K5/$3$k$3$H$G!"$"$J$?$O%K%e!<%9%0%k!<(B
 $B%W$K$H$F$bNI$/;w$?2?$+$r8+$;$i$l$k$3$H$K$J$k$G$7$g$&!#$[$s$H$&$K@#J,0c$o(B
@@ -16886,13 +16884,13 @@ Clarinet $B$N%K%e!<%99`L\$rMWLs$7$?$^$H$aAw$j!#(B
 @cindex SOUP
 @cindex offline
 
-PC $B$N@$3&$N?M!9$O$h$/!"(B``$B%*%U%i%$%s(B'' $B%K%e!<%9%j!<%@$K$D$$$FOC$r$7$F$$$^(B
-$B$9!#$3$l$O%j!<%@$H%K%e!<%9G[Aw$r9gBN$5$;$?!"<B:_$9$k%b%s%9%?!<$G$9!#FbB"(B
-$B%b%G%`%W%m%0%i%`IU$-$G$M!#$-$c$O$O(B!
+PC $B$N@$3&$N?M!9$O$h$/!"(B``$B%*%U%i%$%s(B'' $B%K%e!<%9%j!<%@!<$K$D$$$FOC$r$7$F$$(B
+$B$^$9!#$3$l$O%j!<%@!<$H%K%e!<%9G[Aw$r9gBN$5$;$?!"<B:_$9$k%b%s%9%?!<$G$9!#(B
+$BFbB"%b%G%`%W%m%0%i%`IU$-$G$M!#$-$c$O$O(B!
 
 $B$b$A$m$s!"2f$i$,(B Unix $B%-%A%,%$$N?M4V6!$O(B @code{uucp} $B$@$H(B
 $B$+(B @code{nntpd} $B$N$h$&$J$b$N$r;H$$!"?@$NNN0h$?$k%a!<%k!"%K%e!<%9$NG[Aw$r(B
-$B@5$7$/@_Dj$9$k$N$G$9!#$=$7$FKM$?$A$O$?$@IaDL$N%K%e!<%9%j!<%@$r;H$$$^$9!#(B
+$B@5$7$/@_Dj$9$k$N$G$9!#$=$7$FKM$?$A$O$?$@IaDL$N%K%e!<%9%j!<%@!<$r;H$$$^$9!#(B
 
 $B$7$+$7!"$"$J$?$,$H$F$bCY$$%b%G%`$r;}$C$F$$$F$3$l$i$r@5$7$/@_Dj$9$k$3$H$K(B
 $B6=L#$,L5$1$l$P!"G>$_$=$K3Z$r$5$;$kJ}$r$9$k$N$b;~$K$OJXMx$G$9!#(B
@@ -19609,9 +19607,9 @@ Date ($BF|IU(B) $B%X%C%@!<$K$O;0$D$N$J$s$H$J$/$P$+$2$F$$$k9gCW$N7?$,$"$j$^$9
 @item Followup
 $B$3$N9gCW$N%-!<$O>/$7FCJL$G!"$=$l$O(B @code{From} $B%X%C%@!<$K9gCW$7!"9gCW$7(B
 $B$?5-;v$@$1$G$J$/$=$N5-;v$X$N$9$Y$F$N%U%)%m!<%"%C%W$N%9%3%"$K$b1F6A$7$^$9!#(B
-$B$3$l$O$?$H$($P!"$"$J$?<+?H$N5-;v$X$N%U%)%m!<%"%C%W$N%9%3%"$rA}$d$7$?$j!"(B
-$BNI$/CN$i$l$?LdBj;y$X$N%U%)%m!<%"%C%W5-;v$N%9%3%"$r2<$2$?$j$9$k$N$K;H$o$l(B
-$B$^$9!#(B@code{From} $B%X%C%@!<$,;H$&$N$HF1$87?$N9gCW$r;H$$$^$9!#(B($B$3$N9gCW%-!<(B
+$B$3$l$ONc$($P!"$"$J$?<+?H$N5-;v$X$N%U%)%m!<%"%C%W$N%9%3%"$rA}$d$7$?$j!"NI(B
+$B$/CN$i$l$?LdBj;y$X$N%U%)%m!<%"%C%W5-;v$N%9%3%"$r2<$2$?$j$9$k$N$K;H$o$l$^(B
+$B$9!#(B@code{From} $B%X%C%@!<$,;H$&$N$HF1$87?$N9gCW$r;H$$$^$9!#(B($B$3$N9gCW%-!<(B
 $B$r;H$&$H!"(B@file{ADAPT} $B%U%!%$%k$r:n$k$3$H$K$J$j$^$9!#(B)
 
 @item Thread
@@ -24607,7 +24605,7 @@ Lars $B$5$s$,D4@=$7$F%j%j!<%9$7$?(B Gnus $B$K2C$($F!"F|K\$G$O(B Semi-gnus $
 Gnus $B$NL\E*$O2?$G$9$+(B?
 
 $B;d$O!"$"$J$?$N9M$(IU$/$3$H$r$9$Y$F$G$-(B
-$B$k(B ``$B$9$P$i$7$$(B'' ``$B$+$C$3$$$$(B'' ``$B$$$+$9(B'' ``$B$O$d$j$N(B'' $B%K%e!<%9%j!<%@(B
+$B$k(B ``$B$9$P$i$7$$(B'' ``$B$+$C$3$$$$(B'' ``$B$$$+$9(B'' ``$B$O$d$j$N(B'' $B%K%e!<%9%j!<%@!<(B
 $B$rDs6!$7$?$$$H;W$$$^$9!#$3$l$O;d$NBg85$NF05!$G$9$,!"(BGnus $B$N:n6H$r$7$F$$(B
 $B$k4V$K!"$3$N@$Be$N%K%e!<%9%j!<%@!<$OK\Ev$K@P4o;~Be$KB0$7$F$$$k$H$$$&$3$H(B
 $B$,L@$i$+$K$J$j$^$7$?!#%K%e!<%9%j!<%@!<$O!"%$%s%?!<%M%C%H$NMD;y4|$+$i$[$H(B
-- 
1.7.10.4