Synch with No Gnus (200701050451).

diff --git a/gnus-ja.texi b/gnus-ja.texi
index fc295c3..3ae799e 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -11194,6 +11194,58 @@ Emacs @acronym{MIME} \e$B%^%K%e%"%k$G=R$Y$i$l$F$$$^$9!#\e(B
 \e$BCW$9$k@55,I=8=$N%j%9%H$G$9!#@)8fJQ?t$NCM$,!">e$G@bL@$5$l$F$$$k$h$&$K=R8l\e(B
 \e$B$N%j%9%H$G$"$k$H$-$O!"$3$NJQ?t$OL5;k$5$l$^$9!#\e(B
 
+@ifinfo
+@c \e$B0u:~$5$l$k%^%K%e%"%k$G$O!"F1$8%;%/%7%g%s$K>iD95$L#$J%(%s%H%j!<$,8=$l\e(B
+@c \e$B$J$$$h$&$K$7$^$9$,!"\e(B`i gnus-treat-foo-bar RET' \e$B$^$?$O\e(B `i foo-bar' \e$B$r\e(B
+@c \e$B9T$J$&$3$H$,$G$-$k$h$&$K!"$3$l$i$r\e(B info \e$B$K2C$($^$9!#\e(B
+@vindex gnus-treat-buttonize
+@vindex gnus-treat-buttonize-head
+@vindex gnus-treat-capitalize-sentences
+@vindex gnus-treat-overstrike
+@vindex gnus-treat-strip-cr
+@vindex gnus-treat-strip-headers-in-body
+@vindex gnus-treat-strip-leading-blank-lines
+@vindex gnus-treat-strip-multiple-blank-lines
+@vindex gnus-treat-strip-pem
+@vindex gnus-treat-strip-trailing-blank-lines
+@vindex gnus-treat-unsplit-urls
+@vindex gnus-treat-wash-html
+@vindex gnus-treat-date-english
+@vindex gnus-treat-date-iso8601
+@vindex gnus-treat-date-lapsed
+@vindex gnus-treat-date-local
+@vindex gnus-treat-date-original
+@vindex gnus-treat-date-user-defined
+@vindex gnus-treat-date-ut
+@vindex gnus-treat-from-picon
+@vindex gnus-treat-mail-picon
+@vindex gnus-treat-newsgroups-picon
+@vindex gnus-treat-display-smileys
+@vindex gnus-treat-body-boundary
+@vindex gnus-treat-display-x-face
+@vindex gnus-treat-display-face
+@vindex gnus-treat-emphasize
+@vindex gnus-treat-fill-article
+@vindex gnus-treat-fill-long-lines
+@vindex gnus-treat-hide-boring-headers
+@vindex gnus-treat-hide-citation
+@vindex gnus-treat-hide-citation-maybe
+@vindex gnus-treat-hide-headers
+@vindex gnus-treat-hide-signature
+@vindex gnus-treat-strip-banner
+@vindex gnus-treat-strip-list-identifiers
+@vindex gnus-treat-highlight-citation
+@vindex gnus-treat-highlight-headers
+@vindex gnus-treat-highlight-signature
+@vindex gnus-treat-play-sounds
+@vindex gnus-treat-translate
+@vindex gnus-treat-x-pgp-sig
+@vindex gnus-treat-unfold-headers
+@vindex gnus-treat-fold-headers
+@vindex gnus-treat-fold-newsgroups
+@vindex gnus-treat-leading-whitespace
+@end ifinfo
+
 \e$B0J2<$N%H%j!<%H%a%s%H$N%*%W%7%g%s$,;HMQ2DG=$G$9!#$3$l$r%+%9%?%^%$%:$9$k$?\e(B
 \e$B$a$N:G$b4JC1$JJ}K!$O\e(B @code{gnus-article-treat} \e$B%+%9%?%^%$%:%0%k!<%W$rD4\e(B
 \e$B::$9$k$3$H$G$9!#4]3g8L$NCf$NCM$ODs0F$5$l$F$$$k0UL#$N$"$kCM$G$9!#B>$N$b$N\e(B
@@ -11201,66 +11253,42 @@ Emacs @acronym{MIME} \e$B%^%K%e%"%k$G=R$Y$i$l$F$$$^$9!#\e(B
 \e$B$G==J,$G$7$g$&!#\e(B
 
 @table @code
-@vindex gnus-treat-buttonize
 @item gnus-treat-buttonize (t, integer)
-@vindex gnus-treat-buttonize-head
 @item gnus-treat-buttonize-head (head)
 
 @xref{Article Buttons}.
 
-@vindex gnus-treat-capitalize-sentences
 @item gnus-treat-capitalize-sentences (t, integer)
-@vindex gnus-treat-overstrike
 @item gnus-treat-overstrike (t, integer)
-@vindex gnus-treat-strip-cr
 @item gnus-treat-strip-cr (t, integer)
-@vindex gnus-treat-strip-headers-in-body
 @item gnus-treat-strip-headers-in-body (t, integer)
-@vindex gnus-treat-strip-leading-blank-lines
 @item gnus-treat-strip-leading-blank-lines (t, first, integer)
-@vindex gnus-treat-strip-multiple-blank-lines
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
-@vindex gnus-treat-strip-pem
 @item gnus-treat-strip-pem (t, last, integer)
-@vindex gnus-treat-strip-trailing-blank-lines
 @item gnus-treat-strip-trailing-blank-lines (t, last, integer)
-@vindex gnus-treat-unsplit-urls
 @item gnus-treat-unsplit-urls (t, integer)
-@vindex gnus-treat-wash-html
 @item gnus-treat-wash-html (t, integer)
 
 @xref{Article Washing}.
 
-@vindex gnus-treat-date-english
 @item gnus-treat-date-english (head)
-@vindex gnus-treat-date-iso8601
 @item gnus-treat-date-iso8601 (head)
-@vindex gnus-treat-date-lapsed
 @item gnus-treat-date-lapsed (head)
-@vindex gnus-treat-date-local
 @item gnus-treat-date-local (head)
-@vindex gnus-treat-date-original
 @item gnus-treat-date-original (head)
-@vindex gnus-treat-date-user-defined
 @item gnus-treat-date-user-defined (head)
-@vindex gnus-treat-date-ut
 @item gnus-treat-date-ut (head)
 
 @xref{Article Date}.
 
-@vindex gnus-treat-from-picon
 @item gnus-treat-from-picon (head)
-@vindex gnus-treat-mail-picon
 @item gnus-treat-mail-picon (head)
-@vindex gnus-treat-newsgroups-picon
 @item gnus-treat-newsgroups-picon (head)
 
 @xref{Picons}.
 
-@vindex gnus-treat-display-smileys
 @item gnus-treat-display-smileys (t, integer)
 
-@vindex gnus-treat-body-boundary
 @item gnus-treat-body-boundary (head)
 
 @vindex gnus-body-boundary-delimiter

diff --git a/message-ja.texi b/message-ja.texi
index 513bb20..553bc4b 100644 (file)
--- a/message-ja.texi
+++ b/message-ja.texi
@@ -902,6 +902,17 @@ Libidn} \e$B$r%$%s%9%H!<%k$7$F$*$+$J$1$l$P$J$j$^$;$s!#\e(B
 \e$B;R0E9f2=$5$l$?%a%C%;!<%8$r:n$k$3$H$,$G$-$^$9!#\e(BMessage (\e$B$H8@$&\e(B
 \e$B$+\e(B @acronym{MML}) \e$B$O!"8=:_\e(B @acronym{PGP} (RFC 1991), @acronym{PGP/MIME}
 (RFC 2015/3156) \e$B$*$h$S\e(B @acronym{S/MIME} \e$B$r%5%]!<%H$7$F$$$^$9!#\e(B
+
+@menu
+* Signing and encryption::      \e$B=pL>$H0E9f2=$N%3%^%s%I\e(B
+* Using S/MIME::                S/MIME \e$B$r;H$&\e(B
+* Using PGP/MIME::              PGP/MIME \e$B$r;H$&\e(B
+* PGP Compatibility::           \e$B8E$$<BAu$H$N8_49@-\e(B
+@end menu
+
+@node Signing and encryption
+@subsection \e$B=pL>$H0E9f2=$N%3%^%s%I\e(B
+
 @acronym{MIME} \e$B%Q!<%H$KBP$7$F%;%-%e%j%F%#!<$NA`:n$r9T$J$&$?$a\e(B
 \e$B$N\e(B @acronym{MML} \e$B$X$N;X<($O!"0J2<$N$h$&$K=pL>$N>l9g$O\e(B @kbd{C-c C-m s} \e$B%-!<\e(B
 \e$B%^%C%W$r;H$C$F!"0E9f2=$N>l9g$O\e(B @kbd{C-c C-m c} \e$B%-!<%^%C%W$r;H$C$F9T$J$$\e(B
@@ -989,6 +1000,7 @@ Libidn} \e$B$r%$%s%9%H!<%k$7$F$*$+$J$1$l$P$J$j$^$;$s!#\e(B
 \e$B$7$F!#$=$3$G!"30It$N$I$s$J%i%$%V%i%j!<$^$?$O%W%m%0%i%`$,I,MW$+$K$D$$$F!"\e(B
 \e$B$*$h$S$$$/$D$+$N:3:Y$G0lHLE*$J%R%s%H$r=R$Y$k$3$H$K$7$^$9!#\e(B
 
+@node Using S/MIME
 @subsection S/MIME \e$B$r;H$&\e(B
 
 @emph{\e$BCm0U\e(B!}  \e$B$3$N>O$O6aBeE*$J0E9fK!!"\e(B@acronym{S/MIME}\e$B!"$5$^$6$^\e(B
@@ -1054,6 +1066,7 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
 \e$B$k\e(B) \e$B$N$G$"$l$P!"%Q%9%U%l!<%:$NF~NO$rMW5a$5$l$?$H$-!"C1$K\e(B @kbd{RET} \e$B$r2!\e(B
 \e$B$7$F2<$5$$!#\e(B
 
+@node Using PGP/MIME
 @subsection PGP/MIME \e$B$r;H$&\e(B
 
 @acronym{PGP/MIME} \e$B$O\e(B @uref{http://www.gnupg.org/, GNU Privacy Guard} \e$B$N\e(B
@@ -1061,7 +1074,47 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
 \e$B$k\e(B PGP 2.x \e$B$H\e(B PGP 5.x \e$B$b%5%]!<%H$7$^$9!#\e(BPGP \e$B$N<BAu$X$N0l$D$N\e(B Emacs \e$B%$%s\e(B
 \e$B%?!<%U%'!<%9$G$"$k\e(B (@pxref{Top, ,PGG, pgg-ja, PGG Manual}) \e$B$,4^$^$l$F$$\e(B
 \e$B$^$9$,!"\e(BMailcrypt \e$B$H\e(B Florian Weimer \e$B$5$s$N\e(B @code{gpg.el} \e$B$b%5%]!<%H$7$^\e(B
-\e$B$9!#\e(B
+\e$B$9!#\e(B@xref{PGP Compatibility}.
+
+@cindex gpg-agent
+Message \e$B$O%G!<%?$r0E9f2=$9$k$?$a$KFbItE*$K\e(B GnuPG (@command{gpg} \e$B%3%^%s\e(B
+\e$B%I\e(B) \e$B$r8F$S$^$9!#$^$?!"$"$k>l9g\e(B (\e$BNc$($P0E9f$N2rFI$d=pL>$r9T$J$&>l9g\e(B) \e$B$K$O!"\e(B
+@command{gpg} \e$B$O%f!<%6!<$N%Q%9%U%l!<%:$rMW5a$7$^$9!#8=\e(B
+\e$B:_\e(B @command{gpg} \e$B$K%Q%9%U%l!<%:$rEO$9J}K!$H$7$F?d>)$5$l$F$$$k$N$O!"\e(B
+@command{gpg-agent} \e$B%W%m%0%i%`$r;H$&$3$H$G$9!#\e(B
+
+Emacs \e$B$G\e(B @command{gpg-agent} \e$B$r;H$&$K$O!"\e(BEmacs \e$B$r5/F0$9$kA0$K%7%'%k$G\e(B
+\e$B0J2<$N%3%^%s%I$rAv$i$;$kI,MW$,$"$j$^$9!#\e(B
+
+@example
+eval `gpg-agent --daemon`
+@end example
+
+\e$B$3$l$O\e(B @command{gpg-agent} \e$B$r<B9T$9$k$H$H$b\e(B
+\e$B$K\e(B @command{gpg} \e$B$,\e(B @command{gpg-agent} \e$B$HDL?.$G$-$k$h$&$K!"4D6-JQ\e(B
+\e$B?t\e(B @code{GPG_AGENT_INFO} \e$B$r@_Dj$7$^$9!#$3$l$r\e(B @file{.xsession} \e$B$^$?\e(B
+\e$B$O\e(B @file{.bash_profile} \e$B$K=q$-9~$`$N$ONI$$9M$($G$7$g$&!#\e(B@xref{Invoking
+GPG-AGENT, , , gnupg, Using the GNU Privacy Guard}.
+
+\e$B$$$C$?$s\e(B @command{gpg-agent} \e$B$,N)$A>e$,$k$H!"$=$l$O\e(B @command{gpg} \e$B$N$?$a\e(B
+\e$B$KI,MW$K1~$8$F%Q%9%U%l!<%:$r?R$M$^$9!#\e(BX \e$B%&%#%s%I%&!&%7%9%F%`$G$O!"%Q%9%U\e(B
+\e$B%l!<%:$rF~NO$9$k$?$a$NBPOC<jCJ$,?7$?$K=P8=$7$^$9!#$=$NBPOC<jCJ$O\e(B PIN
+Entry (@command{pinentry} \e$B%3%^%s%I\e(B) \e$B$K$h$C$FDs6!$5$l$^$9$,!"%P!<%8%g\e(B
+\e$B%s\e(B 0.7.2 \e$B$N$b$N$OC10l$N\e(B tty \e$B>e$N\e(B Emacs \e$B$H$O6(D4$7$FF0:n$9$k$3$H$,$G$-$^\e(B
+\e$B$;$s!#$7$?$,$C$F!"$b$7J8;z%3%s%=!<%k$r;H$C$F$$$k$N$G$"$l$P!"%Q%9%U%l!<%:\e(B
+\e$B$r\e(B gpg-agent \e$B$N%-%c%C%7%e$KA0$b$C$FF~$l$F$*$+$J$1$l$P$J$i$J$$$G$7$g$&!#\e(B
+\e$B0J2<$N%3%^%s%I$r!"$=$N$?$a$K;H$&$3$H$,$G$-$^$9!#\e(B
+
+@example
+gpg --use-agent --sign < /dev/null > /dev/null
+@end example
+
+Lisp \e$BJQ?t\e(B @code{pgg-gpg-use-agent} \e$B$G\e(B @command{gpg-agent} \e$B$r;H$&$+$I$&$+\e(B
+\e$B$r@)8f$7$^$9!#\e(B@xref{Caching passphrase, ,\e$B%Q%9%U%l!<%:$r%-%c%C%7%e$9$k\e(B,
+pgg-ja, The PGG Manual}, \e$B$b;2>H$7$F2<$5$$!#\e(B
+
+@node PGP Compatibility
+@subsection \e$B8E$$<BAu$H$N8_49@-\e(B
 
 @vindex gpg-temp-directory
 \e$BCm\e(B: \e$B$b$7\e(B @code{gpg.el} \e$B$r;H$&$N$G$"$l$P!"\e(B@code{gpg-temp-directory} \e$B$G;X\e(B