summary refs log tree commit diff
path: root/docs/libnm-util/html/NMSetting8021x.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm-util/html/NMSetting8021x.html')
-rw-r--r--docs/libnm-util/html/NMSetting8021x.html32
1 files changed, 16 insertions, 16 deletions
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index a0bd18de..10ee02e0 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -369,7 +369,7 @@ or DER private key
 </tr>
 <tr>
 <td><p><a name="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_PKCS12</code></span></p></td>
-<td>file contains a PKCS<span class="type">12</span> certificate
+<td>file contains a PKCS#12 certificate
 and private key
 </td>
 </tr>
@@ -1587,7 +1587,7 @@ authentication method.
 <td><p><span class="term"><em class="parameter"><code>cert_path</code></em> :</span></p></td>
 <td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>
 or <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the client
-certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
+certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
 encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> with
 any <em class="parameter"><code>scheme</code></em> clears the client certificate.</td>
 </tr>
@@ -2203,7 +2203,7 @@ authentication method.
 <td><p><span class="term"><em class="parameter"><code>cert_path</code></em> :</span></p></td>
 <td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>
 or <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
+certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
 encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> with
 any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.</td>
 </tr>
@@ -2511,7 +2511,7 @@ key password to prevent unauthorized access to unencrypted private key data.
 <td><p><span class="term"><em class="parameter"><code>key_path</code></em> :</span></p></td>
 <td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the private key file
-(PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
+(PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded; use
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> with any <em class="parameter"><code>scheme</code></em>
 clears the private key.</td>
 </tr>
@@ -2757,7 +2757,7 @@ key password to prevent unauthorized access to unencrypted private key data.
 <td><p><span class="term"><em class="parameter"><code>key_path</code></em> :</span></p></td>
 <td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" private
-key file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded;
+key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
 use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> with any
 <em class="parameter"><code>scheme</code></em> clears the private key.</td>
 </tr>
@@ -3165,15 +3165,15 @@ and path. When using the blob scheme and private keys, this property
 should be set to the key's encrypted PEM encoded data. When using private
 keys with the path scheme, this property should be set to the full UTF-8
 encoded path of the key, prefixed with the string "file://" and ending
-with a terminating NUL byte. When using PKCS<span class="type">12</span> format private keys and
-the blob scheme, this property should be set to the PKCS<span class="type">12</span> data and the
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property must be set to
-password used to decrypt the PKCS<span class="type">12</span> certificate and key. When using
-PKCS<span class="type">12</span> files and the path scheme, this property should be set to the
+password used to decrypt the PKCS#12 certificate and key. When using
+PKCS#12 files and the path scheme, this property should be set to the
 full UTF-8 encoded path of the key, prefixed with the string "file://"
 and and ending with a terminating NUL byte, and as with the blob scheme
 the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property must be set to
-the password used to decode the PKCS<span class="type">12</span> private key and certificate.
+the password used to decode the PKCS#12 private key and certificate.
 </p>
 <p>
 Setting this property directly is discouraged; use the
@@ -3187,7 +3187,7 @@ Setting this property directly is discouraged; use the
 <p>
 The password used to decrypt the "phase 2" private key specified in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property when the private key either
-uses the path scheme, or is a PKCS<span class="type">12</span> format key.  Setting this property
+uses the path scheme, or is a PKCS#12 format key.  Setting this property
 directly is not generally necessary except when returning secrets to
 NetworkManager; it is generally set automatically when setting the
 private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> function.
@@ -3250,15 +3250,15 @@ and path. When using the blob scheme and private keys, this property
 should be set to the key's encrypted PEM encoded data. When using private
 keys with the path scheme, this property should be set to the full UTF-8
 encoded path of the key, prefixed with the string "file://" and ending
-with a terminating NUL byte. When using PKCS<span class="type">12</span> format private keys and
-the blob scheme, this property should be set to the PKCS<span class="type">12</span> data and the
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property must be set to password
-used to decrypt the PKCS<span class="type">12</span> certificate and key. When using PKCS<span class="type">12</span> files
+used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files
 and the path scheme, this property should be set to the full UTF-8
 encoded path of the key, prefixed with the string "file://" and and
 ending with a terminating NUL byte, and as with the blob scheme the
 "private-key-password" property must be set to the password used to
-decode the PKCS<span class="type">12</span> private key and certificate.
+decode the PKCS#12 private key and certificate.
 </p>
 <p>
 Setting this property directly is discouraged; use the
@@ -3279,7 +3279,7 @@ private key data.
 <p>
 The password used to decrypt the private key specified in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property when the private key either uses the
-path scheme, or if the private key is a PKCS<span class="type">12</span> format key.  Setting this
+path scheme, or if the private key is a PKCS#12 format key.  Setting this
 property directly is not generally necessary except when returning
 secrets to NetworkManager; it is generally set automatically when setting
 the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function.