aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorDaiki Ueno2009-06-06 14:26:52 +0000
committerDaiki Ueno2009-06-06 14:26:52 +0000
commit8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c (patch)
treef98f09f66b940112a2b9f6d9229ffb6a8d227783 /doc/misc
parent28bf482a7d4e577bc1efec8ca97501e372372444 (diff)
downloademacs-8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c.tar.gz
emacs-8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c.zip
* gnus.texi (Security): Fix wording; add a link to epa.info.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog2
-rw-r--r--doc/misc/gnus.texi9
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e72ed3c6390..fe048ee67d5 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,6 @@
12009-06-04 Daiki Ueno <ueno@unixuser.org> 12009-06-04 Daiki Ueno <ueno@unixuser.org>
2 2
3 * gnus.texi (Security): Fix wording. 3 * gnus.texi (Security): Fix wording; add a link to epa.info.
4 4
52009-06-04 Ryan Yeske <rcyeske@gmail.com> 52009-06-04 Ryan Yeske <rcyeske@gmail.com>
6 6
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 7a0fd7eac0d..a7eb08101a2 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12020,8 +12020,9 @@ things to work:
12020@item 12020@item
12021To handle @acronym{PGP} and @acronym{PGP/MIME} messages, you have to 12021To handle @acronym{PGP} and @acronym{PGP/MIME} messages, you have to
12022install an OpenPGP implementation such as GnuPG. The Lisp interface 12022install an OpenPGP implementation such as GnuPG. The Lisp interface
12023to GnuPG included with Emacs is called EasyPG, but PGG (@pxref{Top, 12023to GnuPG included with Emacs is called EasyPG (@pxref{Top, ,EasyPG,
12024,PGG, pgg, PGG Manual}), Mailcrypt, and gpg.el are also supported. 12024epa, EasyPG Assistant user's manual}), but PGG (@pxref{Top, ,PGG, pgg,
12025PGG Manual}), Mailcrypt, and gpg.el are also supported.
12025 12026
12026@item 12027@item
12027To handle @acronym{S/MIME} message, you need to install OpenSSL. OpenSSL 0.9.6 12028To handle @acronym{S/MIME} message, you need to install OpenSSL. OpenSSL 0.9.6
@@ -12050,7 +12051,7 @@ protocols. Otherwise, ask user.
12050Symbol indicating elisp interface to OpenPGP implementation for 12051Symbol indicating elisp interface to OpenPGP implementation for
12051@acronym{PGP} messages. The default is @code{epg}, but @code{pgg}, 12052@acronym{PGP} messages. The default is @code{epg}, but @code{pgg},
12052@code{mailcrypt}, and @code{gpg} are also supported although 12053@code{mailcrypt}, and @code{gpg} are also supported although
12053deprecated. By default, Gnus uses the first available interface on 12054deprecated. By default, Gnus uses the first available interface in
12054this order. 12055this order.
12055 12056
12056@item mml2015-use 12057@item mml2015-use
@@ -12059,7 +12060,7 @@ Symbol indicating elisp interface to OpenPGP implementation for
12059@acronym{PGP/MIME} messages. The default is @code{epg}, but 12060@acronym{PGP/MIME} messages. The default is @code{epg}, but
12060@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported 12061@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported
12061although deprecated. By default, Gnus uses the first available 12062although deprecated. By default, Gnus uses the first available
12062interface on this order. 12063interface in this order.
12063 12064
12064@end table 12065@end table
12065 12066