summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-08-19 13:06:56 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-08-19 13:56:14 +0200
commit0004404cb1749e0ad610d1ed59209c55f301989b (patch)
tree76e556c29319805e851a48bd1efcb9a9f1acd8f7
parent2d3d1bbc961fd6fdb0e315cfb8c9f9e24291f27e (diff)
downloadNetworkManager-0004404cb1749e0ad610d1ed59209c55f301989b.tar.gz
ip4-config: fix a typo
(cherry picked from commit 0550003ef0b71cd4342519c06d8bc3c92b4f64ea)
-rw-r--r--clients/common/settings-docs.h.in2
-rw-r--r--libnm-core/nm-setting-ip4-config.c2
-rw-r--r--po/id.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/ru.po2
-rw-r--r--po/uk.po2
6 files changed, 6 insertions, 6 deletions
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index b80da262cb..d430e686d7 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -196,7 +196,7 @@
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 44de154ec0..19f1cc8d40 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -718,7 +718,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
*
* The special values "mac" and "perm-mac" are supported, which use the
* current or permanent MAC address of the device to generate a client identifier
- * with type ethernet type (01). Currently, these options only work for ethernet
+ * with type ethernet (01). Currently, these options only work for ethernet
* type of links.
*
* The special value "stable" is supported to generate a type 0 client identifier based
diff --git a/po/id.po b/po/id.po
index d10868ec22..4b577d5948 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8139,7 +8139,7 @@ msgid ""
"hardware-address client ID and the 'type' field is set to 0. The special "
"values \"mac\" and \"perm-mac\" are supported, which use the current or "
"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
"type of links. The special value \"stable\" is supported to generate a type "
"0 client identifier based on the stable-id (see connection.stable-id). If "
"unset, a globally configure default is used. If still unset, the client-id "
diff --git a/po/ja.po b/po/ja.po
index ddc7a28e2c..c0d60ade7d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8164,7 +8164,7 @@ msgid ""
"hardware-address client ID and the 'type' field is set to 0. The special "
"values \"mac\" and \"perm-mac\" are supported, which use the current or "
"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
"type of links. The special value \"stable\" is supported to generate a type "
"0 client identifier based on the stable-id (see connection.stable-id) and a "
"per-host key. If unset, a globally configured default is used. If still "
diff --git a/po/ru.po b/po/ru.po
index 1cc52e5e42..29403e1054 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7142,7 +7142,7 @@ msgid ""
"hardware-address client ID and the 'type' field is set to 0. The special "
"values \"mac\" and \"perm-mac\" are supported, which use the current or "
"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
"type of links. The special value \"stable\" is supported to generate a type "
"0 client identifier based on the stable-id (see connection.stable-id). If "
"unset, a globally configured default is used. If still unset, the client-id "
diff --git a/po/uk.po b/po/uk.po
index e69a8e0fa2..14d7050e31 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8691,7 +8691,7 @@ msgid ""
"hardware-address client ID and the 'type' field is set to 0. The special "
"values \"mac\" and \"perm-mac\" are supported, which use the current or "
"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
"type of links. The special value \"stable\" is supported to generate a type "
"0 client identifier based on the stable-id (see connection.stable-id) and a "
"per-host key. If unset, a globally configured default is used. If still "