(Quick start): Don't refer to nonexistent epa-mode.

(Mail-mode integration): Mention epa-mail-mode and
epa-global-mail-mode.  Reported by Jari Aalto (Bug#4211).

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a6b601ce0a35903483e03fada02ec2b73ad65c88..67963c1c9c2ccba1f7f992ce7127ea8809911a85 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-23  Daiki Ueno  <ueno@unixuser.org>
+
+       * epa.texi (Quick start): Don't refer to nonexistent epa-mode.
+       (Mail-mode integration): Mention epa-mail-mode and
+       epa-global-mail-mode.  Reported by Jari Aalto (Bug#4211).
+
 2009-08-16  Michael Albinus  <michael.albinus@gmx.de>
 
        * dbus.texi (Asynchronous Methods): Allow nil handler.

diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 97a61cd55478f6ac9c53477538a4ec4c752c70d9..32cc20778f77e8ecfdc92f7b1180a090ccb44cf2 100644 (file)
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -99,9 +99,6 @@ EasyPG Assistant provides several cryptographic features which can be
 integrated into other Emacs functionalities.  For example, automatic
 encryption/decryption of @samp{*.gpg} files.
 
-To install these features, do @kbd{C-u 1 M-x epa-mode}.  It can also
-be turned on by customize.  Try @kbd{M-x customize-variable epa-mode}.
-
 @node Commands
 @chapter Commands
 
@@ -314,7 +311,9 @@ PGP/MIME.  See
 Inline PGP in E-mail is bad, Mm'kay?}.
 
 @noindent
-The following keys are assigned.
+Once @code{epa-mail-mode} is enabled, the following keys are assigned.
+You can do it by @kbd{C-u 1 M-x epa-mail-mode} or through the Customize
+interface.  Try @kbd{M-x customize-variable epa-global-mail-mode}.
 
 @table @kbd
 @item C-c C-e d