2002-01-30 Marcus Brinkmann <marcus@g10code.de>

	* gpgme.texi (Deleting Keys): Document new error values.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index bfe382e22c013898ab4b8c4d57d3596fdf7ed32a..8d5a898a418db9d597f9f05f630b88c903078eb5 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-30  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.texi (Deleting Keys): Document new error values.
+
 2002-01-30  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.texi (Importing Keys): Add reference to gpgme_get_op_info.

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 44b699700466f831476c4f70cfa9556b81f802e7..7287307c80fa78dda7ef8b066ec87cf92a1dc250 100644 (file)
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1562,8 +1562,10 @@ key ring of the crypto engine used by @var{ctx}.  If
 otherwise secret keys are deleted as well.
 
 The function returns @code{GPGME_No_Error} if the key was deleted
-successfully, and @code{GPGME_Invalid_Value} if @var{ctx} or @var{key}
-is not a valid pointer.
+successfully, @code{GPGME_Invalid_Value} if @var{ctx} or @var{key} is
+not a valid pointer, @code{GPGME_Invalid_Key} if @var{key} could not
+be found in the keyring, and @code{GPGME_Conflict} if the secret key
+for @var{key} is available, but @var{allow_secret} is zero.
 @end deftypefun
 
 @deftypefun GpgmeError gpgme_op_delete_start (@w{GpgmeCtx @var{ctx}}, @w{const GpgmeKey @var{key}}, @w{int @var{allow_secret}})