1 files changed, 49 insertions, 8 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 0d38b51b..f3d85d55 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/06/2020
+.\"      Date: 02/11/2021
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.28.0
+.\"    Source: NetworkManager 1.29.90
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.28\&.0" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.29\&.90" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -214,9 +214,11 @@ true, network configuration for Wi\-Fi, WWAN, Bluetooth, ADSL, and PPPoE interfa
 .RS 4
 Set the management mode of the hostname\&. This parameter will affect only the transient hostname\&. If a valid static hostname is set, NetworkManager will skip the update of the hostname despite the value of this option\&. An hostname empty or equal to \*(Aqlocalhost\*(Aq, \*(Aqlocalhost6\*(Aq, \*(Aqlocalhost\&.localdomain\*(Aq or \*(Aqlocalhost6\&.localdomain\*(Aq is considered invalid\&.
 .sp
-default: NetworkManager will update the hostname with the one provided via DHCP on the main connection (the one with a default route)\&. If not present, the hostname will be updated to the last one set outside NetworkManager\&. If it is not valid, NetworkManager will try to recover the hostname from the reverse lookup of the IP address of the main connection\&. If this fails too, the hostname will be set to \*(Aqlocalhost\&.localdomain\*(Aq\&.
+default: NetworkManager will update the hostname with the one provided via DHCP or reverse DNS lookup of the IP address on the connection with the default route or on any connection with the property hostname\&.only\-from\-default set to \*(Aqfalse\*(Aq\&. Connections are considered in order of increasing value of the
+hostname\&.priority
+property\&. In case multiple connections have the same priority, connections activated earlier are considered first\&. If no hostname can be determined in such way, the hostname will be updated to the last one set outside NetworkManager or to \*(Aqlocalhost\&.localdomain\*(Aq\&.
 .sp
-dhcp: NetworkManager will update the transient hostname only with information coming from DHCP\&. No fallback nor reverse lookup will be performed, but when the dhcp connection providing the hostname is deactivated, the hostname is reset to the last hostname set outside NetworkManager or \*(Aqlocalhost\*(Aq if none valid is there\&.
+dhcp: this is similar to \*(Aqdefault\*(Aq, with the difference that after trying to get the DHCP hostname, reverse DNS lookup is not done\&. Note that selecting this option is equivalent to setting the property \*(Aqhostname\&.from\-dns\-lookup\*(Aq to \*(Aqfalse\*(Aq globally for all connections in NetworkManager\&.conf\&.
 .sp
 none: NetworkManager will not manage the transient hostname and will never set it\&.
 .RE
@@ -638,6 +640,10 @@ false\&.
 .PP
 Specify default values for connections\&.
 .PP
+Such default values are only consulted if the corresponding per\-connection property explicitly allows for that\&. That means, all these properties correspond to a property of the connection profile (for example
+connection\&.mud\-url)\&. Only if the per\-profile property is set to a special value that indicates to use the default, the default value from NetworkManager\&.conf is consulted\&. It depends on the property, which is the special value that indicates fallback to the default, but it usually is something like empty, unset values or special numeric values like 0 or \-1\&. That means the effectively used value can first always be configured for each profile, and these default values only matter if the per\-profile values explicitly indicates to use the default from
+NetworkManager\&.conf\&.
+.PP
 Example:
 .sp
 .if n \{\
@@ -655,7 +661,8 @@ ipv6\&.ip6\-privacy=0
 .PP
 Not all properties can be overwritten, only the following properties are supported to have their default values configured (see
 \fBnm-settings\fR(5)
-for details)\&. A default value is only consulted if the corresponding per\-connection value explicitly allows for that\&.
+for details)\&.
+.PP
 
 
 .PP
@@ -722,6 +729,22 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat
 .RS 4
 .RE
 .PP
+\fIhostname\&.from\-dhcp\fR
+.RS 4
+.RE
+.PP
+\fIhostname\&.from\-dns\-lookup\fR
+.RS 4
+.RE
+.PP
+\fIhostname\&.only\-from\-default\fR
+.RS 4
+.RE
+.PP
+\fIhostname\&.priority\fR
+.RS 4
+.RE
+.PP
 \fIinfiniband\&.mtu\fR
 .RS 4
 If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints\&. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation\&.
@@ -1018,10 +1041,28 @@ wifi\&.generate\-mac\-address\-mask, this allows to configure the generated MAC
 for details\&.
 .RE
 .PP
+\fIwifi\&.iwd\&.autoconnect\fR
+.RS 4
+If
+wifi\&.backend
+is
+iwd, setting this to
+false
+forces IWD\*(Aqs autoconnect mechanism to be disabled for this device and connections will only be initiated by NetworkManager whether commaned by a client or automatically\&. Leaving it
+true
+(default) stops NetworkManager from automatically initiating connections and allows IWD to use its network ranking and scanning logic to decide the best networks to autoconnect to next\&. Connections\*(Aq
+autoconnect\-priority,
+autoconnect\-retries
+settings will be ignored\&. Other settings like
+permissions
+or
+multi\-connect
+may interfere with IWD connection attempts\&.
+.RE
+.PP
 \fIsriov\-num\-vfs\fR
 .RS 4
-
-         , Specify the number of virtual functions (VF) to enable for a PCI physical device that supports single\-root I/O virtualization (SR\-IOV)\&.
+Specify the number of virtual functions (VF) to enable for a PCI physical device that supports single\-root I/O virtualization (SR\-IOV)\&.
 .RE
 .SS "Sections"
 .PP