Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter01/changelog.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -43,10 +43,11 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
     <listitem>
-      <para>2021-08-20</para>
+      <para>2021-09-06</para>
       <itemizedlist>
         <listitem>
-           <para>[bdubbs] - Add a sed to glibc in Chapter 8 to fix a 
-           critical security issue.</para>
+          <para>[bdubbs] - Text clarifications in the backup/restore section
+          of Chapter 7. Thanks to Kevin Buckley for the patch.</para>
         </listitem>
       </itemizedlist>
@@ -54,780 +55,11 @@
 
     <listitem>
-      <para>2021-08-18</para>
+      <para>2021-09-01</para>
       <itemizedlist>
         <listitem>
-           <para>[bdubbs] - Eliminate an instruction to remove a test
-           in bunutils that no longer fails.</para>
+          <para>[bdubbs] - LFS-11.0 released.</para>
         </listitem>
       </itemizedlist>
     </listitem>
-
-    <listitem>
-      <para>2021-08-16</para>
-      <itemizedlist>
-        <listitem>
-          <para>[dj] - add p11-kit to dependencies list for systemd.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - LFS-11.0-rc1 released.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    
-    <listitem>
-      <para>2021-08-14</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to grep-3.7. Fixes
-          <ulink url="&lfs-ticket-root;4901">#4901</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-13</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.13.10. Fixes
-          <ulink url="&lfs-ticket-root;4904">#4904</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-5.0.0. Fixes
-          <ulink url="&lfs-ticket-root;4903">#4903</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.3337. Addresses
-          <ulink url="&lfs-ticket-root;4521">#4521</ulink>.</para>
-        </listitem>
-        <listitem>
-           <para>[bdubbs] - Add binutils-2.37 upstream patch.</para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-08</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.13.9. Fixes
-          <ulink url="&lfs-ticket-root;4900">#4900</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libffi-3.4.2. Fixes
-          <ulink url="&lfs-ticket-root;4902">#4902</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-06</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Fix
-          <filename class="libraryfile">libasan.a</filename> building
-          GCC with Glibc-2.34.  Addresses
-          <ulink url="https://wiki.linuxfromscratch.org/blfs/ticket/15350">
-          BLFS #15350</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-02</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to glibc-2.34. Fixes
-          <ulink url="&lfs-ticket-root;4897">#4897</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to diffutils-3.8. Fixes
-          <ulink url="&lfs-ticket-root;4898">#4898</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.52. Fixes
-          <ulink url="&lfs-ticket-root;4899">#4899</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-08-01</para>
-      <itemizedlist>
-        <listitem>
-           <para>[bdubbs] - Remove unneeded sed commands from automake and
-           coreutils. Fixes 
-           <ulink url="&lfs-ticket-root;4895">#4895</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.13.7. Fixes
-          <ulink url="&lfs-ticket-root;4893">#4893</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to e2fsprogs-1.46.3. Fixes
-          <ulink url="&lfs-ticket-root;4896">#4896</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-27</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to GCC-11.2.0. Fixes
-          <ulink url="&lfs-ticket-root;4883">#4883</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to inetutils-2.1. Fixes
-          <ulink url="&lfs-ticket-root;4892">#4892</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to automake-1.16.4. Fixes
-          <ulink url="&lfs-ticket-root;4894">#4894</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Always use --strip-unneeded for stripping.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-27</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Use workaround for Glibc NSS modules during
-          stripping, to prevent bash from crash.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-26</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Fix a programming error in shadow-4.9</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-25</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - (Hopefully) complete stripping workaround.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-25</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Add workaround to strip libraries 
-          correctly.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Add workaround to install Binutils-2.37 man pages
-          correctly.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to shadow-4.9. Fixes
-          <ulink url="&lfs-ticket-root;4891">#4891</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux 2.37.1. Fixes
-          <ulink url="&lfs-ticket-root;4890">#4890</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-23</para>
-      <itemizedlist>
-        <listitem revision="systemd">
-          <para>[renodr] - Guard systemd against CVE-2021-33910. Fixes
-          <ulink url="&lfs-ticket-root;4889">#4889</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to meson-0.59.0. Fixes
-          <ulink url="&lfs-ticket-root;4888">#4888</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to binutils-2.37. Fixes
-          <ulink url="&lfs-ticket-root;4887">#4887</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to less-590. Fixes
-          <ulink url="&lfs-ticket-root;4884">#4884</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-22</para>
-      <itemizedlist>
-        <listitem>
-          <para>[dj] - Correct page IDs in Chapter 08 dejagnu, expect, and
-          tcl.</para>
-        </listitem>
-        <listitem>
-          <para>[dj] - Ensure that glibc installs ldconfig and sln to 
-          <filename class="directory">/usr/sbin</filename>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-20</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Update to linux-5.13.4 (security fix). Fixes
-          <ulink url="&lfs-ticket-root;4886">#4886</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Use a fixed, non-zero UID for
-          <systemitem class="username">tester</systemitem> user, and spawn a
-          new pseudoterminal to satisfy bash testsuite.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-19</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Add text about security advisories to the
-          Errata page.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-17</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Fix test failures in perl-5.34.0 by building less before
-          perl and by patching perl for a problem highlighted by gdbm-1.20. Fixes
-          <ulink url="&lfs-ticket-root;4885">#4885</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-08</para>
-      <itemizedlist>
-        <listitem revision="systemd">
-          <para>[renodr] - Added Jinja2-3.0.1.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[renodr] - Added MarkupSafe-2.0.1.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to texinfo-6.8. Fixes
-          <ulink url="&lfs-ticket-root;4880">#4880</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to iproute2-5.13.0. Fixes
-          <ulink url="&lfs-ticket-root;4879">#4879</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to Python-3.9.6 (Security Update). Fixes
-          <ulink url="&lfs-ticket-root;4878">#4878</ulink>.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[renodr] - Update to systemd-249 (Security Update). Fixes
-          <ulink url="&lfs-ticket-root;4882">#4882</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to Linux-5.13.1. Fixes
-          <ulink url="&lfs-ticket-root;4873">#4873</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-07-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Patch gcc to fix some regressions (will be
-          needed to build firefox-91ESR in BLFS) and to allow it to
-          build against linux-5.13.0 kernel headers. Fixes
-          <ulink url="&lfs-ticket-root;4875">#4875</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-06-28</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - If installing individual locales, add 9 more
-          used by libstdc++-v3 tests. Fixes
-          <ulink url="&lfs-ticket-root;4877">#4877</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-06-27</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to bash-5.1.8. Fixes
-          <ulink url="&lfs-ticket-root;4869">#4869</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to dejagnu-1.6.3. Fixes
-          <ulink url="&lfs-ticket-root;4871">#4871</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gdbm-1.20. Fixes
-          <ulink url="&lfs-ticket-root;4872">#4872</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.51. Fixes
-          <ulink url="&lfs-ticket-root;4874">#4874</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-pages-5.1. Fixes
-          <ulink url="&lfs-ticket-root;4876">#4876</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-06-18</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Ensure libcap installs capsh.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-06-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210611. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.3001. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.37. Fixes
-          <ulink url="&lfs-ticket-root;4865">#4865</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.58.1. Fixes
-          <ulink url="&lfs-ticket-root;4867">#4867</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.12.10. Fixes
-          <ulink url="&lfs-ticket-root;4857">#4866</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to m4-1.4.19. Fixes
-          <ulink url="&lfs-ticket-root;4864">#4864</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to grub-2.06. Fixes
-          <ulink url="&lfs-ticket-root;4868">#4868</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-06-09</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - For consistency, make the cpp link in /usr/lib.
-          </para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Install iproute2 programs in /usr/sbin for
-          consistency.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem revision="sysv">
-      <para>2021-06-08</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Make shutting down the netwrok more robust.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem revision="sysv">
-      <para>2021-06-02</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Tweak sendsignal bootscript to avoid
-            killing mdmod (if active).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-31</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Update to linux-5.12.8 (security fix). Fixes
-          <ulink url="&lfs-ticket-root;4863">#4863</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-28</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210526. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2890. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to zstd-1.5.0. Fixes
-          <ulink url="&lfs-ticket-root;4858">#4858</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to perl-5.34.0. Fixes
-          <ulink url="&lfs-ticket-root;4860">#4860</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.12.7. Fixes
-          <ulink url="&lfs-ticket-root;4857">#4857</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.50. Fixes
-          <ulink url="&lfs-ticket-root;4862">#4862</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kmod-29. Fixes
-          <ulink url="&lfs-ticket-root;4859">#4859</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to expat-2.4.1. Fixes
-          <ulink url="&lfs-ticket-root;4861">#4861</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to elfutils-0.185. Fixes
-          <ulink url="&lfs-ticket-root;4855">#4855</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-4.0.2. Fixes
-          <ulink url="&lfs-ticket-root;4855">#4855</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-26</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Remove obsolete DOCDIR option from iproute2 install command.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-17</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Tweak install directories for eudev and e2fsprogs.
-          Thanks to Ryan Marsaw for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-14</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Add a Note about upgrading in OpenSSL.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-05-12</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Removed instructions for running tests
-          in Python due to an indefinite hang in the partial
-          LFS envrionment.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Moved LFS to a merged-/usr configuration. Thanks
-          goes to Xi Ruoyao for doing almost all of the work. Fixes
-          <ulink url="&lfs-ticket-root;4848">#4848</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gcc-11.1.0. Fixes
-          <ulink url="&lfs-ticket-root;4847">#4847</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Fix a FTBFS when building glibc-2.33 with
-          gcc-11.1.0.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[renodr] - Update to systemd-248. Fixes
-          <ulink url="&lfs-ticket-root;4841">#4841</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to iproute2-5.12.0. Fixes
-          <ulink url="&lfs-ticket-root;4852">#4852</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to Python-3.9.5. Fixes
-          <ulink url="&lfs-ticket-root;4854">#4854</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to meson-0.58.0. Fixes
-          <ulink url="&lfs-ticket-root;4853">#4853</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to linux-5.12.2. Fixes
-          <ulink url="&lfs-ticket-root;4840">#4840</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-04-28</para>
-      <itemizedlist>
-        <listitem revision="systemd">
-          <para>[renodr] - Fix building systemd with Linux-API-Headers 5.11.14
-          and higher, as well as with meson-0.57.2. Fixes
-          <ulink url="&lfs-ticket-root;4851">#4851</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add manual locales needed for tests
-          if using alternate locale installation instructions. Fixes
-          <ulink url="&lfs-ticket-root;4844">#4844</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Minor changes to boot scripts. Fixes
-          <ulink url="&lfs-ticket-root;4842">#4842</ulink>.
-          Thanks to Scott Andrews for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-04-26</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2812. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210407. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python3-3.9.4. Fixes
-          <ulink url="&lfs-ticket-root;4843">#4843</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.57.2. Fixes
-          <ulink url="&lfs-ticket-root;4846">#4846</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.11.16. Addresses
-          <ulink url="&lfs-ticket-root;4840">#4840</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to less-581. Fixes
-          <ulink url="&lfs-ticket-root;4849">#4849</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to file-5.40. Fixes
-          <ulink url="&lfs-ticket-root;4839">#4839</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-4.0.1. Fixes
-          <ulink url="&lfs-ticket-root;4845">#4845</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-04-22</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Revert 2772bb9c, as the proposed fix in it is
-          rejected by Python maintainers explicitly.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-04-06</para>
-      <itemizedlist>
-        <listitem>
-          <para>The XML source code of this book is migrated from SVN
-          to Git.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-03-26</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to openssl-1.1.1k (Security Update). Fixes
-          <ulink url="&lfs-ticket-root;4838">#4838</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to attr-2.5.1. Fixes
-          <ulink url="&lfs-ticket-root;4833">#4833</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to linux-5.11.10. Fixes
-          <ulink url="&lfs-ticket-root;4834">#4834</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to bc-3.3.4. Fixes
-          <ulink url="&lfs-ticket-root;4835">#4835</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to man-pages-5.11. Fixes
-          <ulink url="&lfs-ticket-root;4836">#4836</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to expat-2.3.0. Fixes
-          <ulink url="&lfs-ticket-root;4837">#4837</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to acl-2.3.1. Fixes
-          <ulink url="&lfs-ticket-root;4832">#4832</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-03-17</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Use <option>-j1</option> for Binutils
-		    installation.  Thanks report from Hans Meier.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-03-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2604. Addreses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210304. Addreses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to zstd-1.4.9. Fixes
-          <ulink url="&lfs-ticket-root;4827">#4827</ulink>.</para>
-        </listitem>
-        <listitem revision="sysv">
-          <para>[bdubbs] - Update to sysvinit-2.99. Fixes
-          <ulink url="&lfs-ticket-root;4822">#4822</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.11.6. Fixes
-          <ulink url="&lfs-ticket-root;4824">#4824</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.49. Fixes
-          <ulink url="&lfs-ticket-root;4831">#4831</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.11.0. Fixes
-          <ulink url="&lfs-ticket-root;4823">#4823</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to e2fsprogs-1.46.2. Fixes
-          <ulink url="&lfs-ticket-root;4826">#4826</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bison-3.7.6. Fixes
-          <ulink url="&lfs-ticket-root;4828">#4828</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.3.3. Fixes
-          <ulink url="&lfs-ticket-root;4825">#4825</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to attr-2.5.0. Fixes
-          <ulink url="&lfs-ticket-root;4830">#4830</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to acl-2.3.0. Fixes
-          <ulink url="&lfs-ticket-root;4829">#4829</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem revision="systemd">
-      <para>2021-03-05</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Simplify the installation of systemd man pages.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem revision="systemd">
-      <para>2021-03-04</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Patch systemd-247 so that it will function with
-          Linux-5.11 API headers.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-03-02</para>
-      <itemizedlist>
-        <listitem>
-          <para>[pierre] - Fix a header file for python, so that
-          <command>#include &lt;python&python-minor;/Python.h&gt;</command>
-          works.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-03-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - LFS-10.1 released.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
   </itemizedlist>
 </sect1>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter01/whatsnew.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -31,28 +31,28 @@
     <para>None</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Attr-&attr-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bash &bash-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bc &bc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
