Update upstream source from tag 'upstream/1.32.10'

Update to upstream version '1.32.10'
with Debian dir fcf2778b50b013ede3e7375bc1d829e984175658

1 files changed, 20 insertions, 6 deletions

diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5
index fffd5a5c..2d9c067a 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: 06/30/2021
+.\"      Date: 08/18/2021
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.32.2
+.\"    Source: NetworkManager 1.32.10
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.32\&.2" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.32\&.10" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1655,7 +1655,7 @@ Properties:
 .RS 4
 Alias: ip4
 .sp
-A list of IPv4 addresses and their prefix length\&. Multiple addresses can be separated by comma\&. For example "192\&.168\&.1\&.5/24, 10\&.1\&.0\&.5/24"\&.
+A list of IPv4 addresses and their prefix length\&. Multiple addresses can be separated by comma\&. For example "192\&.168\&.1\&.5/24, 10\&.1\&.0\&.5/24"\&. The addresses are listed in increasing priority, meaning the last address will be the primary address\&.
 .sp
 Format: a comma separated list of addresses
 .RE
@@ -1802,6 +1802,13 @@ If TRUE, this connection will never be the default connection for this IP type,
 Format: boolean
 .RE
 .PP
+\fBrequired\-timeout\fR
+.RS 4
+The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds\&. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail\&. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e\&.g\&. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active\&. Note that if "may\-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout\&. A zero value means that no required timeout is present, \-1 means the default value (either configuration ipvx\&.required\-timeout override or zero)\&.
+.sp
+Format: int32
+.RE
+.PP
 \fBroute\-metric\fR
 .RS 4
 The default metric for routes that don\*(Aqt explicitly specify a metric\&. The default value \-1 means that the metric is chosen automatically based on the device type\&. The metric applies to dynamic routes, manual (static) routes that don\*(Aqt have an explicit metric setting, address prefix routes, and the default route\&. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default)\&. Hence, setting this property to zero effectively mean setting it to 1024\&. For IPv4, zero is a regular value for the metric\&.
@@ -1843,9 +1850,9 @@ Format: int32
 .RS 4
 Alias: ip6
 .sp
-Array of IP addresses\&.
+A list of IPv6 addresses and their prefix length\&. Multiple addresses can be separated by comma\&. For example "2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64"\&. The addresses are listed in increasing priority, meaning the last address will be the primary address\&.
 .sp
-Format: array of legacy IPv6 address struct
+Format: a comma separated list of addresses
 .RE
 .PP
 \fBdhcp\-duid\fR
@@ -1976,6 +1983,13 @@ A timeout for waiting Router Advertisements in seconds\&. If zero (the default),
 Format: int32
 .RE
 .PP
+\fBrequired\-timeout\fR
+.RS 4
+The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds\&. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail\&. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e\&.g\&. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active\&. Note that if "may\-fail" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout\&. A zero value means that no required timeout is present, \-1 means the default value (either configuration ipvx\&.required\-timeout override or zero)\&.
+.sp
+Format: int32
+.RE
+.PP
 \fBroute\-metric\fR
 .RS 4
 The default metric for routes that don\*(Aqt explicitly specify a metric\&. The default value \-1 means that the metric is chosen automatically based on the device type\&. The metric applies to dynamic routes, manual (static) routes that don\*(Aqt have an explicit metric setting, address prefix routes, and the default route\&. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default)\&. Hence, setting this property to zero effectively mean setting it to 1024\&. For IPv4, zero is a regular value for the metric\&.