man: reorder and rework CONNECTION SECTION in NetworkManager.conf's manual

diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index e53de0a..1554007 100644 (file)
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -508,12 +508,71 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
 
   <refsect1>
     <title><literal>connection</literal> section</title>
-    <para>This section allows to specify default values for
-    connections. Not all properties can be overwritten, only a selected
-    list below. You can have multiple <literal>connection</literal>
-    sections, by having different sections with a name that all start
-    with "connection".</para>
+    <para>Specify default values for connections.
+    </para>
+    <para>
+      Example:
+<programlisting>
+[connection]
+ipv6.ip6-privacy=0
+</programlisting>
+    </para>
+    <refsect2>
+    <title>Supported Properties</title>
     <para>
+      Not all properties can be overwritten, only the following
+      properties are supported to have their default values configured
+      (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details).
+      A default value is only consulted if the corresponding per-connection value
+      explicitly allows for that.
+      <variablelist>
+        <varlistentry>
+          <term><varname>connection.autoconnect-slaves</varname></term>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>connection.lldp</varname></term>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ethernet.wake-on-lan</varname></term>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ipv4.dad-timeout</varname></term>
+        </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>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ipv4.route-metric</varname></term>
+        </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.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>ipv6.route-metric</varname></term>
+        </varlistentry>
+      </variablelist>
+      <varlistentry>
+        <term><varname>vpn.timeout</varname></term>
+        <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>wifi.mac-address-randomization</varname></term>
+        <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem>
+      </varlistentry>
+    </para>
+    </refsect2>
+
+    <refsect2>
+    <title>Sections</title>
+    <para>
+        You can configure multiple <literal>connection</literal>
+        sections, by having different sections with a name that all start
+        with "connection".
         Example:
 <programlisting>
 [connection]
@@ -553,6 +612,7 @@ ipv6.ip6-privacy=1
     </para>
 
     <para>
+      The following properties further control how a connection section applies.
       <variablelist>
         <varlistentry>
           <term><varname>match-device</varname></term>
@@ -575,49 +635,7 @@ ipv6.ip6-privacy=1
         </varlistentry>
       </variablelist>
     </para>
-
-    <para>
-      The following properties are supported to have their default values configured:
-      <variablelist>
-        <varlistentry>
-          <term><varname>connection.autoconnect-slaves</varname></term>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>connection.lldp</varname></term>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>ethernet.wake-on-lan</varname></term>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>ipv4.dad-timeout</varname></term>
-        </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>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>ipv4.route-metric</varname></term>
-        </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.
-          </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>ipv6.route-metric</varname></term>
-        </varlistentry>
-      </variablelist>
-      <varlistentry>
-        <term><varname>vpn.timeout</varname></term>
-        <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>wifi.mac-address-randomization</varname></term>
-        <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem>
-      </varlistentry>
-    </para>
+    </refsect2>
   </refsect1>
 
   <refsect1>