tree-wide: use the term "initrd" at most places we so far used "initramfs"

In most cases we refernced the concept as "initrd". Let's convert most
remaining uses of "initramfs" to "initrd" too, to stay internally
consistent.

This leaves "initramfs" only where it's relevant to explain historical
concepts or where "initramfs" is part of the API (i.e. in
/run/initramfs).

Follow-up for: b66a6e1a5838b874b789820c090dd6850cf10513

9 files changed, 34 insertions, 42 deletions

diff --git a/man/bootup.xml b/man/bootup.xml
index 62a34fe3d7..16bb9c0b3f 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -31,9 +31,9 @@
     boot loader will then invoke an OS kernel from disk (or the network). On systems using EFI or other types
     of firmware, this firmware may also load the kernel directly.</para>
 
-    <para>The kernel (optionally) mounts an in-memory file system, often generated by
-    <citerefentry project='man-pages'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-    which looks for the root file system. Nowadays this is implemented as an "initramfs" — a compressed CPIO
+    <para>The kernel (optionally) mounts an in-memory file system, often generated by <citerefentry
+    project='man-pages'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>, which
+    looks for the root file system. Nowadays this is implemented as an "initramfs" — a compressed CPIO
     archive that the kernel extracts into a tmpfs. In the past normal file systems using an in-memory block
     device (ramdisk) were used, and the name "initrd" is still used to describe both concepts. It's the boot
     loader or the firmware that loads both the kernel and initrd/initramfs images into memory, but the kernel
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 2a54c81595..363691a007 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -733,7 +733,7 @@
       <varlistentry>
         <term><option>x-initrd.attach</option></term>
 
-        <listitem><para>Setup this encrypted block device in the initramfs, similarly to
+        <listitem><para>Setup this encrypted block device in the initrd, similarly to
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         units marked with <option>x-initrd.mount</option>.</para>
 
@@ -744,8 +744,8 @@
         use. With this option the device will still be detached but later after the root file
         system is unmounted.</para>
 
-        <para>All other encrypted block devices that contain file systems mounted in the initramfs
-        should use this option.</para>
+        <para>All other encrypted block devices that contain file systems mounted in the initrd should use
+        this option.</para>
         </listitem>
       </varlistentry>
 
diff --git a/man/localectl.xml b/man/localectl.xml
index a4bda2c4ba..617922ebd5 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -48,11 +48,11 @@
     such as the display manager, as well as the default for users
     after login.</para>
 
-    <para>Note that the changes performed using this tool might require
-    the initramfs to be rebuilt to take effect during early system boot.
-    The initramfs is not rebuilt automatically by <filename>localectl</filename>,
-    this task has to be performed manually, usually using a tool like
-    <citerefentry project='man-pages'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    <para>Note that the changes performed using this tool might require the initrd to be rebuilt to take
+    effect during early system boot.  The initrd is not rebuilt automatically by
+    <filename>localectl</filename>, this task has to be performed manually, usually using a tool like
+    <citerefentry
+    project='man-pages'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     </para>
 
     <para>Note that
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index aa0d8b12ae..a9aa0ffd0a 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -31,15 +31,12 @@
   <refsect1>
     <title>Description</title>
 
-    <para><filename>systemd-fsck@.service</filename> and
-    <filename>systemd-fsck-root.service</filename> are services
-    responsible for file system checks. They are instantiated for each
-    device that is configured for file system checking.
-    <filename>systemd-fsck-root.service</filename> is responsible for
-    file system checks on the root file system, but only if the
-    root filesystem was not checked in the initramfs.
-    <filename>systemd-fsck@.service</filename> is used for all other
-    file systems and for the root file system in the initramfs.</para>
+    <para><filename>systemd-fsck@.service</filename> and <filename>systemd-fsck-root.service</filename> are
+    services responsible for file system checks. They are instantiated for each device that is configured for
+    file system checking.  <filename>systemd-fsck-root.service</filename> is responsible for file system
+    checks on the root file system, but only if the root filesystem was not checked in the initrd.
+    <filename>systemd-fsck@.service</filename> is used for all other file systems and for the root file
+    system in the initrd.</para>
 
     <para>These services are started at boot if
     <option>passno</option> in <filename>/etc/fstab</filename> for the
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index df6e180ffc..12cd4c331b 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -54,13 +54,11 @@
     <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
 
