From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 28 Jun 2012 19:27:21 +0000 (+0200)
Subject: doc fix
X-Git-Tag: gnutls_3_0_21~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98e25bbadadeea2e03bd0d06b6c2812523924ff9;p=thirdparty%2Fgnutls.git

doc fix
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 65141c85d8..9b0411771c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -512,6 +512,9 @@ FUNCS += functions/gnutls_privkey_get_type
 FUNCS += functions/gnutls_privkey_import_pkcs11
 FUNCS += functions/gnutls_privkey_import_x509
 FUNCS += functions/gnutls_privkey_import_openpgp
+FUNCS += functions/gnutls_privkey_import_openpgp_raw
+FUNCS += functions/gnutls_privkey_import_x509_raw
+FUNCS += functions/gnutls_privkey_import_pkcs11_url
 FUNCS += functions/gnutls_privkey_import_ext
 FUNCS += functions/gnutls_privkey_sign_data
 FUNCS += functions/gnutls_privkey_sign_hash
@@ -828,6 +831,7 @@ FUNCS += functions/gnutls_tdb_deinit
 FUNCS += functions/gnutls_verify_stored_pubkey
 FUNCS += functions/gnutls_store_commitment
 FUNCS += functions/gnutls_store_pubkey
+FUNCS += functions/gnutls_load_file
 FUNCS += functions/gnutls_ocsp_req_init
 FUNCS += functions/gnutls_ocsp_req_deinit
 FUNCS += functions/gnutls_ocsp_req_import
diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index efc44d76a0..573b68d5f0 100644
--- a/doc/cha-cert-auth2.texi
+++ b/doc/cha-cert-auth2.texi
@@ -588,7 +588,6 @@ sequence.
 @showfuncC{gnutls_pubkey_import_x509,gnutls_pubkey_import_openpgp,gnutls_pubkey_import_pkcs11}
 @showfuncC{gnutls_pubkey_import_pkcs11_url,gnutls_pubkey_import_privkey,gnutls_pubkey_import}
 
-@showfuncC{gnutls_pubkey_import_x509_raw,gnutls_pubkey_import_openpgp_raw,gnutls_pubkey_import_pkcs11_url}
 @showfuncdesc{gnutls_pubkey_export}
 
 Additional functions are available that will return
@@ -606,6 +605,7 @@ to allow abstraction over @acronym{PKCS} #11 keys that
 are not extractable.
 
 @showfuncC{gnutls_privkey_import_x509,gnutls_privkey_import_openpgp,gnutls_privkey_import_pkcs11}
+@showfuncC{gnutls_privkey_import_x509_raw,gnutls_privkey_import_openpgp_raw,gnutls_privkey_import_pkcs11_url}
 
 @showfuncB{gnutls_privkey_get_pk_algorithm,gnutls_privkey_get_type}
 
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index 58b08ab298..34d618f255 100644
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-certtool.texi)
 # 
-# It has been AutoGen-ed  May 14, 2012 at 05:26:00 PM by AutoGen 5.16
+# It has been AutoGen-ed  June 28, 2012 at 09:25:29 PM by AutoGen 5.16
 # From the definitions    ../src/certtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -87,7 +87,6 @@ USAGE:  certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
        --to-p12               Generate a PKCS #12 structure
                                 - requires these options:
                                 load-certificate
-                                load-privkey
        --to-p8                Generate a PKCS #8 structure
    -8, --pkcs8                Use PKCS #8 format for private keys
        --rsa                  Generate RSA key
@@ -219,7 +218,7 @@ This option has some usage constraints.  It:
 @itemize @bullet
 @item
 must appear in combination with the following options:
-load-certificate, load-privkey.
+load-certificate.
 @end itemize
 
 It requires a certificate, a private key and possibly a CA certificate to be specified.