fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 17:18:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'typo-fixes'

Browse source 
various typo fixes detected by lintian

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1940
This commit is contained in:
Íñigo Huguet 2024-05-23 10:23:03 +00:00
commit 802b3f5af5
13 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -791,7 +791,7 @@ This is a new stable release of NetworkManager. Notable changes include:
* The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0,
and disabled by default since NetworkManager 1.12, has now been removed.
* The DHCP client now defaults to "internal". The default can be overriden
* The DHCP client now defaults to "internal". The default can be overridden
at build time by using the --with-config-dhcp-default option of the
configure script or at run time by setting the main.dhcp option in the
configuration file.

2
man/NetworkManager.conf.xml
View file

@ -492,7 +492,7 @@ no-auto-default=*
files without preserving their contents.
</para>
<para>
The path can also be overriden by pointing to a specific
The path can also be overridden by pointing to a specific
existing and writable directory. On the other hand setting
this to an empty string or any other value disables the
profile conversion mechanism.

2
po/ca.po
View file

@ -7801,7 +7801,7 @@ msgstr ""
#: src/libnmc-setting/settings-docs.h.in:190
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), "
"\"default\" (3) or \"default-or-eui64\" (2). If the property is set to "

2
po/de.po
View file

@ -8278,7 +8278,7 @@ msgstr ""
#: src/libnmc-setting/settings-docs.h.in:192
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The "
"permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) "
"or \"default-or-eui64\" (2). If the property is set to \"eui64\", the "

2
po/ka.po
View file

@ -7259,7 +7259,7 @@ msgstr ""
#: src/libnmc-setting/settings-docs.h.in:190
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), "
"\"default\" (3) or \"default-or-eui64\" (2). If the property is set to "

2
po/ru.po
View file

@ -8634,7 +8634,7 @@ msgstr "Список, через запятую, правил маршрутиз
#: src/libnmc-setting/settings-docs.h.in:191
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), "
"\"default\" (3) or \"default-or-eui64\" (2). If the property is set to "

2
po/sv.po
View file

@ -8600,7 +8600,7 @@ msgstr "En kommaseparerad lista med routingregler för policyrouting."
#: src/libnmc-setting/settings-docs.h.in:195
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), "
"\"default\" (3) or \"default-or-eui64\" (2). If the property is set to "

2
po/tr.po
View file

@ -7839,7 +7839,7 @@ msgstr ""
#: src/libnmc-setting/settings-docs.h.in:197
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), "
"\"default\" (3) or \"default-or-eui64\" (2). If the property is set to "

2
po/uk.po
View file

@ -8535,7 +8535,7 @@ msgstr "Список відокремлених комами правил мар
#: src/libnmc-setting/settings-docs.h.in:190
msgid ""
"Configure method for creating the IPv6 interface identifer of addresses with "
"Configure method for creating the IPv6 interface identifier of addresses with "
"RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. "
"The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default"
"\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the "

4
src/core/devices/wifi/nm-device-iwd.c
View file

@ -3483,7 +3483,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter *
/* Use SOURCE_DHCP as shorthand for the various autoconfiguration protocols */
source = NM_IP_CONFIG_SOURCE_DHCP;
else
_LOGW(LOGD_WIFI, "iwd_parse_netconfig: Uknown Method value \"%s\"", str_value);
_LOGW(LOGD_WIFI, "iwd_parse_netconfig: Unknown Method value \"%s\"", str_value);
}
if (nm_streq(key, "Addresses")) {
@ -3527,7 +3527,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter *
else if (nm_streq(str_value, "resolve"))
mdns = NM_SETTING_CONNECTION_MDNS_RESOLVE;
else
_LOGW(LOGD_WIFI, "iwd_parse_netconfig: Uknown MDNS value \"%s\"", str_value);
_LOGW(LOGD_WIFI, "iwd_parse_netconfig: Unknown MDNS value \"%s\"", str_value);
}
}

2
src/libnm-core-impl/nm-setting-ip6-config.c
View file

