diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/gpgme.texi | 6 | 
2 files changed, 4 insertions, 5 deletions
| diff --git a/doc/ChangeLog b/doc/ChangeLog index 5f320008..0f819055 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,8 @@  2003-04-25  Marcus Brinkmann  <[email protected]> +	* 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/doc/gpgme.texi b/doc/gpgme.texi index ff519299..4f0e852e 100644 --- a/doc/gpgme.texi +++ b/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. | 
