diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:27:57 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:27:57 +0100 |
| commit | a46c3e57291e64e9258698dbe5b0ef11def833c5 (patch) | |
| tree | de9a6dcb3ab058a02fa0a2d9e7d1b3572b588583 /docs/libnm/html/NMClient.html | |
| parent | 767904eab32f132502230df57e146cb822dad7ba (diff) | |
| parent | 19e73abd360f0198f94ce49f36ddf009056f6324 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'docs/libnm/html/NMClient.html')
| -rw-r--r-- | docs/libnm/html/NMClient.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index 7a06059a..8d27ad9c 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -2649,7 +2649,7 @@ any. </p> nm_client_get_activating_connection (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre> <p>Gets the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> corresponding to a currently-activating connection that is expected to become the new -<span class="type">“primary-connection”</span> upon successful activation.</p> +<a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#NMClient--primary-connection"><span class="type">“primary-connection”</span></a> upon successful activation.</p> <div class="refsect3"> <a name="nm-client-get-activating-connection.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -2699,7 +2699,7 @@ in <em class="parameter"><code>connection</code></em> picks the best available connection for the device and activates it.</p> <p>Note that the callback is invoked when NetworkManager has started activating the new connection, not when it finishes. You can use the returned -<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state”</span>) to +<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="/usr/share/gtk-doc/html/libnm-glib/NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state”</span></a>) to track the activation to its completion.</p> <div class="refsect3"> <a name="nm-client-activate-connection-async.parameters"></a><h4>Parameters</h4> @@ -2819,7 +2819,7 @@ activated as with <a class="link" href="NMClient.html#nm-client-activate-connect VPN connections at this time.</p> <p>Note that the callback is invoked when NetworkManager has started activating the new connection, not when it finishes. You can used the returned -<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state”</span>) to +<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="/usr/share/gtk-doc/html/libnm-glib/NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state”</span></a>) to track the activation to its completion.</p> <div class="refsect3"> <a name="nm-client-add-and-activate-connection-async.parameters"></a><h4>Parameters</h4> @@ -2948,7 +2948,7 @@ activated as with <a class="link" href="NMClient.html#nm-client-activate-connect VPN connections at this time.</p> <p>Note that the callback is invoked when NetworkManager has started activating the new connection, not when it finishes. You can used the returned -<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state”</span>) to +<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="/usr/share/gtk-doc/html/libnm-glib/NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state”</span></a>) to track the activation to its completion.</p> <p>This is identitcal to <a class="link" href="NMClient.html#nm-client-add-and-activate-connection-async" title="nm_client_add_and_activate_connection_async ()"><code class="function">nm_client_add_and_activate_connection_async()</code></a> but takes a further <em class="parameter"><code>options</code></em> |