diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
| commit | b3c2e57e153446d32d16f2d99e6abbb50146dddb (patch) | |
| tree | e71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/libnm-core-impl/nm-setting-hostname.c | |
| parent | 1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff) | |
| parent | ed857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff) | |
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/libnm-core-impl/nm-setting-hostname.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-hostname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnm-core-impl/nm-setting-hostname.c b/src/libnm-core-impl/nm-setting-hostname.c index 8a5e50be..399f41a8 100644 --- a/src/libnm-core-impl/nm-setting-hostname.c +++ b/src/libnm-core-impl/nm-setting-hostname.c @@ -134,7 +134,7 @@ nm_setting_hostname_init(NMSettingHostname *setting) * * Returns: (transfer full): the new empty #NMSettingHostname object * - * Since: 1.42, 1.40.4 + * Since: 1.42 **/ NMSetting * nm_setting_hostname_new(void) @@ -233,7 +233,7 @@ nm_setting_hostname_class_init(NMSettingHostnameClass *klass) * Since: 1.30 **/ /* ---ifcfg-rh--- - * property: from-dhcp + * property: from-dns-lookup * variable: HOSTNAME_FROM_DNS_LOOKUP(+) * default: missing variable means global default or 1 * description: whether the system hostname can be determined from reverse |