diff options
| author | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
| commit | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch) | |
| tree | 94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /doc/misc/message.texi | |
| parent | cc390e46c7ba95b76ea133d98fd386214cd01709 (diff) | |
| parent | 6b0f7311f16646e0de2045b2410e20921901c616 (diff) | |
| download | emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip | |
Merge from trunk
Diffstat (limited to 'doc/misc/message.texi')
| -rw-r--r-- | doc/misc/message.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 6b922476596..ad56520f892 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi | |||
| @@ -1090,11 +1090,11 @@ the passphrase prompt. | |||
| 1090 | @subsection Using PGP/MIME | 1090 | @subsection Using PGP/MIME |
| 1091 | 1091 | ||
| 1092 | @acronym{PGP/MIME} requires an external OpenPGP implementation, such | 1092 | @acronym{PGP/MIME} requires an external OpenPGP implementation, such |
| 1093 | as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP | 1093 | as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP |
| 1094 | implementations such as PGP 2.x and PGP 5.x are also supported. One | 1094 | implementations such as PGP 2.x and PGP 5.x are also supported. One |
| 1095 | Emacs interface to the PGP implementations, PGG (@pxref{Top, ,PGG, | 1095 | Emacs interface to the PGP implementations, PGG (@pxref{Top, ,PGG, |
| 1096 | pgg, PGG Manual}), is included, but Mailcrypt and Florian Weimer's | 1096 | pgg, PGG Manual}), is included, but Mailcrypt is also supported. |
| 1097 | @code{gpg.el} are also supported. @xref{PGP Compatibility}. | 1097 | @xref{PGP Compatibility}. |
| 1098 | 1098 | ||
| 1099 | @cindex gpg-agent | 1099 | @cindex gpg-agent |
| 1100 | Message internally calls GnuPG (the @command{gpg} command) to perform | 1100 | Message internally calls GnuPG (the @command{gpg} command) to perform |