Merge upstream

chapter01/changelog.xml

@@ -54,7 +54,7 @@
       <para>2022-05-01</para>
       <itemizedlist>
         <listitem>
-           <para>[bdubbs] - Change nobody/nogroup uid/git to 65534. </para>
+          <para>[bdubbs] - Change nobody/nogroup uid/gid to 65534. </para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to meson-0.62.1.  Fixes

chapter08/procps.xml

@@ -89,7 +89,7 @@ make check</userinput></screen>
          But the "used" value is from "Committed_AS" in the same file,
          which is the total commited virtual memory space of all processes.
          I'll make a report to upstream anyway.  -->
-    <para>One test named <filename>FAIL: free with commit</filename>
+    <para>One test named <filename>free with commit</filename>
     may fail if some applications with a custom memory allocator (for
     example, JVM and Web browsers) are running on the host distro.</para>
 

chapter09/introduction.xml

@@ -31,11 +31,11 @@
 
     <para>The <command>init</command> program is controlled by the
     <filename>/etc/inittab</filename> file and is organized into run levels that
-    can be run by the user:</para>
+    can be run by the user. In LFS, they are used as follows:</para>
 
 <literallayout>0 &mdash; halt
 1 &mdash; Single user mode
-2 &mdash; Multiuser, without networking
+2 &mdash; User definable
 3 &mdash; Full multiuser mode
 4 &mdash; User definable
 5 &mdash; Full multiuser mode with display manager

chapter09/usage.xml

@@ -31,7 +31,7 @@
     generally not used. See <filename>init(8)</filename> for more details), and
     each one of those corresponds to the actions the computer is supposed to
     perform when it starts up. The default run-level is 3. Here are the
-    descriptions of the different run-levels as they are implemented:</para>
+    descriptions of the different run-levels as they are implemented in LFS:</para>
 
 <literallayout>0: halt the computer
 1: single-user mode

chapter10/kernel.xml

@@ -106,6 +106,7 @@
       not work correctly or boot at all:</para>
 
       <screen role="nodump" revision="sysv">General setup -->
+   [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
 Device Drivers  ---&gt;
   Graphics support ---&gt;
@@ -117,6 +118,7 @@ Device Drivers  ---&gt;
    [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]</screen>
 
       <screen role="nodump" revision="systemd">General setup -->
+   [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    [ ] Auditing Support [CONFIG_AUDIT]
    CPU/Task time and stats accounting ---&gt;
       [*] Pressure stall information tracking [CONFIG_PSI]
@@ -203,6 +205,19 @@ File systems  ---&gt;
     <variablelist>
       <title>The rationale for the above configuration items:</title>
 
+      <varlistentry>
+        <term>
+          <parameter>
+            Compile the kernel with warnings as errors
+          </parameter>
+        </term>
+        <listitem>
+          <para>This may cause building failure if the compiler and/or
+          configuration are different from those of the kernel
+          developers.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>
           <parameter>