@@ -64,28 +64,28 @@
       <para>Coreutils-&coreutils-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>DejaGNU-&dejagnu-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>File-&file-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Findutils-&findutils-version;</para>
@@ -97,16 +97,16 @@
       <para>Gawk-&gawk-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>GCC-&gcc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
@@ -115,19 +115,19 @@
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Grep-&grep-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>GRUB-&grub-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gzip-&gzip-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
@@ -136,7 +136,7 @@
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>IPRoute2-&iproute2-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem revision="systemd">
       <para>Jinja2-&jinja2-version;</para>
@@ -145,22 +145,22 @@
       <para>Kbd-&kbd-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Kmod-&kmod-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Less-&less-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Libffi-&libffi-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libpipeline-&libpipeline-version;</para>
@@ -169,10 +169,10 @@
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>M4-&m4-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Make-&make-version;</para>
@@ -181,13 +181,13 @@
       <para>Man-DB-&man-db-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Meson-&meson-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>MPC-&mpc-version;</para>
@@ -202,13 +202,13 @@
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Perl-&perl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Pkg-config-&pkgconfig-version;</para>
@@ -220,7 +220,7 @@
       <para>Psmisc-&psmisc-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Python-&python-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Readline-&readline-version;</para>
@@ -229,16 +229,16 @@
       <para>Sed-&sed-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Shadow-&shadow-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+   <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
