New upstream version 1.47.90 upstream/1.47.90

1 files changed, 43 insertions, 5 deletions

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 69cfdb07..fc184ff7 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "common.ent" >
 %entities;
 ]>
@@ -824,6 +824,11 @@ domains=ALL
       to use the default from <literal>NetworkManager.conf</literal>.
     </para>
     <para>
+      Note that while nmcli supports various aliases and convenience features for configuring
+      properties, the settings in this section do not. For example, enum values usually only
+      can be configured via their numeric magic number.
+    </para>
+    <para>
       Example:
 <programlisting>
 [connection]
@@ -856,6 +861,10 @@ ipv6.ip6-privacy=0
           <term><varname>connection.autoconnect-slaves</varname></term>
         </varlistentry>
         <varlistentry>
+          <term><varname>connection.down-on-poweroff</varname></term>
+          <listitem><para>Whether the connection will be brought down before the system is powered off.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>connection.mud-url</varname></term>
           <listitem><para>If unspecified, MUD URL defaults to <literal>"none"</literal>.</para></listitem>
         </varlistentry>
@@ -868,7 +877,13 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>connection.mdns</varname></term>
-          <listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0).</para></listitem>
+          <listitem><para>
+            Currently only the systemd-resolve DNS plugin supports this setting.
+            If the setting is unspecified both in the profile and in the global
+            default here, then the default is determined by systemd-resolved.
+            See <literal>MulticastDNS=</literal> in
+            <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+          </para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.mptcp-flags</varname></term>
@@ -936,6 +951,10 @@ ipv6.ip6-privacy=0
           <listitem><para>If left unspecified, the value 3 (fqdn-encoded,fqdn-serv-update) is used.</para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>ipv4.dhcp-send-release</varname></term>
+          <listitem><para>Whether the DHCP client will send RELEASE message when bringing the connection down.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>ipv4.dhcp-timeout</varname></term>
           <listitem><para>If left unspecified, the default value for
            the interface type is used.</para></listitem>
@@ -989,6 +1008,10 @@ ipv6.ip6-privacy=0
           <listitem><para>If left unspecified, the value 1 (fqdn-serv-update) is used.</para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>ipv6.dhcp-send-release</varname></term>
+          <listitem><para>Whether the DHCP client will send RELEASE message when bringing the connection down.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>ipv6.dhcp-timeout</varname></term>
           <listitem><para>If left unspecified, the default value for
            the interface type is used.</para></listitem>
@@ -1000,8 +1023,23 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>ipv6.ip6-privacy</varname></term>
-          <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of
-            "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback.
+          <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, fall back to the original
+            value of "/proc/sys/net/ipv6/conf/&lt;iface&gt;/use_tempaddr" from before NetworkManager
+            started.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ipv6.temp-valid-lifetime</varname></term>
+          <listitem><para>If <literal>ipv6.temp-valid-lifetime</literal> is unset, fall back to the
+            original value of "/proc/sys/net/ipv6/conf/&lt;iface&gt;/temp_valid_lft" from before
+            NetworkManager started.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ipv6.temp-preferred-lifetime</varname></term>
+          <listitem><para>If <literal>ipv6.temp-preferred-lifetime</literal> is unset, fall back to
+            the original value of "/proc/sys/net/ipv6/conf/&lt;iface&gt;/temp_prefered_lft" from
+            before NetworkManager started.
           </para></listitem>
         </varlistentry>
         <varlistentry>