diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
| commit | 229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch) | |
| tree | edfc7357b6494a5c0cb016bb88d61b623daa9876 /libnm/nm-setting-docs-overrides.xml | |
| parent | 6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff) | |
| parent | 7514efc2f38c9ace4557d4e69d68e7d380389030 (diff) | |
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'libnm/nm-setting-docs-overrides.xml')
| -rw-r--r-- | libnm/nm-setting-docs-overrides.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libnm/nm-setting-docs-overrides.xml b/libnm/nm-setting-docs-overrides.xml index 2f788db8..8cfa2cc0 100644 --- a/libnm/nm-setting-docs-overrides.xml +++ b/libnm/nm-setting-docs-overrides.xml @@ -137,10 +137,24 @@ vlan's interface name."/> <setting name="wimax"> </setting> <setting name="802-3-ethernet"> +<property name="cloned-mac-address" variable="cloned-mac-address" format="byte array" values="" default="" example="" description="This D-Bus field is deprecated in favor of "assigned-mac-address" +which is more flexible and allows specifying special variants like "random"."/> +<property name="assigned-mac-address" variable="assigned-mac-address" format="string" values="" default="" example="" description="The new field for the cloned MAC address. It can be either +a hardware address in ASCII representation, or one of the special values +"preserve", "permanent", "random" or "stable". +This field replaces the deprecated "cloned-mac-address" on D-Bus, which +can only contain explict hardware addresses."/> </setting> <setting name="802-11-wireless-security"> </setting> <setting name="802-11-wireless"> +<property name="cloned-mac-address" variable="cloned-mac-address" format="byte array" values="" default="" example="" description="This D-Bus field is deprecated in favor of "assigned-mac-address" +which is more flexible and allows specifying special variants like "random"."/> +<property name="assigned-mac-address" variable="assigned-mac-address" format="string" values="" default="" example="" description="The new field for the cloned MAC address. It can be either +a hardware address in ASCII representation, or one of the special values +"preserve", "permanent", "random" or "stable". +This field replaces the deprecated "cloned-mac-address" on D-Bus, which +can only contain explict hardware addresses."/> <property name="security" variable="security" format="" values="" default="" example="" description="This property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old |