[Emacs-diffs] /srv/bzr/emacs/trunk r102681: Mention epa-file-select-keys in epa.texi.

[Daiki Ueno]

------------------------------------------------------------
revno: 102681
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-17 10:43:03 +0900
message:
  Mention epa-file-select-keys in epa.texi.
modified:
  doc/misc/ChangeLog
  doc/misc/epa.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-12-16 22:22:28 +0000
+++ b/doc/misc/ChangeLog        2010-12-17 01:43:03 +0000
@@ -1,3 +1,8 @@
+2010-12-17  Daiki Ueno  <address@hidden>
+
+       * epa.texi (Encrypting/decrypting *.gpg files): Mention
+       epa-file-select-keys.
+
 2010-12-16  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.texi (Archived Messages): Remove outdated text.

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2010-10-25 12:24:44 +0000
+++ b/doc/misc/epa.texi 2010-12-17 01:43:03 +0000
@@ -353,16 +353,21 @@
 
 @node Encrypting/decrypting *.gpg files
 @section Encrypting/decrypting *.gpg files
-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
-epa-file-enable}.
+By default, every file whose name ends with @samp{.gpg} will be
+treated as encrypted.  That is, when you open such a file, the
+decrypted text is inserted in the buffer rather than encrypted one.
+Similarly, when you save the buffer to a @samp{foo.gpg} file,
+encrypted data is written.
+
+The file name pattern for encrypted files can be controlled by
address@hidden
+
address@hidden epa-file-name-regexp
+Regexp which matches filenames treated as encrypted.
address@hidden defvar
+
+You can disable this behavior with @kbd{M-x epa-file-disable}, and
+then get it back with @kbd{M-x epa-file-enable}.
 
 @deffn Command epa-file-disable
 Disable automatic encryption/decryption of *.gpg files.
@@ -373,23 +378,48 @@
 @end deffn
 
 @noindent
address@hidden will let you select recipients.  If you want to
-suppress this question, it might be a good idea to put the following
-line on the first line of the text being encrypted.
+By default, @code{epa-file} will try to use symmetric encryption, aka
+password-based encryption.  If you want to use public key encryption
+instead, do @kbd{M-x epa-file-select-keys}, which will pops up the key
+selection dialog.
+
address@hidden Command epa-file-select-keys
+Select recipient keys to encrypt the currently visiting file with
+public key encryption.
address@hidden deffn
+
+You can also change the default behavior with the variable
address@hidden
+
address@hidden epa-file-select-keys
+Control whether or not to pop up the key selection dialog.
address@hidden defvar
+
+For frequently visited files, it might be a good idea to tell Emacs
+which encryption method should be used through @xref{File Variables, ,
+, emacs, the Emacs Manual}.  Use the @code{epa-file-encrypt-to} local
+variable for this.
 @vindex epa-file-encrypt-to
 
+For example, if you want an Elisp file should be encrypted with a
+public key associated with an email address @samp{ueno@@unixuser.org},
+add the following line to the beginning of the file.
+
 @cartouche
 @lisp
 ;; -*- epa-file-encrypt-to: ("ueno@@unixuser.org") -*-
 @end lisp
 @end cartouche
 
-The file name extension of encrypted files can be controlled by
address@hidden
+Instead, if you want the file always (regardless of the value of the
address@hidden variable) encrypted with symmetric
+encryption, change the line as follows.
 
address@hidden epa-file-name-regexp
-Regexp which matches filenames treated as encrypted.
address@hidden defvar
address@hidden
address@hidden
+;; -*- epa-file-encrypt-to: nil -*-
address@hidden lisp
address@hidden cartouche
 
 Other variables which control the automatic encryption/decryption
 behavior are below.