[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-134-g7b6ae74

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

The branch, master has been updated
       via  7b6ae740e8e8a403cf5cf4a2fe19c7cc99da328a (commit)
      from  b66e349e3b895bf4a97daac764f97ca42fba2664 (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 7b6ae740e8e8a403cf5cf4a2fe19c7cc99da328a
Author: Simon Josefsson <address@hidden>
Date:   Wed Feb 17 18:24:48 2010 +0100

    More GTK-DOC fixes.

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

Summary of changes:
 doc/reference/Makefile.am      |    2 +-
 doc/reference/gnutls-docs.sgml |    1 -
 lib/ext_safe_renegotiation.c   |    2 +-
 lib/ext_signature.c            |    2 +-
 lib/gnutls_supplemental.c      |   10 ++++++++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index a485490..2a28283 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -99,7 +99,7 @@ IGNORE_HFILES += alignof.h alloca.h alloca.in.h arg-nonnull.h 
        \
 IGNORE_HFILES += socket.h stat.h
 
 # cd lib/minitasn1/ && echo *.h
-IGNORE_HFILES += element.h gstr.h int.h parser_aux.h structure.h
+IGNORE_HFILES += element.h gstr.h int.h libtasn1.h parser_aux.h structure.h
 
 # cd lib/opencdk/ && echo *.h
 IGNORE_HFILES += context.h filters.h keydb.h main.h opencdk.h packet.h \
diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index 850ca7d..1085f54 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -28,7 +28,6 @@
     <xi:include href="xml/openpgp.xml"/>
     <xi:include href="xml/crypto.xml"/>
     <xi:include href="xml/openssl.xml"/>
-    <xi:include href="xml/libtasn1.xml"/>
   </chapter>
 
   <index>
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 45d3d2f..492e9be 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -137,7 +137,7 @@ gnutls_safe_negotiation_set_initial (gnutls_session_t 
session, int value)
 }
 
 /**
- * gnutls_safe_negotiation_set:
+ * gnutls_safe_renegotiation_set:
  * @session: is a #gnutls_session_t structure.
  * @value: 0 to disable and 1 to enable
  *
diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index a2aefb8..25fdb0f 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -284,7 +284,7 @@ _gnutls_session_sign_algo_enabled (gnutls_session_t session,
 }
 
 /**
- * gnutls_sign_algorithm_get:
+ * gnutls_sign_algorithm_get_requested:
  * @session: is a #gnutls_session_t structure.
  * @indx: is an index of the signature algorithm to return
  * @algo: the returned certificate type will be stored there
diff --git a/lib/gnutls_supplemental.c b/lib/gnutls_supplemental.c
index 9ee172b..dabee2a 100644
--- a/lib/gnutls_supplemental.c
+++ b/lib/gnutls_supplemental.c
@@ -66,6 +66,16 @@ gnutls_supplemental_entry _gnutls_supplemental[] = {
   {0, 0, 0, 0}
 };
 
+/**
+ * gnutls_supplemental_get_name:
+ * @type: is a supplemental data format type
+ *
+ * Convert a #gnutls_supplemental_data_format_type_t value to a
+ * string.
+ *
+ * Returns: a string that contains the name of the specified
+ *   supplemental data format type, or %NULL for unknown types.
+ **/
 const char *
 gnutls_supplemental_get_name (gnutls_supplemental_data_format_type_t type)
 {


hooks/post-receive
-- 
GNU gnutls