summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2009-06-06 14:26:52 +0000
committerDaiki Ueno <ueno@unixuser.org>2009-06-06 14:26:52 +0000
commit8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c (patch)
treef98f09f66b940112a2b9f6d9229ffb6a8d227783
parent28bf482a7d4e577bc1efec8ca97501e372372444 (diff)
downloademacs-8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c.tar.gz
emacs-8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c.tar.bz2
emacs-8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c.zip
* gnus.texi (Security): Fix wording; add a link to epa.info.
-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 @@
2009-06-04 Daiki Ueno <ueno@unixuser.org>
- * gnus.texi (Security): Fix wording.
+ * gnus.texi (Security): Fix wording; add a link to epa.info.
2009-06-04 Ryan Yeske <rcyeske@gmail.com>
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:
@item
To handle @acronym{PGP} and @acronym{PGP/MIME} messages, you have to
install an OpenPGP implementation such as GnuPG. The Lisp interface
-to GnuPG included with Emacs is called EasyPG, but PGG (@pxref{Top,
-,PGG, pgg, PGG Manual}), Mailcrypt, and gpg.el are also supported.
+to GnuPG included with Emacs is called EasyPG (@pxref{Top, ,EasyPG,
+epa, EasyPG Assistant user's manual}), but PGG (@pxref{Top, ,PGG, pgg,
+PGG Manual}), Mailcrypt, and gpg.el are also supported.
@item
To handle @acronym{S/MIME} message, you need to install OpenSSL. OpenSSL 0.9.6
@@ -12050,7 +12051,7 @@ protocols. Otherwise, ask user.
Symbol indicating elisp interface to OpenPGP implementation for
@acronym{PGP} messages. The default is @code{epg}, but @code{pgg},
@code{mailcrypt}, and @code{gpg} are also supported although
-deprecated. By default, Gnus uses the first available interface on
+deprecated. By default, Gnus uses the first available interface in
this order.
@item mml2015-use
@@ -12059,7 +12060,7 @@ Symbol indicating elisp interface to OpenPGP implementation for
@acronym{PGP/MIME} messages. The default is @code{epg}, but
@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported
although deprecated. By default, Gnus uses the first available
-interface on this order.
+interface in this order.
@end table