-    </listitem>
-    <listitem revision="systemd">
+    </listitem>-->
+   <!--<listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+   <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Tar-&tar-version;</para>
@@ -247,16 +247,16 @@
       <para>Tcl-&tcl-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Texinfo-&texinfo-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
@@ -268,7 +268,7 @@
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>
+    </listitem>-->
   </itemizedlist>
 
@@ -285,4 +285,5 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
+    <!--
     <listitem>
       <para>binutils-2.37-upstream_fix-1.patch</para>
@@ -297,5 +298,5 @@
       <para>Jinja2-&jinja2-version;</para>
     </listitem>
-
+    -->
   </itemizedlist>
 
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter05/binutils-pass1.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -71,8 +71,8 @@
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=$LFS/tools       \
-             --with-sysroot=$LFS        \
-             --target=$LFS_TGT          \
-             --disable-nls              \
+    <screen><userinput remap="configure">../configure --prefix=$LFS/tools \
+             --with-sysroot=$LFS \
+             --target=$LFS_TGT   \
+             --disable-nls       \
              --disable-werror</userinput></screen>
 
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter06/coreutils.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -84,8 +84,8 @@
     programs harcode executable locations:</para>
 
-<screen><userinput remap="install">mv -v $LFS/usr/bin/chroot                                     $LFS/usr/sbin
+<screen><userinput remap="install">mv -v $LFS/usr/bin/chroot              $LFS/usr/sbin
 mkdir -pv $LFS/usr/share/man/man8
