about summary refs log tree commit diff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2022-08-26 20:37:52 +0200
committerMichael Biebl <biebl@debian.org>2022-08-26 20:37:52 +0200
commit31b0de3e5396f971e1476a155031a2c6d30af711 (patch)
treeb248ac35833f8356ece0e5719521d97c1cb03925 /man/NetworkManager.conf.xml
parent6ba52b312b7e2bd5744d3edacbe4149212242c74 (diff)
parentab0efddcdb48d800e2f938da54cfe3074640792e (diff)
Update upstream source from tag 'upstream/1.40.0'
Update to upstream version '1.40.0'
with Debian dir a59a8bafb9190ecb810335bfdaa82270e423df1d
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 6a0fd7b1..301172e4 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -868,7 +868,7 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>connection.mptcp-flags</varname></term>
-          <listitem><para>If unspecified, the fallback is either 0 (<literal>"disabled"</literal>) or 0x22 (<literal>"enabled-on-global-iface,subflow"</literal>), depending on <literal>/proc/sys/net/mptcp/enabled</literal>.</para></listitem>
+          <listitem><para>If unspecified, the fallback is 0x22 (<literal>"enabled,subflow"</literal>). Note that if sysctl <literal>/proc/sys/net/mptcp/enabled</literal> is disabled, NetworkManager will still not configure endpoints.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.dns-over-tls</varname></term>