Mercurial > emacs
changeset 111177:35a6397b95e8
Don't use the word "PGP", since it is a non-free program.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Mon, 25 Oct 2010 21:24:44 +0900 |
| parents | 7b332968b4ae |
| children | b2ce1b10b56f |
| files | doc/misc/ChangeLog doc/misc/epa.texi |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Mon Oct 25 05:43:08 2010 +0000 +++ b/doc/misc/ChangeLog Mon Oct 25 21:24:44 2010 +0900 @@ -2,6 +2,7 @@ * epa.texi (Mail-mode integration): Add alternative key bindings for epa-mail commands; escape comma. + Don't use the word "PGP", since it is a non-free program. 2010-10-24 Jay Belanger <jay.p.belanger@gmail.com>
--- a/doc/misc/epa.texi Mon Oct 25 05:43:08 2010 +0000 +++ b/doc/misc/epa.texi Mon Oct 25 21:24:44 2010 +0900 @@ -306,14 +306,14 @@ @section Mail-mode integration EasyPG Assistant provides a minor mode @code{epa-mail-mode} to help -user compose inline PGP messages. Inline PGP is a traditional style -of sending signed/encrypted emails by embedding raw OpenPGP blobs -inside a message body, not using modern MIME format. +user compose inline OpenPGP messages. Inline OpenPGP is a traditional +style of sending signed/encrypted emails by embedding raw OpenPGP +blobs inside a message body, not using modern MIME format. -NOTE: Inline PGP is not recommended and you should consider to use +NOTE: Inline OpenPGP is not recommended and you should consider to use PGP/MIME. See @uref{http://josefsson.org/inline-openpgp-considered-harmful.html, -Inline PGP in E-mail is bad@comma{} Mm'kay?}. +Inline OpenPGP in E-mail is bad@comma{} Mm'kay?}. @noindent Once @code{epa-mail-mode} is enabled, the following keys are assigned.