Synch with Oort Gnus.
[elisp/gnus.git-] / texi / gnus-ja.texi
index c536b12..eb3a467 100644 (file)
 \usepackage{pixidx}
 \input{gnusconfig.tex}
 
+\ifx\pdfoutput\undefined
+\else
+\usepackage[pdftex,bookmarks]{hyperref}
+\pdfcompresslevel=9
+\fi
+
 \makeindex
 \begin{document}
 
 \newcommand{\gnusbackslash}{/}
 
 \newcommand{\gnusref}[1]{``#1'' on page \pageref{#1}}
+\ifx\pdfoutput\undefined
 \newcommand{\gnusuref}[1]{\gnustt{#1}}
+\else
+\newcommand{\gnusuref}[1]{\href{#1}{\gnustt{#1}}}
+\fi
 \newcommand{\gnusxref}[1]{See ``#1'' on page \pageref{#1}}
 \newcommand{\gnuspxref}[1]{see ``#1'' on page \pageref{#1}}
 
@@ -555,6 +565,7 @@ Misc Group Stuff
 * Group Timestamp::             Gnus \e$B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-\e(B
                                 \e$BO?$5$;$k\e(B
 * File Commands::               Gnus \e$B$N%U%!%$%k$NFI$_=q$-\e(B
+* Sieve Commands::              Sieve \e$B%9%/%j%W%H$N4IM}\e(B
 
 Summary Buffer
 
@@ -1108,7 +1119,9 @@ Emacs for Heathens
 \e$B$N$h$&$K$G$-$^$9!#\e(B
 
 \e$B%m!<%+%k$N%9%W!<%k$r;H$($k$N$G$"$l$P!"$+$J$j$N3NN($G$=$NJ}$,$:$C$HB.$$$G\e(B
-\e$B$7$g$&$7!"$=$l$r;H$&$Y$-$G$7$g$&!#\e(B
+\e$B$7$g$&$7!"$=$l$r;H$&$Y$-$G$7$g$&!#$G$b!"$b$7$"$J$?$N%5!<%P!<\e(B
+\e$B$,\e(B Leafnode \e$B$G$"$k$J$i$P%m!<%+%k%9%W!<%k$r;H$C$F$O$$$1$^$;$s!#$3$N>l9g\e(B
+\e$B$O\e(B @code{(nntp "localhost")} \e$B$K$7$^$7$g$&!#\e(B
 
 @vindex gnus-nntpserver-file
 @cindex NNTPSERVER
@@ -1826,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
@@ -2153,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
@@ -2522,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
@@ -2608,10 +2632,12 @@ 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%U%!%$%k$J$I$r$b$H$K%0%k!<%W$r:n@.$7$^\e(B
 \e$B$9\e(B (@code{gnus-group-make-doc-group})\e$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($?>l9g!"\e(B
 \e$B%U%!%$%kL>$H%U%!%$%k%?%$%W$r%W%m%s%W%H$GF~NO$7$^$9!#8=:_%5%]!<%H$5$l$F$$\e(B
-\e$B$k%U%!%$%k%?%$%W$O!"\e(B
-@code{babyl}, @code{mbox}, @code{digest}, @code{mmdf}, @code{news}, @code{rnews}, @code{clari-briefs}, @code{rfc934}, @code{rfc822-forward}, @code{nsmail}, @code{forward} \e$B$G\e(B
-\e$B$9!#@\F,<-$J$7$G$3$N%3%^%s%I$r<B9T$9$k$H!"\e(Bgnus \e$B$O%U%!%$%k%?%$%W$r?dB,$7\e(B
-\e$B$^$9!#\e(B
+\e$B$k%U%!%$%k%?%$%W$O\e(B @code{mbox}, @code{babyl}, @code{digest}, @code{news},
+@code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
+@code{rfc822-forward}, @code{mime-parts}, @code{standard-digest},
+@code{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook},
+@code{oe-dbx} \e$B$*$h$S\e(B @code{mailman} \e$B$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
 
 @item G u
@@ -2835,6 +2861,10 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 @item all
 \e$BL$FI!"4{FI5-;v$NN>J}$rA4$FI=<($7$^$9!#\e(B
 
+@item an integer
+\e$B$=$N%0%k!<%W$N:G8e$N@0?t8D$N5-;v$rI=<($7$^$9!#$3$l$O\e(B C-u \e$B@0?t\e(B \e$B$G$=$N%0%k!<\e(B
+\e$B%W$KF~$k$N$HF1$8$G$9!#\e(B
+
 @item default
 \e$B=i4|@_Dj$G$NI=<(5-;v$rI=<($7$^$9!#$3$l$ODL>o$OL$FI5-;v$H0uIU$-5-;v$G$9!#\e(B
 
@@ -2918,6 +2948,27 @@ See also @code{gnus-group-ignored-charsets-alist}.
 \e$B=|\e(B) \e$B$dO"A[%j%9%H\e(B @code{gnus-article-banner-alist} \e$B$N3FMWAG$r;H$&$3$H$b$G\e(B
 \e$B$-$^$9!#\e(B
 
+@item sieve
+@cindex sieve
+\e$B$3$N%Q%i%a!<%?$O!"F~$C$F$-$?%a!<%k$,$3$N%0%k!<%W$KCV$/$KCM$9$k$+$I$&$+$r\e(B
+\e$BD4$Y$k\e(B Sieve (\e$B$U$k$$\e(B) \e$B%F%9%H$r;}$A$^$9!#$3$N%0%k!<%W%Q%i%a!<%?$r85\e(B
+\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:
+
+@example
+  if address \"sender\" \"sieve-admin@@extundo.com\" @{
+          fileinto \"INBOX.list.sieve\";
+  @}
+@end example
+
+Sieve \e$B8@8l$O\e(B RFC 3028 \e$B$G=R$Y$i$l$F$$$^$9!#\e(B@xref{Top, , Top, sieve, Emacs
+Sieve}\e$B!#\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
 \e$B%?$r;HMQ$9$k$3$H$,$G$-$^$9!#\e(B@samp{news.answers} \e$B$K$*$$$F%9%l%C%II=<($r9T\e(B
@@ -3261,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
@@ -3721,6 +3772,12 @@ Gnus \e$B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^\e(B
 @findex gnus-topic-sort-groups-by-method
 \e$B8=:_$N%H%T%C%/$r%P%C%/%(%s%I$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^\e(B
 \e$B$9\e(B (@code{gnus-topic-sort-groups-by-method})\e$B!#\e(B
+
+@item T S e
+@kindex T S e (Topic)
+@findex gnus-topic-sort-groups-by-server
+\e$B8=:_$N%H%T%C%/$r%5!<%P!<$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^\e(B
+\e$B$9\e(B (@code{gnus-topic-sort-groups-by-server})\e$B!#\e(B
 @end table
 
 \e$B%0%k!<%W$N%=!<%H$K$D$$$F$N$5$i$J$k>pJs$O\e(B @xref{Sorting Groups} \e$B$r;2>H$7\e(B
@@ -3844,6 +3901,7 @@ Gnus
 * Group Timestamp::             Gnus \e$B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-\e(B
                                 \e$BO?$5$;$k\e(B
 * File Commands::               Gnus \e$B$N%U%!%$%k$NFI$_=q$-\e(B
+* Sieve Commands::              Sieve \e$B%9%/%j%W%H$N4IM}\e(B
 @end menu
 
 @table @kbd
@@ -3858,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:
@@ -3899,9 +3958,11 @@ Gnus
 @end lisp
 
 @item gnus-group-name-charset-group-alist
+@cindex UTF-8 group names
 @vindex gnus-group-name-charset-group-alist
 \e$B%0%k!<%WL>MQ$N%0%k!<%WL>$N@55,I=8=$HJ8;z=89g$NO"A[%j%9%H$G$9!#$3$l$O1Q;z\e(B
-\e$B$G$O$J$$%0%k!<%WL>$rI=<($9$k$?$a$K;H$$$^$9!#\e(B
+\e$B$G$O$J$$%0%k!<%WL>$rI=<($9$k$?$a$K;H$$$^$9!#%G%#%U%)%k%HCM$O!"\e(BUTF-8 \e$B$,%5\e(B
+\e$B%]!<%H$5$l$F$$$k>l9g$O\e(B @code{((".*" utf-8))}\e$B!"$=$l0J30$N>l9g$O\e(B nil \e$B$G$9!#\e(B
 
 \e$BNc\e(B:
 @lisp
@@ -4089,6 +4150,63 @@ Gnus \e$B$K!"$"$J$?$,:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k$HJXMx$+$b$7$l\e(B
 @c (@code{gnus-group-clear-dribble})\e$B!#\e(B
 @end table
 
+@node Sieve Commands
+@subsection Sieve \e$B%3%^%s%I\e(B
+@cindex group sieve commands
+
+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(B
+\e$B%W$KE,MQ$5$l$k\e(B sieve \e$B$N5,B'$r;XDj$9$k!"\e(B@code{sieve} \e$B%0%k!<%W%Q%i%a!<\e(B
+\e$B%?\e(B (@pxref{Group Parameters}) \e$B$r;H$&$3$H$,$G$-$^$9!#\e(Bguns \e$B$O$=$l$i$9$Y$F\e(B
+\e$B$N%0%k!<%W%Q%i%a!<%?$r!"%5!<%P!<$G;H$&$3$H$b2DG=$J@5$7$$\e(B Sieve \e$B%9%/%j%W\e(B
+\e$B%H$KK]Lu$9$k!"Fs$D$N%3%^%s%I$rDs6!$7$^$9!#\e(B
+
+@vindex gnus-sieve-file
+@vindex gnus-sieve-region-start
+@vindex gnus-sieve-region-end
+\e$B:n@.$5$l$?\e(B Sieve \e$B%9%/%j%W%H$O\e(B @code{gnus-sieve-file} (\e$B%G%#%U%)%k%H\e(B
+\e$B$O\e(B @file{~/.sieve}) \e$B$KCV$+$l$^$9!#\e(Bgnus \e$B$,:n$k%3!<%I$OFs$D$N6h@Z$j5-\e(B
+\e$B9f\e(B @code{gnus-sieve-region-start} \e$B$H\e(B @code{gnus-sieve-region-end} \e$B$N4V$K\e(B
+\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
+@item D g
+@kindex D g (Group)
+@findex gnus-sieve-generate
+@vindex gnus-sieve-file
+@cindex generating sieve script
+@code{sieve} \e$B%0%k!<%W%Q%i%a!<%?$+$i\e(B Sieve \e$B%9%/%j%W%H$r:F:n@.$7$F!"\e(B
+@code{gnus-sieve-file} \e$B$K=q$-9~$_$^$9!#0JA0$NFbMF$OJ]B8$5$l$^$;$s!#\e(B
+
+@item D u
+@kindex D u (Group)
+@findex gnus-sieve-update
+@vindex gnus-sieve-file
+@cindex updating sieve script
+@code{sieve} \e$B%0%k!<%W%Q%i%a!<%?$r85$K\e(B @code{gnus-sieve-file} \e$B$N\e(B gnus \e$B$,\e(B
+\e$B4IM}$7$F$$$kItJ,$r:F:n@.$7$F%U%!%$%k$K%;!<%V$7!"\e(B@code{sieveshell} \e$B%W%m%0\e(B
+\e$B%i%`$r;H$C$F%5!<%P!<$K%"%C%W%m!<%I$7$^$9!#\e(B
+@end table
+
 @node Summary Buffer
 @chapter \e$B35N,%P%C%U%!\e(B
 @cindex summary buffer
@@ -4202,11 +4320,11 @@ 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
 
-\e$B0J2<$NMM<0;X<(J8;z$r;H$&$3$H$,$G$-$^$9\e(B:
+\e$B0J2<$NMM<0;X<(J8;z$H3HD%MM<0;X<($r;H$&$3$H$,$G$-$^$9\e(B:
 
 @table @samp
 @item N
@@ -4294,6 +4412,9 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$B9T?t!#\e(B
 @item O
 \e$B%@%&%s%m!<%I$N0u!#\e(B
+@item &user-date;
+\e$B7P2a;~4V$NMM<0!#$$$m$$$m$JMM<0$,\e(B @code{gnus-user-date-format-alist} \e$B$GDj\e(B
+\e$B5A$5$l$F$$$^$9!#\e(B
 @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
@@ -4303,6 +4424,10 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$B$5$l$^$9!#\e(B
 @end table
 
+@samp{%(} \e$B$H\e(B @samp{%)} \e$B$N4V$K$"$k%F%-%9%H$O!"$=$3$K%^%&%9$,$"$k$H$-\e(B
+\e$B$K\e(B @code{gnus-mouse-face} \e$B$G%O%$%i%$%H$5$l$^$9!#$=$&$$$&NN0h$O0l$D$@$1$G\e(B
+\e$B$9!#\e(B
+
 @samp{%U} (\e$B>uBV\e(B), @samp{%R} (\e$BJVEz:Q$_\e(B), @samp{%z} (zcore) \e$B$N07$$$K$O5$$r\e(B
 \e$BIU$1$kI,MW$,$"$j$^$9!#8zN($N$?$a$K!"\e(Bgnus \e$B$O$3$l$i$NJ8;z$,$I$N7e$K8=$l$k\e(B
 \e$B$+$r7W;;$7!"!X%O!<%I!&%3!<%I!Y$7$^$9!#$3$l$O!"2DJQD9$N;EMM$N8e$G$O!"$3$l\e(B
@@ -5661,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
@@ -6155,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
@@ -6165,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
@@ -6237,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
@@ -6246,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
@@ -6525,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
@@ -6709,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
@@ -7749,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)
@@ -7775,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
@@ -8489,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
@@ -8662,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
@@ -8766,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
@@ -8790,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
@@ -9055,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
@@ -9271,7 +9430,7 @@ Gnus \e$B$O%X%C%@!<$NJB$YBX$(\e(B(sort)\e$B$b9T$$$^$9\e(B (\e$B$3$l$O%G%#%U%)%k%H$G9T
 \e$B$3$l$O$3$NJQ?t$N%G%#%U%)%k%HCM$G$b$"$j$^$9!#\e(B
 
 @node Using MIME
-@section @sc{mime} \e$B$r;H$&\e(B
+@section MIME \e$B$r;H$&\e(B
 @cindex @sc{mime}
 
 \e$B%Q%s%H%^%$%`\e(B (mime) \e$B$H$O!"0UL#$bL5$/6uCf$G<j$r?6$k$b$N$H$7$F9-$/\e(B
@@ -9282,7 +9441,7 @@ Gnus \e$B$O%X%C%@!<$NJB$YBX$(\e(B(sort)\e$B$b9T$$$^$9\e(B (\e$B$3$l$O%G%#%U%)%k%H$G9T
 
 @sc{mime} \e$B$O$=$N5-;v$,$I$s$JJ8;z=89g$r;HMQ$7$F$$$k$+!"$=$NJ8;z$r$I$&Id9f\e(B
 \e$B2=$7$F$$$k$+$r;XDj$9$k$3$H$,$G$-!"$5$i$K$O3($d$=$NB>$N$_$@$i$J$b$N$rL5<Y\e(B
-\e$B5$$J3J9%$N5-;v$GKd$a9~$`$3$H$5$(2DG=$K$7$^$9!#\e(B
+\e$B5$$J3J9%$N5-;v$KKd$a9~$`$3$H$5$(2DG=$K$7$^$9!#\e(B
 
 @vindex gnus-show-mime
 @vindex gnus-article-display-method-for-mime
@@ -9328,7 +9487,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,
 @cindex article customization
 
 \e$B5-;v$,$I$N$h$&$KB8:_$7$F$$$k$+$r%+%9%?%^%$%:$9$k$?$a$N$?$/$5$s$N4X?t$G$9!#\e(B
-\e$B$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$^$9$7$$!"5-;v$rA*Br$7$?$H$-$K<+F0E*\e(B
+\e$B$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$^$9$7!"5-;v$rA*Br$7$?$H$-$K<+F0E*\e(B
 \e$B$KA*Br$9$k$3$H$b$G$-$^$9!#\e(B
 
 \e$B<+F0E*$K8F$P$l$k$h$&$K$9$k$?$a$K$O!"BP1~$9$k\e(B ``treatment'' \e$BJQ?t$r@_Dj$7\e(B
@@ -9392,42 +9551,41 @@ 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$,!"$[$H$s$I$N?M$O$*$=$i$/$3$3$K0lMwI=<($5$l$F$$$k$b$N$G==J,$G$7$g$&!#\e(B
 
 @table @code
-@item gnus-treat-highlight-signature (t, last)
 @item gnus-treat-buttonize (t, integer)
 @item gnus-treat-buttonize-head (head)
+@item gnus-treat-capitalize-sentences (t, integer)
+@item gnus-treat-date-english (head)
+@item gnus-treat-date-iso8601 (head)
+@item gnus-treat-date-lapsed (head)
+@item gnus-treat-date-local (head)
+@item gnus-treat-date-original (head)
+@item gnus-treat-date-user-defined (head)
+@item gnus-treat-date-ut (head)
+@item gnus-treat-display-picons (head)
+@item gnus-treat-display-smileys (t, integer)
+@item gnus-treat-display-xface (head)
 @item gnus-treat-emphasize (t, head, integer)
 @item gnus-treat-fill-article (t, integer)
-@item gnus-treat-strip-cr (t, integer)
-@item gnus-treat-hide-headers (head)
+@item gnus-treat-fill-long-lines (t, integer)
 @item gnus-treat-hide-boring-headers (head)
-@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-hide-citation (t, integer)
 @item gnus-treat-hide-citation-maybe (t, integer)
-@item gnus-treat-strip-pgp (t, last, integer)
-@item gnus-treat-x-pgp-sig (head)
-@item gnus-treat-strip-pem (t, last, integer)
-@item gnus-treat-highlight-headers (head)
+@item gnus-treat-hide-headers (head)
+@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-highlight-citation (t, integer)
+@item gnus-treat-highlight-headers (head)
 @item gnus-treat-highlight-signature (t, last, integer)
-@item gnus-treat-date-ut (head)
-@item gnus-treat-date-local (head)
-@item gnus-treat-date-english (head)
-@item gnus-treat-date-lapsed (head)
-@item gnus-treat-date-original (head)
-@item gnus-treat-date-iso8601 (head)
-@item gnus-treat-date-user-defined (head)
+@item gnus-treat-overstrike (t, integer)
+@item gnus-treat-play-sounds
+@item gnus-treat-strip-cr (t, integer)
 @item gnus-treat-strip-headers-in-body (t, integer)
-@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-strip-leading-blank-lines (t, integer)
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
-@item gnus-treat-overstrike (t, integer)
-@item gnus-treat-display-xface (head)
-@item gnus-treat-display-smileys (t, integer)
-@item gnus-treat-display-picons (head)
-@item gnus-treat-capitalize-sentences (t, integer)
-@item gnus-treat-fill-long-lines (t, integer)
-@item gnus-treat-play-sounds
+@item gnus-treat-strip-pem (t, last, integer)
+@item gnus-treat-strip-pgp (t, last, integer)
+@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-translate
+@item gnus-treat-x-pgp-sig (head)
 @item gnus-treat-decode-article-as-default-mime-charset
 @end table
 
@@ -9538,8 +9696,32 @@ 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,
 
 @table @samp
 @item w
-\e$B5-;v$N!V@vBu>uBV!W\e(B@dfn{wash status}\e$B!#$3$l$O5-;v$KBP$7$F9T$o$l$?\e(B
-\e$B$G$"$m$&@vBuA`:n$r<($90lJ8;z$+$i$J$kC;$$J8;zNs$K$J$j$^$9!#\e(B
+\e$B5-;v$N!V@vBu>uBV!W\e(B@dfn{wash status}\e$B!#$3$l$O5-;v$KBP$7$F9T$o$l$?$G$"$m$&\e(B
+\e$B@vBuA`:n$r<($90lJ8;z$+$i$J$kC;$$J8;zNs$K$J$j$^$9!#J8;z$H$=$l$i$N0UL#$O\e(B:
+
+@table @samp
+@item c
+\e$B5-;v%P%C%U%!$K$*$$$F!"0zMQ$5$l$?J8$,1#$5$l$F$$$k$+$b$7$l$J$$>l9g$KI=<($5\e(B
+\e$B$l$^$9!#\e(B
+
+@item h
+\e$B5-;v%P%C%U%!$K$*$$$F!"%X%C%@!<$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#\e(B
+
+@c @item p 
+@c Displayed when article is digitally signed or encrypted, and Gnus has
+@c hidden the security headers.  (N.B. does not tell anything about
+@c security status, i.e. good or bad signature.)
+
+@item s
+\e$B5-;v%P%C%U%!$K$*$$$F!"=pL>$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#\e(B
+
+@item o
+\e$B5-;v%P%C%U%!$K=E$MBG$AJ8;z$,$"$k>l9g$KI=<($5$l$^$9!#\e(B
+
+@item e
+\e$B5-;v%P%C%U%!$K6/D4$5$l$?J8;zNs$,$"$k>l9g$KI=<($5$l$^$9!#\e(B
+@end table
+
 @c FIXMETGNUS Does this work?
 @item m
 \e$B5-;v$N\e(B @sc{mime} \e$BItJ,$N?t$G$9!#\e(B
@@ -9570,9 +9752,10 @@ 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 @cindex using gpg
 
 @kindex C-c C-c (\e$BEj9F\e(B)
-\e$BA4$F$NEj9F$H%a!<%k$NL?Na$O!"\e(B@kbd{C-c C-c} \e$B$r2!$9;v$K$h$C$F!"5-;v$rAw?.$9\e(B
-\e$B$kA0$K5-;v$r9%$-$J$h$&$KJT=8$9$k;v$N$G$-$k!"%a%C%;!<%8%P%C%U%!$K0\F0$7$^\e(B
-\e$B$9!#\e(B@xref{Top, , Top, message, The Message Manual}\e$B!#5-;v$O$"$J$?$N@_Dj$K\e(B
+\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$^$9!#\e(B
+@xref{Top, , Top, message, The Message Manual}\e$B!#5-;v$O$"$J$?$N@_Dj$K\e(B
 \e$B4p$E$$$FAw?.$5$l$^$9\e(B (@pxref{Posting Server})\e$B!#\e(B
 
 @menu
@@ -9643,7 +9826,7 @@ gnus \e$B$OEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#\e(B
 gnus \e$B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#\e(B
 
 \e$B:G8e$K!"$"$J$?$,$$$D$G$b4pK\$NA*BrJ}K!$r;H$C$FEj9F$7$?$$$N$J$i$P!"$3$NJQ\e(B
-\e$B?t$r\e(B @code{nil} \e$B$K$7$F2<$5$$!#\e(B
+\e$B?t$r\e(B @code{native} \e$B$K$7$F2<$5$$!#\e(B
 
 @node Mail and Post
 @section \e$B%a!<%k$HEj9F\e(B
@@ -9739,7 +9922,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
+@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
@@ -9752,11 +9936,14 @@ Gnus \e$B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0\e(B
 \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
 
@@ -10043,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
 
@@ -10066,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}.
@@ -10354,7 +10542,7 @@ you've typed it correctly.
 @node Creating a Virtual Server
 @subsection \e$B;v<B>e$N%5!<%P!<$r:n@.$9$k\e(B
 
-\e$B$b$7$"$J$?$O1JB35-;v$r;H$C$F$?$/$5$s$N5-;v$r%-%c%C%7%e$KJ]B8$7$F$$$k$N$G\e(B
+\e$B$b$7$"$J$?$,1JB35-;v$r;H$C$F$?$/$5$s$N5-;v$r%-%c%C%7%e$KJ]B8$7$F$$$k$N$G\e(B
 \e$B$"$l$P!"%-%c%C%7%e$rFI$`$?$a$N;v<B>e$N%5!<%P!<$r:n$j$?$$$H;W$&$+$b$7$l$^\e(B
 \e$B$;$s!#\e(B
 
@@ -10364,8 +10552,8 @@ you've typed it correctly.
 
 @kbd{a nnspool RET cache RET} \e$B$HBG$C$F$/$@$5$$!#\e(B
 
-\e$B:#$dA4$/?7$7$$\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$"$k$O$:$G$9!#<!$O$=$l$rJT=8$7$F!"@5$7$$Dj5A$rM?$($k$@$1$G$9!#%5!<%P!<$r\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!<$r\e(B
 \e$BJT=8$9$k$?$a$K\e(B @kbd{e} \e$B$rBG$C$F$/$@$5$$!#0J2<$N$b$N$r4^$`%P%C%U%!$KF~$k\e(B
 \e$B$G$7$g$&!#\e(B
 
@@ -10390,7 +10578,7 @@ you've typed it correctly.
 @subsection \e$B%5!<%P!<JQ?t\e(B
 
 \e$BJQ?t$rDj5A$9$k0l$D$N$d$C$+$$$JE@$O\e(B (\e$B%P%C%/%(%s%I$H\e(B Emacs \e$B0lHL$NN>J}$G\e(B)\e$B!"\e(B
-\e$BJQ?t$NDj5A$,%m!<%I$5$l$k$F$$$k4V$K!"$$$/$D$+$NJQ?t$OB>$NJQ?t$+$i=i4|2=$5\e(B
+\e$BJQ?t$NDj5A$,%m!<%I$5$l$F$$$k4V$K!"$$$/$D$+$NJQ?t$OB>$NJQ?t$G=i4|2=$5\e(B
 \e$B$l$k$H$$$&;v$G$9!#$b$7\e(B "\e$B4p$H$J$k\e(B" \e$BJQ?t$,%m!<%I$5$l$?8e$KJQ99$7$F$b!"\e(B"\e$BF3\e(B
 \e$B$-=P$5$l$?\e(B" \e$BJQ?t$OJQ99$5$l$^$;$s!#\e(B
 
@@ -10415,9 +10603,9 @@ you've typed it correctly.
 @node Servers and Methods
 @subsection \e$B%5!<%P!<$HJ}K!\e(B
 
-\e$BIaDL$OA*BrJ}K!$r;H$&$H$3$m\e(B (\e$BNc$($P!"30It%5!<%P!<$r354Q$7$F$$$k$H$-$N%0%k!<\e(B
-\e$B%WA*BrJ}K!$G$N\e(B @code{gnus-secondary-select-method}) \e$B$O$I$3$G$b!";v<B>e$N\e(B
-\e$B%5!<%P!<L>$r$=$l$NBe$o$j$K;H$&;v$,$G$-$^$9!#$3$N$3$H$K$h$j$?$/$5$s%-!<%\!<\e(B
+\e$BIaDL$KA*BrJ}K!$r;H$&$H$3$m$G$"$l$P$I$3$G$b\e(B (\e$BNc$($P!"30It%5!<%P!<$r354Q$7$F$$$k$H$-$N\e(B
+\e$B%0%k!<%WA*BrJ}K!$G$"$k\e(B @code{gnus-secondary-select-method} ) \e$B!"Be$o$j$K\e(B
+\e$B;v<B>e$N%5!<%P!<L>$r;H$&;v$,$G$-$^$9!#$3$N$3$H$K$h$j$?$/$5$s%-!<%\!<\e(B
 \e$B%I$rC!$+$J$/$F$9$`2DG=@-$,$"$j$^$9!#$=$7$F!"A4$F$K$o$?$C$F!"$=$NJ}$,NI$$\e(B
 \e$B$G$9!#\e(B
 
@@ -10439,8 +10627,8 @@ you've typed it correctly.
 \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$@$H2?$,5/$3$k$N$G$7$g$&\e(B? \e$B$I$&\e(B
-\e$B$d$C$F%^%7%s$,La$C$F$-$F$$$k$+$I$&$+$C$r:F$SD4$Y$k;v$,$G$-$k$G$N$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%^%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:
@@ -10503,7 +10691,7 @@ Gnus \e$B$,$I$l$+$N%5!<%P!<$+$i@\B35qH]$r<u$1$?$+$I$&$+$NA4$F$N0u$r>C5n$7$^\e(B
 \e$B$9$k;v$,$G$-$k$G$7$g$&!#$=$N$?$a$K%0%k!<%W>pJs$rJT=8$7$J$1$l$P$J$j$^$;\e(B
 \e$B$s\e(B (@pxref{Foreign Groups})\e$B!#\e(B
 
-\e$B30It%0%k!<%W$NL>A0$O4pK\%0%k!<%W$HF1$8$G$"$k;v$,$G$-$^$9!#<B:]!"$"$J$?$N\e(B
+\e$B30It%0%k!<%W$NL>A0$O4pK\%0%k!<%W$HF1$8$G$b9=$$$^$;$s!#<B:]!"$"$J$?$N\e(B
 \e$B;W$&$^$^$KF1$8%0%k!<%W$r2DG=$J8B$j$N0c$C$?%5!<%P!<$+$i9XFI$9$k;v$,$G$-$^\e(B
 \e$B$9!#L>A0$N>WFM$O5/$3$j$^$;$s!#\e(B
 
@@ -10706,6 +10894,19 @@ default force yes
 \e$B$5$l$F$$$^$9!#$=$l$i$OFs<oN`$KJ,N`$9$k$3$H$,$G$-!"D>@\@\B3$9$k$?$a$N4X?t\e(B
 \e$B72\e(B (\e$B;0$D\e(B) \e$B$H4V@\E*$K@\B3$9$k$?$a$N$b$N\e(B (\e$BFs$D\e(B) \e$B$,$"$j$^$9!#\e(B
 
+@item nntp-prepare-post-hook
+@vindex nntp-prepare-post-hook
+\e$B5-;v$r%]%9%H$9$kD>A0$K<B9T$5$l$k%U%C%/$G$9!#$b$75-;v\e(B
+\e$B$K\e(B @code{Message-ID} \e$B%X%C%@!<$,L5$/$F%K%e!<%9%5!<%P!<$,?d>)\e(B ID \e$B$rDs6!$7\e(B
+\e$B$F$/$l$k$J$i$P!"$3$N%U%C%/$,<B9T$5$l$kA0$K$=$l$,5-;v$K2C$($i$l$^$9!#$3$l\e(B
+\e$B$O!"$b$7$"$J$?$,\e(B gnus \e$B$,\e(B @code{Message-ID} \e$B%X%C%@!<$rIU$1$J$$$h$&$K$7$F\e(B
+\e$B$$$F$b!"\e(B@code{Cancel-Lock} \e$B%X%C%@!<$r:n$k$?$a$KMxMQ$9$k$3$H$,$G$-$^$9!#\e(B
+\e$B$=$l$K$O$3$&$9$l$PNI$$$G$7$g$&\e(B:
+
+@lisp
+(add-hook 'nntp-prepare-post-hook 'canlock-insert-header)
+@end lisp
+
 @item nntp-list-options
 @vindex nntp-list-options
 LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$7$?%K%e!<\e(B
@@ -11292,10 +11493,11 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @item directory
 \e$B%G%#%l%/%H%j!<Cf$NJ#?t$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#$3$l$OIaDL\e(B
 \e$B$O\e(B procmail \e$B$K?7$7$$%a!<%k$r$$$/$D$+$N%U%!%$%k$KJ,3d$5$;$F$$$k$H$-$K;HMQ\e(B
-\e$B$5$l$^$9!#\e(B@code{nnmail-scan-directory-mail-source-once} \e$B$r\e(B @code{nil} \e$B0J\e(B
-\e$B30$K$9$k$H!"\e(Bgnus \e$B$O?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$k$h$&$K$J$j$^$9!#$3\e(B
-\e$B$l$O!";XDj$7$?%l%Y%k$N%a!<%k%0%k!<%W$@$1$rD4$Y$?$$$H$-$K!"$H$j$o$1JXMx$G\e(B
-\e$B$9!#\e(B
+\e$B$5$l$^$9!#$9$J$o$A%U%!%$%k\e(B @file{foo.bar.spool} \e$B$K$"$k%a!<%k$O!"%0%k!<\e(B
+\e$B%W\e(B @code{foo.bar} \e$B$KCV$+$l$^$9\e(B (\e$B%5%U%#%C%/%9\e(B @code{.spool} \e$B$OJQ992DG=$G\e(B
+\e$B$9\e(B)\e$B!#\e(B@code{nnmail-scan-directory-mail-source-once} \e$B$r\e(B @code{nil} \e$B0J30$K\e(B
+\e$B$9$k$H!"\e(Bgnus \e$B$O?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$k$h$&$K$J$j$^$9!#$3$l$O!"\e(B
+\e$B;XDj$7$?%l%Y%k$N%a!<%k%0%k!<%W$@$1$rD4$Y$?$$$H$-$K!"$H$j$o$1JXMx$G$9!#\e(B
 
 \e$B%-!<%o!<%I\e(B:
 
@@ -11458,6 +11660,9 @@ IMAP \e$B%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#2?$i$+$NM}M3$G\e(B IMAP \e$B$r0U?^$5$l$?$h
 gnus \e$B$G$O\e(B POP \e$B%5!<%P!<$HF1MM$K07$&$3$H$,$G$-!"M?$($i$l$?\e(B IMAP \e$B%a!<%k%\%C\e(B
 \e$B%/%9$+$i5-;v$r<hF@$7$^$9!#>\$7$/$O\e(B @xref{IMAP} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
+Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%V\e(B
+\e$B%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}
+
 \e$B%-!<%o!<%I\e(B:
 
 @table @code
@@ -11465,7 +11670,7 @@ gnus \e$B$G$O\e(B POP \e$B%5!<%P!<$HF1MM$K07$&$3$H$,$G$-!"M?$($i$l$?\e(B IMAP \e$B%a!
 IMAP \e$B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t\e(B @code{MAILHOST} \e$B$+$iF@$^$9!#\e(B
 
 @item :port
-IMAP \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BSSL \e$B@\B3$K\e(B
+IMAP \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BSSL/TLS \e$B@\B3$K\e(B
 \e$B$O\e(B @samp{993} \e$B$G$9!#\e(B
 
 @item :user
@@ -11662,6 +11867,11 @@ www.my-deja.com \e$B$J$I$N%&%'%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
 @vindex mail-source-default-file-modes
 \e$BA4$F$N?7$7$$%a!<%k%U%!%$%k$O$3$N%U%!%$%k%b!<%I$K$J$j$^$9!#=i4|CM\e(B
 \e$B$O\e(B 384 \e$B$G$9!#\e(B
+
+@item mail-source-movemail-program
+@vindex mail-source-movemail-program
+\e$BHs\e(B-nil \e$B$@$C$?$i?7Ce%a!<%k$N<h$j9~$`$?$a$N%W%m%0%i%`$NL>A0!#\e(Bnil \e$B$@$C$?\e(B
+\e$B$i\e(B @var{exec-directory} \e$B$K$"$k\e(B @code{movemail}\e$B!#\e(B
 @end table
 
 @node Fetching Mail
@@ -11913,10 +12123,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$9$3$H$,$G$-$^$9!#\e(B
 
 \e$B$3$N5!G=$rMxMQ$9$k$?$a$K$O!"$^$:JQ\e(B
-\e$B?t\e(B @code{nnmail-treat-duplicates} \e$B$H\e(B @code{nnmail-cache-accepted-message-ids} \e$B$NCM\e(B
-\e$B$rHs\e(B nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9\e(B (\e$B4{DjCM$N$^$^$J$iLdBj$"$j$^$;$s\e(B)\e$B!#$=$l\e(B
-\e$B$,$G$-$?$i\e(B @code{nnmail-split-fancy-with-parent} \e$B$r;H$C$F$_$F$/$@$5$$!#\e(B
-\e$B%3%m%s$r;H$C$F$3$s$JIw$K=q$-$^$9\e(B:
+\e$B?t\e(B @code{nnmail-treat-duplicates} \e$B$H\e(B @code{nnmail-cache-accepted-message-ids} \e$B$N\e(B
+\e$BCM$rHs\e(B nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#$=$l$,$G$-$?\e(B
+\e$B$i\e(B @code{nnmail-split-fancy-with-parent} \e$B$r;H$C$F$_$F$/$@$5$$!#%3%m%s$r\e(B
+\e$B;H$C$F$3$s$JIw$K=q$-$^$9\e(B:
 @lisp
 (setq nnmail-split-fancy
       '(| (: nnmail-split-fancy-with-parent)
@@ -12239,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
@@ -13188,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
@@ -13561,6 +13792,9 @@ gnus-secondary-select-methods \e$B$K\e(B nnimap \e$B$rEPO?$7$F2<$5$$!#$3$l$K$h$C\e(B
                 (nnimap-stream ssl))))
 @end lisp
 
+(SSL/TLS \e$B$r;H$&$K$O30It%i%$%V%i%j\e(B @samp{ssl.el} \e$B$,I,MW$G$9!#0J2<$r;2>H$7\e(B
+\e$B$F2<$5$$!#\e(B)
+
 \e$B0J2<$NJQ?t$O2>A[\e(B @code{nnimap} \e$B%5!<%P!<$r:n@.$9$k$?$a$K;H$&$3$H$,$G$-$^\e(B
 \e$B$9!#\e(B
 
@@ -13606,9 +13840,9 @@ gnus-secondary-select-methods \e$B$K\e(B nnimap \e$B$rEPO?$7$F2<$5$$!#$3$l$K$h$C\e(B
 @item nnimap-stream
 @vindex nnimap-stream
 \e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$o$l$k%9%H%j!<%`$N7?$G$9!#=i4|@_Dj$G\e(B
-\e$B$O\e(B nnimap \e$B$O\e(B SSL \e$B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#\e(B
-(SSL \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P$G$-$^$9$,!"$^$@\e(B
-\e$B9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
+\e$B$O\e(B nnimap \e$B$O\e(B SSL/TLS \e$B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#\e(B
+(SSL/TLS \e$B$r;H$&\e(B IMAP \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P\e(B
+\e$B$G$-$^$9$,!"$^$@9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
 
 \e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
 
@@ -13632,7 +13866,8 @@ gnus-secondary-select-methods \e$B$K\e(B nnimap \e$B$rEPO?$7$F2<$5$$!#$3$l$K$h$C\e(B
 \e$B%j\e(B @samp{starttls.el} \e$B$H\e(B @samp{starttls} \e$B%W%m%0%i%`$,I,MW$G$9!#\e(B
 @item
 @dfn{ssl:} SSL \e$B$r;H$$$^$9!#\e(BOpenSSL (@samp{openssl} \e$B%W%m%0%i\e(B
-\e$B%`\e(B) \e$B$+\e(B SSLeay (@samp{s_client}) \e$B$,I,MW$G$9!#\e(B
+\e$B%`\e(B) \e$B$+\e(B SSLeay (@samp{s_client}) \e$B$H30It%i%$%V%i%j\e(B @samp{ssl.el} \e$B$,I,MW$G\e(B
+\e$B$9!#\e(B
 @item
 @dfn{shell:} \e$B%7%'%kL?Na$r;H$C$F\e(B @sc{imap} \e$B@\B3$r3+;O$7$^$9!#\e(B
 @item
@@ -13657,7 +13892,8 @@ SSL \e$B@\B3$N$?$a$N\e(B OpenSSL \e$B%W%m%0%i%`$O\e(B @uref{http://www.openssl.org/}
 nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e$B$K$O\e(B
 \e$B=EBg$J%P%0$,$"$k$?$a;H$($^$;$s!#0JA0$NHG!"FC$K\e(B SSLeay 0.8.x \e$B$O;H$($k$3$H\e(B
 \e$B$,$o$+$C$F$$$^$9!#JQ?t\e(B @code{imap-ssl-program} \e$B$O\e(B OpenSSL/SSLeay \e$B$KEO$9\e(B
-\e$B%Q%?%a!<%?$r4^$_$^$9!#\e(B
+\e$B%Q%?%a!<%?$r4^$_$^$9!#2C$($F\e(B @samp{ssl.el}  (\e$BNc$($P\e(B W3 \e$B$K4^$^$l$F$$$k$b\e(B
+\e$B$N\e(B) \e$B$,I,MW$G$9!#\e(B
 
 @vindex imap-shell-program
 @vindex imap-shell-host
@@ -14168,8 +14404,12 @@ MIME \e$BB>ItJ,%a%C%;!<%8\e(B (multipart) \e$B$G$9!#\e(B
 @table @code
 @item nndoc-article-type
 @vindex nndoc-article-type
-\e$B$3$l$O\e(B @code{mbox}, @code{babyl}, @code{digest}, @code{news}, @code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934}, @code{rfc822-forward}, @code{mime-digest}, @code{standard-digest}, @code{slack-digest}, @code{clari-briefs}, @code{guess} \e$B$N\e(B
-\e$B$$$:$l$+$G$J$/$F$O$J$j$^$;$s!#\e(B
+\e$B$3$l$O\e(B @code{mbox}, @code{babyl}, @code{digest}, @code{news},
+@code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
+@code{rfc822-forward}, @code{mime-parts}, @code{standard-digest},
+@code{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook},
+@code{oe-dbx} \e$B$*$h$S\e(B @code{mailman} \e$B$^$?$O\e(B @code{guess} \e$B$N$$$:$l$+$G$J$/\e(B
+\e$B$F$O$J$j$^$;$s!#\e(B
 
 @item nndoc-post-type
 @vindex nndoc-post-type
@@ -17379,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:
 
@@ -17532,6 +17775,8 @@ Gnus \e$B$O0lF|$K0l2s%9%3%"$rIeGT$5$;$h$&$H$7$^$9!#Nc$($P!"$b$7\e(B gnus \e$B$r;MF|
 @iflatex
 @chapter Message
 @include message-ja.texi
+@chapter Sieve
+@include sieve.texi
 @end iflatex
 @end iftex
 
@@ -17660,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
 
@@ -17730,6 +17975,9 @@ Gnus \e$B$O$"$J$?<+?H$N=qK!;EMM;XDj$r:n$k<jEA$$$r$9$kL?Na$rHw$($F$$$^$9!#\e(B
 \e$B$=$N$?$a$K$O!"\e(B@samp{%4,6y} \e$B$H$9$k;v$,$G$-$F!"$3$l$O$=$NNN0h$O7h$7$F\e(B 6 \e$BJ8\e(B
 \e$B;z$rD6$($kD9$5$K$O$J$i$:!"\e(B4 \e$BJ8;z$h$j>/$J$$D9$5$K$J$i$J$$$H$$$&;v$G$9!#\e(B
 
+gnus \e$B$O\e(B @samp{%&user-date;} \e$B$N$h$&$J!"$$$/$D$+$N3HD%MM<0;X<($b%5%]!<%H$7\e(B
+\e$B$^$9!#\e(B
+
 @node Mode Line Formatting
 @subsection \e$B%b!<%I9T=qK!;EMM\e(B
 
@@ -17822,6 +18070,9 @@ Emacs \e$B$,\e(B @samp{%b} \e$B$r<u$1<h$k$H!"\e(BEmacs \e$B$N%b!<%I9TI=<($NItJ,$,$=$l
 \e$B$h$&$K%P%C%U%!$KA^F~$5$l$^$9!#4X?t$O0UL#$NL5$$CM$H6&$K8F$P$l$k;v$b$"$j$(\e(B
 \e$B$^$9$N$G!"$=$l$NBP:v$r$9$k$Y$-$G$9!#\e(B
 
+gnus \e$B$O\e(B @samp{%u&foo;} \e$B$N$h$&$J3HD%MxMQ<TDj5A;X<($b%5%]!<%H$7$^$9!#\e(B
+gnus \e$B$O4X?t\e(B @code{gnus-user-format-function-}@samp{foo} \e$B$r8F$S=P$7$^$9!#\e(B
+
 \e$B?7$7$$4X?t$rDj5A$7$J$$$G$b!"%A%k%@=$>~\e(B
 \e$B;R\e(B (@pxref{Advanced Formatting}) \e$B$r;H$C$F$[$H$s$IF1$8;v$rC#@.$9$k;v$,$G\e(B
 \e$B$-$^$9!#Nc$G$9\e(B: @samp{%~(form (count-lines (point-min) (point)))@@}\e$B!#\e(B
@@ -18678,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
@@ -18810,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
@@ -18894,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
@@ -18933,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
@@ -20465,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
@@ -20497,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
@@ -22596,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
@@ -22633,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