[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-86-gc9dd561

[Nikos Mavrogiannopoulos]

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

The branch, master has been updated
       via  c9dd561e8f6aec3445f097dc0ec8c13acc805c46 (commit)
      from  18cb0a89d3eb08847fc3ecc8cd9438bb88c7b4fa (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 c9dd561e8f6aec3445f097dc0ec8c13acc805c46
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 7 20:23:59 2011 +0200

    document new config file format and path.

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

Summary of changes:
 doc/cha-cert-auth.texi |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index 7c13e22..a18b63f 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -399,12 +399,11 @@ shared cryptographic keys and certificates in a uniform 
way, as in the following
 
 @subsection Initialization
 To allow all the  @acronym{GnuTLS} applications to access @acronym{PKCS #11} 
tokens
-it is adviceable to use @code{/etc/gnutls/pkcs11.conf}. This file has the 
following
+it is adviceable to use @code{/etc/pkcs11/modules/mymodule.conf}. This file 
has the following
 format:
 
 @verbatim
-load=/usr/lib/opensc-pkcs11.so
-load=/usr/lib/gnome-keyring/gnome-keyring-pkcs11.so
+module: /usr/lib/opensc-pkcs11.so
 @end verbatim
 
 If you use this file, then there is no need for other initialization in
@@ -426,9 +425,9 @@ the user to insert the token. All the initialization 
functions are below.
 
 @end itemize
 
-Note that due to limitations of @acronym{PKCS #11} there might be issues when 
multiple libraries 
-are sharing a module. If this is the case we suggest to use 
address@hidden://p11-glue.freedesktop.org/}
-that provides an intermediate module to control access to resources over the
+Note that due to limitations of @acronym{PKCS #11} there are issues when 
multiple libraries 
+are sharing a module. To avoid this problem GnuTLS uses 
address@hidden://p11-glue.freedesktop.org/}
+that provides a middleware to control access to resources over the
 multiple users.
 
 @subsection Reading Objects


hooks/post-receive
-- 
GNU gnutls