diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:08:28 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:08:28 +0200 |
| commit | b51f06ff71a2060925bf3c0f04c44bd12480e670 (patch) | |
| tree | fd305682823aff144f345fd1d439fa78f3d51a0a /docs/libnm/html/NMSettingConnection.html | |
| parent | b92fc658301eb82b80167a31179c9b839f151b18 (diff) | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'docs/libnm/html/NMSettingConnection.html')
| -rw-r--r-- | docs/libnm/html/NMSettingConnection.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 64d0303d..1cbdd134 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -1691,7 +1691,7 @@ nm_setting_connection_get_wait_device_timeout <div class="refsect3"> <a name="nm-setting-connection-get-wait-device-timeout.returns"></a><h4>Returns</h4> <p> the <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-WAIT-DEVICE-TIMEOUT:CAPS" title="NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT"><code class="literal">NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT</code></a> property with -the timeout in milli seconds. -1 is the default.</p> +the timeout in milliseconds. -1 is the default.</p> </div> <p class="since">Since: 1.20</p> </div> @@ -2422,9 +2422,9 @@ be generated by <a class="link" href="libnm-nm-utils.html#nm-utils-uuid-generate <p>Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service -and nm-online to give the device a chance to appear.</p> -<p>Note that this property only works together with NMSettingConnection:interface-name -to identify the device that will be waited for.</p> +and nm-online to give the device a chance to appear. This works by +waiting for the given timeout until a compatible device for the +profile is available and managed.</p> <p>The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.</p> <p>Owner: NMSettingConnection</p> |