[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.3-7-g8a29173

[by Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  8a2917345ba88159bce6153b54706e701564f189 (commit)
      from  4cf3cc6e3d48c8400466ca29c3f1c22ed2da6c2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a2917345ba88159bce6153b54706e701564f189
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Nov 17 10:17:08 2017 +0800

    doc: clarify that --encrypt refers to public key encryption
    
    --
    
    A simple read of gpg(1) is ambiguous about whether --encrypt could be
    for either symmetric or pubkey encryption.  Closer inference suggests
    that --encrypt is about pubkey encryption only.  Make that clearer on
    a first read.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index bd45b04..35bb9a8 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -196,11 +196,13 @@ Make a detached signature.
 @item --encrypt
 @itemx -e
 @opindex encrypt
-Encrypt data. This command may be combined with @option{--sign} (to
-sign and encrypt a message), @option{--symmetric} (to encrypt a
-message that can decrypted using a secret key or a passphrase), or
- at option{--sign} and @option{--symmetric} together (for a signed
-message that can be decrypted using a secret key or a passphrase).
+Encrypt data to one or more public keys. This command may be combined
+with @option{--sign} (to sign and encrypt a message),
+ at option{--symmetric} (to encrypt a message that can decrypted using a
+secret key or a passphrase), or @option{--sign} and
+ at option{--symmetric} together (for a signed message that can be
+decrypted using a secret key or a passphrase).  @option{--recipient}
+and related options specify which public keys to use for encryption.
 
 @item --symmetric
 @itemx -c

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org