about summary refs log tree commit diff
path: root/clients/cli
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2020-08-19 10:14:39 +0200
committerMichael Biebl <biebl@debian.org>2020-08-19 10:14:39 +0200
commitc61fd724fffbf1225fdd233a8e450d9a1ddcc849 (patch)
tree43e0feb9d3cf8842022ed94b164324c0603855fc /clients/cli
parentf86436e83639986f20fb44663edcccf36c3c150c (diff)
parente7b44ef4c80907346ec7492a09c45277459924fc (diff)
Update upstream source from tag 'upstream/1.26.2'
Update to upstream version '1.26.2'
with Debian dir ba5e61f5f737f4e42f743638f9a83bd5cd708a3c
Diffstat (limited to 'clients/cli')
-rw-r--r--clients/cli/generate-docs-nm-settings-nmcli.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cli/generate-docs-nm-settings-nmcli.xml b/clients/cli/generate-docs-nm-settings-nmcli.xml
index 9a3316a3..c0a0eebd 100644
--- a/clients/cli/generate-docs-nm-settings-nmcli.xml
+++ b/clients/cli/generate-docs-nm-settings-nmcli.xml
@@ -411,7 +411,7 @@
         <property name="mud-url"
                   description="If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with &quot;https://&quot;. The special value &quot;none&quot; is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is &quot;none&quot;." />
         <property name="wait-device-timeout"
-                  description="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." />
+                  description="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." />
     </setting>
     <setting name="dcb" >
         <property name="app-fcoe-flags"