summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-09-23 11:45:25 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-09-23 12:09:43 +0200
commitc87bce7d2817eea37171f682b85edc3507edbd73 (patch)
tree364f8c398c02751736796b8ed5e9e32afe85f568
parentman: slightly enhance docs about "exitrd" and remove TODO entry for it (diff)
downloadsystemd-c87bce7d2817eea37171f682b85edc3507edbd73.tar.xz
systemd-c87bce7d2817eea37171f682b85edc3507edbd73.zip
man: reword some sentences with umbiguous subjects
A sencence like "The system manager does, a, b, c, which is really d, and e.", it is generally understood that the manager also does "e". This can be quite confusing if the manager cannot do "e", in our case unmount the file system on which it is sitting. Similary, we cannot "fall back to x if it is missing", since "it" in that sentence means "x".
-rw-r--r--man/bootup.xml6
-rw-r--r--man/os-release.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/man/bootup.xml b/man/bootup.xml
index bba3bd2d7d..a0aafe5e79 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -47,9 +47,9 @@
necessary file systems and spawning all configured services.</para>
<para>On shutdown, the system manager stops all services, unmounts all non-busy file systems (detaching
- the storage technologies backing them), and then (optionally) jumps into the exitrd, which is backed by
- tmpfs, and unmounts/detaches the remaining file systems, including the real root. As a last step,
- the system is powered down.</para>
+ the storage technologies backing them), and then (optionally) jumps into the exitrd. The exitrd is backed
+ by tmpfs and unmounts/detaches the remaining file systems, including the real root. As a last step, the
+ system is powered down.</para>
<para>Additional information about the system boot process may be
found in
diff --git a/man/os-release.xml b/man/os-release.xml
index 1ff112e057..6fb3e1bb1a 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -53,9 +53,9 @@
precedence over <filename>/usr/lib/os-release</filename>.
Applications should check for the former, and exclusively use its
data if it exists, and only fall back to
- <filename>/usr/lib/os-release</filename> if it is missing.
- Applications should not read data from both files at the same
- time. <filename>/usr/lib/os-release</filename> is the recommended
+ <filename>/usr/lib/os-release</filename> if that is missing.
+ Applications should not combine the data from both files.
+ <filename>/usr/lib/os-release</filename> is the recommended
place to store OS release information as part of vendor trees.
<filename>/etc/os-release</filename> should be a relative symlink
to <filename>/usr/lib/os-release</filename>, to provide