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.

7 files changed, 7 insertions, 7 deletions

diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index f825c8b185..43c8ca42fe 100644
--- 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 79cf679daf..dc09171afe 100644
--- 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 733ac128ef..d674001042 100644
--- 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 3078f82a44..8bb4477a2f 100644
--- 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 807e0fadc6..98e6159040 100644
--- 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 b9f5c55f4c..7fc1306d19 100644
--- 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 4e4b285f08..68d55ed84d 100644
--- 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)