New upstream version 1.40.0 upstream/1.40.0

1 files changed, 13 insertions, 11 deletions

diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5
index df827802..38b29ab1 100644
--- a/man/nm-settings-dbus.5
+++ b/man/nm-settings-dbus.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-dbus
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/15/2022
+.\"      Date: 08/26/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.39.90
+.\"    Source: NetworkManager 1.40.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.39\&.90" "Configuration"
+.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -267,13 +267,15 @@ Whether to configure MPTCP endpoints and the address flags\&. If MPTCP is enable
 
  If "disabled" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered\&.
 
- The flag "enabled\-on\-global\-iface" (0x2) means that MPTCP handling is enabled if the interface configures a default route in the main routing table\&. This choice is per\-address family, for example if there is an IPv4 default route 0\&.0\&.0\&.0/0, IPv4 endpoints are configured\&.
+ The "enabled" (0x2) flag means that MPTCP handling is enabled\&. This flag can also be implied from the presence of other flags\&.
 
- The "enabled" (0x4) flag means that MPTCP handling is explicitly enabled\&. This flag can also be implied from the presence of other flags\&.
+ Even when enabled, MPTCP handling will by default still be disabled unless "/proc/sys/net/mptcp/enabled" sysctl is on\&. NetworkManager does not change the sysctl and this is up to the administrator or distribution\&. To configure endpoints even if the sysctl is disabled, "also\-without\-sysctl" (0x4) flag can be used\&. In that case, NetworkManager doesn\*(Aqt look at the sysctl and configures endpoints regardless\&.
 
- If MPTCP handling is enabled, then endpoints will be configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80)\&. See ip\-mptcp(8) manual for additional information about the flags\&.
+ Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0\&.0\&.0\&.0/0 or ::/0) in the main routing table\&. The flag "also\-without\-default\-route" (0x8) can override that\&.
 
- If the flags are zero, the global connection default from NetworkManager\&.conf is honored\&. If still unspecified, the fallback is either "disabled" or "enabled\-on\-global\-iface,subflow" depending on "/proc/sys/net/mptcp/enabled"\&.
+ When MPTCP handling is enabled then endpoints are configured with the specified address flags "signal" (0x10), "subflow" (0x20), "backup" (0x40), "fullmesh" (0x80)\&. See ip\-mptcp(8) manual for additional information about the flags\&.
+
+ If the flags are zero (0x0), the global connection default from NetworkManager\&.conf is honored\&. If still unspecified, the fallback is "enabled,subflow"\&. Note that this means that MPTCP is by default done depending on the "/proc/sys/net/mptcp/enabled" sysctl\&.
 
  NetworkManager does not change the MPTCP limits nor enable MPTCP via "/proc/sys/net/mptcp/enabled"\&. That is a host configuration which the admin can change via sysctl and ip\-mptcp\&.
 
@@ -2268,9 +2270,9 @@ T}:T{
 T}:T{
 The gateway associated with this configuration\&. This is only meaningful if "addresses" is also set\&.
 
- The gateway\*(Aqs main purpose is to control the next hop of the standard default route on the device\&. Hence, the gateway property conflicts with "never\-default" and will be automatically dropped if the IP configuration is set to never\-default\&.
+ Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop\&. This is ignored if "never\-default" is set\&. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length\&.
 
- As an alternative to set the gateway, configure a static default route with /0 as prefix length\&.
+ Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case\&. See "ip4\-auto\-default\-route"\&.
 T}
 T{
 ignore\-auto\-dns
@@ -2643,9 +2645,9 @@ T}:T{
 T}:T{
 The gateway associated with this configuration\&. This is only meaningful if "addresses" is also set\&.
 
- The gateway\*(Aqs main purpose is to control the next hop of the standard default route on the device\&. Hence, the gateway property conflicts with "never\-default" and will be automatically dropped if the IP configuration is set to never\-default\&.
+ Setting the gateway causes NetworkManager to configure a standard default route with the gateway as next hop\&. This is ignored if "never\-default" is set\&. An alternative is to configure the default route explicitly with a manual route and /0 as prefix length\&.
 
- As an alternative to set the gateway, configure a static default route with /0 as prefix length\&.
+ Note that the gateway usually conflicts with routing that NetworkManager configures for WireGuard interfaces, so usually it should not be set in that case\&. See "ip4\-auto\-default\-route"\&.
 T}
 T{
 ignore\-auto\-dns