about summary refs log tree commit diff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-09-08 17:44:52 +0200
committerMichael Biebl <biebl@debian.org>2018-09-08 17:44:52 +0200
commitd8cad4490d54acb162ad218a8a682ab379bb8bcc (patch)
tree140abd545d62a1b0144be27c93ad8edb021e4311 /man/NetworkManager.conf.xml
parente3bc109cd0eb97346c448f591af518d85dbee21b (diff)
parent8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff)
Update upstream source from tag 'upstream/1.13.90'
Update to upstream version '1.13.90'
with Debian dir d7d3d98e1240df49343a72511602da7099232e10
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 17bc42f3..87cf0016 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -654,6 +654,9 @@ ipv6.ip6-privacy=0
           <term><varname>connection.lldp</varname></term>
         </varlistentry>
         <varlistentry>
+          <term><varname>connection.llmnr</varname></term>
+        </varlistentry>
+        <varlistentry>
           <term><varname>connection.mdns</varname></term>
         </varlistentry>
         <varlistentry>
@@ -728,6 +731,10 @@ ipv6.ip6-privacy=0
           </para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>sriov.autoprobe-drivers</varname></term>
+          <listitem><para>If left unspecified, drivers are autoprobed when the SR-IOV VF gets created.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>vpn.timeout</varname></term>
           <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem>
         </varlistentry>