-mv -v $LFS/usr/share/man/man1/chroot.1                        $LFS/usr/share/man/man8/chroot.8
-sed -i 's/"1"/"8"/'                                           $LFS/usr/share/man/man8/chroot.8</userinput></screen>
+mv -v $LFS/usr/share/man/man1/chroot.1 $LFS/usr/share/man/man8/chroot.8
+sed -i 's/"1"/"8"/'                    $LFS/usr/share/man/man8/chroot.8</userinput></screen>
 
   </sect2>
Index: chapter07/cleanup.xml
===================================================================
--- chapter07/cleanup.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter07/cleanup.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -21,5 +21,5 @@
     <para>Second, the libtool .la files are only useful when linking with static
     libraries. They are unneeded and potentially harmful when using dynamic
-    shared libraries, specially when using non-autotools build systems.
+    shared libraries, especially when using non-autotools build systems.
     While still in chroot, remove those files now:</para>
 
@@ -37,4 +37,15 @@
   <sect2>
     <title>Backup</title>
+
+    <para>
+      At this point the essential programs and libraries have been created
+      and your current LFS system is in a good state. Your system can now be
+      backed up for later reuse. In case of fatal failures in the subsequent
+      chapters, it often turns out that removing everything and starting over
+      (more carefully) is the best option to recover. Unfortunately, all the
+      temporary files will be removed, too. To avoid spending extra time to
+      redo something which has been built successfully, creating a backup of
+      the current LFS system may prove useful.
+    </para>
 
     <note><para>
