summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/manual/p11-kit-sharing.xml4
-rw-r--r--doc/manual/pkcs11.conf.xml8
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/manual/p11-kit-sharing.xml b/doc/manual/p11-kit-sharing.xml
index 8be3057..0edf36e 100644
--- a/doc/manual/p11-kit-sharing.xml
+++ b/doc/manual/p11-kit-sharing.xml
@@ -15,7 +15,7 @@
<para>An example: An application might use GnuTLS for
TLS connections, and use libgcr for display of certificates. Both of
- these want to load (and initialze) the same PKCS#11 modules. There are
+ these want to load (and initialize) the same PKCS#11 modules. There are
many places where this situation occurs, including large applications
like Evolution which due to their dependencies end up using both NSS and
GnuTLS.</para>
@@ -25,7 +25,7 @@
When consumer B initializes the module (also using C_Initialize),
the error code <literal>CKR_CRYPTOKI_ALREADY_INITIALIZED</literal>
is correctly returned. This is normal PKCS#11 specification
- defined behavior for when a module is initalized twice in the
+ defined behavior for when a module is initialized twice in the
same process. If consumer B is aware of this situation they may
choose to ignore this error code.</para>
diff --git a/doc/manual/pkcs11.conf.xml b/doc/manual/pkcs11.conf.xml
index 16e6cb2..16b6baa 100644
--- a/doc/manual/pkcs11.conf.xml
+++ b/doc/manual/pkcs11.conf.xml
@@ -138,7 +138,7 @@ x-custom : text
p11-kit. Making a module unmanaged is not recommended, and will cause
problems if multiple callers in a single process share a PKCS#11 module.</para>
- <para>This argument is optonal and defaults to <literal>yes</literal>.</para>
+ <para>This argument is optional and defaults to <literal>yes</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -146,7 +146,7 @@ x-custom : text
<listitem>
<para>The value should be an integer. When lists of modules are
returned to a caller of p11-kit, modules with a higher number are sorted
- first. When applications search modules for for certificates, keys and
+ first. When applications search modules for certificates, keys and
trust policy information, this setting will affect what find
first.</para>
<para>This argument is optional, and defaults to zero. Modules
@@ -181,7 +181,7 @@ remote: |ssh user@remote p11-kit remote /path/to/module.so
<para>Set to <literal>yes</literal> to write a log to stderr of all the
calls into the module. This is only supported for managed modules.</para>
- <para>This argument is optonal and defaults to <literal>no</literal>.</para>
+ <para>This argument is optional and defaults to <literal>no</literal>.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -220,7 +220,7 @@ remote: |ssh user@remote p11-kit remote /path/to/module.so
problems if multiple callers in a single process share a PKCS#11
module.</para>
- <para>This argument is optonal.</para>
+ <para>This argument is optional.</para>
</listitem>
</varlistentry>
<varlistentry>