aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christoph Steiner <[email protected]>2013-05-24 15:51:16 +0000
committerWerner Koch <[email protected]>2013-05-28 08:37:51 +0000
commitd34e343487c688303a332869fdd7779e3ea7c0e8 (patch)
tree8060fb311a6494e1f2983398b6146d8ba1bbc73d
parentw32: Fix installing of .def file. (diff)
downloadgpgme-d34e343487c688303a332869fdd7779e3ea7c0e8.tar.gz
gpgme-d34e343487c688303a332869fdd7779e3ea7c0e8.zip
doc: rename gpgme_sub_key_t to gpgme_subkey_t to match gpgme.h
--
-rw-r--r--NEWS2
-rw-r--r--doc/gpgme.texi8
2 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 3a583d3e..971075d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1026,7 +1026,7 @@ gpgme_trust_item_release DEPRECATED: Use gpgme_trust_item_unref.
gpgme_trust_item_get_string_attr DEPRECATED
gpgme_trust_item_get_ulong_attr DEPRECATED
gpgme_get_key CHANGED: Removed force_update argument.
-gpgme_sub_key_t NEW
+gpgme_subkey_t NEW
gpgme_key_sig_t NEW
gpgme_user_id_t NEW
gpgme_key_t CHANGED: Now has user accessible data members.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 589747d0..217dc13a 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2545,8 +2545,8 @@ signers are specified. This is always done by specifying the
respective keys that should be used for the operation. The following
section describes how such keys can be selected and manipulated.
-@deftp {Data type} gpgme_sub_key_t
-The @code{gpgme_sub_key_t} type is a pointer to a subkey structure.
+@deftp {Data type} gpgme_subkey_t
+The @code{gpgme_subkey_t} type is a pointer to a subkey structure.
Sub keys are one component of a @code{gpgme_key_t} object. In fact,
subkeys are those parts that contains the real information about the
individual cryptographic keys that belong to the same key object. One
@@ -2556,7 +2556,7 @@ the linked list is also called the primary key.
The subkey structure has the following members:
@table @code
-@item gpgme_sub_key_t next
+@item gpgme_subkey_t next
This is a pointer to the next subkey structure in the linked list, or
@code{NULL} if this is the last element.
@@ -2795,7 +2795,7 @@ chain ID, which can be used to built the certificate chain.
If @code{protocol} is @code{GPGME_PROTOCOL_OpenPGP}, then this is the
owner trust.
-@item gpgme_sub_key_t subkeys
+@item gpgme_subkey_t subkeys
This is a linked list with the subkeys of the key. The first subkey
in the list is the primary key and usually available.