doc: updated text to account for pkcs11-url standardization

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index da53f1e05910e64db7b83c6184572008ddb88789..ac54eb60b551fddd435c5b7ac052daabebda77aa 100644 (file)
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -18,7 +18,7 @@ In GnuTLS the approach is to handle all keys transparently by the high level API
 the API that loads a key or certificate from a file.
 The high-level API will accept URIs in addition to files that specify keys on an HSM or in TPM,
 and a callback function will be used to obtain any required keys. The URI format is defined in 
-@xcite{TPMURI} and @xcite{PKCS11URI}, and is in the process of being standardized across systems.
+@xcite{TPMURI} and the standardized @xcite{PKCS11URI}.
 
 More information on the API is provided in the next sections. Examples of a URI of a certificate 
 stored in an HSM, as well as a key stored in the TPM chip are shown below. To discover the URIs 
@@ -27,7 +27,7 @@ or @code{tpmtool} (see @ref{tpmtool Invocation}) may be used.
 
 @example
 pkcs11:token=Nikos;serial=307521161601031;model=PKCS%2315; \
-manufacturer=EnterSafe;object=test1;objecttype=cert
+manufacturer=EnterSafe;object=test1;type=cert
 
 tpmkey:uuid=42309df8-d101-11e1-a89a-97bb33c23ad1;storage=user
 @end example
@@ -370,7 +370,7 @@ key on a smart card may be referenced as:
 
 @example
 pkcs11:token=Nikos;serial=307521161601031;model=PKCS%2315; \
-manufacturer=EnterSafe;object=test1;objecttype=public;\
+manufacturer=EnterSafe;object=test1;type=public;\
 id=32f153f3e37990b08624141077ca5dec2d15faed
 @end example