@ -1097,7 +1097,7 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
* property: addr-gen-mode
* format: one of "eui64" (0), "stable-privacy" (1), "default" (3) or "default-or-eui64" (2)
* description: Configure method for creating the
* IPv6 interface identifer of addresses with RFC4862 IPv6 Stateless
* IPv6 interface identifier of addresses with RFC4862 IPv6 Stateless
* Address Autoconfiguration and Link Local addresses.
*
* The permitted values are: "eui64" (0), "stable-privacy" (1), "default"

2
src/libnmc-setting/settings-docs.h.in
View file

@ -195,7 +195,7 @@
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTES N_("A list of IPv4 destination addresses, prefix length, optional IPv4 next hop addresses, optional route metric, optional attribute. The valid syntax is: \"ip[/prefix] [next-hop] [metric] [attribute=val]...[,ip[/prefix]...]\". For example \"192.0.2.0/24 10.1.1.1 77, 198.51.100.0/24\".")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTING_RULES N_("A comma separated list of routing rules for policy routing.")
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the IPv6 interface identifer of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host's presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the \"ipv6.token\" is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to \"stable-privacy\", the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection's \"connection.stable-id\" property and the address prefix. This improves privacy by making it harder to use the address to track the host's presence and the address is stable when the network interface hardware is replaced. The special values \"default\" and \"default-or-eui64\" will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is \"stable-privacy\" or \"eui64\", respectively. If not specified, when creating a new profile the default is \"default\". Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.")
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the IPv6 interface identifier of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host's presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the \"ipv6.token\" is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to \"stable-privacy\", the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection's \"connection.stable-id\" property and the address prefix. This improves privacy by making it harder to use the address to track the host's presence and the address is stable when the network interface hardware is replaced. The special values \"default\" and \"default-or-eui64\" will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is \"stable-privacy\" or \"eui64\", respectively. If not specified, when creating a new profile the default is \"default\". Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.")
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("A list of IPv6 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64\". The addresses are listed in decreasing priority, meaning the first address will be the primary address. This can make a difference with IPv6 source address selection (RFC 6724, section 5).")
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.")
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum 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. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")

2
src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
View file

@ -1468,7 +1468,7 @@
values="0 - 2147483647"
special-values="default (0)" />
<property name="addr-gen-mode"
nmcli-description="Configure method for creating the IPv6 interface identifer of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: &quot;eui64&quot; (0), &quot;stable-privacy&quot; (1), &quot;default&quot; (3) or &quot;default-or-eui64&quot; (2). If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host&apos;s presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the &quot;ipv6.token&quot; is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to &quot;stable-privacy&quot;, the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection&apos;s &quot;connection.stable-id&quot; property and the address prefix. This improves privacy by making it harder to use the address to track the host&apos;s presence and the address is stable when the network interface hardware is replaced. The special values &quot;default&quot; and &quot;default-or-eui64&quot; will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is &quot;stable-privacy&quot; or &quot;eui64&quot;, respectively. If not specified, when creating a new profile the default is &quot;default&quot;. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option."
nmcli-description="Configure method for creating the IPv6 interface identifier of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: &quot;eui64&quot; (0), &quot;stable-privacy&quot; (1), &quot;default&quot; (3) or &quot;default-or-eui64&quot; (2). If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host&apos;s presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the &quot;ipv6.token&quot; is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to &quot;stable-privacy&quot;, the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection&apos;s &quot;connection.stable-id&quot; property and the address prefix. This improves privacy by making it harder to use the address to track the host&apos;s presence and the address is stable when the network interface hardware is replaced. The special values &quot;default&quot; and &quot;default-or-eui64&quot; will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is &quot;stable-privacy&quot; or &quot;eui64&quot;, respectively. If not specified, when creating a new profile the default is &quot;default&quot;. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option."
format="choice (NMSettingIP6ConfigAddrGenMode)"
values="eui64 (0), stable-privacy (1), default-or-eui64 (2), default (3)" />
<property name="ra-timeout"