From 6ca2087afa3c6026472548ef3bf2280bbf0155c4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 25 May 2016 12:19:20 -0400
Subject: [PATCH 7/7] FSDG: man/: Refer to the operating system as GNU/Linux

... and say "Linux kernel" when we explicitly mean the kernel and not the
whole system.

I use the following command to search for instances I might want to replace:

    git grep -w Linux man|sed -E 's,(EFI/Linux|GNU/Linux|Fedora Linux|Arch Linux|User-mode Linux|Windows Subsystem for Linux|Linux[- ]kernel|Linux KVM|Linux container|Linux[_ ]Security[_ ]Module),,g'|grep Linux

There are still a few false-positives in that output.
---
 man/bootup.xml                     |  2 +-
 man/daemon.xml                     | 10 ++++-----
 man/homectl.xml                    |  2 +-
 man/hostnamectl.xml                |  4 ++--
 man/journald.conf.xml              |  2 +-
 man/machinectl.xml                 |  4 ++--
 man/org.freedesktop.machine1.xml   |  2 +-
 man/org.freedesktop.resolve1.xml   |  8 +++----
 man/org.freedesktop.systemd1.xml   |  2 +-
 man/os-release.xml                 |  2 +-
 man/pam_systemd_home.xml           |  2 +-
 man/portablectl.xml                |  2 +-
 man/repart.d.xml                   |  2 +-
 man/sd-bus-errors.xml              |  2 +-
 man/sd-event.xml                   |  2 +-
 man/sd-id128.xml                   |  2 +-
 man/sd_bus_error_add_map.xml       |  2 +-
 man/sd_bus_get_name_machine_id.xml |  2 +-
 man/sd_event_add_io.xml            |  2 +-
 man/sd_event_set_signal_exit.xml   |  2 +-
 man/sd_id128_to_string.xml         |  2 +-
 man/sd_is_fifo.xml                 |  2 +-
 man/sd_notify.xml                  |  2 +-
 man/sd_uid_get_state.xml           |  2 +-
 man/systemd-analyze.xml            |  2 +-
 man/systemd-boot.xml               |  2 +-
 man/systemd-cgls.xml               |  2 +-
 man/systemd-cgtop.xml              |  2 +-
 man/systemd-cryptenroll.xml        |  2 +-
 man/systemd-detect-virt.xml        |  8 +++----
 man/systemd-dissect.xml            |  2 +-
 man/systemd-machine-id-setup.xml   |  2 +-
 man/systemd-nspawn.xml             |  6 ++---
 man/systemd-oomd.service.xml       |  2 +-
 man/systemd-pstore.service.xml     |  4 ++--
 man/systemd-resolved.service.xml   |  6 ++---
 man/systemd-sleep.conf.xml         |  2 +-
 man/systemd-stub.xml               |  2 +-
 man/systemd-sysext.xml             |  2 +-
 man/systemd-system.conf.xml        |  2 +-
 man/systemd.automount.xml          |  2 +-
 man/systemd.exec.xml               | 36 +++++++++++++++---------------
 man/systemd.netdev.xml             |  2 +-
 man/systemd.network.xml            |  8 +++----
 man/systemd.nspawn.xml             |  4 ++--
 man/systemd.resource-control.xml   |  2 +-
 man/systemd.service.xml            |  4 ++--
 man/systemd.slice.xml              |  2 +-
 man/systemd.socket.xml             |  2 +-
 man/systemd.swap.xml               |  2 +-
 man/systemd.xml                    |  6 ++---
 man/tmpfiles.d.xml                 |  6 ++---
 man/ukify.xml                      |  4 ++--
 53 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/man/bootup.xml b/man/bootup.xml
index c872b13c68..ba0c564b39 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -23,7 +23,7 @@
   <refsect1>
     <title>Description</title>
 
