# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1251044637 0
# Node ID 5341a7b533a2c09b892f4548cbdc6453f0fbe0bf
# Parent  1de57b71aa21d040fa0a5ca6b07ba4543254d407
(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 -r 1de57b71aa21 -r 5341a7b533a2 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Sun Aug 23 04:43:12 2009 +0000
+++ b/doc/misc/ChangeLog	Sun Aug 23 16:23:57 2009 +0000
@@ -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 -r 1de57b71aa21 -r 5341a7b533a2 doc/misc/epa.texi
--- a/doc/misc/epa.texi	Sun Aug 23 04:43:12 2009 +0000
+++ b/doc/misc/epa.texi	Sun Aug 23 16:23:57 2009 +0000
@@ -99,9 +99,6 @@
 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 @@
 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