aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2021-05-12 18:34:57 -0500
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2021-05-12 18:34:57 -0500
commit5d0219fdad8111535fe2608b410a9fa6c5f11ed3 (patch)
tree720090deb318f99dc875fb00423c0612cf0b85cc
parent5ed37b354c07cafe913e7a4dba2b87c4e44dfe7b (diff)
parent871fd2f4a2928eeec32c2a0da75e5603c4656f08 (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--chapter01/changelog.xml2
-rw-r--r--chapter08/shadow.xml2
-rw-r--r--chapter08/systemd.xml3
3 files changed, 3 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b239a4384..4cf1252c9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -61,7 +61,7 @@
<ulink url="&lfs-ticket-root;4847">#4847</ulink>.</para>
</listitem>
<listitem>
- <para>[renodr] - Fix a FTBFS when building glibc-2.30 with
+ <para>[renodr] - Fix a FTBFS when building glibc-2.33 with
gcc-11.1.0.</para>
</listitem>
<listitem revision="systemd">
diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml
index 3471b347b..b705ffbda 100644
--- a/chapter08/shadow.xml
+++ b/chapter08/shadow.xml
@@ -73,7 +73,7 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<note>
<para>If <filename class="directory">/bin</filename> and/or
- <filename class="directory">/sbin</filename> are prefereed to be
+ <filename class="directory">/sbin</filename> are preferred to be
left over in <envar>PATH</envar> for some reason, modify
<envar>PATH</envar> in <filename>.bashrc</filename> after LFS is
built.</para>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index c5df6bf78..ef1147b28 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -734,8 +734,7 @@ meson --prefix=/usr \
<varlistentry id="systemd-sysext">
<term><command>systemd-sysext</command></term>
<listitem>
- <para>Creates, deletes, and manages system extensions through the
- systemd-sysextd daemon</para>
+ <para>Activates system extension images</para>
<indexterm zone="ch-system-systemd systemd-sysext">
<primary sortas="b-systemd-sysext">systemd-sysext</primary>
</indexterm>