[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-132-gf8b593e

[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=f8b593eb08697de5ccd7b1523d8533d8c481fadb

The branch, master has been updated
       via  f8b593eb08697de5ccd7b1523d8533d8c481fadb (commit)
       via  62d97f39e87243345186a2ada659f3165470a0a6 (commit)
      from  0b856fdbd1b003dd4c5c3408521e424f96b15196 (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 f8b593eb08697de5ccd7b1523d8533d8c481fadb
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 17:57:42 2010 +0100

    Doc fix.

commit 62d97f39e87243345186a2ada659f3165470a0a6
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 17:47:40 2010 +0100

    Doc fix.

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

Summary of changes:
 lib/includes/gnutls/gnutls.h.in |    4 ++--
 lib/openpgp/gnutls_openpgp.c    |    8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 96792a0..c3b6262 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -289,8 +289,8 @@ extern "C" {
 
   /**
    * gnutls_alert_level_t:
-   * @GNUTLS_AL_WARNING: TLS alert of warning severity.
-   * @GNUTLS_AL_FATAL: TLS alert of fatal severity.
+   * @GNUTLS_AL_WARNING: Alert of warning severity.
+   * @GNUTLS_AL_FATAL: Alert of fatal severity.
    *
    * Enumeration of different TLS alert severities.
    */
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 511c4d7..d9c498a 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -295,7 +295,6 @@ gnutls_certificate_set_openpgp_key_mem 
(gnutls_certificate_credentials_t res,
                                                  NULL, format);
 }
 
-
 /**
  * gnutls_certificate_set_openpgp_key_file:
  * @res: the destination context to save the data.
@@ -438,7 +437,6 @@ gnutls_certificate_set_openpgp_key_mem2 
(gnutls_certificate_credentials_t res,
   return ret;
 }
 
-
 /**
  * gnutls_certificate_set_openpgp_key_file2:
  * @res: the destination context to save the data.
@@ -551,7 +549,6 @@ gnutls_openpgp_count_key_names (const gnutls_datum_t * cert)
   return nuids;
 }
 
-
 /**
  * gnutls_certificate_set_openpgp_keyring_file:
  * @c: A certificate credentials structure
@@ -911,7 +908,6 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, 
gnutls_openpgp_crt_t cert)
 
 }
 
-
 /**
  * gnutls_openpgp_privkey_sign_hash:
  * @key: Holds the key
@@ -919,8 +915,8 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, 
gnutls_openpgp_crt_t cert)
  * @signature: will contain newly allocated signature
  *
  * This function will sign the given hash using the private key.  You
- * should use gnutls_openpgp_privkey_set_subkey() before calling this
- * function to set the subkey to use.
+ * should use gnutls_openpgp_privkey_set_preferred_key_id() before
+ * calling this function to set the subkey to use.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.


hooks/post-receive
-- 
GNU gnutls