@@ -57,45 +68,58 @@
     </para>
 
+    <para>
+       If you have decided to make a backup, leave the chroot environment:
+    </para>
+
+<screen role="nodump"><userinput>exit</userinput></screen>
+
     <important>
-      <para>All of the following instructions are executed by
-        <systemitem class="username">root</systemitem>. Take extra
-        care about the commands you're going to run as mistakes
+      <para>
+        All of the following instructions are executed by
+        <systemitem class="username">root</systemitem> on your host system.
+        Take extra care about the commands you're going to run as mistakes
         here can modify your host system. Be aware that the
         environment variable <envar>LFS</envar>
         is set for user <systemitem class="username">lfs</systemitem> by default
         but may <emphasis>not</emphasis> be set for
-        <systemitem class="username">root</systemitem>. Whenever
-        commands are to be executed by <systemitem class="username">root</systemitem>,
+        <systemitem class="username">root</systemitem>.
+     </para>
+     <para>
+        Whenever commands are to be executed by <systemitem class="username">root</systemitem>,
         make sure you have set <envar>LFS</envar>.
+     </para>
+     <para>
         This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>.
       </para>
     </important>
 
-    <para>
-       Now, if you are making a backup, leave the chroot environment:
-    </para>
-
-<screen role="nodump"><userinput>exit</userinput></screen>
-
-    <para>
-      At this point the essential programs and libraries have been created
-      and your current system is in a good state. Your system can now be
-      backed up for later reuse. In case of fatal failures in the subsequent
-      chapters, it often turns out that removing everything and starting over
-      (more carefully) is the best option to recover. Unfortunately, all the
-      temporary files will be removed, too. To avoid spending extra time to
-      redo something which has been built successfully, prepare a backup.
-    </para>
-
-    <para>
+    <para>Before making a backup, unmount the virtual file systems:</para>
+
+<screen role="nodump"><userinput>umount $LFS/dev/pts
+umount $LFS/{sys,proc,run,dev}</userinput></screen>
+
+    <para>
+      Make sure you have at least 1 GB free disk space (the source tarballs
+      will be included in the backup archive) on the filesystem containing
+      directory where you create the backup archive.
+    </para>
+
+    <para>
+<<<<<<< HEAD
       Make sure you have at least 1 GB free disk space (the source tarballs
       will be included in the backup archive) in the home directory of user
       <systemitem class="username">root</systemitem>.
