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.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 739d6938f0c5a4ea37b07599eec4de941419df97..7242110ec0f2072fa9ae759c92330b85175612f0 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-06  Glenn Morris  <rgm@gnu.org>
 
+       * 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  <eggert@cs.ucla.edu>

diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 4c4bbba8017328333a0db6b1f701005e62b6f619..4dbc1373d3267caaa4cabb5f2077f6e83a6c3a01 100644 (file)
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -342,11 +342,14 @@ Compose a signed message from the current buffer.
 @kindex @kbd{C-c C-e C-e}
 @kindex @kbd{C-c C-e e}
 @findex epa-mail-encrypt
+@vindex 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
-@file{~/.gnupg/gpg.conf}.
+@file{~/.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
 

diff --git a/etc/NEWS b/etc/NEWS
index 63ad54cf7a831ab71c6b26010e11082e26aad12e..7f58284d978fa8e173af785c73822c3b5415c1dc 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -517,9 +517,10 @@ You can customize `electric-pair-text-pairs' and
 `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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 571f9547279b9468a5072bc137a2e15d696c795d..1a1a7031b8cb4d921b0bf67ca1085c9061edbccb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-06  Glenn Morris  <rgm@gnu.org>
+
+       * epa.el (epa-mail-aliases): Doc fix.
+
 2014-02-06  Dmitry Gutov  <dgutov@yandex.ru>
 
        * emacs-lisp/lisp.el (lisp-completion-at-point): Use

diff --git a/lisp/epa.el b/lisp/epa.el
index ec1c0387bee9a8ac3ce84cefcc545eadac0b3104..be439ef241d5b6d4b727bc1e8c361b25e8357ce6 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -57,7 +57,9 @@ instead of encrypting it for ALIAS, encrypt it for EXPANSIONS...
 
 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")