X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7ad8fe5e2876518a8f33b80050f98dab4ff78398..19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0:/doc/misc/epa.texi

diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 048fe538cc..b02e41e914 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -7,13 +7,13 @@
 @set VERSION 1.0.0
 
 @copying
-This file describes EasyPG Assistant.
+This file describes EasyPG Assistant @value{VERSION}.
 
-Copyright @copyright{} 2007, 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the license
@@ -36,7 +36,6 @@ license to the document, as described in section 6 of the license.
 * EasyPG Assistant: (epa).   An Emacs user interface to GNU Privacy Guard.
 @end direntry
 
-
 @titlepage
 @title EasyPG Assistant
 
@@ -46,10 +45,8 @@ license to the document, as described in section 6 of the license.
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
 
-@c @summarycontents
-@c @contents
+@contents
 
 @node Top
 @top EasyPG Assistant user's manual
@@ -61,8 +58,9 @@ EasyPG Assistant is a part of the package called EasyPG, an all-in-one
 GnuPG interface for Emacs.  EasyPG also contains the library interface
 called EasyPG Library.
 
-@noindent
-This manual covers EasyPG version @value{VERSION}.
+@ifnottex
+@insertcopying
+@end ifnottex
 
 @menu
 * Overview::                    
@@ -101,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
 
@@ -308,15 +303,20 @@ Encrypt marked files.
 @node Mail-mode integration
 @section Mail-mode integration
 
-EasyPG Assistant provides a minor mode to help user compose inline PGP
-messages.  Inline PGP is sending the OpenPGP blobs directly inside a
-mail message and it is not recommended and you should consider to use
+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.
+
+NOTE: Inline PGP 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 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
@@ -338,17 +338,21 @@ Compose a signed message from the current buffer.
 @kindex @kbd{C-c C-e e}
 @findex epa-mail-encrypt
 Compose an encrypted message from the current buffer.
+By default it tries to build the recipient list from @samp{to},
+@samp{cc}, and @samp{bcc} fields of the mail header.  To include your
+key in the recipient list, use @samp{encrypt-to} option in
+@file{~/.gnupg/gpg.conf}.
 
 @end table
 
 @node Encrypting/decrypting *.gpg files
 @section Encrypting/decrypting *.gpg files
-Once @code{epa-setup} is loaded, every file whose extension is
-@samp{.gpg} will be treated as encrypted.  That is, when you attempt
-to open such a file which already exists, the decrypted text is
-inserted in the buffer rather than encrypted one.  On the other hand,
-when you attempt to save the buffer to a file whose extension is
-@samp{.gpg}, encrypted data is written.
+By default, every file whose extension is @samp{.gpg} will be treated
+as encrypted.  That is, when you attempt to open such a file which
+already exists, the decrypted text is inserted in the buffer rather
+than encrypted one.  On the other hand, when you attempt to save the
+buffer to a file whose extension is @samp{.gpg}, encrypted data is
+written.
 
 If you want to temporarily disable this behavior, use @kbd{M-x
 epa-file-disable}, and then to enable this behavior use @kbd{M-x