aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaiki Ueno2009-06-04 22:44:48 +0000
committerDaiki Ueno2009-06-04 22:44:48 +0000
commit71fbd643c20ad105952570f8aa481231c932f366 (patch)
treec6502d20d4d6dc4f7a58973b615085e1aa41c00e /doc
parente66f4dfb7555eed2da7b2632f9dd87a793226127 (diff)
downloademacs-71fbd643c20ad105952570f8aa481231c932f366.tar.gz
emacs-71fbd643c20ad105952570f8aa481231c932f366.zip
(Security): Fix wording.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/gnus.texi8
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 105b4bed7cd..e72ed3c6390 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12009-06-04 Daiki Ueno <ueno@unixuser.org>
2
3 * gnus.texi (Security): Fix wording.
4
12009-06-04 Ryan Yeske <rcyeske@gmail.com> 52009-06-04 Ryan Yeske <rcyeske@gmail.com>
2 6
3 * message.texi (Header Commands): Fix descriptions to match 7 * message.texi (Header Commands): Fix descriptions to match
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ccaebb82fcf..7a0fd7eac0d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12020,7 +12020,7 @@ 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 Gnus is called EasyPG, but PGG (@pxref{Top, 12023to GnuPG included with Emacs is called EasyPG, but PGG (@pxref{Top,
12024,PGG, pgg, PGG Manual}), Mailcrypt, and gpg.el are also supported. 12024,PGG, pgg, PGG Manual}), Mailcrypt, and gpg.el are also supported.
12025 12025
12026@item 12026@item
@@ -12050,14 +12050,16 @@ protocols. Otherwise, ask user.
12050Symbol indicating elisp interface to OpenPGP implementation for 12050Symbol indicating elisp interface to OpenPGP implementation for
12051@acronym{PGP} messages. The default is @code{epg}, but @code{pgg}, 12051@acronym{PGP} messages. The default is @code{epg}, but @code{pgg},
12052@code{mailcrypt}, and @code{gpg} are also supported although 12052@code{mailcrypt}, and @code{gpg} are also supported although
12053deprecated. 12053deprecated. By default, Gnus uses the first available interface on
12054this order.
12054 12055
12055@item mml2015-use 12056@item mml2015-use
12056@vindex mml2015-use 12057@vindex mml2015-use
12057Symbol indicating elisp interface to OpenPGP implementation for 12058Symbol indicating elisp interface to OpenPGP implementation for
12058@acronym{PGP/MIME} messages. The default is @code{epg}, but 12059@acronym{PGP/MIME} messages. The default is @code{epg}, but
12059@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported 12060@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported
12060although deprecated. 12061although deprecated. By default, Gnus uses the first available
12062interface on this order.
12061 12063
12062@end table 12064@end table
12063 12065