[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-252-gfe3a250

[Ludovic Courtès]

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=fe3a2502c48346cd4ad79abda995061268667a2a

The branch, master has been updated
       via  fe3a2502c48346cd4ad79abda995061268667a2a (commit)
       via  0d3496deb4e583a6f1817c46e8f5424655745136 (commit)
      from  6588bbdbfde030bca4286d6efe3da3bb7add7139 (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 fe3a2502c48346cd4ad79abda995061268667a2a
Author: Ludovic Courtès <address@hidden>
Date:   Sun Feb 27 23:36:13 2011 +0100

    Pass the right CPPFLAGS when building Guile doc.

commit 0d3496deb4e583a6f1817c46e8f5424655745136
Author: Ludovic Courtès <address@hidden>
Date:   Sun Feb 27 23:35:54 2011 +0100

    Add nodes for the subsections of "The TLS Handshake Protocol".

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

Summary of changes:
 doc/Makefile.am        |    5 +++--
 doc/cha-intro-tls.texi |   13 ++++++++++++-
 guile/src/core.c       |    4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8770e62..3b47aca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010 Free Software Foundation, Inc.
+# 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -192,7 +192,8 @@ GUILE_FOR_BUILD =                           \
 SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)                     \
         -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes    \
         -I$(top_srcdir)/libextra/includes                              \
-         -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src
+         -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src         \
+        $(GUILE_CFLAGS)
 
 core.c.texi: $(top_srcdir)/guile/src/core.c
        $(MAKE) -C ../guile/src built-sources &&                        \
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index c6f3fab..f260a90 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -316,6 +316,14 @@ To set whether client certificate is required or not.
 To initiate the handshake.
 @end table
 
address@hidden
+* TLS Cipher Suites::           TLS session parameters.
+* Priority Strings::            Defining how parameters are negotiated.
+* Client Authentication::       Requesting a certificate from the client.
+* Resuming Sessions::           Reusing previously established keys.
address@hidden menu
+
address@hidden TLS Cipher Suites
 @subsection TLS Cipher Suites
 
 The Handshake Protocol of @acronym{TLS} negotiates cipher suites of
@@ -343,7 +351,8 @@ that you consider weak.
 
 All the supported ciphersuites are shown in @ref{ciphersuites}.
 
address@hidden Priority strings
address@hidden Priority Strings
address@hidden Priority Strings
 In order to specify cipher suite preferences, the
 previously shown priority functions accept a string
 that specifies the algorithms to be enabled in a TLS handshake.
@@ -492,6 +501,7 @@ will allow V1 CAs in chains.
 
 @end table
 
address@hidden Client Authentication
 @subsection Client Authentication
 @cindex Client Certificate authentication
 
@@ -513,6 +523,7 @@ Sending of the names of the CAs can be controlled using
 @ref{gnutls_certificate_send_x509_rdn_sequence}. The client, then, may
 send a certificate, signed by one of the server's acceptable signers.
 
address@hidden Resuming Sessions
 @subsection Resuming Sessions
 @anchor{resume}
 @cindex Resuming sessions
diff --git a/guile/src/core.c b/guile/src/core.c
index e0b264b..afdbd93 100644
--- a/guile/src/core.c
+++ b/guile/src/core.c
@@ -539,8 +539,8 @@ SCM_DEFINE (scm_gnutls_set_session_priorities_x,
            (SCM session, SCM priorities),
            "Have @var{session} use the given @var{priorities} for "
            "the ciphers, key exchange methods, MACs and compression "
-           "methods.  @var{priorities} must be a string; see the "
-           "manual for the syntax.  When @var{priorities} cannot be "
+           "methods.  @var{priorities} must be a string (@pxref{"
+           "Priority Strings}).  When @var{priorities} cannot be "
            "parsed, an @code{error/invalid-request} error is raised, "
            "with an extra argument indication the position of the "
            "error.\n")


hooks/post-receive
-- 
GNU gnutls