diff options
| author | Werner Koch <[email protected]> | 2017-03-28 14:49:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-28 14:49:42 +0000 |
| commit | 1b55e90d422983f303e1d243daeac15e6f916d20 (patch) | |
| tree | 56f8aea297d04f8b3f95b4930675e12b7f4d4183 /doc | |
| parent | Revert "qt: Disable testEncryptDecryptNowrap" (diff) | |
| parent | Post release updates (diff) | |
| download | gpgme-1b55e90d422983f303e1d243daeac15e6f916d20.tar.gz gpgme-1b55e90d422983f303e1d243daeac15e6f916d20.zip | |
Merge branch 'gpgme-1.9-branch'
--
Diffstat (limited to '')
| -rw-r--r-- | doc/gpgme.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/gpgme.texi b/doc/gpgme.texi index 62004aed..40423cff 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -14,7 +14,7 @@ @syncodeindex pg fn @copying -Copyright @copyright{} 2002--2008, 2010, 2012--2016 g10 Code GmbH. +Copyright @copyright{} 2002--2008, 2010, 2012--2017 g10 Code GmbH. @quotation Permission is granted to copy, distribute and/or modify this document @@ -3426,7 +3426,7 @@ The function @code{gpgme_op_keylist_from_data_start} initiates a key listing operation inside the context @var{ctx}. In contrast to the other key listing operation the keys are read from the supplied @var{data} and not from the local key database. The keys are also not -imported into the local ley database. The function sets everything up +imported into the local key database. The function sets everything up so that subsequent invocations of @code{gpgme_op_keylist_next} return the keys from @var{data}. |