summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/cha-intro-tls.texi13
-rw-r--r--guile/src/core.c4
2 files changed, 14 insertions, 3 deletions
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index c6f3fab284..f260a90c82 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
+@menu
+* 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.
+@end menu
+
+@node 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}.
-@subsection Priority strings
+@node Priority Strings
+@subsection 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
+@node 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.
+@node Resuming Sessions
@subsection Resuming Sessions
@anchor{resume}
@cindex Resuming sessions
diff --git a/guile/src/core.c b/guile/src/core.c
index e0b264bf88..afdbd93047 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")