From 6518e361171f64bcaaa4bf868139362ed95cc2e0 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 20 Oct 2018 01:30:31 +0200
Subject: New upstream version 1.14.2

---
 libnm/nm-settings-keyfile-docs.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'libnm/nm-settings-keyfile-docs.xml')

diff --git a/libnm/nm-settings-keyfile-docs.xml b/libnm/nm-settings-keyfile-docs.xml
index 561b0588..09b119a2 100644
--- a/libnm/nm-settings-keyfile-docs.xml
+++ b/libnm/nm-settings-keyfile-docs.xml
@@ -3,7 +3,9 @@
 ]>
 
 <nm-keyfile-docs>
-  <setting name="802-1x">
+  <setting name="6lowpan">
+</setting>
+<setting name="802-1x">
 </setting>
 <setting name="adsl">
 </setting>
@@ -26,6 +28,8 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/>
 </setting>
 <setting name="dummy">
 </setting>
+<setting name="ethtool">
+</setting>
 <setting name="generic">
 </setting>
 <setting name="gsm">
@@ -53,6 +57,8 @@ route2=7.7.0.0/16" description="List of IP routes."/>
 </setting>
 <setting name="macvlan">
 </setting>
+<setting name="match">
+</setting>
 <setting name="802-11-olpc-mesh">
 </setting>
 <setting name="ovs-bridge">
@@ -74,6 +80,8 @@ route2=7.7.0.0/16" description="List of IP routes."/>
 versions of NetworkManager stored this as an integer: 69 (&apos;E&apos;) for even,
 111 (&apos;o&apos;) for odd, or 110 (&apos;n&apos;) for none."/>
 </setting>
+<setting name="sriov">
+</setting>
 <setting name="tc">
 </setting>
 <setting name="team-port">
@@ -117,4 +125,8 @@ under [vpn-secrets] section."/>
 (e.g. 0;34;104;18;121;178)."/>
 <property name="mac-address-blacklist" variable="mac-address-blacklist" format="list of MACs (separated with semicolons)" values="" default="" example="mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78" description="MAC address blacklist."/>
 </setting>
+<setting name="wpan">
+<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="MAC address in hex-digits-and-colons notation
+(e.g. 76:d8:9b:87:66:60:84:ee)."/>
+</setting>
 </nm-keyfile-docs>
\ No newline at end of file
-- 
cgit 1.3.0-6-gf8a5