diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 83d94c7903..9e0be7fbf7 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -56,13 +56,13 @@
     (in which case the kernel closes them automatically). Note that the file descriptors received by daemons
     are duplicates of the file descriptors the service manager originally allocated and bound and of which it
     continuously keeps a copy (except if <varname>Accept=yes</varname> is used). This means any socket option
-    changes and other changes made to the sockets will visible to the service manager too. Most importanly
-    this means it's generally not a good idea to invoke <citerefentry
+    changes and other changes made to the sockets will be visible to the service manager too. Most
+    importantly this means it's generally not a good idea to invoke <citerefentry
     project='man-pages'><refentrytitle>shutdown</refentrytitle><manvolnum>2</manvolnum></citerefentry> on
     such sockets, since it will shut down communication on the file descriptor the service manager holds for
-    the same socket, too. Also note that if a daemon is restarted (and its associated sockets are not) it
-    will receive file descriptors to the very same sockets as the earlier invocations, thus all socket
-    options applied then will still apply.</para>
+    the same socket too. Also note that if a daemon is restarted (and its associated sockets are not) it will
+    receive file descriptors to the very same sockets as the earlier invocations, thus all socket options
+    applied then will still apply.</para>
 
     <para>If a daemon receives more than one file descriptor, they will be passed in the same order as
     configured in the systemd socket unit file (see
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 134c42d10b..e90877ada8 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2687,9 +2687,9 @@ Token=prefixstable:2002:da8:1::</programlisting></para>
       <varlistentry>
         <term><varname>RouterLifetimeSec=</varname></term>
 
-        <listitem><para>Takes a timespan. Configures the IPv6 router lifetime in seconds. When set to
-        0, the host is not acting as a router. The value must be 0 second, or between 4 seconds and
-        9000 seconds. Defaults to 1800 seconds (30 minutes).</para>
+        <listitem><para>Takes a timespan. Configures the IPv6 router lifetime in seconds. The value must be 0
+        seconds, or between 4 seconds and 9000 seconds. When set to 0, the host is not acting as a router.
+        Defaults to 1800 seconds (30 minutes).</para>
         </listitem>
       </varlistentry>
 
diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index 7ac74cd48d..730a5f2de2 100644
--- a/src/basic/architecture.c
+++ b/src/basic/architecture.c
@@ -135,39 +135,40 @@ int uname_architecture(void) {
         return _ARCHITECTURE_INVALID;
 }
 
+/* Maintain same order as in the table above. */
 static const char *const architecture_table[_ARCHITECTURE_MAX] = {
-        [ARCHITECTURE_X86] = "x86",
-        [ARCHITECTURE_X86_64] = "x86-64",
-        [ARCHITECTURE_PPC] = "ppc",
-        [ARCHITECTURE_PPC_LE] = "ppc-le",
-        [ARCHITECTURE_PPC64] = "ppc64",
-        [ARCHITECTURE_PPC64_LE] = "ppc64-le",
-        [ARCHITECTURE_IA64] = "ia64",
-        [ARCHITECTURE_PARISC] = "parisc",
-        [ARCHITECTURE_PARISC64] = "parisc64",
-        [ARCHITECTURE_S390] = "s390",
-        [ARCHITECTURE_S390X] = "s390x",
-        [ARCHITECTURE_SPARC] = "sparc",
-        [ARCHITECTURE_SPARC64] = "sparc64",
-        [ARCHITECTURE_MIPS] = "mips",
-        [ARCHITECTURE_MIPS_LE] = "mips-le",
-        [ARCHITECTURE_MIPS64] = "mips64",
+        [ARCHITECTURE_ARM64]     = "arm64",
+        [ARCHITECTURE_ARM64_BE]  = "arm64-be",
+        [ARCHITECTURE_ARM]       = "arm",
+        [ARCHITECTURE_ARM_BE]    = "arm-be",
+        [ARCHITECTURE_ALPHA]     = "alpha",
+        [ARCHITECTURE_ARC]       = "arc",
+        [ARCHITECTURE_ARC_BE]    = "arc-be",
+        [ARCHITECTURE_CRIS]      = "cris",
+        [ARCHITECTURE_X86_64]    = "x86-64",
+        [ARCHITECTURE_X86]       = "x86",
+        [ARCHITECTURE_IA64]      = "ia64",
+        [ARCHITECTURE_M68K]      = "m68k",
         [ARCHITECTURE_MIPS64_LE] = "mips64-le",
-        [ARCHITECTURE_ALPHA] = "alpha",
-        [ARCHITECTURE_ARM] = "arm",
-        [ARCHITECTURE_ARM_BE] = "arm-be",
-        [ARCHITECTURE_ARM64] = "arm64",
-        [ARCHITECTURE_ARM64_BE] = "arm64-be",
-        [ARCHITECTURE_SH] = "sh",
-        [ARCHITECTURE_SH64] = "sh64",
-        [ARCHITECTURE_M68K] = "m68k",
-        [ARCHITECTURE_TILEGX] = "tilegx",
-        [ARCHITECTURE_CRIS] = "cris",
-        [ARCHITECTURE_NIOS2] = "nios2",
-        [ARCHITECTURE_RISCV32] = "riscv32",
-        [ARCHITECTURE_RISCV64] = "riscv64",
-        [ARCHITECTURE_ARC] = "arc",
-        [ARCHITECTURE_ARC_BE] = "arc-be",
+        [ARCHITECTURE_MIPS64]    = "mips64",
+        [ARCHITECTURE_MIPS_LE]   = "mips-le",
+        [ARCHITECTURE_MIPS]      = "mips",
+        [ARCHITECTURE_NIOS2]     = "nios2",
+        [ARCHITECTURE_PARISC64]  = "parisc64",
+        [ARCHITECTURE_PARISC]    = "parisc",
+        [ARCHITECTURE_PPC64_LE]  = "ppc64-le",
+        [ARCHITECTURE_PPC64]     = "ppc64",
+        [ARCHITECTURE_PPC]       = "ppc",
+        [ARCHITECTURE_PPC_LE]    = "ppc-le",
+        [ARCHITECTURE_RISCV32]   = "riscv32",
+        [ARCHITECTURE_RISCV64]   = "riscv64",
+        [ARCHITECTURE_S390X]     = "s390x",
+        [ARCHITECTURE_S390]      = "s390",
+        [ARCHITECTURE_SH64]      = "sh64",
+        [ARCHITECTURE_SH]        = "sh",
+        [ARCHITECTURE_SPARC64]   = "sparc64",
+        [ARCHITECTURE_SPARC]     = "sparc",
+        [ARCHITECTURE_TILEGX]    = "tilegx",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(architecture, int);