New upstream version 1.42.2 upstream/1.42.2

1 files changed, 31 insertions, 5 deletions

diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5
index 593adb0d..5f92f801 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: 02/10/2023
+.\"      Date: 02/23/2023
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.42.0
+.\"    Source: NetworkManager 1.42.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.42\&.0" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.42\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1834,7 +1834,13 @@ Format: uint32
 .PP
 \fBdhcp\-iaid\fR
 .RS 4
-A string containing the "Identity Association Identifier" (IAID) used by the DHCP client\&. The property is a 32\-bit decimal value or a special value among "mac", "perm\-mac", "ifname" and "stable"\&. When set to "mac" (or "perm\-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID\&. When set to "ifname", the IAID is computed by hashing the interface name\&. The special value "stable" can be used to generate an IAID based on the stable\-id (see connection\&.stable\-id), a per\-host key and the interface name\&. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname"\&. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address\&.
+A string containing the "Identity Association Identifier" (IAID) used by the DHCP client\&. The string can be a 32\-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers)\&. Alternatively it can be set to the special values "mac", "perm\-mac", "ifname" or "stable"\&. When set to "mac" (or "perm\-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID\&. When set to "ifname", the IAID is computed by hashing the interface name\&. The special value "stable" can be used to generate an IAID based on the stable\-id (see connection\&.stable\-id), a per\-host key and the interface name\&. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname"\&.
+.sp
+For DHCPv4, the IAID is only used with "ipv4\&.dhcp\-client\-id" values "duid" and "ipv6\-duid" to generate the client\-id\&.
+.sp
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin\&. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address\&.
+.sp
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device\&.
 .sp
 Format: string
 .RE
@@ -1994,6 +2000,13 @@ If TRUE, this connection will never be the default connection for this IP type,
 Format: boolean
 .RE
 .PP
+\fBreplace\-local\-rule\fR
+.RS 4
+Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE\&.
+.sp
+Format: NMTernary (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\&.
@@ -2386,7 +2399,13 @@ Format: uint32
 .PP
 \fBdhcp\-iaid\fR
 .RS 4
-A string containing the "Identity Association Identifier" (IAID) used by the DHCP client\&. The property is a 32\-bit decimal value or a special value among "mac", "perm\-mac", "ifname" and "stable"\&. When set to "mac" (or "perm\-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID\&. When set to "ifname", the IAID is computed by hashing the interface name\&. The special value "stable" can be used to generate an IAID based on the stable\-id (see connection\&.stable\-id), a per\-host key and the interface name\&. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname"\&. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address\&.
+A string containing the "Identity Association Identifier" (IAID) used by the DHCP client\&. The string can be a 32\-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers)\&. Alternatively it can be set to the special values "mac", "perm\-mac", "ifname" or "stable"\&. When set to "mac" (or "perm\-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID\&. When set to "ifname", the IAID is computed by hashing the interface name\&. The special value "stable" can be used to generate an IAID based on the stable\-id (see connection\&.stable\-id), a per\-host key and the interface name\&. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname"\&.
+.sp
+For DHCPv4, the IAID is only used with "ipv4\&.dhcp\-client\-id" values "duid" and "ipv6\-duid" to generate the client\-id\&.
+.sp
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin\&. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address\&.
+.sp
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device\&.
 .sp
 Format: string
 .RE
@@ -2548,6 +2567,13 @@ Set to 2147483647 (MAXINT32) for infinity\&.
 Format: int32
 .RE
 .PP
+\fBreplace\-local\-rule\fR
+.RS 4
+Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE\&.
+.sp
+Format: NMTernary (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\&.