From: Daiki Ueno Date: Mon, 25 Oct 2010 12:24:44 +0000 (+0900) Subject: Don't use the word "PGP", since it is a non-free program. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~466 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c05c2b9bb0cfe2628301c431ee503e680ba3bc01;p=emacs.git Don't use the word "PGP", since it is a non-free program. --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ac4784606ec..cde97d40fa5 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -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 diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index dd7468959f4..7afe9c0c9b8 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -306,14 +306,14 @@ Encrypt marked files. @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.