Synch with Oort Gnus.
[elisp/gnus.git-] / texi / gnus-ja.texi
index 7eee151..eb3a467 100644 (file)
@@ -1839,10 +1839,10 @@ Gnus \e$B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$K<B9T$5$l$k%U%C%/$G$9!#\e(B
 @samp{%M%S%5y: %(%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!#B>$K$O2?$bI,MW$G$O$"$j$^$;\e(B
-\e$B$s!=!=%0%k!<%WL>$5$($b$G$9!#I=<($5$l$F$$$kJ8;z$OA4$F$?$@$N2hLL$N>~$j$G$"\e(B
-\e$B$j!"\e(Bgnus \e$B$,$=$l$rD4$Y$k$3$H$O$"$j$^$;$s!#\e(BGnus \e$B$OI,MW$H$9$kA4$F$N<B>pJs$r!"\e(B
-\e$B%F%-%9%HB0@-$r;H$C$F21$($F$$$^$9!#\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$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
 
 (\e$B$b$77/$,!"$9$4$/%X%s$J!"AG@2$i$7$$!"I=7W;;Iw$N%l%$%"%&%H$r:n$C$?$H$7$?\e(B
 \e$B$i!"$_$s$J!"7/$O2q7W$N;E;v$,K;$7$/$C$F!"%K%e!<%9$rFI$s$G;~4V$rL5BL;H$$$7\e(B
@@ -2166,8 +2166,8 @@ Gnus \e$B$O\e(B @code{gnus-user-format-function-}@samp{X} \e$B4X?t$r8F$S=P$7$^$9!#$
 \e$B$3$N%3%^%s%I$O5-;v>C5n$HJ]N15-;v$r1#$9=hM}$r9T$$$^$;\e(B
 \e$B$s\e(B (@code{gnus-group-visible-select-group})\e$B!#\e(B
 
-@item M-C-RET
-@kindex M-C-RET (Group)
+@item C-M-RET
+@kindex C-M-RET (Group)
 @findex gnus-group-select-group-ephemerally
 \e$B:G8e$K$3$N%3%^%s%I$O!"8=:_$N%0%k!<%W$r0lEY8B$j!"$=$NFbMF$K0l@Z$N=hM}$r$9\e(B
 \e$B$k$3$H$N$J$$$h$&$KA*Br$7$^\e(B
@@ -2535,6 +2535,17 @@ Gnus \e$B$ODL>o!"\e(B@code{gnus-activate-level} \e$B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 \e$B$F$-$^$9!#$h$j4JC1$K\e(B @sc{nntp} \e$B%0%k!<%W$r9XFI$9$kJ}K!$O!"\e(B
 @pxref{Browse Foreign Server}\e$B!#\e(B
 
+@item G n
+@kindex G n (Group)
+@findex gnus-group-make-shimbun-group
+@cindex making groups
+@cindex nnshimbun
+@cindex Web Newspaper
+\e$B?7$7$$\e(B @code{nnshimbun} \e$B%0%k!<%W$r:n@.$7$^\e(B
+\e$B$9\e(B (@code{gnus-group-make-shimbun-group})\e$B!#\e(Bgnus \e$B$O%W%m%s%W%H$rI=<($7$F!"\e(B
+\e$B%5!<%P!<$N%"%I%l%9$r<($9%7%s%\%kL>$H5-;v%0%k!<%WL>$NF~NO$r5a$a$F$-$^$9!#\e(B
+@code{nnshimbun} \e$B$K4X$9$k>\:Y$O\e(B @pxref{Web Newspaper} \e$B$r;2>H$7$F2<$5$$!#\e(B
+
 @item G r
 @kindex G r (Group)
 @findex gnus-group-rename-group
@@ -3301,8 +3312,8 @@ kill \e$B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#@\
 \e$B$7$P$i$/B8:_$7$F$$$?4|8B@Z$l:o=|2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3$H$G\e(B
 \e$B$9!#\e(B(@pxref{Expiring Mail})\e$B!#\e(B
 
-@item C-c M-C-x
-@kindex C-c M-C-x (Group)
+@item C-c C-M-x
+@kindex C-c C-M-x (Group)
 @findex gnus-group-expire-all-groups
 \e$BA4$F$N%0%k!<%W$NA4$F$N4|8B@Z$l:o=|2DG=$J5-;v$KBP$7$F!"%(%/%9%Q%$%"=hM}$r\e(B
 \e$B9T$$$^$9!#\e(B(@code{gnus-group-expire-all-groups})\e$B!#\e(B
@@ -3905,11 +3916,12 @@ Gnus
 @findex gnus-group-post-news
 \e$B$"$k%0%k!<%W$K5-;v$rEj9F$9$k\e(B (@code{gnus-group-post-news})\e$B!#%W%l%U%#%C%/\e(B
 \e$B%9$rM?$($k$H!"8=:_$N%0%k!<%WL>$,=i4|CM$H$7$F;HMQ$5$l$^$9!#\e(B
+@xref{Composing Messages}\e$B!#\e(B
 
 @item m
 @kindex m (Group)
 @findex gnus-group-mail
-\e$B%a!<%k$r$I$3$+$KAw$k\e(B (@code{gnus-group-mail})\e$B!#\e(B
+\e$B%a!<%k$r$I$3$+$KAw$k\e(B (@code{gnus-group-mail})\e$B!#\e(B@xref{Composing Messages}\e$B!#\e(B
 @end table
 
 \e$B0J2<$O%0%k!<%W%P%C%U%!$N$?$a$NJQ?t$G$9\e(B:
@@ -4157,6 +4169,23 @@ Sieve \e$B$O%5!<%P!<B&$G;H$o$l$k%a!<%k%U%#%k%?!<8@8l$G$9!#\e(Bgnus \e$B$G$O!"3F%0%k
 \e$BCV$+$l$k$N$G!"$3$l$i$N6h@Z$j5-9f$N30$KDI2C$N\e(B Sieve \e$B%3!<%I$r=q$$$F$b!"<!\e(B
 \e$B2s\e(B Sieve \e$B%9%/%j%W%H$r:F:n@.$9$k$H$-$K>C$5$l$F$7$^$&$3$H$O$"$j$^$;$s!#\e(B
 
+@vindex gnus-sieve-crosspost
+\e$BJQ?t\e(B @code{gnus-sieve-crosspost} \e$B$O\e(B Sieve \e$B%9%/%j%W%H$,$I$N$h$&$K:n$i$l$k\e(B
+\e$B$+$r@)8f$7$^$9!#$b$7Hs\e(B-nil (\e$B%G%#%U%)%k%H\e(B) \e$B$@$C$?$i5-;v$O5,B'$K%^%C%A$9$k\e(B
+\e$B$9$Y$F$N%0%k!<%W$KCV$+$l$^$9!#$=$&$G$J$$>l9g!"5-;v$O:G=i$N5,B'$K%^%C%A$9\e(B
+\e$B$k%0%k!<%W$@$1$KCV$+$l$^$9!#Nc$($P%0%k!<%W%Q%i%a!<%?\e(B @samp{(sieve
+address "sender" "owner-ding@@hpc.uh.edu")} \e$B$O!"\e(B
+@code{gnus-sieve-crosspost} \e$B$,\e(B nil \e$B$@$C$?$i0J2<$N\e(B Sieve \e$B%3!<%I$NCGJR$r:n\e(B
+\e$B$j$^$9!#\e(B(@code{gnus-sieve-crosspost} \e$B$,Hs\e(B-nil \e$B$@$C$?>l9g$O!"9T$,4^\e(B
+\e$B$`\e(B @code{stop} \e$B$N8F$S=P$7$,:o=|$5$l$k$3$H0J30$OF1$8$G$9!#\e(B)
+
+@example
+if address "sender" "owner-ding@@hpc.uh.edu" @{
+       fileinto "INBOX.ding";
+       stop;
+@}
+@end example
+
 @xref{Top, ,Top, sieve, Emacs Sieve}.
 
 @table @kbd
@@ -4291,7 +4320,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)
+\e$BF0$-$K$J$k$h$&$K!"?7$?$K=q$1$PNI$$$N$G$9!#\e(B) @xref{Positioning Point}\e$B!#\e(B
 
 \e$B=i4|CM$NJ8;zNs$O\e(B @samp{%U%R%z%I%(%[%4L: %-23,23n%]%) %s\n} \e$B$G$9!#\e(B
 
@@ -5757,19 +5786,22 @@ 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$*
 @kindex / / (\e$B35N,\e(B)
 @findex gnus-summary-limit-to-subject
 \e$B35N,%P%C%U%!$r$$$/$D$+$NI=Bj$H9gCW$9$k$b$N$@$1$K@)8B$7$^\e(B
-\e$B$9\e(B (@code{gnus-summary-limit-to-subject})\e$B!#\e(B
+\e$B$9\e(B (@code{gnus-summary-limit-to-subject})\e$B!#$b$7@\F,<-$,M?$($i$l$l$P!"9g\e(B
+\e$BCW$9$k5-;v$r=|30$7$^$9!#\e(B
 
 @item / a
 @kindex / a (\e$B35N,\e(B)
 @findex gnus-summary-limit-to-author
 \e$B35N,%P%C%U%!$r2??M$+$NCx<T$K9gCW$9$k$b$N$@$1$K@)8B$7$^\e(B
-\e$B$9\e(B (@code{gnus-summary-limit-to-author})\e$B!#\e(B
+\e$B$9\e(B (@code{gnus-summary-limit-to-author})\e$B!#$b$7@\F,<-$,M?$($i$l$l$P!"9gCW\e(B
+\e$B$9$k5-;v$r=|30$7$^$9!#\e(B
 
 @item / x
 @kindex / x (\e$B35N,\e(B)
 @findex gnus-summary-limit-to-extra
 ``\e$BDI2C\e(B'' \e$B$N%X%C%@!<$N0l$D$K9gCW$9$k5-;v$K35N,%P%C%U%!$r@)8B$7$^\e(B
-\e$B$9\e(B (@pxref{To From Newsgroups}) (@code{gnus-summary-limit-to-extra}).
+\e$B$9\e(B (@pxref{To From Newsgroups}) (@code{gnus-summary-limit-to-extra})\e$B!#$b\e(B
+\e$B$7@\F,<-$,M?$($i$l$l$P!"9gCW$9$k5-;v$r=|30$7$^$9!#\e(B
 
 @item / u
 @itemx x
@@ -6251,9 +6283,9 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 
 @table @kbd
 @item T k
-@itemx M-C-k
+@itemx C-M-k
 @kindex T k (\e$B35N,\e(B)
-@kindex M-C-k (\e$B35N,\e(B)
+@kindex C-M-k (\e$B35N,\e(B)
 @findex gnus-summary-kill-thread
 \e$B8=:_$N\e(B (\e$BItJ,\e(B) \e$B%9%l%C%I$K4{FI$N0u$rIU$1$^\e(B
 \e$B$9\e(B (@code{gnus-summary-kill-thread})\e$B!#$b$7@\F,0z?t$,@5$G$"$k$H!"Be$o$j$K\e(B
@@ -6261,9 +6293,9 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 \e$B$9!#\e(B
 
 @item T l
-@itemx M-C-l
+@itemx C-M-l
 @kindex T l (\e$B35N,\e(B)
-@kindex M-C-l (\e$B35N,\e(B)
+@kindex C-M-l (\e$B35N,\e(B)
 @findex gnus-summary-lower-thread
 \e$B8=:_$N\e(B (\e$BItJ,\e(B) \e$B%9%l%C%I$N%9%3%"$r2<$2$^\e(B
 \e$B$9\e(B (@code{gnus-summary-lower-thread})\e$B!#\e(B
@@ -6333,8 +6365,8 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @table @kbd
 @item T n
 @kindex T n (\e$B35N,\e(B)
-@itemx M-C-n
-@kindex M-C-n (Summary)
+@itemx C-M-n
+@kindex C-M-n (Summary)
 @itemx M-down
 @kindex M-down (Summary)
 @findex gnus-summary-next-thread
@@ -6342,8 +6374,8 @@ gnus \e$B$OA4$F$N5-;v$N40A4$J\e(B @code{References} \e$BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 
 @item T p
 @kindex T p (\e$B35N,\e(B)
-@itemx M-C-p
-@kindex M-C-p (Summary)
+@itemx C-M-p
+@kindex C-M-p (Summary)
 @itemx M-up
 @kindex M-up (Summary)
 @findex gnus-summary-prev-thread
@@ -6621,8 +6653,8 @@ gnus \e$B$OJ*;v$r@5$7$/$9$k$?$a$KFs$D$N4X?t$r$*4+$a$7$^$9!#\e(B
 @node Persistent Articles
 @section \e$B1JB35-;v\e(B
 @cindex persistent articles
-\e$B5-;v$N%-%c%C%7%e$H6a$$4X78$K$"$k$b$K!"\e(B@dfn{\e$B1JB35-;v\e(B}\e$B$,$"$j$^$9!#<B:]!"$=\e(B
-\e$B$l$O%-%c%C%7%e$NJL$N8+J}$G!";d$N0U8+$G$O$=$NJ}$,$b$C$HLr$KN)$A$^$9!#\e(B
+\e$B5-;v$N%-%c%C%7%e$H6a$$4X78$K$"$k$b$N$K!"\e(B@dfn{\e$B1JB35-;v\e(B}\e$B$,$"$j$^$9!#<B:]!"\e(B
+\e$B$=$l$O%-%c%C%7%e$NJL$N8+J}$G!";d$N0U8+$G$O$=$NJ}$,$b$C$HLr$KN)$A$^$9!#\e(B
 
 \e$BNc$($P!"%K%e!<%9%0%k!<%W$rFI$s$G$$$F!"$=$N$^$^1J1s$KJ]B8$7$FHkB"$7$?$$!"\e(B
 \e$B$$$/$D$+$N2ACM$"$kJu@P$K=P2q$C$?$H$7$^$7$g$&!#IaDL$O$=$l$r%U%!%$%k$KJ]B8\e(B
@@ -6805,6 +6837,13 @@ Unix \e$B%a!<%k\e(B (mbox) \e$B%U%!%$%k$KJ]B8$7$^$9!#JQ\e(B
 \e$BF~$C$F$$$k4X?t$r!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%kL>$r<hF@$9$k$?$a$K;HMQ$7$^\e(B
 \e$B$9!#%G%#%U%)%k%H$O\e(B @code{gnus-numeric-save-name} \e$B$G$9!#\e(B
 
+@item gnus-summary-write-to-file
+@findex gnus-summary-write-to-file
+\e$B5-;v$r%9%H%l!<%H$KDL>o$N%U%!%$%k$KJ]B8$7$^$9!#$=$N%U%!%$%k$,B8:_$7$F$$$?\e(B
+\e$B$i>e=q$-$5$l$^$9!#JQ?t\e(B @code{gnus-file-save-name} \e$B$KF~$C$F$$$k4X?t$r!"5-\e(B
+\e$B;v$rJ]B8$9$k$?$a$N%U%!%$%kL>$r<hF@$9$k$?$a$K;HMQ$7$^$9!#%G%#%U%)%k%H\e(B
+\e$B$O\e(B @code{gnus-numeric-save-name} \e$B$G$9!#\e(B
+
 @item gnus-summary-save-body-in-file
 @findex gnus-summary-save-body-in-file
 \e$B5-;v$NK\BN$rDL>o$N%U%!%$%k$N8e$KDI2C$7$^$9!#JQ\e(B
@@ -7845,7 +7884,8 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 \e$B$7:,K\E*\e(B X-Face \e$B5!G=$,$J$$$N$G$"$l$P!"\e(Bgnus \e$B$O\e(B @code{pbmplus} \e$B$d$=$NCg4V\e(B
 \e$B$N30It%W%m%0%i%`$r;H$C$F\e(B @code{X-Face} \e$BMs$rJQ49$7$h$&$H;n$_$^$9!#\e(B) \e$B$3$N\e(B
 \e$B4X?t$rI=<(%U%C%/$KF~$l$?$$$N$G$"$l$P!"$*$=$i$/$=$l$O:G8e$K$J$k$Y$-$G$7$g\e(B
-\e$B$&!#\e(B
+\e$B$&!#\e(B(\e$BCm\e(B: \e$BJQ?t\e(B/\e$B4X?tL>$K$O\e(B @code{xface} \e$B$G$O$J$/\e(B @code{x-face} \e$B$,;H$o$l$^\e(B
+\e$B$9!#\e(B)
 
 @item W b
 @kindex W b (\e$B35N,\e(B)
@@ -7871,6 +7911,12 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 \e$B$N\e(B PGP \e$B$N80$O\e(B @uref{ftp://ftp.isc.org/pub/pgpcontrol/README.html} \e$B$+$iF~\e(B
 \e$B<j$9$k$3$H$,$G$-$^$9!#\e(B}
 
+@c @item W s
+@c @kindex W s (Summary)
+@c @findex gnus-summary-force-verify-and-decrypt
+@c Verify a signed (PGP, PGP/MIME or S/MIME) message
+@c (@code{gnus-summary-force-verify-and-decrypt}).
+
 @item W W H
 @kindex W W H (\e$B35N,\e(B)
 @findex gnus-article-strip-headers-from-body
@@ -8585,8 +8631,8 @@ Line Formatting})\e$B!#%G%#%U%)%k%H$O\e(B @samp{Gnus: %%b %S %Z} \e$B$G$9!#;HMQ2DG=
 \e$B%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l:o=|2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3\e(B
 \e$B$H$G$9!#\e(B(@pxref{Expiring Mail})\e$B!#\e(B
 
-@item B M-C-e
-@kindex B M-C-e (\e$B35N,\e(B)
+@item B C-M-e
+@kindex B C-M-e (\e$B35N,\e(B)
 @findex gnus-summary-expire-articles-now
 \e$B%0%k!<%W$N$9$Y$F$N4|8B:o=|2DG=$J5-;v$r:o=|$7$^\e(B
 \e$B$9\e(B (@code{gnus-summay-expire-articles-now})\e$B!#$3$l$O8=:_$N%0%k!<%W$N3:Ev\e(B
@@ -8758,6 +8804,22 @@ Gnus \e$B$,F1$8\e(B @code{Message-ID} \e$B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$
       (append gnus-newsgroup-cached articles)
     articles))
 @end lisp
+
+@vindex gnus-newsgroup-variables
+@item gnus-newsgroup-variables
+\e$B%K%e!<%9%0%k!<%W\e(B (\e$B$=$N35N,%P%C%U%!$N\e(B) \e$B$N%m!<%+%kJQ?t!"$^$?$OJQ?t$H$=$l$i\e(B
+\e$B$N%G%#%U%)%k%HCM\e(B (\e$B%G%#%U%)%k%HCM$,\e(B nil \e$B$G$J$$>l9g\e(B) \e$B$N\e(B cons \e$B%;%k$N%j%9%H\e(B
+\e$B$G!"$=$N35N,%P%C%U%!$,3h$-$F$$$k4V$O%0%m!<%P%kJQ?t$K$J$j$^$9!#$3$l$i$NJQ\e(B
+\e$B?t$O!"JL$N%P%C%U%!$G$=$l$i\e(B (\e$B%0%k!<%W%Q%i%a!<%?\e(B) \e$B$N8z2L$,JQ99$5$l$F$$$F$b!"\e(B
+(\e$B$=$N%0%k!<%W$N\e(B) \e$B%0%k!<%W%Q%i%a!<%?$NJQ?t$r@_Dj$9$k$?$a$K;H$&$3$H$,$G$-\e(B
+\e$B$^$9!#Nc$G$9\e(B:
+
+@lisp
+(setq gnus-newsgroup-variables
+      '(message-use-followup-to
+        (gnus-visible-headers
+         . "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:")))
+@end lisp
 @end table
 
 @node Summary Group Information
@@ -8862,8 +8924,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$N%a%C%;!<%8$N=89g$G$"$C$?$H$-$O!"\e(B@kbd{C-d} \e$B$H$9$k$3$H$K$h$j$b$C$HJXMx$J\e(B
 \e$BJ}K!$G$=$l$i$N%a%C%;!<%8$rFI$`;v$,$G$-$k$h$&$K$J$j$^$9!#\e(B
 
-@item M-C-d
-@kindex M-C-d (\e$B35N,\e(B)
+@item C-M-d
+@kindex C-M-d (\e$B35N,\e(B)
 @findex gnus-summary-read-document
 \e$B$3$NL?Na$O>e$N$b$N$KHs>o$K;w$F$$$^$9$,!"$$$/$D$+$NJ8=q$r0l$D$NBg!<$-$$%0\e(B
 \e$B%k!<%W$K=8$a$^$9\e(B (@code{gnus-summary-read-read-document})\e$B!#$=$l$O$$$/$D\e(B
@@ -8886,14 +8948,14 @@ 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$9\e(B (@code{gnus-summary-expand-window})\e$B!#@\F,0z?t$rM?$($i$l$l$P!"\e(B
 @code{\e$B5-;v\e(B} \e$B%&%#%s%I%&$r3HBg$7$^$9!#\e(B
 
-@item M-C-e
-@kindex M-C-e (\e$B35N,\e(B)
+@item C-M-e
+@kindex C-M-e (\e$B35N,\e(B)
 @findex gnus-summary-edit-parameters
 \e$B8=:_$N%0%k!<%W$N%0%k!<%W$NG^2pJQ?t\e(B (parameter) (@pxref{Group
 Parameters}) \e$B$rJT=8$7$^$9\e(B (@code{gnus-summary-edit-parameters})\e$B!#\e(B
 
-@item M-C-a
-@kindex M-C-a (\e$B35N,\e(B)
+@item C-M-a
+@kindex C-M-a (\e$B35N,\e(B)
 @findex gnus-summary-customize-parameters
 \e$B8=:_$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?\e(B (@pxref{Group Parameters}) \e$B$r%+%9%?%^\e(B
 \e$B%$%:$7$^$9\e(B (@code{gnus-summary-customize-parameters})\e$B!#\e(B
@@ -9151,8 +9213,9 @@ Gnus \e$B$K$$$D$G$b@5$7$$\e(B @code{Xref} \e$B$r<hF@$9$k$h$&$K$5$;$?$$$N$G$"$l$P!"\e
 @section Security
 
 Gnus is able to verify signed messages or decrypt encrypted messages.
-The formats that are supported are PGP and S/MIME, however you need
-some external programs to get things to work:
+The formats that are supported are PGP (plain text, RFC 1991 format),
+PGP/MIME (RFC 2015/3156) and S/MIME, however you need some external
+programs to get things to work:
 
 @enumerate
 @item
@@ -10167,6 +10230,7 @@ To use this correctly with GPG, you'll need the following lisp code in your
 @lisp
 (require 'gpg)
 (setq mml2015-use 'gpg)
+(setq mml1991-use 'gpg)
 (setq gpg-temp-directory (expand-file-name "~/.gnupg/tmp"))
 @end lisp
 
@@ -10190,7 +10254,7 @@ your @file{~/.emacs} or @file{~/.gnus}:
 
 To sign or encrypt your message you may choose to use the MML Security
 menu or @kbd{C-c C-m s p} to sign your message using PGP/MIME,
-@kbd{C-c C-m s s} to sign your message using S/MIME. There's also
+@kbd{C-c C-m s s} to sign your message using S/MIME.  There's also
 @kbd{C-c C-m c p} to encrypt your message with PGP/MIME and @kbd{C-c
 C-m c s} to encrypt using S/MIME. @xref{Security, ,Security, message,
 The Message Manual}.
@@ -12385,6 +12449,27 @@ Gnus \e$B$O5-;v$,$I$N%0%k!<%W$KB0$7$F$$$k$+$K4p$E$$$F!"$=$l$,$I$N$/$i$$@8B8\e(B
 (setq nnmail-expiry-target "nnml:expired")
 @end lisp
 
+@findex nnmail-fancy-expiry-target
+@vindex nnmail-fancy-expiry-targets
+gnus \e$B$K$OJQ?t\e(B @code{nnmail-fancy-expiry-targets} \e$B$K=>$C$F%a!<%k$r4|8B@Z\e(B
+\e$B$l>C5n$9$k$?$a$N4X?t\e(B @code{nnmail-fancy-expiry-target} \e$B$,$"$j$^$9!#$3$l\e(B
+\e$B$ONc$G$9\e(B:
+
+@lisp
+ (setq nnmail-expiry-target 'nnmail-fancy-expiry-target
+       nnmail-fancy-expiry-targets
+       '((to-from "boss" "nnfolder:Work")
+         ("subject" "IMPORTANT" "nnfolder:IMPORTANT.%Y.%b")
+         ("from" ".*" "nnfolder:Archive-%Y")))
+@end lisp
+
+\e$B$3$N@_Dj$K$h$C$F!"BjL>$K\e(B @code{IMPORTANT} \e$B$r;}$A!"\e(B
+@code{YYYY} \e$BG/\e(B @code{MMM} \e$B7n$KH/?.$5$l$?$$$+$J$k%a!<%k$b!"%0%k!<\e(B
+\e$B%W\e(B @code{nnfolder:IMPORTANT.YYYY.MMM} \e$B$K4|8B@Z$l>C5n\e(B (\e$BLuCm\e(B: \e$B<B:]$NF0:n$O\e(B
+\e$BJ]B8\e(B) \e$B$5$l$^$9!#$b$7\e(B From \e$B$^$?$O\e(B To \e$B%X%C%@!<$,J8;zNs\e(B @code{boss} \e$B$r4^$s\e(B
+\e$B$G$$$?$i\e(B @code{nnfolder:Work} \e$B$K4|8B@Z$l>C5n$5$l$^$9!#$=$l0J30$N$9$Y$F$N\e(B
+\e$B%a!<%k$O\e(B @code{nnfolder:Archive-YYYY} \e$B$K4|8B@Z$l>C5n$5$l$^$9!#\e(B
+
 @vindex nnmail-keep-last-article
 @code{nnmail-keep-last-article} \e$B$,\e(B @code{nil} \e$B$G$J$$$H!"\e(Bgnus \e$B$O%a!<%k%K%e!<\e(B
 \e$B%9%0%k!<%W$N:G8e$N5-;v$r7h$7$F4|8B@Z$l>C5n$7$^$;$s!#$3$l$O\e(B procmail \e$B$NMx\e(B
@@ -13334,16 +13419,16 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
   @uref{http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/}
 @end example
 
-@code{nnshimbun} \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:
-
-@example
-  @kbd{M-x gnus-group-make-shimbun-group RET asahi RET a_group RET}
-@end example
-
-\e$B>e$N\e(B @samp{a_group} \e$B$O1\Mw$7$?$$5-;v%0%k!<%W$KCV$-49$($F$/$@$5$$!#\e(B
-\e$B$^$?$O\e(B @kbd{B nnshimbun RET asahi RET} \e$B$G%P%C%/%(%s%I$r%V%i%&%:$7$F2<$5\e(B
-\e$B$$!#2C$($F!"\e(B@sc{html} \e$B$N%I%-%e%a%s%H$r%$%s%i%$%sI=<($5$;$?$$>l9g$O!"\e(B
+@findex gnus-group-make-shimbun-group
+@kindex G n (Group)
+@code{nnshimbun} \e$B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O%0%k!<%W%P%C%U%!$NE,Ev$J\e(B
+\e$B>l=j$G\e(B @kbd{G n asahi RET national RET} \e$B$J$I$H%?%$%W$9$k$3$H$G$9!#\e(B
+@samp{asahi} \e$B$O@\B3$7$?$$%5!<%P!<$N%"%I%l%9$r<($9%7%s%\%k$K!"\e(B
+@samp{national} \e$B$O1\Mw$7$?$$5-;v%0%k!<%W$K$=$l$>$lCV$-49$($F$/$@$5$$!#N>\e(B
+\e$BJ}$H$bL>A0$NJd40$,$G$-$^$9!#\e(B
+@c \e$B$^$?$O\e(B @kbd{B nnshimbun RET asahi RET} \e$B$G%P%C%/%(%s%I$r%V%i%&%:$9$k$3$H\e(B
+@c \e$B$K$h$C$F$b5-;v$rFI$`$3$H$,$G$-$^$9!#\e(B
+\e$B2C$($F!"\e(B@sc{html} \e$B$N%I%-%e%a%s%H$r%$%s%i%$%sI=<($5$;$?$$>l9g$O!"\e(B
 @file{~/.gnus} \e$B%U%!%$%k$K0J2<$N@_Dj$r$7$F2<$5$$!#\e(B
 
 @lisp
@@ -17534,6 +17619,9 @@ bbbd \e$B%5!<%P!<$,<B9T$5$l$F$$$k%[%9%H$N%]!<%H$G$9!#=i4|CM$O\e(B 9000 \e$B$G$9!#\e(
 @node Advanced Scoring Examples
 @subsection \e$B>e5i%9%3%"IU$1$NNc\e(B
 
+\e$B0J2<$NNc$O%9%3%"%U%!%$%k$N5,B'$G$"$k$3$H$K$4Cm0U2<$5$$!#40`z$J%9%3%"%U%!\e(B
+\e$B%$%k$r:n$k$K$O!"JL$N3g8L$NAH$G$=$l$i$r0O$s$G2<$5$$!#\e(B
+
 Lars \e$B$,\e(B Gnus \e$B$K4X$7$FOC$r$7$F$$$k$H$-$KH`$K$h$C$F=q$+$l$?5-;v$N%9%3%"$r\e(B
 \e$BA}$d$7$?$$$H$7$^$7$g$&\e(B:
 
@@ -17817,8 +17905,8 @@ 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$B?t\e(B---@dfn{\e$B%7%s%\%k@\F,0z?t\e(B} \e$B$r2C$($^$7$?!#@\F,%-!<\e(B
 \e$B$O\e(B @kbd{M-i} (@code{gnus-symbolic-argument}) \e$B$G!"<!$K2!$5$l$kJ8;z$,CM$G\e(B
 \e$B$9!#K>$`$@$1B?$/$N\e(B @kbd{M-i} \e$B@\F,8l$r@Q$_=E$M$k;v$,$G$-$^$9!#\e(B
-@kbd{M-i a M-C-u} \e$B$O\e(B ``\e$BL?Na\e(B @kbd{M-C-u} \e$B$K%7%s%\%k@\F,0z?t\e(B @code{a} \e$B$rM?\e(B
-\e$B$($k\e(B'' \e$B$H$$$&$3$H$G$9!#\e(B@kbd{M-i a M-i b M-C-u} \e$B$OL?Na\e(B @kbd{M-C-u} \e$B$K%7%s\e(B
+@kbd{M-i a C-M-u} \e$B$O\e(B ``\e$BL?Na\e(B @kbd{C-M-u} \e$B$K%7%s%\%k@\F,0z?t\e(B @code{a} \e$B$rM?\e(B
+\e$B$($k\e(B'' \e$B$H$$$&$3$H$G$9!#\e(B@kbd{M-i a M-i b C-M-u} \e$B$OL?Na\e(B @kbd{C-M-u} \e$B$K%7%s\e(B
 \e$B%\%k@\F,0z?t\e(B @code{a} @code{b} \e$B$rM?$($k\e(B'' \e$B$H$$$&;v$G$9!#<q;]$OJ,$+$C$?$G\e(B
 \e$B$7$g$&!#\e(B
 
@@ -18841,7 +18929,7 @@ Gnus \e$B$O!"MxMQ<T$,2?$r$9$k$+$r21$($F$*$-!"$=$NMxMQ<T$NF0:n$N5U$r9T$J$&F0\e(B
 @findex gnus-undo
 \e$B$d$jD>$75!G=$O\e(B @code{gnus-undo-mode} \e$B%^%$%J!<%b!<%I$K$h$C$FDs6!$5$l$^$9!#\e(B
 \e$B$3$l$O\e(B @code{gnus-use-undo} \e$B$,\e(B @code{nil} \e$B0J30$G$"$l$P;HMQ$5$l!"$3$l$,=i\e(B
-\e$B4|@_Dj$G$9!#\e(B@kbd{M-C-_} \e$B%-!<$,\e(B @code{gnus-undo} \e$BL?Na$r<B9T$7$^$9!#$3$l$O\e(B
+\e$B4|@_Dj$G$9!#\e(B@kbd{C-M-_} \e$B%-!<$,\e(B @code{gnus-undo} \e$BL?Na$r<B9T$7$^$9!#$3$l$O\e(B
 \e$BDL>o$N\e(B Emacs \e$B$N\e(B @code{undo} \e$BL?Na$K$A$g$C$H$@$1;w$F$$$k$H;W$o$l$k$G$7$g$&!#\e(B
 
 @node Moderation
@@ -18973,6 +19061,7 @@ Gnus \e$B$K\e(B picon \e$B$rI=<($5$;$k$K$O\e(B @code{x} \e$B%5%]!<%HIU$-$G\e(B XEmacs
 \e$B%]!<%HIU$-$G%3%s%Q%$%k$7$J$1$l$P$J$j$^$;$s!#$=$&$G$J$1$l$P!"\e(B
 @code{netpbm} \e$B%f!<%F%#%j%F%#$r%$%s%9%H!<%k$7$F$*$/$+!"$"$k$$$OB>$N2?$+$r\e(B
 \e$B;H$&$h$&$K\e(B @code{gnus-picons-convert-x-face} \e$BJQ?t$r$$$8$/$C$F$/$@$5$$!#\e(B
+(\e$BCm\e(B: \e$BJQ?t\e(B/\e$B4X?tL>$K$O\e(B @code{xface} \e$B$G$O$J$/\e(B @code{x-face} \e$B$,;H$o$l$^$9!#\e(B)
 
 @node Easy Picons
 @subsubsection \e$B3Z!9\e(B Picons
@@ -19057,8 +19146,9 @@ picon \e$B2hA|$,I=<($5$l$k>l=j!#$3$l$O=i4|@_Dj$G$O\e(B @code{picons} \e$B$G$9\e(B (\e
 \e$B%U%!$KI=<($7$^$9!#\e(B
 
 @item gnus-picons-article-display-x-face
-@findex gnus-article-display-picons
-X-Face \e$B%X%C%@!<$,$"$l$P$=$l$rI|9f2=$7I=<($7$^$9!#\e(B
+@findex gnus-picons-article-display-x-face
+X-Face \e$B%X%C%@!<$,$"$l$P$=$l$rI|9f2=$7I=<($7$^$9!#\e(B(\e$BCm\e(B: \e$BJQ?t\e(B/\e$B4X?tL>$K\e(B
+\e$B$O\e(B @code{xface} \e$B$G$O$J$/\e(B @code{x-face} \e$B$,;H$o$l$^$9!#\e(B)
 @end table
 
 @node Picon Useless Configuration
@@ -19096,12 +19186,14 @@ X-Face \e$B%X%C%@!<$,$"$l$P$=$l$rI|9f2=$7I=<($7$^$9!#\e(B
 @code{X-Face} \e$B%X%C%@!<$r\e(B X \e$B%S%C%H%^%C%W\e(B (@code{xbm}) \e$B$KJQ49$9$k$N$K;HMQ\e(B
 \e$B$5$l$^$9!#=i4|@_DjCM\e(B
 \e$B$O\e(B @code{(format "@{ echo '/* Width=48, Height=48 */'; uncompface; @} | icontopbm | pbmtoxbm > %s" gnus-picons-x-face-file-name)} \e$B$G\e(B
-\e$B$9!#\e(B
+\e$B$9!#\e(B(\e$BCm\e(B: \e$BJQ?t\e(B/\e$B4X?tL>$K$O\e(B @code{xface} \e$B$G$O$J$/\e(B @code{x-face} \e$B$,;H$o$l$^\e(B
+\e$B$9!#\e(B)
 
 @item gnus-picons-x-face-file-name
 @vindex gnus-picons-x-face-file-name
 @code{X-Face} \e$B%S%C%H%^%C%W$r3JG<$7$F$*$/0l;~%U%!%$%k$NL>A0!#=i4|@_DjCM\e(B
-\e$B$O\e(B @code{(format "/tmp/picon-xface.%s.xbm" (user-login-name))}\e$B!#\e(B
+\e$B$O\e(B @code{(format "/tmp/picon-xface.%s.xbm" (user-login-name))}\e$B!#\e(B(\e$BCm\e(B: \e$BJQ\e(B
+\e$B?t\e(B/\e$B4X?tL>$K$O\e(B @code{xface} \e$B$G$O$J$/\e(B @code{x-face} \e$B$,;H$o$l$^$9!#\e(B)
 
 @item gnus-picons-has-modeline-p
 @vindex gnus-picons-has-modeline-p
@@ -20628,7 +20720,7 @@ Signature})\e$B!#\e(B
 \e$B;XDj$9$kJ}K!$,$"$j$^$9\e(B (@pxref{Advanced Formatting})\e$B!#\e(B
 
 @item
-\e$B%0%k!<%W%P%C%U%!$G$N$$$/$D$+$NL?Na$O\e(B @kbd{M-C-_} \e$B$G85$KLa$9;v$,$G$-$k$h\e(B
+\e$B%0%k!<%W%P%C%U%!$G$N$$$/$D$+$NL?Na$O\e(B @kbd{C-M-_} \e$B$G85$KLa$9;v$,$G$-$k$h\e(B
 \e$B$&$K$J$j$^$7$?\e(B (@pxref{Undo})\e$B!#\e(B
 
 @item
@@ -20660,7 +20752,7 @@ Signature})\e$B!#\e(B
 
 @item
 \e$BJ8=q$N=89g$rFI$`$?$a$N?7$7$$L?Na\e(B (@code{nndoc} \e$B$H\e(B @code{nnvirtual} \e$B$N>e\e(B
-\e$B$G\e(B) \e$B$,2C$($i$l$^$7$?\e(B---@kbd{M-C-d} (@pxref{Really Various Summary
+\e$B$G\e(B) \e$B$,2C$($i$l$^$7$?\e(B---@kbd{C-M-d} (@pxref{Really Various Summary
 Commands})\e$B!#\e(B
 
 @item
@@ -22759,7 +22851,7 @@ description   = <string>
 
 \e$B?.$8$k$+$I$&$+$OCN$j$^$;$s$,!"\e(Bgnus \e$B$r;H$&?M$NCf$K$O\e(B Gnus Love Boat \e$B$G$N\e(B
 \e$BN9$KEk>h$9$kA0$K$"$^$j\e(B Emacs \e$B$r;H$C$?;v$,L5$$$H$$$&?M$,$$$^$9!#$b$7$"$J\e(B
-\e$B$?$,\e(B ``@kbd{M-C-a}'' \e$B$d\e(B ``\e$B%j!<%8%g%s$r@Z$k\e(B''\e$B!"$=$7\e(B
+\e$B$?$,\e(B ``@kbd{C-M-a}'' \e$B$d\e(B ``\e$B%j!<%8%g%s$r@Z$k\e(B''\e$B!"$=$7\e(B
 \e$B$F\e(B ``@code{gnus-flargblossen} \e$B$rO"A[%j%9%H$K@_Dj$7$F$/$@$5$$!#$=$N%-!<$O\e(B
 \e$B%0%k!<%WL>$K9gCW$9$k$?$a$K;H$o$l$k@55,I=8=$G$9\e(B'' \e$B$,>/$7$N0UL#$+A4$/0UL#\e(B
 \e$B$NL5$$KbK!$N8@MU$G$"$kIT9,$J?M$G$"$l$P!"$3$NIUO?$O$"$J$?$N$?$a$K$"$j$^$9!#\e(B
@@ -22796,11 +22888,11 @@ A: \e$BC<Kv$,%Z%@%k$r;}$C$F$$$?$i$J$!$H4j$&?M$N;v$G$9!#\e(B
 \e$B$O%-!<%\!<%I$N:8<jB&$K0LCV$7$F$$$F!"IaDL$O:G2<CJ$K$"$j$^$9!#\e(B
 
 \e$B$3$l$+$i!"2f!9\e(B Emacs \e$B$N?M!9$O!"$=$l$,$"$^$j$KITJX$J$?$a!"\e(B
-``meta-control-m \e$B%-!<$r2!$9\e(B'' \e$B$H$O8@$$$^$;$s!#;d$?$A$O\e(B ``@kbd{M-C-m} \e$B$r\e(B
+``meta-control-m \e$B%-!<$r2!$9\e(B'' \e$B$H$O8@$$$^$;$s!#;d$?$A$O\e(B ``@kbd{C-M-m} \e$B$r\e(B
 \e$B2!$9\e(B'' \e$B$H8@$$$^$9!#\e(B@kbd{M-} \e$B$O\e(B ``\e$B%a%?\e(B'' \e$B$r8=$9@\F,<-$G!"\e(B``C-'' \e$B$O\e(B ``\e$B%3%s\e(B
 \e$B%H%m!<%k\e(B'' \e$B$r0UL#$9$k@\F,<-$G$9!#$G$9$+$i!"\e(B``@kbd{C-k} \e$B$r2!$9\e(B'' \e$B$O\e(B ``\e$B%3\e(B
 \e$B%s%H%m!<%k%-!<$r2<$K2!$7!"\e(B@kbd{k} \e$B$r2!$7$F$$$k4V!"$=$l$r2<$KJ]$A$J$5\e(B
-\e$B$$\e(B'' \e$B$H8@$&;v$G$9!#\e(B``@kbd{M-C-k} \e$B$r2!$9\e(B'' \e$B$O\e(B ``\e$B%a%?%-!<$H%3%s%H%m!<%k%-!<\e(B
+\e$B$$\e(B'' \e$B$H8@$&;v$G$9!#\e(B``@kbd{C-M-k} \e$B$r2!$9\e(B'' \e$B$O\e(B ``\e$B%a%?%-!<$H%3%s%H%m!<%k%-!<\e(B
 \e$B$r2!$7$F2<$KJ]$C$?8e$G\e(B @kbd{k} \e$B$r2!$9\e(B'' \e$B$H8@$&;v$G$9!#4JC1$G$7$g!#$M\e(B?
 
 \e$B$3$l$OA4$F$N%-!<%\!<%I$,%a%?%-!<$r;}$C$F$$$k$o$1$G$O$J$$$H8@$&;v<B$K$h$j\e(B