* epa.el: Use :weight or :slant keywords to define faces, if

[elisp/epg.git] / epa.texi

diff --git a/epa.texi b/epa.texi
index 405067c..9c71547 100644 (file)
--- a/epa.texi
+++ b/epa.texi
@@ -52,7 +52,7 @@ Free Documentation License".
 @node Top
 @top EasyPG Assistant user's manual
 
-EasyPG Assistant is an Emacs user interface for GNU Privacy Guard
+EasyPG Assistant is an Emacs user interface to GNU Privacy Guard
 (GnuPG, @pxref{Top, , Top, gnupg, Using the GNU Privacy Guard}).
 
 EasyPG Assistant is a part of the package called EasyPG, an all-in-one
@@ -149,7 +149,6 @@ A character on the leftmost column indicates the trust level of the
 key.  If it is @samp{u}, the key is marked as ultimately trusted.  The
 second column is the key ID, and the rest is the user ID.
 
-@noindent
 You can move over entries by @key{TAB}.  If you type @key{RET} or
 click button1 on an entry, you will see more detailed information
 about the key you selected.
@@ -289,6 +288,7 @@ M-x dired
 (select recipients by 'm' and click [OK])
 @end example
 
+@noindent
 The following keys are assigned.
 
 @table @kbd
@@ -317,10 +317,38 @@ Encrypt marked files.
 @node Mail-mode integration
 @section Mail-mode integration
 
-EasyPG Assistant provides a minor mode to help composing clearsigned
-or OpenPGP armored encrypted mails.  The following keys are assigned.
+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
+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.
+
+@table @kbd
+@item C-c C-e d
+@kindex @kbd{C-c C-e d}
+@findex epa-mail-decrypt
+Decrypt OpenPGP armors in the current buffer.
+
+@item C-c C-e v
+@kindex @kbd{C-c C-e v}
+@findex epa-mail-verify
+Verify OpenPGP cleartext signed messages in the current buffer.
+
+@item C-c C-e s
+@kindex @kbd{C-c C-e s}
+@findex epa-mail-sign
+Compose a signed message from the current buffer.
+
+@item C-c C-e e
+@kindex @kbd{C-c C-e e}
+@findex epa-mail-encrypt
+Compose an encrypted message from the current buffer.
 
-(not yet written.)
+@end table
 
 @node Encrypting/decrypting *.gpg files
 @section Encrypting/decrypting *.gpg files