[systemd-devel] [PATCH] Correct typos and use consistent spelling

[Torstein Husebø]

---
 man/systemd.link.xml                     | 2 +-
 man/systemd.unit.xml                     | 2 +-
 src/libsystemd-network/dhcp-identifier.c | 2 +-
 src/libsystemd-network/dhcp-network.c    | 2 +-
 src/libsystemd-network/sd-dhcp-server.c  | 2 +-
 src/network/networkd-link.c              | 2 +-
 src/network/networkd-network.c           | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index d5c8b9968d..afc0ad8c5e 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -218,7 +218,7 @@
                 boot for the given machine and the given device, but
                 which is otherwise random. This feature depends on ID_NET_NAME_*
                 properties existing for the link, on hardware where these
-                properties are not set the generation of a persistent mac address
+                properties are not set the generation of a persistent MAC address
                 will fail.</para>
               </listitem>
             </varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4dae631389..09e11b4711 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1362,7 +1362,7 @@ WantedBy=multi-user.target</programlisting>
 
       <para>Now one wants to change some settings as an administrator:
       firstly, in the local setup, <filename>/srv/webserver</filename>
-      might not exit, because the HTTP server is configured to use
+      might not exist, because the HTTP server is configured to use
       <filename>/srv/www</filename> instead. Secondly, the local
       configuration makes the HTTP server also depend on a memory
       cache service, <filename>memcached.service</filename>, that
diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index e4b0ce6b2e..419a450436 100644
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -90,7 +90,7 @@ int dhcp_identifier_set_iaid(int ifindex, uint8_t *mac, size_t mac_len, uint32_t
         if (name)
                 siphash24((uint8_t*)&id, name, strlen(name), HASH_KEY.bytes);
         else
-                /* fall back to mac address if no predictable name available */
+                /* fall back to MAC address if no predictable name available */
                 siphash24((uint8_t*)&id, mac, mac_len, HASH_KEY.bytes);
 
         /* fold into 32 bits */
diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index 29e9993f66..5f2d2cfbfd 100644
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -63,7 +63,7 @@ static int _bind_raw_socket(int ifindex, union sockaddr_union *link,
                 BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.htype)),  /* A <- DHCP header type */
                 BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, arp_type, 1, 0),                   /* header type == arp_type ? */
                 BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.hlen)),   /* A <- mac address length */
+                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.hlen)),   /* A <- MAC address length */
                 BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, dhcp_hlen, 1, 0),                  /* address length == dhcp_hlen ? */
                 BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
                 BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.xid)),    /* A <- client identifier */
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 24fedd2375..3f89f344d7 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -597,7 +597,7 @@ static int ensure_sane_request(DHCPRequest *req, DHCPMessage *message) {
 
         req->message = message;
 
-        /* set client id based on mac address if client did not send an explicit
+        /* set client id based on MAC address if client did not send an explicit
            one */
         if (!req->client_id.data) {
                 uint8_t *data;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 1f96c634ef..0b1cac1055 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1133,7 +1133,7 @@ static int link_up(Link *link) {
 
         r = sd_rtnl_message_close_container(req);
         if (r < 0) {
-                log_link_error(link, "Could not close IFLA_AF_SPEC contaire: %s", strerror(-r));
+                log_link_error(link, "Could not close IFLA_AF_SPEC container: %s", strerror(-r));
                 return r;
         }
 
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9ebc2d15aa..3ebd4d7d58 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -680,12 +680,12 @@ int config_parse_token(
 
         r = in_addr_is_null(AF_INET6, &buffer);
         if (r < 0) {
-                log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token canno t be the ANY address, ignoring: %s", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token can not be the ANY address, ignoring: %s", rvalue);
                 return 0;
         }
 
         if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
-                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token canno t be longer than 64 bits, ignoring: %s", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token can not be longer than 64 bits, ignoring: %s", rvalue);
                 return 0;
         }
 
-- 
2.3.0