From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Jan 2016 16:26:51 +0100
Subject: Imported Upstream version 1.1.90

---
 libnm/nm-keyfile-docs.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/libnm/nm-keyfile-docs.xml b/libnm/nm-keyfile-docs.xml
index d080a427..663f8a2e 100644
--- a/libnm/nm-keyfile-docs.xml
+++ b/libnm/nm-keyfile-docs.xml
@@ -34,6 +34,8 @@ or semicolon separated list of 20 decimal bytes (obsolete)"/>
 </setting>
 <setting name="">
 </setting>
+<setting name="ip-tunnel">
+</setting>
 <setting name="ipv4">
 <property name="dns" variable="dns" format="list of DNS IP addresses" values="" default="" example="dns=1.2.3.4;8.8.8.8;8.8.4.4;" description="List of DNS servers."/>
 <property name="addresses" variable="address1, address2, ..." format="address/plen" values="" default="" example="address1=192.168.100.100/24 address2=10.1.1.5/24" description="List of static IP addresses."/>
@@ -47,6 +49,8 @@ route2=7.7.0.0/16" description="List of IP routes."/>
 <property name="gateway" variable="gateway" format="string" values="" default="" example="gateway=abbe::1" description="Gateway IP addresses as a string."/>
 <property name="routes" variable="route1, route2, ..." format="route/plen[,gateway,metric]" values="" default="" example="route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403" description="List of IP routes."/>
 </setting>
+<setting name="macvlan">
+</setting>
 <setting name="802-11-olpc-mesh">
 </setting>
 <setting name="ppp">
@@ -62,6 +66,8 @@ versions of NetworkManager stored this as an integer: 69 (&apos;E&apos;) for eve
 </setting>
 <setting name="team">
 </setting>
+<setting name="tun">
+</setting>
 <setting name="vlan">
 </setting>
 <setting name="vpn">
@@ -70,6 +76,8 @@ under [vpn] section."/>
 <property name="secrets" variable="separate variables named after keys of the dictionary" format="" values="" default="" example="password=Popocatepetl" description="The keys of the secrets dictionary are used as variable names directly
 under [vpn-secrets] section."/>
 </setting>
+<setting name="vxlan">
+</setting>
 <setting name="wimax">
 </setting>
 <setting name="802-3-ethernet">
-- 
cgit 1.3.0-6-gf8a5