Fix "link-local" language inconsistencies

"Link-local" and "link local" are used throughout man pages and program
output, with the former used far more than the latter. This commit makes
it consistent throughout the project.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 8c984c5b228639f217457b04c82e2f8c5b6d934b..e090c5592ecec2a54858e38e46879beeeb6eab6a 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -366,7 +366,7 @@
       <varlistentry>
         <term><varname>IPv6LinkLocalAddressGenerationMode=</varname></term>
         <listitem>
-          <para>Specifies how IPv6 link local address is generated. Takes one of
+          <para>Specifies how IPv6 link-local address is generated. Takes one of
           <literal>eui64</literal>, <literal>none</literal>, <literal>stable-privacy</literal> and
           <literal>random</literal>. When unset, <literal>stable-privacy</literal> is used if
           <varname>IPv6StableSecretAddress=</varname> is specified, and if not,
@@ -715,7 +715,7 @@ Table=1234</programlisting></para>
           may trigger the start of the DHCPv6 client if the relevant flags are set in the RA data, or
           if no routers are found on the link. The default is to disable RA reception for bridge
           devices or when IP forwarding is enabled, and to enable it otherwise. Cannot be enabled on
-          bond devices and when link local addressing is disabled.</para>
+          bond devices and when link-local addressing is disabled.</para>
 
           <para>Further settings for the IPv6 RA support may be configured in the [IPv6AcceptRA]
           section, see below.</para>
@@ -2836,7 +2836,7 @@ Token=prefixstable:2002:da8:1::</programlisting></para>
         <listitem><para><varname>DNS=</varname> specifies a list of recursive DNS server IPv6 addresses
         that are distributed via Router Advertisement messages when <varname>EmitDNS=</varname> is true.
         <varname>DNS=</varname> also takes special value <literal>_link_local</literal>; in that case
-        the IPv6 link local address is distributed. If <varname>DNS=</varname> is empty, DNS servers are
+        the IPv6 link-local address is distributed. If <varname>DNS=</varname> is empty, DNS servers are
         read from the [Network] section. If the [Network] section does not contain any DNS servers
         either, DNS servers from the uplink interface specified in <varname>UplinkInterface=</varname>
         will be used. When <varname>EmitDNS=</varname> is false, no DNS server information is sent in

diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index f825c8b185712040fd5cd18c903e70ccf823813f..43c8ca42fef082d663765a1076543cc01d1867be 100644 (file)
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -91,7 +91,7 @@ void network_adjust_dhcp(Network *network) {
 
         if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6) &&
             FLAGS_SET(network->dhcp, ADDRESS_FAMILY_IPV6)) {
-                log_warning("%s: DHCPv6 client is enabled but IPv6 link local addressing is disabled. "
+                log_warning("%s: DHCPv6 client is enabled but IPv6 link-local addressing is disabled. "
                             "Disabling DHCPv6 client.", network->filename);
                 SET_FLAG(network->dhcp, ADDRESS_FAMILY_IPV6, false);
         }

diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c
index 79cf679daf5660888a28f2e713e497254dc8715b..dc09171afee9ef4b92d6b99825d2febe67e0f97b 100644 (file)
--- a/src/network/networkd-ipv6ll.c
+++ b/src/network/networkd-ipv6ll.c
@@ -245,4 +245,4 @@ DEFINE_CONFIG_PARSE_ENUM(
         config_parse_ipv6_link_local_address_gen_mode,
         ipv6_link_local_address_gen_mode,
         IPv6LinkLocalAddressGenMode,
-        "Failed to parse IPv6 link local address generation mode");
+        "Failed to parse IPv6 link-local address generation mode");

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 733ac128efbf6050d3ee674aca87697eb1f0a2e3..d67400104249f643aed30a5ce8c4c5fcee99464a 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -69,7 +69,7 @@ typedef struct Link {
         sd_device *sd_device;
         char *driver;
 
-        /* link local addressing */
+        /* link-local addressing */
         IPv6LinkLocalAddressGenMode ipv6ll_address_gen_mode;
 
         /* wlan */

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 3078f82a44c1699bb856e19fb0f9626627c8e186..8bb4477a2f65a56a579024f7fe12b2594d6ae3d2 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -59,7 +59,7 @@ void network_adjust_ipv6_accept_ra(Network *network) {
 
         if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6)) {
                 if (network->ipv6_accept_ra > 0)
-                        log_warning("%s: IPv6AcceptRA= is enabled but IPv6 link local addressing is disabled or not supported. "
+                        log_warning("%s: IPv6AcceptRA= is enabled but IPv6 link-local addressing is disabled or not supported. "
                                     "Disabling IPv6AcceptRA=.", network->filename);
                 network->ipv6_accept_ra = false;
         }

diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 807e0fadc66715e979004217960db272ecb1c4e1..98e6159040ee302b8cbfa1064d7fb898a0a7505f 100644 (file)
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -204,7 +204,7 @@ struct Network {
         char *dhcp_server_boot_server_name;
         char *dhcp_server_boot_filename;
 
-        /* link local addressing support */
+        /* link-local addressing support */
         AddressFamily link_local;
         IPv6LinkLocalAddressGenMode ipv6ll_address_gen_mode;
         struct in6_addr ipv6ll_stable_secret;

diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index b9f5c55f4c5eb890d528495961c8f2a7b6cdb5c7..7fc1306d199ac4d9c686da05ebc1c95814d92e41 100644 (file)
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -33,7 +33,7 @@ void network_adjust_radv(Network *network) {
 
         if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6)) {
                 if (network->router_prefix_delegation != RADV_PREFIX_DELEGATION_NONE)
-                        log_warning("%s: IPv6PrefixDelegation= is enabled but IPv6 link local addressing is disabled. "
+                        log_warning("%s: IPv6PrefixDelegation= is enabled but IPv6 link-local addressing is disabled. "
                                     "Disabling IPv6PrefixDelegation=.", network->filename);
 
                 network->router_prefix_delegation = RADV_PREFIX_DELEGATION_NONE;

diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index 4e4b285f0874d70ddec2eff01261829adb3fee92..68d55ed84d239c41b7e308940ec43a65d6f25e5d 100644 (file)
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -284,7 +284,7 @@ int link_set_sysctl(Link *link) {
 
         r = link_set_ipv6ll_stable_secret(link);
         if (r < 0)
-                log_link_warning_errno(link, r, "Cannot set stable secret address for IPv6 link local address: %m");
+                log_link_warning_errno(link, r, "Cannot set stable secret address for IPv6 link-local address: %m");
 
         r = link_set_ipv4_accept_local(link);
         if (r < 0)