about summary refs log tree commit diff
path: root/docs/api/html/nm-settings-dbus.html
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-08-31 11:08:28 +0200
committerSebastien Bacher <seb128@ubuntu.com>2020-08-31 11:08:28 +0200
commitb51f06ff71a2060925bf3c0f04c44bd12480e670 (patch)
treefd305682823aff144f345fd1d439fa78f3d51a0a /docs/api/html/nm-settings-dbus.html
parentb92fc658301eb82b80167a31179c9b839f151b18 (diff)
parente7b44ef4c80907346ec7492a09c45277459924fc (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'docs/api/html/nm-settings-dbus.html')
-rw-r--r--docs/api/html/nm-settings-dbus.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 010d85f1..79e17c77 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -276,7 +276,7 @@
 <a name="nm-settings-dbus.property.connection.wait-device-timeout"></a>wait-device-timeout</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
-<td>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. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.</td>
+<td>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. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.</td>
 </tr>
 <tr>
 <td align="left">