[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_4-11-g9f48fc1

[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=9f48fc146f588590f0a6222c9e87f1294ec77ab0

The branch, gnutls_2_12_x has been updated
       via  9f48fc146f588590f0a6222c9e87f1294ec77ab0 (commit)
       via  56ff974c4b54472fced21d090d3a865666e8fc5b (commit)
      from  bcddb921c6f389c1ba588a512f0b6d5ddfdc7b4f (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 9f48fc146f588590f0a6222c9e87f1294ec77ab0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon May 9 19:12:16 2011 +0200

    update on compatibility issues text.

commit 56ff974c4b54472fced21d090d3a865666e8fc5b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon May 9 19:10:16 2011 +0200

    doc update in gnutls_pkcs11_init()

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

Summary of changes:
 doc/cha-intro-tls.texi |   11 +++++------
 lib/pkcs11.c           |    5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index e15dbd5..693d562 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -629,10 +629,10 @@ they do not support and understand. The @acronym{TLS} 
protocol allows for
 graceful downgrade to the commonly supported options, but practice shows that 
 it is not always implemented correctly. 
 
-Because there is no way to handle maximum compatibility with such broken peers
+Because there is no way to handle maximum compatibility with broken peers
 without sacrificing security, @acronym{GnuTLS} ignores such peers by default. 
-This might not be acceptable in several cases
-thus we allow enabling maximum compatibility with such peers using
+This might not be acceptable in several cases, where maximum compatibility
+is required, thus we allow enabling compatibility with broken peers using
 priority strings (see @ref{Priority Strings}). An example priority string that 
will
 disable all supported  @acronym{TLS} protocol versions except for
 the widely supported @acronym{SSL} 3.0 and @acronym{TLS} 1.0
@@ -640,9 +640,8 @@ is shown below:
 @example
 NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT
 @end example
-This priority string provides wider compatibility to broken peers. 
-We suggest however to use the normal defaults and only switch to such 
compatibility
-modes only when compatibility issues occur.
+This priority string provides the wider possible compatibility with broken 
peers. 
+We suggest however only to use that compatibility mode if such issues occur.
 
 @node TLS Extensions
 @section TLS Extensions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 81c043b..24a17cb 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -355,7 +355,7 @@ static int init = 0;
 
 /**
  * gnutls_pkcs11_init:
- * @flags: GNUTLS_PKCS11_FLAG_MANUAL or GNUTLS_PKCS11_FLAG_AUTO
+ * @flags: %GNUTLS_PKCS11_FLAG_MANUAL or %GNUTLS_PKCS11_FLAG_AUTO
  * @configfile: either NULL or the location of a configuration file
  *
  * This function will initialize the PKCS 11 subsystem in gnutls. It will
@@ -364,7 +364,8 @@ static int init = 0;
  * if %GNUTLS_PKCS11_FLAG_MANUAL is specified.
  *
  * Normally you don't need to call this function since it is being called
- * by gnutls_global_init(). Otherwise you must call it before it.
+ * by gnutls_global_init() using the %GNUTLS_PKCS11_FLAG_AUTO. If other option
+ * is required then it must be called before it.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.


hooks/post-receive
-- 
GNU gnutls