diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /libnm/nm-setting-docs-overrides.xml | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'libnm/nm-setting-docs-overrides.xml')
| -rw-r--r-- | libnm/nm-setting-docs-overrides.xml | 8 |
1 files changed, 8 insertions, 0 deletions
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'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'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's interface name."/> </setting> <setting name="vpn"> </setting> +<setting name="vxlan"> +</setting> <setting name="wimax"> </setting> <setting name="802-3-ethernet"> |