[git] GPGME - branch, master, updated. gpgme-1.12.0-85-g649b196

[by Werner Koch]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  649b19688132dd315e361c0f5b63ba6d8f45996d (commit)
      from  2e3a681d0c35bbf6db584fedc9d7f0a010430b51 (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 649b19688132dd315e361c0f5b63ba6d8f45996d
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 3 10:40:52 2018 +0100

    doc: Minor comment cleanups.
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 7d410f8..e04c301 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2461,9 +2461,9 @@ the context @var{ctx} to @var{proto}.  All crypto operations will be
 performed by the crypto engine configured for that protocol.
 @xref{Protocols and Engines}.
 
-Setting the protocol with @code{gpgme_set_protocol} does not check if
-the crypto engine for that protocol is available and installed
-correctly.  @xref{Engine Version Check}.
+Setting the protocol with @code{gpgme_set_protocol} does intentionally
+not check if the crypto engine for that protocol is available and
+installed correctly.  @xref{Engine Version Check}.
 
 The function returns the error code @code{GPG_ERR_NO_ERROR} if the
 protocol could be set successfully, and @code{GPG_ERR_INV_VALUE} if
diff --git a/lang/python/doc/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst
index d1cb3fd..71dd72a 100644
--- a/lang/python/doc/rst/gpgme-python-howto.rst
+++ b/lang/python/doc/rst/gpgme-python-howto.rst
@@ -8,16 +8,10 @@ Introduction
 +-----------------------------------+-----------------------------------+
 | GPGME Version:                    | 1.12.1                            |
 +-----------------------------------+-----------------------------------+
-| Author:                           | `Ben                              |
-|                                   | McGinnes <https://gnupg.org/peopl |
-|                                   | e/index.html#sec-1-5>`__          |
-|                                   | <ben at gnupg.org>                   |
+| Author:                           | Ben McGinnes <ben at gnupg.org>      |
 +-----------------------------------+-----------------------------------+
-| Author GPG Key:                   | `DB4724E6FA4286C92B4E55C4321E4E23 |
-|                                   | 73590E5D <https://hkps.pool.sks-k |
-|                                   | eyservers.net/pks/lookup?search=0 |
-|                                   | xDB4724E6FA4286C92B4E55C4321E4E23 |
-|                                   | 73590E5D&exact=on&op=get>`__      |
+| Author GPG Key:                   | DB4724E6FA4286C92B4E55C4321E4E23  |
+|                                   | 73590E5D                          |
 +-----------------------------------+-----------------------------------+
 | Language:                         | Australian English, British       |
 |                                   | English                           |
diff --git a/src/gpgme.c b/src/gpgme.c
index a0a6c6b..65a2e30 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -320,6 +320,8 @@ _gpgme_release_result (gpgme_ctx_t ctx)
 }
 
 
+/* Note that setting the protocol will intentionally not fail if the
+ * engine is not available.  */
 gpgme_error_t
 gpgme_set_protocol (gpgme_ctx_t ctx, gpgme_protocol_t protocol)
 {

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

Summary of changes:
 doc/gpgme.texi                             |  6 +++---
 lang/python/doc/rst/gpgme-python-howto.rst | 12 +++---------
 src/gpgme.c                                |  2 ++
 3 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org