about summary refs log tree commit diff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-09-20 13:40:44 -0400
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-09-20 13:40:44 -0400
commit9d480fe1a4c3cdb9f2b8228ce8a67803a81631cf (patch)
treef0c0638df5ee5c9d7cc4acd84e8390f6efb4e054 /man/NetworkManager.conf.xml
parentc2575718d2d27d2ee4ec46f51379c686057fe11d (diff)
parent6f7fcde10e47d8af865af336becf1fd8a446e62e (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.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>