[Emacs-diffs] /srv/bzr/emacs/trunk r102098: Don't use the word "PGP", since it is a non-free program.

[Daiki Ueno]

------------------------------------------------------------
revno: 102098
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-25 21:24:44 +0900
message:
  Don't use the word "PGP", since it is a non-free program.
modified:
  doc/misc/ChangeLog
  doc/misc/epa.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-25 03:06:35 +0000
+++ b/doc/misc/ChangeLog        2010-10-25 12:24:44 +0000
@@ -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  <address@hidden>
 

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2010-10-25 03:06:35 +0000
+++ b/doc/misc/epa.texi 2010-10-25 12:24:44 +0000
@@ -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 address@hidden Mm'kay?}.
+Inline OpenPGP in E-mail is address@hidden Mm'kay?}.
 
 @noindent
 Once @code{epa-mail-mode} is enabled, the following keys are assigned.