[Emacs-diffs] trunk r116282: Some doc for epa-mail-aliases

[Glenn Morris]

------------------------------------------------------------
revno: 116282
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-05 20:05:43 -0800
message:
  Some doc for epa-mail-aliases
  
  * doc/misc/epa.texi (Mail-mode integration): Mention epa-mail-aliases.
  
  * lisp/epa.el (epa-mail-aliases): Doc fix.
  
  * etc/NEWS: Related edit.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/epa.texi              epa.texi-20091113204419-o5vbwnq5f7feedwu-8552
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epa.el                    epa.el-20091113204419-o5vbwnq5f7feedwu-8557

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-02-06 02:26:57 +0000
+++ b/doc/misc/ChangeLog        2014-02-06 04:05:43 +0000
@@ -1,5 +1,7 @@
 2014-02-06  Glenn Morris  <address@hidden>
 
+       * epa.texi (Mail-mode integration): Mention epa-mail-aliases.
+
        * mh-e.texi, viper.texi: Do not use colons in index entries.
 
 2014-02-05  Paul Eggert  <address@hidden>

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2014-02-05 08:35:24 +0000
+++ b/doc/misc/epa.texi 2014-02-06 04:05:43 +0000
@@ -342,11 +342,14 @@
 @kindex @kbd{C-c C-e C-e}
 @kindex @kbd{C-c C-e e}
 @findex epa-mail-encrypt
address@hidden epa-mail-aliases
 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
address@hidden/.gnupg/gpg.conf}.
address@hidden/.gnupg/gpg.conf}.  This function translates recipient
+addresses using the @code{epa-mail-aliases} list.  You can also
+use that option to ignore specific recipients for encryption purposes.
 
 @end table
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-06 01:51:20 +0000
+++ b/etc/NEWS  2014-02-06 04:05:43 +0000
@@ -517,9 +517,10 @@
 `electric-pair-text-syntax-table' to tweak pairing behavior inside
 strings and comments.
 
++++
 ** New EPA option `epa-mail-aliases'.
-You can set this to a list of email address aliases for keys to use
-in `epa-mail-encrypt'.
+You can set this to a list of email address aliases that `epa-mail-encrypt'
+should use to find keys.
 
 ---
 ** New ERC option `erc-accidental-paste-threshold-seconds'.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-06 01:22:38 +0000
+++ b/lisp/ChangeLog    2014-02-06 04:05:43 +0000
@@ -1,3 +1,7 @@
+2014-02-06  Glenn Morris  <address@hidden>
+
+       * epa.el (epa-mail-aliases): Doc fix.
+
 2014-02-06  Dmitry Gutov  <address@hidden>
 
        * emacs-lisp/lisp.el (lisp-completion-at-point): Use

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2014-02-05 08:37:39 +0000
+++ b/lisp/epa.el       2014-02-06 04:05:43 +0000
@@ -57,7 +57,9 @@
 
 If EXPANSIONS is empty, ignore ALIAS as regards encryption.
 This is a handy way to avoid warnings about addresses that you don't
-have any key for."
+have any key for.
+
+The command `epa-mail-encrypt' uses this."
   :type '(repeat (cons (string :tag "Alias") (repeat (string :tag 
"Expansion"))))
   :group 'epa
   :version "24.4")