-    <para>When <filename>systemd-networkd</filename> exits, it generally leaves
-    existing network devices and configuration intact. This makes it possible to
-    transition from the initramfs and to restart the service without breaking
-    connectivity. This also means that when configuration is updated and
-    <filename>systemd-networkd</filename> is restarted, netdev interfaces for
-    which configuration was removed will not be dropped, and may need to be
-    cleaned up manually.</para>
+    <para>When <filename>systemd-networkd</filename> exits, it generally leaves existing network devices and
+    configuration intact. This makes it possible to transition from the initrd and to restart the service
+    without breaking connectivity. This also means that when configuration is updated and
+    <filename>systemd-networkd</filename> is restarted, netdev interfaces for which configuration was removed
+    will not be dropped, and may need to be cleaned up manually.</para>
 
     <para><command>systemd-networkd</command> may be introspected and controlled at runtime using
     <citerefentry><refentrytitle>networkctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index e4e35f2dd8..773ca04cd6 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -421,9 +421,8 @@
       <varlistentry>
         <term><option>x-initrd.mount</option></term>
 
-        <listitem><para>An additional filesystem to be mounted in the
-        initramfs. See <filename>initrd-fs.target</filename>
-        description in
+        <listitem><para>An additional filesystem to be mounted in the initrd. See
+        <filename>initrd-fs.target</filename> description in
         <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         </para></listitem>
       </varlistentry>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 1e3e6d8c3e..85eb8ad076 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -372,8 +372,8 @@
         <varlistentry>
           <term><filename>initrd.target</filename></term>
           <listitem>
-            <para>This is the default target in the initramfs, similar to <filename>default.target</filename>
-            in the main system. It is used to mount the real root and transition to it. See
+            <para>This is the default target in the initrd, similar to <filename>default.target</filename> in
+            the main system. It is used to mount the real root and transition to it. See
             <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
             more discussion.</para>
           </listitem>
diff --git a/man/udev.xml b/man/udev.xml
index 886455f61f..142f295f3e 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -647,13 +647,11 @@
                 <varlistentry>
                   <term><option>db_persist</option></term>
                   <listitem>
-                    <para>Set the flag (sticky bit) on the udev database entry
-                    of the event device. Device properties are then kept in the
-                    database even when
-                    <command>udevadm info --cleanup-db</command> is called.
-                    This option can be useful in certain cases
-                    (e.g. Device Mapper devices) for persisting device state
-                    on the transition from initramfs.</para>
+                    <para>Set the flag (sticky bit) on the udev database entry of the event device. Device
+                    properties are then kept in the database even when <command>udevadm info
+                    --cleanup-db</command> is called.  This option can be useful in certain cases
+                    (e.g. Device Mapper devices) for persisting device state on the transition from
+                    initrd.</para>
                   </listitem>
                 </varlistentry>
                 <varlistentry>
diff --git a/man/veritytab.xml b/man/veritytab.xml
index 7146159182..dc2f11c31e 100644
--- a/man/veritytab.xml
+++ b/man/veritytab.xml
@@ -149,7 +149,7 @@ This is based on crypttab(5).
       <varlistentry>
         <term><option>x-initrd.attach</option></term>
 
-        <listitem><para>Setup this verity protected block device in the initramfs, similarly to
+        <listitem><para>Setup this verity protected block device in the initrd, similarly to
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         units marked with <option>x-initrd.mount</option>.</para>
 
@@ -160,8 +160,8 @@ This is based on crypttab(5).
         use. With this option the device will still be detached but later after the root file
         system is unmounted.</para>
 
-        <para>All other verity protected block devices that contain file systems mounted in the
-        initramfs should use this option.</para>
+        <para>All other verity protected block devices that contain file systems mounted in the initrd should
+        use this option.</para>
         </listitem>
       </varlistentry>