[git] GPGME - branch, master, updated. gpgme-1.6.0-10-g3b6e9a3

[by Daiki Ueno]

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  3b6e9a3d0afcdd3c2f1de19f15924c3404c7140a (commit)
      from  8c61cbfb8ff2e1056840ecf8511810ed2482eb1f (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 3b6e9a3d0afcdd3c2f1de19f15924c3404c7140a
Author: Daiki Ueno <ueno at gnu.org>
Date:   Fri Dec 4 17:55:09 2015 +0900

    doc: Fix minor errors
    
    * doc/gpgme.texi: Fix errors and typos in the cancellation and
    gpgme_import_result_t documentation.
    
    Signed-off-by: Daiki Ueno <ueno at gnu.org>

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 1c680b5..db94617 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3810,7 +3810,7 @@ for the context @var{ctx}, or, if that is not set, by the encoding
 specified for @var{keydata}.
 
 The keys to export are taken form the @code{NULL} terminated array
- at var{keys}.  Only keys of the the currently selected protocol of
+ at var{keys}.  Only keys of the currently selected protocol of
 @var{ctx} which do have a fingerprint set are considered for export.
 Other keys specified by the @var{keys} are ignored.  In particular
 OpenPGP keys retrieved via an external key listing are not included.
@@ -3883,7 +3883,7 @@ permanent which have been retrieved from an external source (i.e. using
 for the usual workaround of exporting and then importing a key to make
 an X.509 key permanent.}
 
-Only keys of the the currently selected protocol of @var{ctx} are
+Only keys of the currently selected protocol of @var{ctx} are
 considered for import.  Other keys specified by the @var{keys} are
 ignored.  As of now all considered keys must have been retrieved using
 the same method, that is the used key listing mode must be identical.
@@ -3970,34 +3970,34 @@ The number of keys without user ID.
 @item int imported
 The total number of imported keys.
 
- at item imported_rsa
+ at item int imported_rsa
 The number of imported RSA keys.
 
- at item unchanged
+ at item int unchanged
 The number of unchanged keys.
 
- at item new_user_ids
+ at item int new_user_ids
 The number of new user IDs.
 
- at item new_sub_keys
+ at item int new_sub_keys
 The number of new sub keys.
 
- at item new_signatures
+ at item int new_signatures
 The number of new signatures.
 
- at item new_revocations
+ at item int new_revocations
 The number of new revocations.
 
- at item secret_read
+ at item int secret_read
 The total number of secret keys read.
 
- at item secret_imported
+ at item int secret_imported
 The number of imported secret keys.
 
- at item secret_unchanged
+ at item int secret_unchanged
 The number of unchanged secret keys.
 
- at item not_imported
+ at item int not_imported
 The number of keys not imported.
 
 @item gpgme_import_status_t imports
@@ -6147,16 +6147,16 @@ operation in the context @var{ctx}.  This only works if you use the
 global event loop or your own event loop.
 
 If you use the global event loop, you must not call @code{gpgme_wait}
-or @code{gpgme_wait} during cancellation.  After successful
+during cancellation.  After successful
 cancellation, you can call @code{gpgme_wait} (optionally waiting on
 @var{ctx}), and the context @var{ctx} will appear as if it had
 finished with the error code @code{GPG_ERR_CANCEL}.
 
-If you use your an external event loop, you must ensure that no I/O
+If you use an external event loop, you must ensure that no I/O
 callbacks are invoked for this context (for example by halting the
 event loop).  On successful cancellation, all registered I/O callbacks
 for this context will be unregistered, and a @code{GPGME_EVENT_DONE}
-event with the error code @code{GPG_ERR_CANCEL} will be signaled.
+event with the error code @code{GPG_ERR_CANCEL} will be signalled.
 
 The function returns an error code if the cancellation failed (in this
 case the state of @var{ctx} is not modified).

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

Summary of changes:
 doc/gpgme.texi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)


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