-    <para>A number of different components are involved in the boot of a Linux system. Immediately after
+    <para>A number of different components are involved in the boot of a GNU/Linux system. Immediately after
     power-up, the system firmware will do minimal hardware initialization, and hand control over to a boot
     loader (e.g.
     <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> or
diff --git a/man/daemon.xml b/man/daemon.xml
index 8fa2506198..d091afa1d3 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -47,7 +47,7 @@
         <listitem><para>Close all open file descriptors except
         standard input, output, and error (i.e. the first three file
         descriptors 0, 1, 2). This ensures that no accidentally passed
-        file descriptor stays around in the daemon process. On Linux,
+        file descriptor stays around in the daemon process. On GNU/Linux,
         this is best implemented by iterating through
         <filename>/proc/self/fd</filename>, with a fallback of
         iterating from file descriptor 3 to the value returned by
@@ -142,7 +142,7 @@
     <refsect2>
       <title>New-Style Daemons</title>
 
-      <para>Modern services for Linux should be implemented as
+      <para>Modern services for GNU/Linux should be implemented as
       new-style daemons. This makes it easier to supervise and control
       them at runtime and simplifies their implementation.</para>
 
@@ -285,7 +285,7 @@
       via SysV init scripts, as detailed in the <ulink
       url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
       Linux Standard Base Core Specification</ulink>. This method of activation is supported ubiquitously on
-      Linux init systems, both old-style and new-style systems. Among other issues, SysV init scripts have
+      GNU/Linux init systems, both old-style and new-style systems. Among other issues, SysV init scripts have
       the disadvantage of involving shell scripts in the boot process. New-style init systems generally use
       updated versions of activation, both during boot-up and during runtime and using more minimal service
       description files.</para>
@@ -428,7 +428,7 @@
       often simpler or better alternatives, or they can be put together of combinations of the schemes above.
       Example: Sometimes, it appears useful to start daemons or <filename>.socket</filename> units when a
       specific IP address is configured on a network interface, because network sockets shall be bound to the
-      address. However, an alternative to implement this is by utilizing the Linux
+      address. However, an alternative to implement this is by utilizing the Linux kernel
       <constant>IP_FREEBIND</constant>/<constant>IPV6_FREEBIND</constant> socket option, as accessible via
       <varname>FreeBind=yes</varname> in systemd socket files (see
       <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
@@ -436,7 +436,7 @@
       address, and hence allows bindings to a particular IP address before it actually becomes available,
       making such an explicit dependency to the configured address redundant. Another often suggested trigger
       for service activation is low system load. However, here too, a more convincing approach might be to
-      make proper use of features of the operating system, in particular, the CPU or I/O scheduler of Linux.
+      make proper use of features of the operating system, in particular, the CPU or I/O scheduler of the Linux kernel.
       Instead of scheduling jobs from userspace based on monitoring the OS scheduler, it is advisable to
       leave the scheduling of processes to the OS scheduler itself. systemd provides fine-grained access to
       the CPU and I/O schedulers. If a process executed by the service manager shall not negatively impact
diff --git a/man/homectl.xml b/man/homectl.xml
index 7fc7d5f012..7a56c66425 100644
--- a/man/homectl.xml
+++ b/man/homectl.xml
@@ -430,7 +430,7 @@
       <varlistentry>
         <term><option>--fido2-device=</option><replaceable>PATH</replaceable></term>
 
-        <listitem><para>Takes a path to a Linux <literal>hidraw</literal> device
+        <listitem><para>Takes a path to a Linux kernel <literal>hidraw</literal> device
         (e.g. <filename>/dev/hidraw1</filename>), referring to a FIDO2 security token implementing the
         <literal>hmac-secret</literal> extension that shall be able to unlock the user account. A random salt
         value is generated on the host and passed to the FIDO2 device, which calculates a HMAC hash of the
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 85594b07d7..0061dbd20c 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -47,7 +47,7 @@
 
     <para>Note that the pretty hostname has little restrictions on the characters and length used, while the static and
     transient hostnames are limited to the usually accepted characters of Internet domain names, and 64 characters at
-    maximum (the latter being a Linux limitation).</para>
+    maximum (the latter being a Linux kernel limitation).</para>
 
     <para>Use
     <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> to
@@ -86,7 +86,7 @@
         <para>The static and transient hostnames must each be either a single DNS label (a string composed of
         7-bit ASCII lower-case characters and no spaces or dots, limited to the format allowed for DNS domain
         name labels), or a sequence of such labels separated by single dots that forms a valid DNS FQDN. The
-        hostname must be at most 64 characters, which is a Linux limitation (DNS allows longer names).</para>
+        hostname must be at most 64 characters, which is a Linux kernel limitation (DNS allows longer names).</para>
 
         <xi:include href="version-info.xml" xpointer="v249"/></listitem>
       </varlistentry>
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index e150d04dcf..1fb961de0a 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -136,7 +136,7 @@
         <term><varname>SplitMode=</varname></term>
 
         <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
-        <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
+        <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
         control is managed per file, and the journal daemon will assign users read access to their journal files. If
         <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users,
         and the nobody user) will each get their own journal files, and system users will log to the system journal.
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 1afd4313a7..b0e587a04d 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -72,7 +72,7 @@
 
       <listitem><para>btrfs subvolumes containing OS trees, similar to regular directory trees.</para></listitem>
 
-      <listitem><para>Binary "raw" disk image files containing MBR or GPT partition tables and Linux file
+      <listitem><para>Binary "raw" disk image files containing MBR or GPT partition tables and GNU/Linux file
       systems.</para></listitem>
 
       <listitem><para>Similarly, block devices containing MBR or GPT partition tables and file systems.</para></listitem>
@@ -972,7 +972,7 @@
     <para>The <command>machinectl</command> tool operates on machines
     and images whose names must be chosen following strict
     rules. Machine names must be suitable for use as hostnames
-    following a conservative subset of DNS and UNIX/Linux
+    following a conservative subset of DNS and GNU/Linux
     semantics. Specifically, they must consist of one or more
     non-empty label strings, separated by dots. No leading or trailing
     dots are allowed. No sequences of multiple dots are allowed. The
diff --git a/man/org.freedesktop.machine1.xml b/man/org.freedesktop.machine1.xml
index 1af77e0035..045e784f8b 100644
--- a/man/org.freedesktop.machine1.xml
+++ b/man/org.freedesktop.machine1.xml
@@ -320,7 +320,7 @@ node /org/freedesktop/machine1 {
       service that registers the machine, a class string, the PID of the leader process of the machine, an
       optional root directory of the container, and an array of additional properties to use for the scope
       registration. The virtual machine name must be suitable as a hostname, and hence should follow the usual
-      DNS hostname rules, as well as the Linux hostname restrictions. Specifically, only 7 bit ASCII is
+      DNS hostname rules, as well as the Linux kernel hostname restrictions. Specifically, only 7 bit ASCII is
       permitted, a maximum length of 64 characters is enforced, only characters from the set
       <literal>a-zA-Z0-9-_.</literal> are allowed, the name may not begin with a dot, and it may not contain
       two dots immediately following each other. Container and VM managers should ideally use the hostname
diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml
index f9cba4f612..71500d5f36 100644
--- a/man/org.freedesktop.resolve1.xml
+++ b/man/org.freedesktop.resolve1.xml
@@ -256,7 +256,7 @@ node /org/freedesktop/resolve1 {
       <title>Methods</title>
 
       <para><function>ResolveHostname()</function> takes a hostname and resolves it to one or more IP
-      addresses.  As parameters it takes the Linux network interface index to execute the query on, or 0 if
+      addresses.  As parameters it takes the Linux kernel network interface index to execute the query on, or 0 if
       it may be done on any suitable interface. The <varname>name</varname> parameter specifies the hostname
       to resolve. Note that if required, IDNA conversion is applied to this name unless it is resolved via
       LLMNR or MulticastDNS. The <varname>family</varname> parameter limits the results to a specific address
@@ -290,7 +290,7 @@ node /org/freedesktop/resolve1 {
 
       <para><function>ResolveRecord()</function> takes a DNS resource record (RR) type, class and name, and
       retrieves the full resource record set (RRset), including the RDATA, for it. As parameter it takes the
-      Linux network interface index to execute the query on, or <constant>0</constant> if it may be done on
+      Linux kernel network interface index to execute the query on, or <constant>0</constant> if it may be done on
       any suitable interface. The <varname>name</varname> parameter specifies the RR domain name to look up
       (no IDNA conversion is applied), followed by the 16-bit class and type fields (which may be
       ANY). Finally, a <varname>flags</varname> field may be passed in to alter behaviour of the look-up (see
@@ -314,7 +314,7 @@ node /org/freedesktop/resolve1 {
       service metadata.  The primary benefit of using this method over <function>ResolveRecord()</function>
       specifying the <constant class="dns">SRV</constant> type is that it will resolve the
       <constant class="dns">SRV</constant> and <constant class="dns">TXT</constant> RRs as well as the
-      hostnames referenced in the SRV in a single operation. As parameters it takes a Linux network interface
+      hostnames referenced in the SRV in a single operation. As parameters it takes a Linux kernel network interface
       index, a service name, a service type and a service domain. This method may be invoked in three
       different modes:</para>
 
@@ -745,7 +745,7 @@ node /org/freedesktop/resolve1/link/_1 {
 
     <!--End of Autogenerated section-->
 
-    <para>For each Linux network interface a "Link" object is created which exposes per-link DNS
+    <para>For each Linux kernel network interface a "Link" object is created which exposes per-link DNS
     configuration and state. Use <function>GetLink()</function> on the Manager interface to retrieve the
     object path for a link object given the network interface index (see above).</para>
 
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 6008ba00a3..caf2b9df9e 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -1266,7 +1266,7 @@ node /org/freedesktop/systemd1 {
 
       <para><function>GetUnitByPID()</function> may be used to get the unit object path of the unit a process
       ID belongs to. It takes a UNIX PID and returns the object path. The PID must refer to an existing system process.
-      <function>GetUnitByPIDFD()</function> may be used to query with a Linux PIDFD (see:
+      <function>GetUnitByPIDFD()</function> may be used to query with a Linux kernel PIDFD (see:
       <citerefentry><refentrytitle>pidfd_open</refentrytitle><manvolnum>2</manvolnum></citerefentry>) instead
       of a PID, which is safer as UNIX PIDs can be recycled. The latter method returns the unit id and the
       invocation id together with the unit object path.</para>
diff --git a/man/os-release.xml b/man/os-release.xml
index 5e2569d289..461a5676e7 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -456,7 +456,7 @@
           present and no other configuration source specifies the hostname. Must be either a single DNS label
           (a string composed of 7-bit ASCII lower-case characters and no spaces or dots, limited to the
           format allowed for DNS domain name labels), or a sequence of such labels separated by single dots
-          that forms a valid DNS FQDN. The hostname must be at most 64 characters, which is a Linux
+          that forms a valid DNS FQDN. The hostname must be at most 64 characters, which is a Linux kernel
           limitation (DNS allows longer names).</para>
 
           <para>See <citerefentry><refentrytitle>org.freedesktop.hostname1</refentrytitle><manvolnum>5</manvolnum></citerefentry>
diff --git a/man/pam_systemd_home.xml b/man/pam_systemd_home.xml
index dd28de1176..6e09168bf1 100644
--- a/man/pam_systemd_home.xml
+++ b/man/pam_systemd_home.xml
@@ -106,7 +106,7 @@
     the encrypted data), <option>account</option> (because users with
     <filename>systemd-homed.service</filename> user accounts are described in a <ulink
     url="https://systemd.io/USER_RECORD/">JSON user record</ulink> and may be configured in more detail than
-    in the traditional Linux user database), <option>session</option> (because user sessions must be tracked
+    in the traditional GNU/Linux user database), <option>session</option> (because user sessions must be tracked
     in order to implement automatic release when the last session of the user is gone),
     <option>password</option> (to change the encryption password — also used for user authentication —
     through PAM).</para>
diff --git a/man/portablectl.xml b/man/portablectl.xml
index 03ca65e0cb..157404e8b2 100644
--- a/man/portablectl.xml
+++ b/man/portablectl.xml
@@ -58,7 +58,7 @@
 
       <listitem><para>btrfs subvolumes containing OS trees, similar to normal directory trees.</para></listitem>
 
-      <listitem><para>Binary "raw" disk images containing MBR or GPT partition tables and Linux file system
+      <listitem><para>Binary "raw" disk images containing MBR or GPT partition tables and GNU/Linux file system
       partitions. (These must be regular files, with the <filename>.raw</filename> suffix.)</para></listitem>
     </itemizedlist>
 
diff --git a/man/repart.d.xml b/man/repart.d.xml
index 79908a0805..b9f88f63fc 100644
--- a/man/repart.d.xml
+++ b/man/repart.d.xml
@@ -139,7 +139,7 @@
 
               <row>
                 <entry><constant>linux-generic</constant></entry>
-                <entry>Generic Linux file system partition</entry>
+                <entry>Generic GNU/Linux file system partition</entry>
               </row>
 
               <row>
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index 25e3913162..8198e952f7 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -110,7 +110,7 @@
 
     <para>In addition to this list, in sd-bus, the special error
     namespace <literal>System.Error.</literal> is used to map
-    arbitrary Linux system errors (as defined by <citerefentry
+    arbitrary GNU/Linux system errors (as defined by <citerefentry
     project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
     to D-Bus errors and back. For example, the error
     <constant>EUCLEAN</constant> is mapped to
diff --git a/man/sd-event.xml b/man/sd-event.xml
index 276770f61d..7f1e5e2035 100644
--- a/man/sd-event.xml
+++ b/man/sd-event.xml
@@ -36,7 +36,7 @@
 
     <para><filename>sd-event.h</filename> is part of
     <citerefentry><refentrytitle>libsystemd</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
-    provides a generic event loop implementation, based on Linux <citerefentry
+    provides a generic event loop implementation, based on Linux kernel <citerefentry
     project='man-pages'><refentrytitle>epoll</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
     </para>
 
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index d264220b0b..48d2a1befb 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -193,7 +193,7 @@ int main(int argc, char **argv) {
     "<ulink url="https://en.wikipedia.org/wiki/Universally_unique_identifier#Format">UUID canonical representation</ulink>".
     They format the string based on <ulink
     url="https://tools.ietf.org/html/rfc4122">RFC4122</ulink> Variant 1 rules, i.e. converting from Big
-    Endian byte order. This matches behaviour of most other Linux userspace infrastructure. It's probably
+    Endian byte order. This matches behaviour of most other GNU/Linux userspace infrastructure. It's probably
     best to avoid UUIDs of other variants, in order to avoid unnecessary ambiguities. All 128-bit IDs
     generated by the sd-id128 APIs strictly conform to Variant 1 Version 4 UUIDs, as per RFC 4122.</para>
 
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index 6676455489..5a68d89d8a 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -51,7 +51,7 @@
 
     <para>The <function>sd_bus_error_add_map()</function> call may be
     used to register additional mappings for converting D-Bus errors
-    to Linux <varname>errno</varname>-style errors. The mappings
+    to GNU/Linux <varname>errno</varname>-style errors. The mappings
     defined with this call are consulted by calls such as
     <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     or
diff --git a/man/sd_bus_get_name_machine_id.xml b/man/sd_bus_get_name_machine_id.xml
index 64019c9856..ac29eb3fdc 100644
--- a/man/sd_bus_get_name_machine_id.xml
+++ b/man/sd_bus_get_name_machine_id.xml
@@ -40,7 +40,7 @@
     <para><function>sd_bus_get_name_machine_id()</function> retrieves the D-Bus machine identity of the
     machine that the bus client identified by <parameter>name</parameter> is running on. Internally, it calls
     the <function>GetMachineId</function> method of the <constant>org.freedesktop.DBus.Peer</constant>
-    interface. The D-Bus machine identity is a 128-bit UUID. On Linux systems running systemd, this
+    interface. The D-Bus machine identity is a 128-bit UUID. On GNU/Linux systems running systemd, this
     corresponds to the contents of <filename>/etc/machine-id</filename>. On success, the machine identity is
     stored in <parameter>machine</parameter>.</para>
   </refsect1>
diff --git a/man/sd_event_add_io.xml b/man/sd_event_add_io.xml
index da0fa58227..ac095fb2d4 100644
--- a/man/sd_event_add_io.xml
+++ b/man/sd_event_add_io.xml
@@ -104,7 +104,7 @@
     object is specified in the <parameter>event</parameter> parameter, the event source object is returned in
     the <parameter>source</parameter> parameter. The <parameter>fd</parameter> parameter takes the UNIX file
     descriptor to watch, which may refer to a socket, a FIFO, a message queue, a serial connection, a
-    character device, or any other file descriptor compatible with Linux <citerefentry
+    character device, or any other file descriptor compatible with Linux kernel <citerefentry
     project='man-pages'><refentrytitle>epoll</refentrytitle><manvolnum>7</manvolnum></citerefentry>. The
     <parameter>events</parameter> parameter takes a bit mask of events to watch for, a combination of the
     following event flags: <constant>EPOLLIN</constant>, <constant>EPOLLOUT</constant>,
diff --git a/man/sd_event_set_signal_exit.xml b/man/sd_event_set_signal_exit.xml
index 1ac208ea85..6ab1503275 100644
--- a/man/sd_event_set_signal_exit.xml
+++ b/man/sd_event_set_signal_exit.xml
@@ -49,7 +49,7 @@
     <constant>SIGINT</constant> and <constant>SIGTERM</constant>. If specified as false, it will no
     longer. When this functionality is turned off the calling thread's signal mask is restored to match the
     state before it was turned on, for the two signals. By default the two signals are not handled by the
-    event loop, and Linux' default signal handling for them is in effect.</para>
+    event loop, and the Linux kernel's default signal handling for them is in effect.</para>
 
     <para>It's customary for UNIX programs to exit on either of these two signals, hence it's typically a
     good idea to enable this functionality for the main event loop of a program.</para>
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index da44a0dcdd..c3323e0f97 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -83,7 +83,7 @@
 
     <para>Note that when formatting and parsing 36 character UUIDs this is done strictly in Big Endian byte order,
     i.e. according to <ulink url="https://tools.ietf.org/html/rfc4122">RFC4122</ulink> Variant 1 rules, even
-    if the UUID encodes a different variant. This matches behaviour in various other Linux userspace
+    if the UUID encodes a different variant. This matches behaviour in various other GNU/Linux userspace
     tools. It's probably wise to avoid UUIDs of other variant types.</para>
 
     <para>For more information about the <literal>sd_id128_t</literal> type see
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index a00a2cc1b8..238f9a90c4 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -140,7 +140,7 @@
     the <parameter>path</parameter> parameter is
     <constant>NULL</constant>. For normal file system
     <constant>AF_UNIX</constant> sockets, set the
-    <parameter>length</parameter> parameter to 0. For Linux abstract
+    <parameter>length</parameter> parameter to 0. For Linux kernel abstract
     namespace sockets, set the <parameter>length</parameter> to the
     size of the address, including the initial 0 byte, and set the
     <parameter>path</parameter> to the initial 0 byte of the socket
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 7c32a22bc9..9e25a42aee 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -474,7 +474,7 @@
     <para>These functions send a single datagram with the state string as payload to the socket referenced in
     the <varname>$NOTIFY_SOCKET</varname> environment variable. If the first character of
     <varname>$NOTIFY_SOCKET</varname> is <literal>/</literal> or <literal>@</literal>, the string is
-    understood as an <constant>AF_UNIX</constant> or Linux abstract namespace socket (respectively), and in
+    understood as an <constant>AF_UNIX</constant> or Linux kernel abstract namespace socket (respectively), and in
     both cases the datagram is accompanied by the process credentials of the sending service, using
     SCM_CREDENTIALS. If the string starts with <literal>vsock:</literal> then the string is understood as an
     <constant>AF_VSOCK</constant> address, which is useful for hypervisors/VMMs or other processes on the
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 4a78ed9065..56be9d8e0b 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -181,7 +181,7 @@
 
           <listitem><para>An input parameter was invalid (out of range, or <constant>NULL</constant>,
           where that is not accepted). This is also returned if the passed user ID is
-          <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on Linux.
+          <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux.
           </para></listitem>
         </varlistentry>
 
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 35ad8435f4..7a23d33d3c 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -431,7 +431,7 @@ DATAERR 65     BSD
     <refsect2>
       <title><command>systemd-analyze capability <optional><replaceable>CAPABILITY</replaceable>...</optional></command></title>
 
-      <para>This command prints a list of Linux capabilities along with their numeric IDs. See <citerefentry
+      <para>This command prints a list of Linux kernel capabilities along with their numeric IDs. See <citerefentry
       project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
       for details. If no argument is specified the full list of capabilities known to the service manager and
       the kernel is shown. Capabilities defined by the kernel but not known to the service manager are shown
diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index 2b0ea9be34..3df3661040 100644
--- a/man/systemd-boot.xml
+++ b/man/systemd-boot.xml
@@ -111,7 +111,7 @@
 
     <para><citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry>
     may be used as UEFI boot stub for executed kernels, which is useful to show graphical boot splashes
-    before transitioning into the Linux world. It is also capable of automatically picking up auxiliary
+    before transitioning into the Linux kernel's world. It is also capable of automatically picking up auxiliary
     credential files (for boot parameterization) and system extension images, as companion files to the
     booted kernel images.</para>
   </refsect1>
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 27332c5d31..a843194b52 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -39,7 +39,7 @@
     <title>Description</title>
 
     <para><command>systemd-cgls</command> recursively shows the
-    contents of the selected Linux control group hierarchy in a tree.
+    contents of the selected Linux kernel control group hierarchy in a tree.
     If arguments are specified, shows all member processes of the
     specified control groups plus all their subgroups and their
     members. The control groups may either be specified by their full
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index ddad82e2b3..e515f417d2 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -33,7 +33,7 @@
     <title>Description</title>
 
     <para><command>systemd-cgtop</command> shows the top control
-    groups of the local Linux control group hierarchy, ordered by
+    groups of the local Linux kernel control group hierarchy, ordered by
     their CPU, memory, or disk I/O load. The display is refreshed in
     regular intervals (by default every 1s), similar in style to
     <citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml
index 8fd885cb26..d114ec5f0a 100644
--- a/man/systemd-cryptenroll.xml
+++ b/man/systemd-cryptenroll.xml
@@ -153,7 +153,7 @@
               <entry>9</entry>
               <entry>kernel-initrd</entry>
               <entry>The Linux kernel measures all initrds it receives into this PCR.</entry>
-              <!-- Strictly speaking only Linux >= 5.17 using the LOAD_FILE2 protocol, see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f046fff8bc4c4d8f8a478022e76e40b818f692df -->
+              <!-- Strictly speaking only Linux kernel >= 5.17 using the LOAD_FILE2 protocol, see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f046fff8bc4c4d8f8a478022e76e40b818f692df -->
             </row>
 
             <row>
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index e1caa4fc26..6e35e657ee 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -160,12 +160,12 @@
 
           <row>
             <entry><varname>lxc</varname></entry>
-            <entry>Linux container implementation by LXC</entry>
+            <entry>Container implementation by LXC</entry>
           </row>
 
           <row>
             <entry><varname>lxc-libvirt</varname></entry>
-            <entry>Linux container implementation by libvirt</entry>
+            <entry>Container implementation by libvirt</entry>
           </row>
 
           <row>
@@ -212,8 +212,8 @@
     conjunction, only the latter will be identified (unless
     <option>--vm</option> is passed).</para>
     <para> Windows Subsystem for Linux is not a Linux container,
-    but an environment for running Linux userspace applications on
-    top of the Windows kernel using a Linux-compatible interface.
+    but an environment for running GNU/Linux userspace applications on
+    top of the Windows kernel using a Linux-kernel-compatible interface.
     WSL is categorized as a container for practical purposes.
     Multiple WSL environments share the same kernel and services
     should generally behave like when being run in a container.</para>
diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml
index a17111cb7d..92d1c86b88 100644
--- a/man/systemd-dissect.xml
+++ b/man/systemd-dissect.xml
@@ -97,7 +97,7 @@
       partition only. (This partition is assumed to contain the root file system of the OS.)</para></listitem>
     </orderedlist>
 
-    <para>OS images may use any kind of Linux-supported file systems. In addition they may make use of LUKS
+    <para>OS images may use any kind of Linux-kernel-supported file systems. In addition they may make use of LUKS
     disk encryption, and contain Verity integrity information. Note that qualifying OS images may be booted
     with <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
     <option>--image=</option> switch, and be used as root file system for system service using the
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index d1a77bdf34..d34c53d580 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -55,7 +55,7 @@
       and is different for every booted instance of the
       VM.</para></listitem>
 
-      <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the
+      <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the
       container, this is used to initialize the machine ID. For details, see the documentation of the <ulink
       url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>
 
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index afec5663ca..b164b72b6f 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -57,7 +57,7 @@
 
     <para>In contrast to <citerefentry
     project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> <command>systemd-nspawn</command>
-    may be used to boot full Linux-based operating systems in a container.</para>
+    may be used to boot full Linux-kernel-based operating systems in a container.</para>
 
     <para><command>systemd-nspawn</command> limits access to various kernel interfaces in the container to read-only,
     such as <filename>/sys/</filename>, <filename>/proc/sys/</filename> or <filename>/sys/fs/selinux/</filename>. The
@@ -1000,7 +1000,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
         <para>Note that <option>--network-veth</option> is the default if the
         <filename>systemd-nspawn@.service</filename> template unit file is used.</para>
 
-        <para>Note that on Linux network interface names may have a length of 15 characters at maximum, while
+        <para>Note that on the Linux kernel, network interface names may have a length of 15 characters at maximum, while
         container names may have a length up to 64 characters. As this option derives the host-side interface
         name from the container name the name is possibly truncated. Thus, care needs to be taken to ensure
         that interface names remain unique in this case, or even better container names are generally not
@@ -1043,7 +1043,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
         as argument. Note that <option>--network-bridge=</option> implies <option>--network-veth</option>. If
         this option is used, the host side of the Ethernet link will use the <literal>vb-</literal> prefix
         instead of <literal>ve-</literal>. Regardless of the used naming prefix the same network interface
-        name length limits imposed by Linux apply, along with the complications this creates (for details see
+        name length limits imposed by the Linux kernel apply, along with the complications this creates (for details see
         above).</para>
 
         <para>As with <option>--network-interface=</option>, the underlying bridge network interface must
diff --git a/man/systemd-oomd.service.xml b/man/systemd-oomd.service.xml
index d8ecfde8eb..73fd43a270 100644
--- a/man/systemd-oomd.service.xml
+++ b/man/systemd-oomd.service.xml
@@ -68,7 +68,7 @@
     is set to <constant>true</constant> in
     <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
-    <para>The kernel must be compiled with PSI support. This is available in Linux 4.20 and above.</para>
+    <para>The kernel must be compiled with PSI support. This is available in Linux kernel 4.20 and above.</para>
 
     <para>It is highly recommended for the system to have swap enabled for <command>systemd-oomd</command> to
     function optimally. With swap enabled, the system spends enough time swapping pages to let
diff --git a/man/systemd-pstore.service.xml b/man/systemd-pstore.service.xml
index 66ad5572c8..8362314245 100644
--- a/man/systemd-pstore.service.xml
+++ b/man/systemd-pstore.service.xml
@@ -30,11 +30,11 @@
   <refsect1>
     <title>Description</title>
     <para><filename>systemd-pstore.service</filename> is a system service that archives the
-    contents of the Linux persistent storage filesystem, pstore, to other storage,
+    contents of the Linux kernel persistent storage filesystem, pstore, to other storage,
     thus preserving the existing information contained in the pstore, and clearing
     pstore storage for future error events.</para>
 
-    <para>Linux provides a persistent storage file system, pstore, that can store error records when the
+    <para>The Linux kernel provides a persistent storage file system, pstore, that can store error records when the
     kernel dies (or reboots or powers-off). These records in turn can be referenced to debug kernel problems
     (currently the kernel stores the tail of the kernel log, which also contains a stack backtrace, into
     pstore).</para>
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 85c857dc2f..536ed96391 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -50,7 +50,7 @@
       API as defined by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related
       resolver functions, including
       <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-      This API is widely supported, including beyond the Linux platform. In its current form it does not
+      This API is widely supported, including beyond the GNU/Linux platform. In its current form it does not
       expose DNSSEC validation status information however, and is synchronous only. This API is backed by the
       glibc Name Service Switch
       (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
@@ -335,7 +335,7 @@ search foobar.com barbar.com
     <itemizedlist>
       <listitem><para><command>systemd-resolved</command> maintains the
       <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional
-      Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also
+      GNU/Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also
       contains a list of search domains that are in use by systemd-resolved. The list of search domains is
       always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not
       be used directly by applications, but only through a symlink from
@@ -351,7 +351,7 @@ search foobar.com barbar.com
       </para></listitem>
 
       <listitem><para><command>systemd-resolved</command> maintains the
-      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
+      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept
       up-to-date, containing information about all known DNS servers. Note the file format's limitations: it
       does not know a concept of per-interface DNS servers and hence only contains system-wide DNS server
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 7c2adb068f..7db88f7aca 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -224,7 +224,7 @@
     <title>Example: freeze</title>
 
     <para>Example: to exploit the <quote>freeze</quote> mode added
-    in Linux 3.9, one can use <command>systemctl suspend</command>
+    in Linux kernel 3.9, one can use <command>systemctl suspend</command>
     with
     <programlisting>[Sleep]
 SuspendState=freeze</programlisting></para>
diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml
index 6e853336c2..88fe682e5b 100644
--- a/man/systemd-stub.xml
+++ b/man/systemd-stub.xml
@@ -44,7 +44,7 @@
     attached to a Linux kernel binary image, and is a piece of code that runs in the UEFI firmware
     environment before transitioning into the Linux kernel environment. The UEFI boot stub ensures a Linux
     kernel is executable as regular UEFI binary, and is able to do various preparations before switching the
-    system into the Linux world.</para>
+    system into the Linux kernel's world.</para>
 
     <para>The UEFI boot stub looks for various resources for the kernel invocation inside the UEFI PE binary
     itself. This allows combining various resources inside a single PE binary image (usually called "Unified
diff --git a/man/systemd-sysext.xml b/man/systemd-sysext.xml
index 76076931d5..a0e0ff78c7 100644
--- a/man/systemd-sysext.xml
+++ b/man/systemd-sysext.xml
@@ -83,7 +83,7 @@
       <listitem><para>Plain directories or btrfs subvolumes containing the OS tree</para></listitem>
       <listitem><para>Disk images with a GPT disk label, following the <ulink
       url="https://uapi-group.org/specifications/specs/discoverable_partitions_specification">Discoverable Partitions Specification</ulink></para></listitem>
-      <listitem><para>Disk images lacking a partition table, with a naked Linux file system (e.g. erofs,
+      <listitem><para>Disk images lacking a partition table, with a naked GNU/Linux file system (e.g. erofs,
       squashfs or ext4)</para></listitem>
     </orderedlist>
 
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 3c06b65f93..276d699b3b 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -561,7 +561,7 @@
       <varlistentry>
         <term><varname>DefaultOOMPolicy=</varname></term>
 
-        <listitem><para>Configure the default policy for reacting to processes being killed by the Linux
+        <listitem><para>Configure the default policy for reacting to processes being killed by the Linux kernel
         Out-Of-Memory (OOM) killer or <command>systemd-oomd</command>. This may be used to pick a global default for the per-unit
         <varname>OOMPolicy=</varname> setting. See
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 0bbd4e8ae7..4bfad710f8 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -60,7 +60,7 @@
     <varname>After=network-online.target</varname> or similar on network
     filesystems. Doing so may result in an ordering cycle.</para>
 
-    <para>Note that automount support on Linux is privileged, automount units are hence only available in the
+    <para>Note that automount support on GNU/Linux is privileged, automount units are hence only available in the
     system service manager (and root's user service manager), but not in unprivileged users' service
     managers.</para>
 
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index a6716495db..f6d8c0a0b3 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -42,7 +42,7 @@
     information on the specific unit configuration files. The execution specific configuration options are configured
     in the [Service], [Socket], [Mount], or [Swap] sections, depending on the unit type.</para>
 
-    <para>In addition, options which control resources through Linux Control Groups (cgroups) are listed in
+    <para>In addition, options which control resources through Linux kernel Control Groups (cgroups) are listed in
     <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     Those options complement options listed here.</para>
   </refsect1>
@@ -165,7 +165,7 @@
         to <varname>RootDirectory=</varname> however mounts a file system hierarchy from a block device node
         or loopback file instead of a directory. The device node or file system image file needs to contain a
         file system without a partition table, or a file system within an MBR/MS-DOS or GPT partition table
-        with only a single Linux-compatible partition, or a set of file systems within a GPT partition table
+        with only a single Linux-kernel-compatible partition, or a set of file systems within a GPT partition table
         that follows the
         <ulink url="https://uapi-group.org/specifications/specs/discoverable_partitions_specification">
           Discoverable Partitions Specification</ulink>.</para>
@@ -403,7 +403,7 @@
         unit's processes. This controls the <literal>subset=</literal> mount option of the
         <literal>procfs</literal> instance for the unit. For further details see <ulink
         url="https://docs.kernel.org/filesystems/proc.html#mount-options">The /proc
-        Filesystem</ulink>. Note that Linux exposes various kernel APIs via <filename>/proc/</filename>,
+        Filesystem</ulink>. Note that GNU/Linux exposes various kernel APIs via <filename>/proc/</filename>,
         which are made unavailable with this setting. Since these APIs are used frequently this option is
         useful only in a few, specific cases, and is not suitable for most non-trivial programs.</para>
 
@@ -615,7 +615,7 @@
         <literal>-</literal>, except for the first character which must be one of a-z, A-Z and
         <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The
         user/group name must have at least one character, and at most 31. These restrictions are made in
-        order to avoid ambiguities and to ensure user/group names and unit files remain portable among Linux
+        order to avoid ambiguities and to ensure user/group names and unit files remain portable among GNU/Linux
         systems. For further details on the names accepted and the names warned about see <ulink
         url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para>
 
@@ -951,13 +951,13 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         enforcement. For example, time limits specified for <varname>LimitCPU=</varname> will be rounded up
         implicitly to multiples of 1s. For <varname>LimitNICE=</varname> the value may be specified in two
         syntaxes: if prefixed with <literal>+</literal> or <literal>-</literal>, the value is understood as
-        regular Linux nice value in the range -20…19. If not prefixed like this the value is understood as
+        regular Linux kernel nice value in the range -20…19. If not prefixed like this the value is understood as
         raw resource limit parameter in the range 0…40 (with 0 being equivalent to 1).</para>
 
         <para>Note that most process resource limits configured with these options are per-process, and
         processes may fork in order to acquire a new set of resources that are accounted independently of the
         original process, and may thus escape limits set. Also note that <varname>LimitRSS=</varname> is not
-        implemented on Linux, and setting it has no effect. Often it is advisable to prefer the resource
+        implemented on the Linux kernel, and setting it has no effect. Often it is advisable to prefer the resource
         controls listed in
         <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         over these per-process limits, as they apply to services as a whole, may be altered dynamically at
@@ -1041,13 +1041,13 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
                 <entry>LimitRSS=</entry>
                 <entry>ulimit -m</entry>
                 <entry>Bytes</entry>
-                <entry>Don't use. No effect on Linux.</entry>
+                <entry>Don't use. No effect on the Linux kernel.</entry>
               </row>
               <row>
                 <entry>LimitNOFILE=</entry>
                 <entry>ulimit -n</entry>
                 <entry>Number of File Descriptors</entry>
-                <entry>Don't use. Be careful when raising the soft limit above 1024, since <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry> cannot function with file descriptors above 1023 on Linux. Nowadays, the hard limit defaults to 524288, a very high value compared to historical defaults. Typically applications should increase their soft limit to the hard limit on their own, if they are OK with working with file descriptors above 1023, i.e. do not use <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry>. Note that file descriptors are nowadays accounted like any other form of memory, thus there should not be any need to lower the hard limit. Use <varname>MemoryMax=</varname> to control overall service memory use, including file descriptor memory.</entry>
+                <entry>Don't use. Be careful when raising the soft limit above 1024, since <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry> cannot function with file descriptors above 1023 on GNU/Linux. Nowadays, the hard limit defaults to 524288, a very high value compared to historical defaults. Typically applications should increase their soft limit to the hard limit on their own, if they are OK with working with file descriptors above 1023, i.e. do not use <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry>. Note that file descriptors are nowadays accounted like any other form of memory, thus there should not be any need to lower the hard limit. Use <varname>MemoryMax=</varname> to control overall service memory use, including file descriptor memory.</entry>
               </row>
               <row>
                 <entry>LimitAS=</entry>
@@ -1303,7 +1303,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         <option>local</option>. A list of NUMA nodes that should be associated with the policy must be specified
         in <varname>NUMAMask=</varname>. For more details on each policy please see,
         <citerefentry><refentrytitle>set_mempolicy</refentrytitle><manvolnum>2</manvolnum></citerefentry>. For overall
-        overview of NUMA support in Linux see,
+        overview of NUMA support in GNU/Linux see
         <citerefentry project='man-pages'><refentrytitle>numa</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         </para>
 
@@ -1632,7 +1632,7 @@ StateDirectory=aaa/bbb ccc</programlisting>
         order to provide writable subdirectories within read-only directories. Use
         <varname>ReadWritePaths=</varname> in order to allow-list specific paths for write access if
         <varname>ProtectSystem=strict</varname> is used. Note that <varname>ReadWritePaths=</varname> cannot
-        be used to gain write access to a file system whose superblock is mounted read-only. On Linux, for
+        be used to gain write access to a file system whose superblock is mounted read-only. On GNU/Linux, for
         each mount point write access is granted only if the mount point itself <emphasis>and</emphasis> the
         file system superblock backing it are not marked read-only. <varname>ReadWritePaths=</varname> only
         controls the former, not the latter, hence a read-only file system superblock remains
@@ -1825,7 +1825,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting>
       <varlistentry>
         <term><varname>NetworkNamespacePath=</varname></term>
 
-        <listitem><para>Takes an absolute file system path referring to a Linux network namespace
+        <listitem><para>Takes an absolute file system path referring to a Linux kernel network namespace
         pseudo-file (i.e. a file like <filename>/proc/$PID/ns/net</filename> or a bind mount or symlink to
         one). When set the invoked processes are added to the network namespace referenced by that path. The
         path has to point to a valid namespace file at the moment the processes are forked off. If this
@@ -1859,7 +1859,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting>
 
         <para>Note that IPC namespacing does not have an effect on
         <constant>AF_UNIX</constant> sockets, which are the most common
-        form of IPC used on Linux. Instead, <constant>AF_UNIX</constant>
+        form of IPC used on GNU/Linux. Instead, <constant>AF_UNIX</constant>
         sockets in the file system are subject to mount namespacing, and
         those in the abstract namespace are subject to network namespacing.
         IPC namespacing only has an effect on SysV IPC (which is mostly
@@ -1883,7 +1883,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting>
       <varlistentry>
         <term><varname>IPCNamespacePath=</varname></term>
 
-        <listitem><para>Takes an absolute file system path referring to a Linux IPC namespace
+        <listitem><para>Takes an absolute file system path referring to a Linux kernel IPC namespace
         pseudo-file (i.e. a file like <filename>/proc/$PID/ns/ipc</filename> or a bind mount or symlink to
         one). When set the invoked processes are added to the network namespace referenced by that path. The
         path has to point to a valid namespace file at the moment the processes are forked off. If this
@@ -2058,7 +2058,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting>
       <varlistentry>
         <term><varname>ProtectControlGroups=</varname></term>
 
-        <listitem><para>Takes a boolean argument. If true, the Linux Control Groups (<citerefentry
+        <listitem><para>Takes a boolean argument. If true, the Linux kernel Control Groups (<citerefentry
         project='man-pages'><refentrytitle>cgroups</refentrytitle><manvolnum>7</manvolnum></citerefentry>) hierarchies
         accessible through <filename>/sys/fs/cgroup/</filename> will be made read-only to all processes of the
         unit. Except for container managers no services should require write access to the control groups hierarchies;
@@ -2205,8 +2205,8 @@ RestrictFileSystems=ext4</programlisting>
       <varlistentry>
         <term><varname>RestrictNamespaces=</varname></term>
 
-        <listitem><para>Restricts access to Linux namespace functionality for the processes of this unit. For details
-        about Linux namespaces, see <citerefentry
+        <listitem><para>Restricts access to Linux kernel namespace functionality for the processes of this unit. For details
+        about Linux kernel namespaces, see <citerefentry
         project='man-pages'><refentrytitle>namespaces</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Either
         takes a boolean argument, or a space-separated list of namespace type identifiers. If false (the default), no
         restrictions on namespace creation and switching are made. If true, access to any kind of namespacing is
@@ -3194,7 +3194,7 @@ StandardInputData=V2XigLJyZSBubyBzdHJhbmdlcnMgdG8gbG92ZQpZb3Uga25vdyB0aGUgcnVsZX
         <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         for details about journal namespaces.</para>
 
-        <para>Internally, journal namespaces are implemented through Linux mount namespacing and
+        <para>Internally, journal namespaces are implemented through Linux kernel mount namespacing and
         over-mounting the directory that contains the relevant <constant>AF_UNIX</constant> sockets used for
         logging in the unit's mount namespace. Since mount namespaces are used this setting disconnects
         propagation of mounts from the unit's processes to the host, similarly to how
@@ -4446,7 +4446,7 @@ StandardInputData=V2XigLJyZSBubyBzdHJhbmdlcnMgdG8gbG92ZQpZb3Uga25vdyB0aGUgcnVsZX
       </tgroup>
     </table>
 
-    <para>Finally, the BSD operating systems define a set of exit codes, typically defined on Linux systems too:</para>
+    <para>Finally, the BSD operating systems define a set of exit codes, typically defined on GNU/Linux systems too:</para>
 
     <table>
       <title>BSD exit codes</title>
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 9cad358f1e..f857d74f86 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -515,7 +515,7 @@
         <term><varname>EgressQOSMaps=</varname></term>
         <term><varname>IngressQOSMaps=</varname></term>
         <listitem>
-          <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>)
+          <para>Defines a mapping of Linux kernel internal packet priority (<constant>SO_PRIORITY</constant>)
           to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a
           whitespace-separated list of integer pairs, where each integer must be in the range
           1…4294967294, in the format <literal>from</literal>-<literal>to</literal>, e.g.,
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 6dd38ea875..510516aae4 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1288,7 +1288,7 @@ Table=1234</programlisting></para>
           <para>Takes a boolean. Joining multicast group on ethernet level via
           <command>ip maddr</command> command would not work if we have an Ethernet switch that does
           IGMP snooping since the switch would not replicate multicast packets on  ports that did not
-          have IGMP reports for the multicast addresses. Linux vxlan interfaces created via
+          have IGMP reports for the multicast addresses. Linux kernel vxlan interfaces created via
           <command>ip link add vxlan</command> or networkd's netdev kind vxlan have the group option
           that enables them to do the required join. By extending <command>ip address</command> command
           with option <literal>autojoin</literal> we can get similar functionality for openvswitch (OVS)
@@ -1304,7 +1304,7 @@ Table=1234</programlisting></para>
         <listitem>
 
           <para>This setting provides a method for integrating static and dynamic network configuration into
-          Linux <ulink url="https://docs.kernel.org/netlabel/index.html">NetLabel</ulink> subsystem rules,
+          Linux kernel <ulink url="https://docs.kernel.org/netlabel/index.html">NetLabel</ulink> subsystem rules,
           used by <ulink url="https://en.wikipedia.org/wiki/Linux_Security_Modules">Linux Security Modules
           (LSMs)</ulink> for network access control. The label, with suitable LSM rules, can be used to
           control connectivity of (for example) a service with peers in the local network. At least with
@@ -1324,7 +1324,7 @@ Table=1234</programlisting></para>
           deconfigured. Failures to manage the labels will be ignored.</para>
 
           <para>Warning: Once labeling is enabled for network traffic, a lot of LSM access control points in
-          Linux networking stack go from dormant to active. Care should be taken to avoid getting into a
+          Linux kernel networking stack go from dormant to active. Care should be taken to avoid getting into a
           situation where for example remote connectivity is broken, when the security policy hasn't been
           updated to consider LSM per-packet access controls and no rules would allow any network
           traffic. Also note that additional configuration with <citerefentry
@@ -2346,7 +2346,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
       <varlistentry>
         <term><varname>SocketPriority=</varname></term>
         <listitem>
-          <para>The Linux socket option <constant>SO_PRIORITY</constant> applied to the raw IP socket used for
+          <para>The Linux kernel socket option <constant>SO_PRIORITY</constant> applied to the raw IP socket used for
           initial DHCPv4 messages. Unset by default. Usual values range from 0 to 6.
           More details about <constant>SO_PRIORITY</constant> socket option in
           <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 79806199e5..cce148bf30 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -189,7 +189,7 @@
         <term><varname>Capability=</varname></term>
         <term><varname>DropCapability=</varname></term>
 
-        <listitem><para>Takes a space-separated list of Linux process
+        <listitem><para>Takes a space-separated list of Linux kernel process
         capabilities (see
         <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
         for details). The <varname>Capability=</varname> setting
@@ -216,7 +216,7 @@
 
       <varlistentry>
         <term><varname>AmbientCapability=</varname></term>
-        <listitem><para>Takes a space-separated list of Linux process
+        <listitem><para>Takes a space-separated list of Linux kernel process
         capabilities (see
         <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
         for details). The <varname>AmbientCapability=</varname> setting
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 42f265c950..203e38cc2e 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -34,7 +34,7 @@
     <title>Description</title>
 
     <para>Unit configuration files for services, slices, scopes, sockets, mount points, and swap devices share a subset
-    of configuration options for resource control of spawned processes. Internally, this relies on the Linux Control
+    of configuration options for resource control of spawned processes. Internally, this relies on the Linux kernel Control
     Groups (cgroups) kernel concept for organizing processes in a hierarchical tree of named groups for the purpose of
     resource management.</para>
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index a5f6179ec3..1f1a8e53a2 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1217,7 +1217,7 @@
         <listitem><para>Configure the out-of-memory (OOM) killing policy for the kernel and the userspace OOM
         killer
         <citerefentry><refentrytitle>systemd-oomd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-        On Linux, when memory becomes scarce to the point that the kernel has trouble allocating memory for
+        On the Linux kernel, when memory becomes scarce to the point that the kernel has trouble allocating memory for
         itself, it might decide to kill a running process in order to free up memory and reduce memory
         pressure. Note that <filename>systemd-oomd.service</filename> is a more flexible solution that aims
         to prevent out-of-memory situations for the userspace too, not just the kernel, by attempting to
@@ -1239,7 +1239,7 @@
         <constant>continue</constant>.</para>
 
         <para>Use the <varname>OOMScoreAdjust=</varname> setting to configure whether processes of the unit
-        shall be considered preferred or less preferred candidates for process termination by the Linux OOM
+        shall be considered preferred or less preferred candidates for process termination by the Linux kernel OOM
         killer logic. See
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
         details.</para>
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 5e611997fc..47b3565e4d 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -28,7 +28,7 @@
 
     <para>A unit configuration file whose name ends in <literal>.slice</literal> encodes information about a slice
     unit. A slice unit is a concept for hierarchically managing resources of a group of processes. This management is
-    performed by creating a node in the Linux Control Group (cgroup) tree. Units that manage processes (primarily scope
+    performed by creating a node in the Linux kernel Control Group (cgroup) tree. Units that manage processes (primarily scope
     and service units) may be assigned to a specific slice. For each slice, certain resource limits may be set that
     apply to all processes of all units contained in that slice. Slices are organized hierarchically in a tree. The
     name of the slice encodes the location in the tree. The name consists of a dash-separated series of names, which
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 647b7dbb72..11dc37d03f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -292,7 +292,7 @@
         project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry>
         for details). This expects a valid message queue name (i.e. beginning with
         <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname>
-        directive above. On Linux message queue descriptors are actually file descriptors and can be
+        directive above. On GNU/Linux message queue descriptors are actually file descriptors and can be
         inherited between processes.</para></listitem>
       </varlistentry>
 
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 1c019b26d8..3c5c0b1029 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -58,7 +58,7 @@
     units cannot be templated, nor is possible to add multiple names to a swap unit by creating additional symlinks to
     it.</para>
 
-    <para>Note that swap support on Linux is privileged, swap units are hence only available in the system
+    <para>Note that swap support on GNU/Linux is privileged, swap units are hence only available in the system
     service manager (and root's user service manager), but not in unprivileged user's service manager.</para>
   </refsect1>
 
diff --git a/man/systemd.xml b/man/systemd.xml
index 42da75022f..301193329c 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -37,7 +37,7 @@
   <refsect1>
     <title>Description</title>
 
-    <para>systemd is a system and service manager for Linux operating systems. When run as first process on
+    <para>systemd is a system and service manager for GNU/Linux operating systems. When run as first process on
     boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate
     instances are started for logged-in users to start their services.</para>
 
@@ -212,7 +212,7 @@
     memory its accounting data is flushed out too. However, this data is generally not lost, as a journal log record
     is generated declaring the consumed resources whenever a unit shuts down.</para>
 
-    <para>Processes systemd spawns are placed in individual Linux control groups named after the unit which
+    <para>Processes systemd spawns are placed in individual Linux kernel control groups named after the unit which
     they belong to in the private systemd hierarchy. (see <ulink
     url="https://docs.kernel.org/admin-guide/cgroup-v2.html">Control Groups v2</ulink> for more information
     about control groups, or short "cgroups").  systemd uses this to effectively keep track of
@@ -785,7 +785,7 @@
 
     <para>When run as the system instance, systemd parses a number of options listed below. They can be
     specified as kernel command line arguments which are parsed from a number of sources depending on the
-    environment in which systemd is executed. If run inside a Linux container, these options are parsed from
+    environment in which systemd is executed. If run inside a container, these options are parsed from
     the command line arguments passed to systemd itself, next to any of the command line options listed in
     the Options section above. If run outside of Linux containers, these arguments are parsed from
     <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 971b7e6a9e..b25d36332a 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -416,7 +416,7 @@ L     /tmp/foobar -    -    -     -   /dev/null</programlisting>
           names. This can be useful for setting SMACK labels. Does not follow symlinks.</para>
 
           <para>Please note that extended attributes settable with this line type are a different concept
-          from the Linux file attributes settable with <varname>h</varname>/<varname>H</varname>, see
+          from the Linux kernel file attributes settable with <varname>h</varname>/<varname>H</varname>, see
           below.</para>
 
           <xi:include href="version-info.xml" xpointer="v218"/></listitem>
@@ -431,7 +431,7 @@ L     /tmp/foobar -    -    -     -   /dev/null</programlisting>
 
         <varlistentry>
           <term><varname>h</varname></term>
-          <listitem><para>Set Linux file/directory attributes. Lines of this type accept shell-style globs in
+          <listitem><para>Set Linux kernel file/directory attributes. Lines of this type accept shell-style globs in
           place of normal path names.</para>
 
           <para>The format of the argument field is <varname>[+-=][aAcCdDeijPsStTu]</varname>. The prefix
@@ -447,7 +447,7 @@ L     /tmp/foobar -    -    -     -   /dev/null</programlisting>
           corresponding to the letters listed here. All other attributes will be left untouched. Does not
           follow symlinks.</para>
 
-          <para>Please note that the Linux file attributes settable with this line type are a different
+          <para>Please note that the Linux kernel file attributes settable with this line type are a different
           concept from the extended attributes settable with <varname>t</varname>/<varname>T</varname>,
           see above.</para></listitem>
         </varlistentry>
diff --git a/man/ukify.xml b/man/ukify.xml
index 9b7e20997a..3f1ceb6d30 100644
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -458,7 +458,7 @@
           <term><option>--sign-kernel</option></term>
           <term><option>--no-sign-kernel</option></term>
 
-          <listitem><para>Override the detection of whether to sign the Linux binary itself before it is
+          <listitem><para>Override the detection of whether to sign the Linux kernel binary itself before it is
           embedded in the combined image. If not specified, it will be signed if a SecureBoot signing key is
           provided via the
           <varname>SecureBootPrivateKey=</varname>/<option>--secureboot-private-key=</option> option and the
@@ -582,7 +582,7 @@
       <constant>enter-initrd</constant> phase) with the key
       <filename index='false'>pcr-private-initrd-key.pem</filename>, and for the main system (phases
       <constant>leave-initrd</constant>, <constant>sysinit</constant>, <constant>ready</constant>) with the
-      key <filename index='false'>pcr-private-system-key.pem</filename>. The Linux binary and the resulting
+      key <filename index='false'>pcr-private-system-key.pem</filename>. The Linux kernel binary and the resulting
       combined image will be signed with the SecureBoot key <filename index='false'>sb.key</filename>.</para>
     </example>
 
-- 
2.44.0