-    </para>
-
-    <para>Before we make a backup, unmount the virtual file systems:</para>
-
-<screen role="nodump"><userinput>umount $LFS/dev{/pts,}
-umount $LFS/{sys,proc,run}</userinput></screen>
+=======
+      Note that the instructions below specify the home directory of the host
+      system's <systemitem class="username">root</systemitem> user, which is
+      typically found on the root filesystem.
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
+    </para>
+
+    <para>
+      Replace <envar>$HOME</envar> by a directory of your choice if you
+      do not want to have the backup stored in <systemitem
+      class="username">root</systemitem>'s home directory.
+    </para>
 
     <para>
@@ -108,4 +132,5 @@
           long time (over 10 minutes) even on a resonably fast system.
        </para>
+<<<<<<< HEAD
 
        <para>
@@ -113,4 +138,6 @@
           for the root user.
        </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </note>
 
@@ -121,4 +148,5 @@
 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
 
+<<<<<<< HEAD
     <para>
       Replace <envar>$HOME</envar> by a directory of your choice if you
@@ -126,4 +154,6 @@
       class="username">root</systemitem>'s home directory.
     </para>
+=======
+>>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
   </sect2>
 
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter07/introduction.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -12,9 +12,8 @@
 
   <para>This chapter shows how to build the last missing bits of the temporary
-  system: first, the tools needed by the build machinery of various packages,
-  then three packages needed to run tests.  Now that all circular dependencies
-  have been resolved, we can use a <quote>chroot</quote> environment,
-  completely isolated the host operating system used for the build, except
-  for the running kernel.</para>
+  system: the tools needed by the build machinery of various packages.  Now
+  that all circular dependencies have been resolved, a <quote>chroot</quote>
+  environment, completely isolated from the host operating system (except for
+  the running kernel), can be used for the build.</para>
 
   <para>For proper operation of the isolated environment, some communication
Index: chapter07/texinfo.xml
===================================================================
--- chapter07/texinfo.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter07/texinfo.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -53,10 +53,4 @@
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
-    <note>
-      <para>As part of the configure process, a test is made that indicates an
-      error for TestXS_la-TestXS.lo.  This is not relevant for LFS and should be
-      ignored.</para>
-    </note>
-
     <para>Compile the package:</para>
 
