diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-09-20 13:40:44 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-09-20 13:40:44 -0400 |
| commit | 9d480fe1a4c3cdb9f2b8228ce8a67803a81631cf (patch) | |
| tree | f0c0638df5ee5c9d7cc4acd84e8390f6efb4e054 /man/NetworkManager.conf.5 | |
| parent | c2575718d2d27d2ee4ec46f51379c686057fe11d (diff) | |
| parent | 6f7fcde10e47d8af865af336becf1fd8a446e62e (diff) | |
Merge tag 'debian/1.40.0-1' into ubuntu/master
network-manager Debian release 1.40.0-1
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index c64c01a1..2adc374a 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: 08/15/2022 +.\" Date: 08/26/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.39.90 +.\" Source: NetworkManager 1.40.0 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.39\&.90" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -810,8 +810,9 @@ If unspecified, the ultimate default values depends on the DNS plugin\&. With sy .PP \fIconnection\&.mptcp\-flags\fR .RS 4 -If unspecified, the fallback is either 0 ("disabled") or 0x22 ("enabled\-on\-global\-iface,subflow"), depending on -/proc/sys/net/mptcp/enabled\&. +If unspecified, the fallback is 0x22 ("enabled,subflow")\&. Note that if sysctl +/proc/sys/net/mptcp/enabled +is disabled, NetworkManager will still not configure endpoints\&. .RE .PP \fIconnection\&.dns\-over\-tls\fR |