EasyPG: Implement some suggestions from emacs-devel.

2 files changed, 18 insertions, 11 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 005728ae4ba..f88471754cb 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-10  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.texi (Quick start): Use the command `epa-enable' instead of
+        loading `epa-setup'.
+
 2008-02-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add epa.
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index f47f5c2921f..08f3fb4178b 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -77,26 +77,28 @@ EasyPG Assistant provides the following features.
 @node  Quick start
 @chapter Quick start
 
-To install, just follow the standard CMMI installation instructions.
+@c To install, just follow the standard CMMI installation instructions.
 
-@cartouche
-@example
-$ ./configure
-$ sudo make install
-@end example
-@end cartouche
+@c @cartouche
+@c @example
+@c $ ./configure
+@c $ sudo make install
+@c @end example
+@c @end cartouche
 
-@noindent
-Then, add the following line to your @file{~/.emacs}
+@c @noindent
+@c Then, add the following line to your @file{~/.emacs}
+
+Add the following line to your @file{~/.emacs}.
 
 @cartouche
 @lisp
-(require 'epa-setup)
+(epa-mode 1)
 @end lisp
 @end cartouche
 
 @noindent
-That's all.  Restart emacs and type @kbd{M-x epa- @key{TAB}}, and you will see a
+Restart emacs and type @kbd{M-x epa- @key{TAB}}, and you will see a
 lot of commands available.  For example,
 
 @itemize @bullet