all: fix minor typos

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/565

46 files changed, 79 insertions, 79 deletions

diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 0bbac4c435..ad6187140c 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -935,7 +935,7 @@ _conn_track_update (NMBluezManager *self,
 	}
 
 	if (!cdata_el) {
-		_LOGT ("connecton: track for %s, %s: %s (%s)",
+		_LOGT ("connection: track for %s, %s: %s (%s)",
 		       nm_bluetooth_capability_to_string (bt_type, sbuf_cap, sizeof (sbuf_cap)),
 		       bdaddr,
 		       nm_settings_connection_get_uuid (sett_conn),
@@ -962,7 +962,7 @@ out_remove:
 		GHashTableIter iter;
 		BzDBusObj *bzobj;
 
-		_LOGT ("connecton: untrack for %s, %s: %s (%s)",
+		_LOGT ("connection: untrack for %s, %s: %s (%s)",
 		       nm_bluetooth_capability_to_string (cdata_el_remove->cdata_hd->bt_type, sbuf_cap, sizeof (sbuf_cap)),
 		       cdata_el_remove->cdata_hd->bdaddr,
 		       nm_settings_connection_get_uuid (sett_conn),
@@ -1564,7 +1564,7 @@ _process_change_idle_cb (gpointer user_data)
 	_process_change_idle_all (self, &emit_device_availability_changed);
 
 	if (emit_device_availability_changed)
-		nm_manager_notify_device_availibility_maybe_changed (priv->manager);
+		nm_manager_notify_device_availability_maybe_changed (priv->manager);
 
 	return G_SOURCE_CONTINUE;
 }
@@ -2232,7 +2232,7 @@ _cleanup_for_name_owner (NMBluezManager *self)
 	nm_assert (g_hash_table_size (priv->bzobjs) == 0);
 
 	if (emit_device_availability_changed)
-		nm_manager_notify_device_availibility_maybe_changed (priv->manager);
+		nm_manager_notify_device_availability_maybe_changed (priv->manager);
 }
 
 static void
@@ -2481,7 +2481,7 @@ _connect_dun_step2_cb (NMBluez5DunContext *context,
 	bzobj = user_data;
 
 	if (rfcomm_dev) {
-		/* We want to early notifiy about the rfcomm path. That is because we might still delay
+		/* We want to early notify about the rfcomm path. That is because we might still delay
 		 * to signal full activation longer (asynchronously). But the earliest time the callback
 		 * is invoked with the rfcomm path, we just created the device synchronously.
 		 *
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c
index c253d4e28d..11f3b85784 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/devices/bluetooth/nm-bluez5-dun.c
@@ -256,7 +256,7 @@ _connect_create_rfcomm (NMBluez5DunContext *context)
 		 * not yet fully connected. However, we notify the caller about "what we learned
 		 * so far". Note that this happens synchronously.
 		 *
-		 * The purpose is that once we proceed synchrnously, modem-manager races with
+		 * The purpose is that once we proceed synchronously, modem-manager races with
 		 * the detection of the modem. We want to notify the caller first about the
 		 * device name. */
 		context->cdat->callback (NULL,
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index a02ce34fec..9ab3810f68 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -892,7 +892,7 @@ connect_bz_cb (NMBluezManager *bz_mgr,
 	}
 
 	if (!priv->is_connected) {
-		/* we got the callback from NMBluezManager with succes. We actually should be
+		/* we got the callback from NMBluezManager with success. We actually should be
 		 * connected and this line shouldn't be reached. */
 		nm_assert_not_reached ();
 		_LOGE (LOGD_BT, "bluetooth is unexpectedly not in connected state");
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 3cc2492c39..9d8207f73d 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1010,7 +1010,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
 	 * remote side to handle the disconnection.  Otherwise, the peer may
 	 * get confused and fail to negotiate the new connection. (rh #1023503)
 	 *
-	 * FIXME(shutdown): when exiting, we also need to wait before quiting,
+	 * FIXME(shutdown): when exiting, we also need to wait before quitting,
 	 * at least for additional NM_SHUTDOWN_TIMEOUT_MS seconds because
 	 * otherwise after restart the device won't work for the first seconds.
 	 */
diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h
index 7a323d49b7..e044534dc3 100644
--- a/src/devices/nm-device-factory.h
+++ b/src/devices/nm-device-factory.h
@@ -72,7 +72,7 @@ typedef struct {
 	 * UUID, or parent device permanent hardware address for @connection.
 	 *
 	 * Returns: the parent interface name, parent connection UUID, parent
-	 *   device permenent hardware address, or %NULL
+	 *   device permanent hardware address, or %NULL
 	 */
 	const char * (*get_connection_parent) (NMDeviceFactory *factory,
 	                                       NMConnection *connection);
diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c
index 9f01a76323..d6c6cb78e0 100644
--- a/src/devices/nm-device-wireguard.c
+++ b/src/devices/nm-device-wireguard.c
@@ -32,9 +32,9 @@ _LOG_DECLARE_SELF(NMDeviceWireGuard);
  *   prompt, as the secret is cached (good??). */
 
 /* TODO: unlike for other VPNs, we don't inject a direct route to the peers. That means,
- *   you might get a routing sceneraio where the peer (VPN server) is reachable via the VPN.
+ *   you might get a routing scenario where the peer (VPN server) is reachable via the VPN.
  *   How we handle adding routes to external gateway for other peers, has severe issues
- *   as well. We may use policy-routing like wg-quick does. See also disussions at
+ *   as well. We may use policy-routing like wg-quick does. See also discussions at
  *   https://www.wireguard.com/netns/#improving-the-classic-solutions */
 
 /* TODO: honor the TTL of DNS to determine when to retry resolving endpoints. */
@@ -62,7 +62,7 @@ G_STATIC_ASSERT (NM_WIREGUARD_SYMMETRIC_KEY_LEN == NMP_WIREGUARD_SYMMETRIC_KEY_L
 #define NEXT_TRY_AT_NSEC_PAST ((gint64) 1)
 
 /* like %NEXT_TRY_AT_NSEC_ASAP, but used for indicating to retry ASAP for a @retry_in_msec value.
- * That is a relative time duraction, contrary to @next_try_at_nsec which is an absolute
+ * That is a relative time duration, contrary to @next_try_at_nsec which is an absolute
  * timestamp. */
 #define RETRY_IN_MSEC_ASAP ((gint64) G_MAXINT64)
 
@@ -289,7 +289,7 @@ _auto_default_route_get_auto_priority (const char *uuid)
 	 * - use the connection's UUID as stable seed for the "random" number.
 	 * - have it smaller than RANGE_TOP (32766u - 1000u), where 32766u is the priority of the default
 	 *   rules
-	 * - we add 2 rules (PRIO_WIDTH). Hence only pick even priorites.
+	 * - we add 2 rules (PRIO_WIDTH). Hence only pick even priorities.
 	 * - pick one out of AUTO_RANDOM_RANGE. */
 
 	rnd_seed = c_siphash_hash (NM_HASH_SEED_16 (0x99, 0x22, 0x4d, 0x7c, 0x37, 0xda, 0x8e, 0x7b, 0x2f, 0x55, 0x16, 0x7b, 0x75, 0xda, 0x42, 0xdc),
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index ccab6aea8a..c46952de57 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -2193,7 +2193,7 @@ _stats_refresh_rate_real (guint refresh_rate_ms)
 		return 0;
 
 	if (refresh_rate_ms < STATS_REFRESH_RATE_MS_MIN) {
-		/* you cannot set the refresh-rate arbitrarly small. E.g.
+		/* you cannot set the refresh-rate arbitrarily small. E.g.
 		 * setting to 1ms is just killing. Have a lowest number. */
 		return STATS_REFRESH_RATE_MS_MIN;
 	}
@@ -3239,7 +3239,7 @@ concheck_update_state (NMDevice *self,
 		/* If the connectivity check is disabled and we obtain a fake
 		 * result, make an optimistic guess. */
 		if (priv->state == NM_DEVICE_STATE_ACTIVATED) {
-			/* FIXME: the fake connectivity state depends on the availablility of
+			/* FIXME: the fake connectivity state depends on the availability of
 			 * a default route. However, we have no mechanism that rechecks the
 			 * value if a device route appears/disappears after the device
 			 * was activated. */
@@ -3252,7 +3252,7 @@ concheck_update_state (NMDevice *self,
 	}
 
 	if (priv->concheck_x[IS_IPv4].state == state) {
-		/* we got a connectivty update, but the state didn't change. If we were probing,
+		/* we got a connectivity update, but the state didn't change. If we were probing,
 		 * we bump the probe frequency. */
 		if (allow_periodic_bump)
 			concheck_periodic_schedule_set (self, addr_family, CONCHECK_SCHEDULE_RETURNED_BUMP);
@@ -8881,7 +8881,7 @@ connection_requires_carrier (NMConnection *connection)
 	gboolean ip4_used = FALSE, ip6_used = FALSE;
 
 	/* We can progress to IP_CONFIG now, so that we're enslaved.
-	 * That may actually cause carrier to go up and thus continue acivation. */
+	 * That may actually cause carrier to go up and thus continue activation. */
 	s_con = nm_connection_get_setting_connection (connection);
 	if (nm_setting_connection_get_master (s_con))
 		return FALSE;
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index 9f808d056f..f162a49659 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -1220,7 +1220,7 @@ ovsdb_got_echo (NMOvsdb *self, json_int_t id, json_t *data)
 /**
  * ovsdb_got_msg::
  *
- * Called when when a complete JSON object was seen and unmarshalled.
+ * Called when a complete JSON object was seen and unmarshalled.
  * Either finishes a method call or processes a method call.
  */
 static void
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index bb493c9f26..83d2680c6d 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -1922,7 +1922,7 @@ schedule_periodic_scan (NMDeviceIwd *self, gboolean initial_scan)
 	 * (initial_scan && disconnected) override priv->scanning below
 	 * because of an IWD quirk where a device will often be in the
 	 * autoconnect state and scanning at the time of our initial_scan,
-	 * but our logic will the send it a Disconnect() causeing IWD to
+	 * but our logic will the send it a Disconnect() causing IWD to
 	 * exit autoconnect and interrupt the ongoing scan, meaning that
 	 * we still want a new scan ASAP.
 	 */
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index f7324baf6e..1a41f1b343 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -824,7 +824,7 @@ maybe_add_option (NMDhcpClient *self,
 
 		/* dhclient has no special labels for private dhcp options: it uses "unknown_xyz"
 		 * labels for that. We need to identify those to alias them to our "private_xyz"
-		 * format unsed in the internal dchp plugins.
+		 * format unused in the internal dchp plugins.
 		 */
 		if ((priv_opt_num = label_is_unknown_xyz (key)) > 0) {
 			gs_free guint8 *check_val = NULL;
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 7565bfc8c6..ec89377eec 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -94,7 +94,7 @@ _client_factory_get_gtype (const NMDhcpClientFactory *client_factory,
 	 * Supporting reloading the plugin would also require to re-evalate the decisions from
 	 * the "Device List Format". Likewise, having per-address family plugins would make the
 	 * "main.dhcp" setting and "dhcp-plugin:" match non-sensical because these configurations
-	 * currently are address family independet.
+	 * currently are address family independent.
 	 *
 	 * So actually, we don't want that complexity. We want to phase out all plugins in favor
 	 * of the internal plugin.
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index fe6a4582b8..a8127236c7 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1304,7 +1304,7 @@ ip4_start (NMDhcpClient *client,
 
 	/*
 	 * FIXME:
-	 * Select, or configure, a reasonable start delay, to protect poor servers beeing flooded.
+	 * Select, or configure, a reasonable start delay, to protect poor servers being flooded.
 	 */
 	n_dhcp4_client_probe_config_set_start_delay (config, 1);
 
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index fdff3af16f..ccdb8baaf8 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -268,7 +268,7 @@ _gl_pid_spawn_register_for_termination (void)
 {
 	if (   gl_pid.pid > 0
 	    && !gl_pid.terminate_handle) {
-		/* Create a shtudown handle as a reminder that the currently running process must be terminated
+		/* Create a shutdown handle as a reminder that the currently running process must be terminated
 		 * first. This also happens to block shutdown... */
 		gl_pid.terminate_handle = nm_shutdown_wait_obj_register_handle_full (g_strdup_printf ("kill-dnsmasq-process-%"G_PID_FORMAT, gl_pid.pid), TRUE);
 	}
@@ -287,7 +287,7 @@ _gl_pid_spawn_register_for_termination (void)
  * for two purposes:
  *
  *  - signal that the dnsmasq process was spawned (or failed to be spawned).
- *  - signal that the dnsmasq process quit (if it was spawned sucessfully before).
+ *  - signal that the dnsmasq process quit (if it was spawned successfully before).
  *
  * Depending on the arguments, the callee can see what's the case.
  */
@@ -540,7 +540,7 @@ _gl_pid_spawn_next_step (void)
  * @dm_binary: the binary name for dnsmasq to spawn. We could
  *   detect it ad-hoc right when needing it. But that would be
  *   asynchronously, and if dnsmasq is not in $PATH, we want to
- *   fail right away (synchrounously). Hence, @dm_binary is
+ *   fail right away (synchronously). Hence, @dm_binary is
  *   an argument.
  * @cancellable: abort the operation. This will invoke the callback
  *   a last time. Also, if the dnsmasq process is currently running,
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 666bad60ca..355d2ee445 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -625,7 +625,7 @@ create_resolv_conf (const char *const*searches,
 
 			if (search_base_idx > 0) {
 				if (str->len - search_base_idx + 1 + l > 254) {
-					/* this entry crosses the 256 character boundery. Older glibc versions
+					/* this entry crosses the 256 character boundary. Older glibc versions
 					 * would truncate the entry at this point.
 					 *
 					 * Fill the line with spaces to cross the 256 char boundary and continue
@@ -977,7 +977,7 @@ update_resolv_conf (NMDnsManager *self,
 		             RESOLV_CONF_TMP,
 		             nm_strerror_native (errsv));
 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but canot delete temporary file %s: %s",
+		       "but cannot delete temporary file %s: %s",
 		       MY_RESOLV_CONF, RESOLV_CONF_TMP, nm_strerror_native (errsv));
 		return SR_ERROR;
 	}
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c
index 2373b4220b..4f449cb99e 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/dnsmasq/nm-dnsmasq-utils.c
@@ -42,7 +42,7 @@ nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr,
 		 *
 		 * In this case, only a /24 portion of the subnet is used.
 		 * No particular reason for that, but it's unlikely that a user
-		 * would use NetworkManager's shared method when having hundered
+		 * would use NetworkManager's shared method when having hundred
 		 * of DHCP clients. So, restrict the range to the same /24 in
 		 * which the host address lies.
 		 */
diff --git a/src/nm-act-request.c b/src/nm-act-request.c
index 1c252052bb..9398cd0d4a 100644
--- a/src/nm-act-request.c
+++ b/src/nm-act-request.c
@@ -135,7 +135,7 @@ get_secrets_cb (NMSettingsConnection *connection,
  * @callback:
  * @callback_data:
  *
- * Asnychronously starts the request for secrets. This function cannot
+ * Asynchronously starts the request for secrets. This function cannot
  * fail.
  *
  * The return call-id can be used to cancel the request. You are
diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h
index a6c6d65965..e79c57be69 100644
--- a/src/nm-auth-utils.h
+++ b/src/nm-auth-utils.h
@@ -80,7 +80,7 @@ nm_auth_chain_parent_lst_list (NMAuthChain *self)
 
 /* Caller must free returned error description */
 gboolean nm_auth_is_subject_in_acl (NMConnection *connection,
-                                    NMAuthSubject *subect,
+                                    NMAuthSubject *subject,
                                     char **out_error_desc);
 
 gboolean nm_auth_is_subject_in_acl_set_error (NMConnection *connection,
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index 3a37266751..6851710c54 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -32,7 +32,7 @@ typedef struct {
 	NMDeviceState state;
 	bool is_software:1;
 	bool realized:1;
-	bool activation_lifetime_bound_to_profile_visiblity:1;
+	bool activation_lifetime_bound_to_profile_visibility:1;
 	NMUnmanFlagOp unmanaged_explicit;
 	NMActivationReason activation_reason;
 	gulong dev_exported_change_id;
@@ -292,7 +292,7 @@ restore_and_activate_connection (NMCheckpoint *self,
 		                                     subject,
 		                                     NM_ACTIVATION_TYPE_MANAGED,
 		                                     dev_checkpoint->activation_reason,
-		                                       dev_checkpoint->activation_lifetime_bound_to_profile_visiblity
+		                                       dev_checkpoint->activation_lifetime_bound_to_profile_visibility
 		                                     ? NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY
 		                                     : NM_ACTIVATION_STATE_FLAG_NONE,
 		                                     &local_error)) {
@@ -550,7 +550,7 @@ device_checkpoint_create (NMCheckpoint *checkpoint, NMDevice *device)
 		dev_checkpoint->settings_connection = nm_simple_connection_new_clone (nm_settings_connection_get_connection (settings_connection));
 		dev_checkpoint->ac_version_id = nm_active_connection_version_id_get (NM_ACTIVE_CONNECTION (act_request));
 		dev_checkpoint->activation_reason = nm_active_connection_get_activation_reason (NM_ACTIVE_CONNECTION (act_request));
-		dev_checkpoint->activation_lifetime_bound_to_profile_visiblity = NM_FLAGS_HAS (nm_active_connection_get_state_flags (NM_ACTIVE_CONNECTION (act_request)),
+		dev_checkpoint->activation_lifetime_bound_to_profile_visibility = NM_FLAGS_HAS (nm_active_connection_get_state_flags (NM_ACTIVE_CONNECTION (act_request)),
 		                                                                               NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY);
 	}
 
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index b6589b678e..66245ec0d6 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2475,7 +2475,7 @@ again:
 			gsize seed_len;
 
 			if (!allow_fake) {
-				/* we don't allow generating (and memoizing) a fake key.
+				/* we don't allow generating (and memorizing) a fake key.
 				 * Signal that no valid machine-id exists. */
 				return NULL;
 			}
@@ -3322,14 +3322,14 @@ nm_utils_stable_id_parse (const char *stable_id,
 			_stable_id_append (str, hwaddr);
 		else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) {
 			/* RANDOM makes not so much sense for cloned-mac-address
-			 * as the result is similar to specyifing "cloned-mac-address=random".
+			 * as the result is similar to specifying "cloned-mac-address=random".
 			 * It makes however sense for RFC 7217 Stable Privacy IPv6 addresses
 			 * where this is effectively the only way to generate a different
 			 * (random) host identifier for each connect.
 			 *
 			 * With RANDOM, the user can switch the lifetime of the
 			 * generated cloned-mac-address and IPv6 host identifier
-			 * by toggeling only the stable-id property of the connection.
+			 * by toggling only the stable-id property of the connection.
 			 * With RANDOM being the most short-lived, ~non-stable~ variant.
 			 */
 			if (str)
@@ -3423,7 +3423,7 @@ _set_stable_privacy (NMUtilsStableType stable_type,
 		 * That is no real problem and it is still impossible to
 		 * force a collision here, because of how the remaining
 		 * fields are hashed. That is, as we also hash @host_id_len
-		 * and the terminating '\0' of @network_id, it is unambigiously
+		 * and the terminating '\0' of @network_id, it is unambiguously
 		 * possible to revert the process and deduce the @stable_type.
 		 */
 		g_checksum_update (sum, &stable_type_uint8, sizeof (stable_type_uint8));
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index 499a1ec26b..da632d5e55 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -1004,7 +1004,7 @@ _obj_register (NMDBusManager *self,
 	nm_assert (!c_list_is_empty (&obj->internal.registration_lst_head));
 
 	/* Currently, the interfaces of an object do not changed and strictly depend on the object glib type.
-	 * We don't need more flixibility, and it simplifies the code. Hence, now emit interface-added
+	 * We don't need more flexibility, and it simplifies the code. Hence, now emit interface-added
 	 * signal for the new object.
 	 *
 	 * Warning: note that if @obj's notify signal is currently blocked via g_object_freeze_notify(),
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 304b15f99a..6892ef0b3d 100644
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -146,7 +146,7 @@ static gboolean
 _get_running (NMFirewallManagerPrivate *priv)
 {
 	/* when starting, we need to asynchronously check whether there is
-	 * a name owner. During that time we optimistially assume that the
+	 * a name owner. During that time we optimistically assume that the
 	 * service is indeed running. That is the time when we queue the
 	 * requests, and they will be started once the get-name-owner call
 	 * returns. */
diff --git a/src/nm-manager.c b/src/nm-manager.c
index a67e8ce7ee..c69922648d 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -700,7 +700,7 @@ initited:
 		/* on systems where a lot of devices are created and go away, the index contains
 		 * a lot of stale entries. We must from time to time clean them up.
 		 *
-		 * Do do this cleanup, whenever we have more enties then 2 times the number of links. */
+		 * Do do this cleanup, whenever we have more entries then 2 times the number of links. */
 		if (G_UNLIKELY (g_hash_table_size (priv->device_route_metrics) > NM_MAX (20, n_links * 2))) {
 			/* from time to time, we need to do some house-keeping and prune stale entries.
 			 * Otherwise, on a system where interfaces frequently come and go (docker), we
@@ -3300,7 +3300,7 @@ _register_device_factory (NMDeviceFactory *factory, gpointer user_data)
 /*****************************************************************************/
 
 void
-nm_manager_notify_device_availibility_maybe_changed (NMManager *self)
+nm_manager_notify_device_availability_maybe_changed (NMManager *self)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
 	NMDevice *device;
diff --git a/src/nm-manager.h b/src/nm-manager.h
index ab08eaa839..ebb7600255 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -191,7 +191,7 @@ void nm_manager_dbus_set_property_handle (NMDBusObject *obj,
 
 NMMetered nm_manager_get_metered (NMManager *self);
 
-void nm_manager_notify_device_availibility_maybe_changed (NMManager *self);
+void nm_manager_notify_device_availability_maybe_changed (NMManager *self);
 
 /*****************************************************************************/
 
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 2a9f6c051f..5912b8f257 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -340,7 +340,7 @@ device_ip6_prefix_delegated (NMDevice *device,
 	}
 
 	if (i == priv->ip6_prefix_delegations->len) {
-		/* Allocate a delegation delegation for new prefix. */
+		/* Allocate a delegation for new prefix. */
 		g_array_set_size (priv->ip6_prefix_delegations, i + 1);
 		delegation = &g_array_index (priv->ip6_prefix_delegations, IP6PrefixDelegation, i);
 		delegation->subnets = g_hash_table_new (nm_direct_hash, NULL);
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 57682e9f77..a0edd13c9e 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -152,7 +152,7 @@ G_STATIC_ASSERT (RTA_MAX == (__RTA_MAX - 1));
 
 /*****************************************************************************/
 
-/* Appeared in in kernel prior to 3.13 dated 19 January, 2014 */
+/* Appeared in the kernel prior to 3.13 dated 19 January, 2014 */
 #ifndef ARPHRD_6LOWPAN
 #define ARPHRD_6LOWPAN 825
 #endif
@@ -271,7 +271,7 @@ struct _ifla_vf_vlan_info {
 
 /*****************************************************************************/
 
-/* Appeared in in kernel 4.0 dated April 12, 2015 */
+/* Appeared in the kernel 4.0 dated April 12, 2015 */
 #ifndef BRIDGE_VLAN_INFO_RANGE_BEGIN
 #define BRIDGE_VLAN_INFO_RANGE_BEGIN    (1 << 3) /* VLAN is start of vlan range */
 #define BRIDGE_VLAN_INFO_RANGE_END      (1 << 4) /* VLAN is end of vlan range */
@@ -1050,12 +1050,12 @@ _linktype_get_type (NMPlatform *platform,
 		 * it means that their type may not have been determined correctly
 		 * due to race conditions while accessing sysfs.
 		 *
-		 * This way, we save edditional ethtool/sysctl lookups, but moreover,
+		 * This way, we save additional ethtool/sysctl lookups, but moreover,
 		 * we keep the linktype stable and don't change it as long as the link
 		 * exists.
 		 *
 		 * Note that kernel *can* reuse the ifindex (on integer overflow, and
-		 * when moving interfce to other netns). Thus here there is a tiny potential
+		 * when moving interface to other netns). Thus here there is a tiny potential
 		 * of messing stuff up. */
 		if (   obj
 		    && obj->_link.netlink.is_in_netlink
@@ -2602,7 +2602,7 @@ again:
 						             &p->endpoint) < 0)
 							goto toobig_peers;
 					} else {
-						/* I think there is no way to clear an endpoint, though there shold be. */
+						/* I think there is no way to clear an endpoint, though there should be. */
 						nm_assert (p->endpoint.sa.sa_family == AF_UNSPEC);
 					}
 				}
@@ -2839,7 +2839,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
 	if (!tb[IFLA_MTU]) {
 		/* Kernel has two places that send RTM_GETLINK messages:
 		 * net/core/rtnetlink.c and net/wireless/ext-core.c.
-		 * Unfotunatelly ext-core.c sets only IFLA_WIRELESS and
+		 * Unfortunately ext-core.c sets only IFLA_WIRELESS and
 		 * IFLA_IFNAME. This confuses code in this function, because
 		 * it cannot get complete set of data for the interface and
 		 * later incomplete object this function creates is used to
@@ -3162,7 +3162,7 @@ _new_from_nl_addr (struct nlmsghdr *nlh, gboolean id_only)
 		 * If IFA_LOCAL is missing, IFA_ADDRESS is @address and @peer_address
 		 * is :: (all-zero).
 		 *
-		 * If unexpectely IFA_ADDRESS is missing, make the best of it -- but it _should_
+		 * If unexpectedly IFA_ADDRESS is missing, make the best of it -- but it _should_
 		 * actually be there. */
 		if (tb[IFA_ADDRESS] || tb[IFA_LOCAL]) {
 			if (tb[IFA_LOCAL]) {
@@ -8736,7 +8736,7 @@ continue_reading:
 			 * NL_PROCEED. */
 		} else if (hdr->nlmsg_type == NLMSG_OVERRUN) {
 			/* Data got lost, report back to user. The default action is to
-			 * quit parsing. The user may overrule this action by retuning
+			 * quit parsing. The user may overrule this action by returning
 			 * NL_SKIP or NL_PROCEED (dangerous) */
 			err = -NME_NL_MSG_OVERFLOW;
 			abort_parsing = TRUE;
diff --git a/src/platform/nm-netlink.c b/src/platform/nm-netlink.c
index d133d35166..fdb2becd03 100644
--- a/src/platform/nm-netlink.c
+++ b/src/platform/nm-netlink.c
@@ -526,7 +526,7 @@ _nest_end (struct nl_msg *msg, struct nlattr *start, int keep_empty)
 	if (pad > 0) {
 		/*
 		 * Data inside attribute does not end at a alignment boundary.
-		 * Pad accordingly and accoun for the additional space in
+		 * Pad accordingly and account for the additional space in
 		 * the message. nlmsg_reserve() may never fail in this situation,
 		 * the allocate message buffer must be a multiple of NLMSG_ALIGNTO.
 		 */
@@ -1184,7 +1184,7 @@ continue_reading:
 			goto skip;
 
 		/* Data got lost, report back to user. The default action is to
-		 * quit parsing. The user may overrule this action by retuning
+		 * quit parsing. The user may overrule this action by returning
 		 * NL_SKIP or NL_PROCEED (dangerous) */
 		else if (hdr->nlmsg_type == NLMSG_OVERRUN) {
 			nmerr = -NME_NL_MSG_OVERFLOW;
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index 6c14bc5c16..c8565f5d23 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -219,7 +219,7 @@ again:
 		 * calling it again should have no bad effect (just setting the same thing more than once).
 		 *
 		 * The only potential bad thing is if there was a race involving swapping names, and we just
-		 * set the ioctl option on the wrong device. But then the bad thing already happend and
+		 * set the ioctl option on the wrong device. But then the bad thing already happenned and
 		 * we cannot detect it (nor do anything about it). At least, we can retry and set the
 		 * option on the right interface. */
 		retry = (try_count < 5);
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index c8b8c6e869..26e1f1e282 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -2414,7 +2414,7 @@ nm_platform_link_tun_add (NMPlatform *self,
 	g_return_val_if_fail (props, -NME_BUG);
 	g_return_val_if_fail (NM_IN_SET (props->type, IFF_TUN, IFF_TAP), -NME_BUG);
 
-	/* creating a non-persistant device requires that the caller handles
+	/* creating a non-persistent device requires that the caller handles
 	 * the file descriptor. */
 	g_return_val_if_fail (props->persist || out_fd, -NME_BUG);
 
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 3e6ef84cf0..145401d19d 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -115,7 +115,7 @@ typedef enum {
 	 * For the ID we can only recognize route fields that we actually implement.
 	 * However, kernel supports more routing options, some of them also part of
 	 * the ID. NetworkManager is oblivious to these options and will wrongly think
-	 * that two routes are idential, while they are not. That can lead to an
+	 * that two routes are identical, while they are not. That can lead to an
 	 * inconsistent platform cache. Not much what we can do about that, except
 	 * implementing all options that kernel supports *sigh*. See rh#1337860.
 	 */
@@ -411,7 +411,7 @@ typedef union {
 	/* RTA_METRICS:
 	 *
 	 * For IPv4 routes, these properties are part of their
-	 * ID (meaning: you can add otherwise idential IPv4 routes that
+	 * ID (meaning: you can add otherwise identical IPv4 routes that
 	 * only differ by the metric property).
 	 * On the other hand, for IPv6 you cannot add two IPv6 routes that only differ
 	 * by an RTA_METRICS property.
@@ -622,7 +622,7 @@ typedef struct {
 	guint32 quantum;
 	guint32 ce_threshold; /* TCA_FQ_CODEL_CE_THRESHOLD: kernel internally stores this value as
 	                       *   ((val64 * NSEC_PER_USEC) >> CODEL_SHIFT). The default value (in
-	                       *   the domain with this coersion) is CODEL_DISABLED_THRESHOLD (INT_MAX).
+	                       *   the domain with this coercion) is CODEL_DISABLED_THRESHOLD (INT_MAX).
 	                       *   That means, "disabled" is expressed on RTM_NEWQDISC netlink API by absence of the
 	                       *   netlink attribute but also as the special value 0x83126E97u
 	                       *   (NM_PLATFORM_FQ_CODEL_CE_THRESHOLD_DISABLED).
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index a6aa5e2239..1cd61a8e7d 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -1437,7 +1437,7 @@ _vt_cmd_plobj_id_cmp (ip4_address, NMPlatformIP4Address,
                       NM_CMP_FIELD (obj1, obj2, ifindex);
                       NM_CMP_FIELD (obj1, obj2, plen);
                       NM_CMP_FIELD (obj1, obj2, address);
-                      /* for IPv4 addresses, you can add the same local address with differing peer-adddress
+                      /* for IPv4 addresses, you can add the same local address with differing peer-address
                        * (IFA_ADDRESS), provided that their net-part differs. */
                       NM_CMP_DIRECT_IN4ADDR_SAME_PREFIX (obj1->peer_address, obj2->peer_address, obj1->plen);
 )
diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h
index 44525ed05b..7866caa428 100644
--- a/src/platform/nmp-object.h
+++ b/src/platform/nmp-object.h
@@ -219,7 +219,7 @@ typedef struct {
 		 * "struct udev", but doesn't own it.
 		 *
 		 * Hence, the udev.device shall not be used after the library
-		 * context is is destroyed.
+		 * context is destroyed.
 		 *
 		 * In case of NMPObjectLink instances that you obtained from the
 		 * platform cache, that means that you shall no keep references
diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
index a30760d916..b37446e3bf 100644
--- a/src/platform/tests/test-route.c
+++ b/src/platform/tests/test-route.c
@@ -1303,7 +1303,7 @@ _rule_fuzzy_equal (const NMPObject *obj,
 		break;
 	case RTM_DELRULE:
 		/* when deleting a rule with RTM_DELRULE, kernel tries to find the
-		 * cadidate to delete. It might delete the wrong rule (rh#1685816). */
+		 * candidate to delete. It might delete the wrong rule (rh#1685816). */
 		if (rr->action == FR_ACT_UNSPEC)
 			rr_co.action = FR_ACT_UNSPEC;
 		if (rr->iifname[0] == '\0')
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 363b117581..a3b99e94e7 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -1171,9 +1171,9 @@ _con_get_try_complete_early (Request *req)
  * Requests secrets for a connection.
  *
  * This function cannot fail. The callback will be invoked
- * asynchrnously, but it will always be invoked exactly once.
+ * asynchronously, but it will always be invoked exactly once.
  * Even for cancellation and disposing of @self. In those latter
- * cases, the callback is invoked synchrnously during the cancellation/
+ * cases, the callback is invoked synchronously during the cancellation/
  * disposal.
  *
  * Returns: a call-id to cancel the call.
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index 17573bbe05..dfd002efdf 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -80,7 +80,7 @@ typedef enum {
 
 	/* Update in-memory (i.e. persist to /run). If the profile is currently on disk,
 	 * then a reference to the profile is remembered as "shadowed-storage".
-	 * Later, when storing again to persistant storage, the shawowed-storage is
+	 * Later, when storing again to persistent storage, the shadowed-storage is
 	 * updated. When deleting the profile, the shadowed-storage is also deleted
 	 * from disk.
 	 *
@@ -90,7 +90,7 @@ typedef enum {
 	/* Update in-memory (i.e. persist to /run). This is almost like
 	 * %NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY, except the in-memory profile
 	 * remembers not to own the shadowed-storage ("shadowed-owned").
-	 * The diffrence is that when deleting the in-memory profile, the original
+	 * The difference is that when deleting the in-memory profile, the original
 	 * profile is not deleted but instead the nmmeta tombstone remembers the
 	 * shadowed-storage and re-used it when re-adding the profile.
 	 *
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 0a1e7b47d6..82ab1b6c4e 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -1748,7 +1748,7 @@ nm_settings_add_connection (NMSettings *self,
 				/* We have a nmmeta tombstone that indicates that a storage is shadowed.
 				 *
 				 * This happens when deleting a in-memory profile that was decoupled from
-				 * the persitant storage with NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY_DETACHED.
+				 * the persistent storage with NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY_DETACHED.
 				 * We need to take over this storage again... */
 				break;
 			}
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index f5c9bb5e91..ad782e2c78 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -353,7 +353,7 @@ _storages_consolidate (NMSIfcfgRHPlugin *self,
 		storage = storages_modified->pdata[i];
 
 		if (!storage->dirty) {
-			/* the entry is no longer dirty. In the meantime we already emited
+			/* the entry is no longer dirty. In the meantime we already emitted
 			 * another signal for it. */
 			continue;
 		}
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 4916ceed68..934c4901f9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -96,7 +96,7 @@ _assert_reread_same_FIXME (NMConnection *connection, NMConnection *reread)
 	/* FIXME: these assertion failures should not happen as we expect
 	 * that re-reading a connection after write yields the same result.
 	 *
-	 * Needs investation and fixing. */
+	 * Needs investigation and fixing. */
 	nmtst_assert_connection_verifies_without_normalization (reread);
 
 	connection_normalized = nmtst_connection_duplicate_and_normalize (connection);
@@ -9576,7 +9576,7 @@ do_svUnescape_combine_ansi_append (GString *str_val, GString *str_exp, const Une
 	if (honor_needs_ascii_separator && data->needs_ascii_separator) {
 		/* the string has an open escape sequence. We must ensure that when
 		 * combining it with another sequence, that they don't merge into
-		 * something diffent. for example "\xa" + "a" must not result in
+		 * something different. for example "\xa" + "a" must not result in
 		 * "\xaa". Instead, we add a space in between to get "\xa a". */
 		g_string_append (str_val, " ");
 		g_string_append (str_exp, " ");
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 6a7b5ecc76..497a1caa10 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -190,7 +190,7 @@ dump_blocks (if_parser *parser)
 		g_print("'%s' '%s'\n", n->type, n->name);
 
 		// each key-value pair within a block is indented & separated by a tab
-		// (single quotes used to show typ & name baoundaries)
+		// (single quotes used to show type & name boundaries)
 		c_list_for_each_entry (m, &n->data_lst_head, data_lst)
 			g_print("\t'%s'\t'%s'\n", m->key, m->data);
 
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index c84bd78d0d..09023dbb29 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -529,7 +529,7 @@ _storages_consolidate (NMSKeyfilePlugin *self,
 		storage = storages_modified->pdata[i];
 
 		if (!storage->is_dirty) {
-			/* the entry is no longer is_dirty. In the meantime we already emited
+			/* the entry is no longer is_dirty. In the meantime we already emitted
 			 * another signal for it. */
 			continue;
 		}
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
index bc8dfd12c2..e3c3969146 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -266,7 +266,7 @@ nms_keyfile_nmmeta_write (const char *dirname,
 		}
 	} else {
 		/* we only have the "loaded_path" to store. That is commonly used for the tombstones to
-		 * link to /dev/null. A symlink is sufficient to store that ammount of information.
+		 * link to /dev/null. A symlink is sufficient to store that amount of information.
 		 * No need to bother with a keyfile. */
 		if (symlink (loaded_path, full_filename_tmp) != 0) {
 			errsv = -NM_ERRNO_NATIVE (errno);
diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c
index 2949f32f68..f37798d97a 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/supplicant/nm-supplicant-config.c
@@ -730,7 +730,7 @@ add_wep_key (NMSupplicantConfig *self,
 			                               sizeof (buffer),
 			                               NULL)) {
 				g_set_error (error, NM_SUPPLICANT_ERROR, NM_SUPPLICANT_ERROR_CONFIG,
-				             "cannot add wep-key %s to suplicant config because key is not hex",
+				             "cannot add wep-key %s to supplicant config because key is not hex",
 				             name);
 				return FALSE;
 			}
@@ -746,7 +746,7 @@ add_wep_key (NMSupplicantConfig *self,
 				return FALSE;
 		} else {
 			g_set_error (error, NM_SUPPLICANT_ERROR, NM_SUPPLICANT_ERROR_CONFIG,
-			             "Cannot add wep-key %s to suplicant config because key-length %u is invalid",
+			             "Cannot add wep-key %s to supplicant config because key-length %u is invalid",
 			             name, (guint) key_len);
 			return FALSE;
 		}
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index c20098cd60..93dbc59641 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -2363,7 +2363,7 @@ assoc_fail_on_idle_cb (gpointer user_data)
  *
  * The callback is invoked exactly once (always) and always asynchronously.
  * The pending association can be aborted via nm_supplicant_interface_disconnect()
- * or by destroying @self. In that case, the @callback is invoked synchornously with
+ * or by destroying @self. In that case, the @callback is invoked synchronously with
  * an error reason indicating cancellation/disposing (see nm_utils_error_is_cancelled()).
  */
 void
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c
index b1a2dea898..b736079875 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/supplicant/nm-supplicant-manager.c
@@ -738,7 +738,7 @@ nm_supplicant_manager_create_interface (NMSupplicantManager *self,
 	c_list_link_tail (&priv->create_iface_lst_head, &handle->create_iface_lst);
 
 	if (!priv->dbus_connection) {
-		_LOGT ("create-iface["NM_HASH_OBFUSCATE_PTR_FMT"]: new request interface %d (driver %s). Fail bacause no D-Bus connection to talk to wpa_supplicant...",
+		_LOGT ("create-iface["NM_HASH_OBFUSCATE_PTR_FMT"]: new request interface %d (driver %s). Fail because no D-Bus connection to talk to wpa_supplicant...",
 		       NM_HASH_OBFUSCATE_PTR (handle),
 		       ifindex,
 		       nm_supplicant_driver_to_string (driver));
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
index 70821ac279..334cd6565b 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
@@ -379,7 +379,7 @@ int sd_dhcp_client_set_client_id(
         /* For hardware types, log debug message about unexpected data length.
          *
          * Note that infiniband's INFINIBAND_ALEN is 20 bytes long, but only
-         * last last 8 bytes of the address are stable and suitable to put into
+         * the last 8 bytes of the address are stable and suitable to put into
          * the client-id. The caller is advised to account for that. */
         if ((type == ARPHRD_ETHER && data_len != ETH_ALEN) ||
             (type == ARPHRD_INFINIBAND && data_len != 8))
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index d653b2571c..a68089261c 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -1495,7 +1495,7 @@ static int client_receive_message(
                         break;
                 }
 
-                _fallthrough_; /* for Soliciation Rapid Commit option check */
+                _fallthrough_; /* for Solicitation Rapid Commit option check */
         case DHCP6_STATE_REQUEST:
         case DHCP6_STATE_RENEW:
         case DHCP6_STATE_REBIND:
diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
index 2dc9f63246..c2abc20121 100644
--- a/src/systemd/src/systemd/sd-lldp.h
+++ b/src/systemd/src/systemd/sd-lldp.h
@@ -176,7 +176,7 @@ int sd_lldp_neighbor_get_mud_url(sd_lldp_neighbor *n, const char **ret);
 int sd_lldp_neighbor_get_system_capabilities(sd_lldp_neighbor *n, uint16_t *ret);
 int sd_lldp_neighbor_get_enabled_capabilities(sd_lldp_neighbor *n, uint16_t *ret);
 
-/* Low-level, iterative TLV access. This is for evertyhing else, it iteratively goes through all available TLVs
+/* Low-level, iterative TLV access. This is for everything else, it iteratively goes through all available TLVs
  * (including the ones covered with the calls above), and allows multiple TLVs for the same fields. */
 int sd_lldp_neighbor_tlv_rewind(sd_lldp_neighbor *n);
 int sd_lldp_neighbor_tlv_next(sd_lldp_neighbor *n);