Index: chapter08/e2fsprogs.xml
===================================================================
--- chapter08/e2fsprogs.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter08/e2fsprogs.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -93,4 +93,6 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
+
+    <para>One test, u_direct_io, is known to fail on some systems.</para>
 
 <!-- This is a ridiculous amount now! And is it still true?
Index: chapter08/gdbm.xml
===================================================================
--- chapter08/gdbm.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter08/gdbm.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -74,10 +74,12 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
-<!--
+<screen><userinput remap="test">make -k check</userinput></screen>
+
     <para>
-      One test, <filename>version</filename>, is known to fail.
+      The gdbmtool tests are known to fail with some DejaGNU
+      <literal>ERROR</literal> messages.  In the summary it's
+      shown as one unresolved testcase.
     </para>
--->
+
     <para>Install the package:</para>
 
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter08/grub.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -54,5 +54,4 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
-            --sbindir=/sbin        \
             --sysconfdir=/etc      \
             --disable-efiemu       \
Index: chapter08/openssl.xml
===================================================================
--- chapter08/openssl.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter08/openssl.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -60,7 +60,8 @@
 <screen><userinput remap="test">make test</userinput></screen>
 
-    <para>One test 30-test_afalg.t is known to fail on some kernel
-    configurations (it apparently assumes certain unspecified crypto
-    options have been selected).</para>
+    <para>One test, 30-test_afalg.t, is known to fail on some kernel
+    configurations (depending on inconsistent values of
+    CONFIG_CRYPTO_USER_API* settings.) If it fails, it can safely be
+    ignored.</para>
 
     <para>Install the package:</para>
Index: chapter11/reboot.xml
===================================================================
--- chapter11/reboot.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter11/reboot.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -21,17 +21,20 @@
   <itemizedlist>
 
-    <listitem><para>A text mode browser such as <ulink
-    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
+    <listitem><para>A text mode browser such as <ulink revision="sysv"
+    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
 
-    <listitem><para>The
-    <ulink url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
+    <listitem><para>The <ulink revision="sysv"
+    url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
     will allow you to set up local trusted anchor certificates, allowing
     the system to verify SSL certificates provided by remote servers (for
     example, a website using HTTPS).</para></listitem>
 
-    <listitem><para>The <ulink
-    url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
+    <listitem><para>The <ulink revision="sysv"
+    url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
@@ -45,25 +48,31 @@
     useful.</para></listitem>
 
-    <listitem><para>Installing <ulink
-    url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
+    <listitem><para>Installing <ulink revision="sysv"
+    url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
     building packages as a non-root user and easily installing the resulting
-    packages in your new system.  </para></listitem>
+    packages in your new system.</para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
-    within a comfortable GUI environment, install <ulink
-    url='&blfs-book;postlfs/openssh.html'>openssh</ulink>.
+    within a comfortable GUI environment, install <ulink revision="sysv"
+    url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>.
     </para></listitem>
 
     <listitem><para>To make fetching files over the internet easier, install
-    <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
+    <ulink
+    revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
+    revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
     <listitem><para>To connect to a wireless access point for networking,
-    install
-    <ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
+    install <ulink revision="sysv"
+    url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink
+    revision="systemd"
+    url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     </para></listitem>
 
     <listitem><para>Finally, a review of the following configuration files
-    is also appropriate at this point.  </para>
+    is also appropriate at this point.</para>
 
       <itemizedlist>
Index: chapter11/whatnow.xml
===================================================================
--- chapter11/whatnow.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ chapter11/whatnow.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -58,5 +58,7 @@
       <para>The Beyond Linux From Scratch book covers installation
       procedures for a wide range of software beyond the scope of the LFS
