diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-30 14:32:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-30 14:32:10 +0200 |
| commit | f3a60e14e7150aafbdc878aab2374220a9270ce2 (patch) | |
| tree | c9545d2f8c0de5ad095499e844e296c724c6dc52 | |
| parent | e109f870670e7503047309358cf97287ebd18d56 (diff) | |
| download | NetworkManager-f3a60e14e7150aafbdc878aab2374220a9270ce2.tar.gz | |
doc: clearify deprecated "cloned-mac-address" field in documentation
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 5 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index fc5ab3e59f..131bbbb7bf 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1130,6 +1130,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * format: byte array * description: This D-Bus field is deprecated in favor of "assigned-mac-address" * which is more flexible and allows specifying special variants like "random". + * For libnm and nmcli, this field is called "cloned-mac-address". * ---end--- */ g_object_class_install_property @@ -1153,7 +1154,9 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * 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. + * can only contain explict hardware addresses. Note that this property + * only exists in D-Bus API. libnm and nmcli continue to call this property + * "cloned-mac-address". * ---end--- */ _nm_setting_class_add_dbus_only_property (setting_class, diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index a7f58fe5d2..06d18008af 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -1372,6 +1372,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * format: byte array * description: This D-Bus field is deprecated in favor of "assigned-mac-address" * which is more flexible and allows specifying special variants like "random". + * For libnm and nmcli, this field is called "cloned-mac-address". * ---end--- */ g_object_class_install_property @@ -1394,7 +1395,9 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * 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. + * can only contain explict hardware addresses. Note that this property + * only exists in D-Bus API. libnm and nmcli continue to call this property + * "cloned-mac-address". * ---end--- */ _nm_setting_class_add_dbus_only_property (setting_class, @@ -1578,7 +1581,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * the user has set a global default to randomize and the supplicant * supports randomization), %NM_SETTING_MAC_RANDOMIZATION_NEVER (never * randomize the MAC address), or %NM_SETTING_MAC_RANDOMIZATION_ALWAYS - * (always randomize the MAC address). + * (always randomize the MAC address). This property is deprecated for + * 'cloned-mac-address'. * * Since: 1.2 * Deprecated: 1.4: Deprecated by NMSettingWireless:cloned-mac-address property |