Ignore generated files.

[elisp/epg.git] / epa.texi

diff --git a/epa.texi b/epa.texi
index 4497d03..671a347 100644 (file)
--- a/epa.texi
+++ b/epa.texi
@@ -120,6 +120,7 @@ This chapter introduces various commands for typical use cases.
 * Cryptographic operations on regions::  
 * Cryptographic operations on files::  
 * Dired integration::           
+* Mail-mode integration::       
 * Encrypting/decrypting *.gpg files::  
 @end menu
 
@@ -171,6 +172,37 @@ In @samp{*Keys*} buffer, several commands are available.  The common
 use case is to export some keys to a file.  To do that, type @kbd{m}
 to select keys, type @kbd{o}, and then supply the filename.
 
+Below are other commands related to key management.  Some of them take
+a file as input/output, and others take the current region.
+
+@deffn Command epa-insert-keys keys
+Insert selected @var{keys} after the point.  It will let you select
+keys before insertion.  By default, it will encode keys in the OpenPGP
+armor format.
+@end deffn
+
+@deffn Command epa-import-keys file
+Import keys from @var{file} to your keyring.
+@end deffn
+
+@deffn Command epa-import-keys-region start end
+Import keys from the current region between @var{start} and @var{end}
+to your keyring.
+@end deffn
+
+@deffn Command epa-import-armor-in-region start end
+Import keys in the OpenPGP armor format in the current region between
+@var{start} and @var{end}.  The difference from
+@code{epa-import-keys-region} is that
+@code{epa-import-armor-in-region} searches armors in the region and
+applies @code{epa-import-keys-region} to each of them.
+@end deffn
+
+@deffn Command epa-delete-keys allow-secret
+Delete selected keys.  If @var{allow-secret} is non-@code{nil}, it
+also delete the secret keys.
+@end deffn
+
 @node Cryptographic operations on regions
 @section Cryptographic operations on regions
 
@@ -182,9 +214,9 @@ replaces the region with the decrypted plaintext.
 @deffn Command epa-decrypt-armor-in-region start end
 Decrypt OpenPGP armors in the current region between @var{start} and
 @var{end}.  The difference from @code{epa-decrypt-region} is that
-@code{epa-decrypt-armor-in-region} searches ASCII armors in the region
+@code{epa-decrypt-armor-in-region} searches armors in the region
 and applies @code{epa-decrypt-region} to each of them.  That is, this
-command does not alter the original text around ASCII armors.
+command does not alter the original text around armors.
 @end deffn
 
 @deffn Command epa-verify-region start end
@@ -238,6 +270,40 @@ Encrypt @var{file}.  It will let you select recipients.
 
 @node Dired integration
 @section Dired integration
+
+EasyPG Assistant extends Dired Mode for GNU Emacs to allow users to
+easily do cryptographic operations on files.  The following keys are
+assigned.
+
+@table @kbd
+@item C-c 
+@kindex @kbd{: d}
+@findex epa-dired-do-decrypt
+Decrypt marked files.
+
+@item : v
+@kindex @kbd{: v}
+@findex epa-dired-do-verify
+Verify marked files.
+
+@item : s
+@kindex @kbd{: s}
+@findex epa-dired-do-sign
+Sign marked files.
+
+@item : e
+@kindex @kbd{: e}
+@findex epa-dired-do-encrypt
+Encrypt marked files.
+
+@end table
+
+@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.
+
 (not yet written.)
 
 @node Encrypting/decrypting *.gpg files
@@ -262,13 +328,27 @@ Enable automatic encryption/decryption of *.gpg files.
 @end deffn
 
 @code{epa-file} will let you select recipients.  If you want to
-suppress this question, it might be good idea to put the following
+suppress this question, it might be a good idea to put the following
 line on the first line of the plaintext.
+@vindex epa-file-encrypt-to
 
 @lisp
 ;; -*- epa-file-encrypt-to: ("ueno@@unixuser.org") -*-
 @end lisp
 
+Other variables which control the automatic encryption/decryption
+behavior are below.
+
+@defvar epa-file-cache-passphrase-for-symmetric-encryption
+If non-@code{nil}, cache passphrase for symmetric encryption.  The
+default value is @code{nil}.
+@end defvar
+
+@defvar epa-file-inhibit-auto-save
+If non-@code{nil}, disable auto-saving when opening an encrypted file.
+The default value is @code{t}.
+@end defvar
+
 @summarycontents
 @contents
 @bye