From 3b51a183affb3ab84bf9a418a184bd5d965d7476 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 24 Sep 2022 10:43:58 +0900
Subject: [PATCH] tree-wide: fix typo

---
 man/systemd.unit.xml      | 2 +-
 src/boot/efi/efi-string.c | 2 +-
 src/boot/efi/meson.build  | 2 +-
 src/core/device.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index e29bb985404..d502b6da186 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -335,7 +335,7 @@
       <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       for details. Note that this behavior can be opted out by setting
       <varname>DefaultDependencies=no</varname> in the specified units, or it can be selectively
-      overidden via an explicit <varname>Before=</varname> dependency.</para>
+      overridden via an explicit <varname>Before=</varname> dependency.</para>
     </refsect2>
   </refsect1>
 
diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c
index 6929e8667ef..5c05dfeb066 100644
--- a/src/boot/efi/efi-string.c
+++ b/src/boot/efi/efi-string.c
@@ -278,7 +278,7 @@ DEFINE_PARSE_NUMBER(char16_t, parse_number16);
 #  undef memcpy
 #  undef memset
 #else
-/* And for userpsace unit testing we need to give them an efi_ prefix. */
+/* And for userspace unit testing we need to give them an efi_ prefix. */
 #  define memcmp efi_memcmp
 #  define memcpy efi_memcpy
 #  define memset efi_memset
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 19471309199..22d28e4197b 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -204,7 +204,7 @@ efi_cflags = [
 # This only happens because the usual instructions for assembling a unified
 # kernel image contain hardcoded addresses for section VMAs added in. Until a
 # proper solution is in place, we can at least compile with as least -O1 to
-# reduce the likelyhood of this happening.
+# reduce the likelihood of this happening.
 # https://github.com/systemd/systemd/issues/24202
 efi_cflags += '-O1'
 
diff --git a/src/core/device.c b/src/core/device.c
index a4fa8705410..224fc908355 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -909,7 +909,7 @@ static int device_setup_units(Manager *m, sd_device *dev, Set **ready_units, Set
         Unit *u;
         SET_FOREACH(u, *not_ready_units)
                 if (set_remove(*ready_units, u))
-                        log_unit_error(u, "Cannot active and deactive simultaneously. Deactivating.");
+                        log_unit_error(u, "Cannot activate and deactivate the unit simultaneously. Deactivating.");
 
         return 0;
 }
-- 
2.47.3