[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_3-4-g0ed0446

[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=0ed0446b6a73886a407136a3881ad90d979e8049

The branch, gnutls_2_12_x has been updated
       via  0ed0446b6a73886a407136a3881ad90d979e8049 (commit)
       via  7c0ded297be37828e301435eb1db491be3392434 (commit)
      from  ccbd77f6dc0b8440e7d80bddce2c8f950674eb46 (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 0ed0446b6a73886a407136a3881ad90d979e8049
Author: Andreas Metzler <address@hidden>
Date:   Sat Apr 30 15:53:10 2011 +0200

    Grammar fix: allows *one* to ...
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 7c0ded297be37828e301435eb1db491be3392434
Author: Andreas Metzler <address@hidden>
Date:   Sat Apr 30 15:32:33 2011 +0200

    escape dashes in manpage
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 doc/manpages/p11tool.1 |    8 ++++----
 libextra/gnutls_ia.c   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/manpages/p11tool.1 b/doc/manpages/p11tool.1
index e66c1df..798a47b 100644
--- a/doc/manpages/p11tool.1
+++ b/doc/manpages/p11tool.1
@@ -49,10 +49,10 @@ Exports the object (e.g. certificate) specified by the URL.
 .IP "\-\-delete URL"
 Deletes the object specified by the URL. Note that several tokens do not
 support deletion.
-.IP "\-\-detailed-url"
+.IP "\-\-detailed\-url"
 When printing URLs print them in a detailed (to the PKCS #11 module used)
 form.
-.IP "\-\-no\-detailed-url"
+.IP "\-\-no\-detailed\-url"
 When printing URLs, do not print details on the module used.
 
 .SS Storing objects
@@ -81,8 +81,8 @@ To store a private key and certificate, run:
 
 .RS
 .nf
-$ p11tool \-\-login \-\-write "pkcs11:XXX"  \-\-load-privkey key.pem --label 
"MyKey"
-$ p11tool \-\-login \-\-write "pkcs11:XXX"  \-\-load-certificate cert.pem 
--label "MyCert"
+$ p11tool \-\-login \-\-write "pkcs11:XXX"  \-\-load\-privkey key.pem 
\-\-label "MyKey"
+$ p11tool \-\-login \-\-write "pkcs11:XXX"  \-\-load\-certificate cert.pem 
\-\-label "MyCert"
 .fi
 .RE
 
diff --git a/libextra/gnutls_ia.c b/libextra/gnutls_ia.c
index e692bde..57dff81 100644
--- a/libextra/gnutls_ia.c
+++ b/libextra/gnutls_ia.c
@@ -957,7 +957,7 @@ gnutls_ia_get_server_avp_ptr 
(gnutls_ia_server_credentials_t cred)
 /**
  * gnutls_ia_enable:
  * @session: is a #gnutls_session_t structure.
- * @allow_skip_on_resume: non-zero if local party allows to skip the
+ * @allow_skip_on_resume: non-zero if local party allows one to skip the
  *                       TLS/IA application phases for a resumed session.
  *
  * Specify whether we must advertise support for the TLS/IA extension


hooks/post-receive
-- 
GNU gnutls