[Emacs-diffs] emacs/doc/misc epa.texi ChangeLog

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       09/08/23 16:23:58

Modified files:
        doc/misc       : epa.texi ChangeLog 

Log message:
        (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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/epa.texi?cvsroot=emacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/ChangeLog?cvsroot=emacs&r1=1.305&r2=1.306

Patches:
Index: epa.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/epa.texi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- epa.texi    16 Feb 2009 17:42:00 -0000      1.12
+++ epa.texi    23 Aug 2009 16:23:57 -0000      1.13
@@ -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

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- ChangeLog   16 Aug 2009 17:49:54 -0000      1.305
+++ ChangeLog   23 Aug 2009 16:23:58 -0000      1.306
@@ -1,3 +1,9 @@
+2009-08-23  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dbus.texi (Asynchronous Methods): Allow nil handler.