diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /libnm/nm-settings-docs-overrides.xml | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'libnm/nm-settings-docs-overrides.xml')
| -rw-r--r-- | libnm/nm-settings-docs-overrides.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libnm/nm-settings-docs-overrides.xml b/libnm/nm-settings-docs-overrides.xml index 474b7319..2b27b640 100644 --- a/libnm/nm-settings-docs-overrides.xml +++ b/libnm/nm-settings-docs-overrides.xml @@ -27,6 +27,8 @@ bridge's interface name."/> </setting> <setting name="dcb"> </setting> +<setting name="dummy"> +</setting> <setting name="generic"> </setting> <setting name="gsm"> @@ -133,6 +135,8 @@ team's interface name."/> </setting> <setting name="tun"> </setting> +<setting name="user"> +</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 |