[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-108-g962549e

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=962549eb0be74f0e90f2181db86b47b78118f3ef

The branch, master has been updated
       via  962549eb0be74f0e90f2181db86b47b78118f3ef (commit)
      from  c93e85ec1ee9d0fd09d078e918f775eff7dd9160 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 962549eb0be74f0e90f2181db86b47b78118f3ef
Author: Simon Josefsson <address@hidden>
Date:   Fri Sep 21 01:19:19 2012 +0200

    More GTK-DOC warning fixes.

-----------------------------------------------------------------------

Summary of changes:
 lib/algorithms/cert_types.c |    4 +---
 lib/tpm.c                   |    8 ++++----
 lib/x509/common.c           |    2 +-
 lib/x509/ocsp_output.c      |    8 ++++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/algorithms/cert_types.c b/lib/algorithms/cert_types.c
index 000e435..5fa6b8f 100644
--- a/lib/algorithms/cert_types.c
+++ b/lib/algorithms/cert_types.c
@@ -78,9 +78,7 @@ static const gnutls_certificate_type_t 
supported_certificate_types[] = {
 /**
  * gnutls_certificate_type_list:
  *
- * Get a list of certificate types.  Note that to be able to use
- * OpenPGP certificates, you must link to libgnutls-extra and call
- * gnutls_global_init_extra().
+ * Get a list of certificate types.
  *
  * Returns: a (0)-terminated list of #gnutls_certificate_type_t
  *   integers indicating the available certificate types.
diff --git a/lib/tpm.c b/lib/tpm.c
index 848cf96..4f20e3c 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -823,11 +823,11 @@ cleanup:
  * @url: The URL of the TPM key to be imported
  * @srk_password: The password for the SRK key (optional)
  * @key_password: A password for the key (optional)
- * @flags: One of the %GNUTLS_PRIVKEY flags
+ * @flags: One of the GNUTLS_PRIVKEY_* flags
  *
  * This function will import the given private key to the abstract
- * #gnutls_privkey_t structure. 
- * 
+ * #gnutls_privkey_t structure.
+ *
  * Note that unless %GNUTLS_PRIVKEY_DISABLE_CALLBACKS
  * is specified, if incorrect (or NULL) passwords are given
  * the PKCS11 callback functions will be used to obtain the
@@ -1052,7 +1052,7 @@ int ret;
  * @fdata: The TPM key to be imported
  * @format: The format of the private key
  * @srk_password: The password for the SRK key (optional)
- * @flags: One of the %GNUTLS_PUBKEY flags
+ * @flags: One of the GNUTLS_PUBKEY_* flags
  *
  * This function will import the public key from the provided TPM key
  * structure.
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 56bc0d6..fd4b815 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -174,7 +174,7 @@ _gnutls_x509_oid_data_choice (const char *oid)
 /**
  * gnutls_x509_dn_oid_name:
  * @oid: holds an Object Identifier in a null terminated string
- * @flags: 0 or %GNUTLS_X509_DN_OID_*
+ * @flags: 0 or GNUTLS_X509_DN_OID_*
  *
  * This function will return the name of a known DN OID. If
  * %GNUTLS_X509_DN_OID_RETURN_OID is specified this function
diff --git a/lib/x509/ocsp_output.c b/lib/x509/ocsp_output.c
index 737b227..cca931d 100644
--- a/lib/x509/ocsp_output.c
+++ b/lib/x509/ocsp_output.c
@@ -161,8 +161,8 @@ print_req (gnutls_buffer_st * str, gnutls_ocsp_req_t req)
  * This function will pretty print a OCSP request, suitable for
  * display to a human.
  *
- * If the format is %GNUTLS_PRINT_FULL then all fields of the request
- * will be output, on multiple lines.
+ * If the format is %GNUTLS_OCSP_PRINT_FULL then all fields of the
+ * request will be output, on multiple lines.
  *
  * The output @out->data needs to be deallocate using gnutls_free().
  *
@@ -593,8 +593,8 @@ print_resp (gnutls_buffer_st * str, gnutls_ocsp_resp_t resp,
  * This function will pretty print a OCSP response, suitable for
  * display to a human.
  *
- * If the format is %GNUTLS_PRINT_FULL then all fields of the response
- * will be output, on multiple lines.
+ * If the format is %GNUTLS_OCSP_PRINT_FULL then all fields of the
+ * response will be output, on multiple lines.
  *
  * The output @out->data needs to be deallocate using gnutls_free().
  *


hooks/post-receive
-- 
GNU gnutls