-      Book. The BLFS project is located at <ulink url="&blfs-book;"/>.</para>
+      Book. The BLFS project is located at <ulink revision="sysv"
+      url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
+      </para>
     </listitem>
 
Index: general.ent
===================================================================
--- general.ent	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ general.ent	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -18,5 +18,5 @@
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY short-versiond  "systemd">
+<!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
 <!ENTITY generic-versiond "systemd"> 
 
@@ -24,4 +24,5 @@
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
+<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
Index: packages.ent
===================================================================
--- packages.ent	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ packages.ent	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -141,8 +141,8 @@
 <!ENTITY diffutils-fin-sbu "0.7 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.3">
-<!ENTITY e2fsprogs-size "9,2688 KB">
+<!ENTITY e2fsprogs-version "1.46.4">
+<!ENTITY e2fsprogs-size "9,298 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "0edcffc4b601a4191bfa152f61b406b2">
+<!ENTITY e2fsprogs-md5 "128f5b0f0746b28d1e3ca7e263c57094">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "93 MB">
@@ -395,8 +395,8 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.52">
-<!ENTITY libcap-size "155 KB">
+<!ENTITY libcap-version "2.53">
+<!ENTITY libcap-size "153 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "91548d37bbb5b706928bc3b3bb0e22ac">
+<!ENTITY libcap-md5 "094994d4554c6689cf98ae4f717b8e19">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "3.2 MB">
@@ -429,10 +429,10 @@
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "10">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "116,553 KB">
+<!ENTITY linux-size "116,545 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "951672e89ffa0a2f32ea34732ee85f3f">
+<!ENTITY linux-md5 "6e1728b2021ca19cc9273f080e6c44c7">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
@@ -476,8 +476,8 @@
 <!ENTITY man-db-fin-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "5.12">
-<!ENTITY man-pages-size "1,737 KB">
+<!ENTITY man-pages-version "5.13">
+<!ENTITY man-pages-size "1,752 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "192132118f07369c88df267a92f3ef16">
+<!ENTITY man-pages-md5 "3ac24e8c6fae26b801cb87ceb63c0a30">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-fin-du "33 MB">
@@ -492,8 +492,8 @@
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.59.0">
-<!ENTITY meson-size "1,896 KB">
+<!ENTITY meson-version "0.59.1">
+<!ENTITY meson-size "1,900 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "bb8bf3898afefc8272989e4be8ff0a5b">
+<!ENTITY meson-md5 "9c8135ecde820094be2f42f457fb6535">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "40 MB">
@@ -534,8 +534,8 @@
 <!ENTITY ninja-fin-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.1k">
-<!ENTITY openssl-size "9,596 KB">
+<!ENTITY openssl-version "1.1.1l">
+<!ENTITY openssl-size "9,604 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "c4e7d95f782b08116afa27b30393dd27">
+<!ENTITY openssl-md5 "ac0d4387f3ba0ad741b0580dd45f6ff3">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "154 MB">
@@ -711,8 +711,8 @@
 
 <!ENTITY util-linux-minor "2.37">
-<!ENTITY util-linux-version "2.37.1"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,497 KB">
+<!ENTITY util-linux-version "2.37.2"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,490 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "6d244f0f59247e9109f47d6e5dd0556b">
+<!ENTITY util-linux-md5 "d659bf7cd417d93dc609872f6334b019">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "128 MB">
Index: prologue/why.xml
===================================================================
--- prologue/why.xml	(revision 2c8fdfc1654e5c1f30ec7f1104a8ca634ed9ed73)
+++ prologue/why.xml	(revision c6f58f47bdce93f07da86485fc3bddc39654a2a8)
@@ -627,5 +627,5 @@
 
         <para>This package contains compression and decompression routines
-        used by some programs. It provide high compression ratios and a very 
+        used by some programs. It provides high compression ratios and a very 
         wide range of compression / speed trade-offs.</para>
       </listitem>
