From: Marcus Brinkmann Date: Fri, 25 Apr 2003 16:11:25 +0000 (+0000) Subject: 2003-04-25 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~666 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a913fe3d36e4ead2d90de9fc665ad2a78c4f6b65;p=gpgme.git 2003-04-25 Marcus Brinkmann * gpgme.texi (Importing Keys): Remove note about gpgme_get_op_info. (Detailed Results): Remove note about import. --- diff --git a/trunk/doc/ChangeLog b/trunk/doc/ChangeLog index 5f32000..0f81905 100644 --- a/trunk/doc/ChangeLog +++ b/trunk/doc/ChangeLog @@ -1,5 +1,8 @@ 2003-04-25 Marcus Brinkmann + * gpgme.texi (Importing Keys): Remove note about gpgme_get_op_info. + (Detailed Results): Remove note about import. + * gpgme.texi (Importing Keys): Add documentation for GpgmeImportStatus, GpgmeImportResult and gpgme_op_import_result. diff --git a/trunk/doc/gpgme.texi b/trunk/doc/gpgme.texi index ff51929..4f0e852 100644 --- a/trunk/doc/gpgme.texi +++ b/trunk/doc/gpgme.texi @@ -2263,9 +2263,6 @@ The function @code{gpgme_op_import} adds the keys in the data buffer The format of @var{keydata} can be @var{ASCII} armored, for example, but the details are specific to the crypto engine. -More information about the import is available with -@code{gpgme_get_op_info}. @xref{Detailed Results}. - The function returns @code{GPGME_No_Error} if the import was completed successfully, @code{GPGME_Invalid_Value} if @var{keydata} if @var{ctx} or @var{keydata} is not a valid pointer, and @code{GPGME_No_Data} if @@ -3171,8 +3168,7 @@ Here is a sample of the information that might be returned: @end example Currently, the only operations that return additional information are -encrypt, sign and import. @xref{Encrypt}, @xref{Sign}, -@xref{Importing Keys}. +encrypt, sign. @xref{Encrypt}, @xref{Sign}. The function returns a string or @code{NULL} if no such data is available.