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-setting-docs-overrides.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/libnm/nm-setting-docs-overrides.xml b/libnm/nm-setting-docs-overrides.xml
index 3a52fd7c..2f788db8 100644
--- a/libnm/nm-setting-docs-overrides.xml
+++ b/libnm/nm-setting-docs-overrides.xml
@@ -35,6 +35,8 @@ bridge&apos;s interface name."/>
 </setting>
 <setting name="">
 </setting>
+<setting name="ip-tunnel">
+</setting>
 <setting name="ipv4">
 <property name="dns" variable="dns" format="array of uint32" values="" default="" example="" description="Array of IP addresses of DNS servers (as network-byte-order
 integers)"/>
@@ -102,6 +104,8 @@ will be used as the metric for the route (otherwise NM will pick a
 default value appropriate to the device). Additional attributes may
 also exist on some routes."/>
 </setting>
+<setting name="macvlan">
+</setting>
 <setting name="802-11-olpc-mesh">
 </setting>
 <setting name="ppp">
@@ -119,6 +123,8 @@ also exist on some routes."/>
 be used for backward-compatibility with older daemons, to set the
 team&apos;s interface name."/>
 </setting>
+<setting name="tun">
+</setting>
 <setting name="vlan">
 <property name="interface-name" variable="interface-name" format="string" values="" default="" example="" description="Deprecated in favor of connection.interface-name, but can
 be used for backward-compatibility with older daemons, to set the
@@ -126,6 +132,8 @@ vlan&apos;s interface name."/>
 </setting>
 <setting name="vpn">
 </setting>
+<setting name="vxlan">
+</setting>
 <setting name="wimax">
 </setting>
 <setting name="802-3-ethernet">
-- 
cgit 1.3.0-6-gf8a5