about summary refs log tree commit diff
path: root/man/nm-settings-nmcli.5
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 /man/nm-settings-nmcli.5
parentb92fc658301eb82b80167a31179c9b839f151b18 (diff)
parente7b44ef4c80907346ec7492a09c45277459924fc (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'man/nm-settings-nmcli.5')
-rw-r--r--man/nm-settings-nmcli.58
1 files changed, 4 insertions, 4 deletions
diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5
index 008fb434..636fb45e 100644
--- a/man/nm-settings-nmcli.5
+++ b/man/nm-settings-nmcli.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/13/2020
+.\"      Date: 08/19/2020
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.26.0
+.\"    Source: NetworkManager 1.26.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.26\&.0" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.26\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -243,7 +243,7 @@ Format: string
 .PP
 \fBwait\-device\-timeout\fR
 .RS 4
-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\&.
+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\&.
 .sp
 Format: int32
 .RE