1 files changed, 57 insertions, 10 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 8c93ac4c..658fd7c2 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -277,6 +277,34 @@ no-auto-default=*
       </varlistentry>
 
       <varlistentry>
+        <term><varname>hostname-mode</varname></term>
+        <listitem>
+          <para>
+            Set the management mode of the hostname. This parameter will
+            affect only the transient hostname. If a valid static hostname is set,
+            NetworkManager will skip the update of the hostname despite the value of
+            this option. An hostname empty or equal to 'localhost', 'localhost6',
+            'localhost.localdomain' or 'localhost6.localdomain' is considered invalid.
+          </para>
+          <para><literal>default</literal>: NetworkManager will update the hostname
+          with the one provided via DHCP on the main connection (the one with a default
+          route). If not present, the hostname will be updated to the last one set
+          outside NetworkManager. If it is not valid, NetworkManager will try to recover
+          the hostname from the reverse lookup of the IP address of the main connection.
+          If this fails too, the hostname will be set to 'localhost.localdomain'.
+          </para>
+          <para><literal>dhcp</literal>: NetworkManager will update the transient hostname
+          only with information coming from DHCP. No fallback nor reverse lookup will be
+          performed, but when the dhcp connection providing the hostname is deactivated,
+          the hostname is reset to the last hostname set outside NetworkManager or
+          'localhost' if none valid is there.
+          </para>
+          <para><literal>none</literal>: NetworkManager will not manage the transient
+          hostname and will never set it.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><varname>dns</varname></term>
         <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.
         If the key is unspecified, <literal>default</literal> is used,
@@ -321,15 +349,17 @@ no-auto-default=*
         options, and this version of NetworkManager was build with a default of
         "<literal>&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;</literal>".
         Regardless of this setting, NetworkManager will
-        always write resolv.conf to its runtime state directory.</para>
-        <para><literal>symlink</literal>: NetworkManager will symlink
-        <filename>/etc/resolv.conf</filename> to its private
-        resolv.conf file in the runtime state directory. If
-        <filename>/etc/resolv.conf</filename>
-        already is a symlink pointing to a different location, the file
-        will not be modified. This allows the user to disable managing
-        by pointing the link <filename>/etc/resolv.conf</filename> to
-        somewhere else.</para>
+        always write resolv.conf to its runtime state directory
+        <filename>&nmrundir;/resolv.conf</filename>.</para>
+        <para><literal>symlink</literal>: If <filename>/etc/resolv.conf</filename> is
+        a regular file, NetworkManager will replace the file on update. If
+        <filename>/etc/resolv.conf</filename> is instead a symlink, NetworkManager
+        will leave it alone. Unless the symlink points to the internal file
+        <filename>&nmrundir;/resolv.conf</filename>,
+        in which case the symlink will be updated to emit an inotify notification.
+        This allows the user to conveniently instruct NetworkManager not
+        to manage <filename>/etc/resolv.conf</filename> by replacing it with
+        a symlink.</para>
         <para><literal>file</literal>: NetworkManager will write
         <filename>/etc/resolv.conf</filename> as file. If it finds
         a symlink, it will follow the symlink and update the target
@@ -401,7 +431,7 @@ no-auto-default=*
           <term><varname>path</varname></term>
           <listitem>
             <para>The location where keyfiles are read and stored.
-            This defaults to "<filename>&sysconfdir;/NetworkManager/conf.d</filename>".
+            This defaults to "<filename>&sysconfdir;/NetworkManager/system-connections</filename>".
             </para>
           </listitem>
         </varlistentry>
@@ -825,6 +855,16 @@ unmanaged=1
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry id="sriov-num-vfs">
+          <term><varname>sriov-num-vfs</varname></term>
+          <listitem>
+            <para>
+              Specify the number of virtual functions (VF) to enable
+              for a PCI physical device that supports single-root I/O
+              virtualization (SR-IOV).
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </para>
     </refsect2>
@@ -1171,6 +1211,13 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
           Globbing is not supported.</para></listitem>
         </varlistentry>
         <varlistentry>
+          <term>driver:DRIVER</term>
+          <listitem><para>Match the device driver as reported by "<literal>nmcli -f GENERAL.DRIVER,GENERAL.DRIVER-VERSION device show</literal>".
+          "<literal>DRIVER</literal>" must match the driver name exactly and does not support globbing.
+          Optionally, a driver version may be specified separated by '/'. Globbing is supported for the version.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term>except:SPEC</term>
           <listitem><para>Negative match of a device. <literal>SPEC</literal> must be explicitly qualified with
              a prefix such as <literal>interface-name:</literal>. A negative match has higher priority then the positive