[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-139-ga43a5f4

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

The branch, gnutls_3_0_x has been updated
       via  a43a5f434ddf24f8bc63beb42abb632b67ad2a14 (commit)
       via  1614f733c08c28ac6d1f51c959b389723dc76bcb (commit)
       via  932f96ec9f670a82b711776821b1d0f006562a77 (commit)
      from  e1388b9af9872b5edebb0982fcd8ce1f47fc58fd (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 a43a5f434ddf24f8bc63beb42abb632b67ad2a14
Merge: e1388b9 1614f73
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 17 17:34:02 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 NEWS                  |    3 ++-
 doc/cha-programs.texi |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index c00064c..f11ca36 100644
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,8 @@ according to TLS specification (from subject to issuer).
 gnutls_x509_crt_list_import. It checks whether the list to be 
 imported is properly sorted.
 
-** crywrap: Added to the distribution
+** crywrap: Added to the distribution. It is an application
+that proxies TLS session to a port using a plaintext service.
 
 ** doc: Many GTK-DOC improvements.
 
diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index bf9a993..9371312 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -803,6 +803,8 @@ client PSK connection}.
 @cindex psktool
 
 This is a program to manage @acronym{PSK} username and keys.
+It will generate random keys for the indicated username, 
+using a simple password file format.
 
 @smallexample
 PSKtool help
@@ -815,8 +817,6 @@ Usage : psktool [options]
      -h, --help               shows this help text
 @end smallexample
 
-Normally the file will generate random keys for the indicated username.
-
 @node Invoking srptool
 @section Invoking srptool
 @anchor{srptool}


hooks/post-receive
-- 
GNU gnutls