Index: Makefile
===================================================================
--- Makefile	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ Makefile	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,5 +1,3 @@
-#BASEDIR = ~/lfs-book
-#SYSDDIR = ~/lfs-systemd
-#DUMPDIR = ~/lfs-commands
+# vim:ts=3
 RENDERTMP = $(HOME)/tmp
 CHUNK_QUIET = 1
@@ -24,13 +22,13 @@
 
 ifeq ($(REV), sysv)
-  BASEDIR         ?= ~/lfs-book
+  BASEDIR         ?= $(HOME)/public_html/lfs-book
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
-  DUMPDIR         ?= ~/lfs-commands
+  DUMPDIR         ?= $(HOME)/lfs-commands
 else
-  BASEDIR         ?= ~/lfs-systemd
+  BASEDIR         ?= $(HOME)/public_html/lfs-systemd
   PDF_OUTPUT      ?= LFS-SYSD-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
-  DUMPDIR         ?= ~/lfs-sysd-commands
+  DUMPDIR         ?= $(HOME)/lfs-sysd-commands
 endif
 
@@ -47,5 +45,6 @@
 	$(Q)mkdir -p $(BASEDIR)/stylesheets
 	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-	$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
+	$(Q)sed -e 's|../stylesheet|stylesheet|' \
+           -i $(BASEDIR)/index.html
 
 	$(Q)mkdir -p $(BASEDIR)/images
@@ -55,10 +54,8 @@
 	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
          tidy -config tidy.conf $$filename;           \
-         true;                                        \
          /bin/bash obfuscate.sh $$filename;           \
-         sed -e "s@text/html@application/xhtml+xml@g" \
-             -e "s/\xa9/\&copy;/ "                    \
+         sed -e "s|text/html|application/xhtml+xml|g" \
              -i $$filename;                           \
-   done;
+       done
 
 	$(Q)$(MAKE) --no-print-directory wget-list md5sums
@@ -99,15 +96,14 @@
                 stylesheets/lfs-nochunks.xsl           \
                 $(RENDERTMP)/lfs-html.xml
-#                $(RENDERTMP)/lfs-html2.xml
 
 	@echo "Running Tidy..."
-	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || test $$? -le 1
 
 	@echo "Running obfuscate.sh..."
-	$(Q)bash obfuscate.sh                                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -i -e "s@../wget-list@wget-list@"            $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -i -e "s@../md5sums@md5sums@"                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -i -e "s@\xa9@\&copy;@"                      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)bash obfuscate.sh      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)sed -e "s|text/html|application/xhtml+xml|g" \
+           -e "s|../wget-list|wget-list|"           \
+           -e "s|../md5sums|md5sums|"               \
+           -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 	@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
@@ -128,14 +124,14 @@
 	$(Q)xsltproc --nonet                               \
                 --xinclude                            \
+                --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/lfs-html2.xml   \
-                --stringparam profile.revision $(REV) \
                 stylesheets/lfs-xsl/profile.xsl       \
                 index.xml
 
 	@echo "Validating the book..."
-	$(Q)xmllint --nonet                      \
-               --noent                      \
-               --postvalid                  \
-               -o $(RENDERTMP)/lfs-full.xml \
+	$(Q)xmllint --nonet                            \
+               --encode UTF-8                     \
+               --postvalid                        \
+               --output $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 
@@ -152,23 +148,26 @@
                 $(RENDERTMP)/lfs-full.xml
 
+DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \
+                packages.ent patches.ent general.ent
+
 wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
-$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                      packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
-	$(Q)xsltproc --xinclude --nonet            \
+	$(Q)xsltproc --nonet                       \
+                --xinclude                    \
                 --output $(BASEDIR)/wget-list \
                 stylesheets/wget-list.xsl     \
                 chapter03/chapter03.xml
 
-$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
-                             chapter03/chapter03.xml \
-                             packages.ent patches.ent general.ent
-	$(Q)xsltproc --nonet --xinclude                   \
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
+	$(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/wget-list.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
-	$(Q)xsltproc --xinclude --nonet                  \
+
+	$(Q)xsltproc --nonet                              \
                 --output $(BASEDIR)/wget-list-$(REV) \
                 stylesheets/wget-list.xsl            \
@@ -176,10 +175,10 @@
 
 md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                    packages.ent patches.ent
+$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
 	$(Q)mkdir -p $(BASEDIR)
 
-	$(Q)xsltproc --nonet --xinclude                   \
+	$(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/md5sum.xml      \
@@ -187,5 +186,5 @@
                 chapter03/chapter03.xml
 
-	$(Q)xsltproc --xinclude --nonet         \
+	$(Q)xsltproc --nonet                     \
                 --output $(BASEDIR)/md5sums \
                 stylesheets/md5sum.xsl      \
Index: appendices/acknowledgments.xml
===================================================================
--- appendices/acknowledgments.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/acknowledgments.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/acronymlist.xml
===================================================================
--- appendices/acronymlist.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/acronymlist.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/creat-comm.xml
===================================================================
--- appendices/creat-comm.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/creat-comm.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/dependencies.xml
===================================================================
--- appendices/dependencies.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/dependencies.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -7,4 +7,5 @@
   <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
                          <phrase revision='sysv'>Udev</phrase>">
+  <!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
 ]>
 
@@ -30,8 +31,5 @@
   the test suites. The fourth list of dependencies are packages that require
   this package to be built and installed in its final location before they are
-  built and installed. In most cases, this is because these packages will hard
-  code paths to binaries within their scripts. If not built in a certain order,
-  this could result in paths of /tools/bin/[binary] being placed inside scripts
-  installed to the final system. This is obviously not desirable.</para>
+  built and installed.</para>
 
   <para>The last list of dependencies are optional packages that are not
@@ -110,5 +108,5 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Acl and Libcap</seg>
+          <seg>Acl, Libcap, and Patch</seg>
         </seglistitem>
       </segmentedlist>
@@ -1050,5 +1048,5 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>None</seg>
+          <seg><ulink url='&blfs-book;general/libxml2.html'>libxml2</ulink></seg>
         </seglistitem>
       </segmentedlist>
@@ -1242,5 +1240,5 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Man-DB and Perl</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -1487,5 +1485,5 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
             <ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
@@ -2417,5 +2415,6 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
+          <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and
+          Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -2424,5 +2423,5 @@
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Glibc</seg>
+          <seg>Attr and Glibc</seg>
         </seglistitem>
       </segmentedlist>
@@ -2457,5 +2456,5 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff,
+          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
           Libxcrypt, Make, Sed, and Zlib</seg>
         </seglistitem>
@@ -2487,5 +2486,5 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
+            &bdb;
           </seg>
         </seglistitem>
@@ -2656,5 +2655,5 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
             <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
@@ -2938,4 +2937,5 @@
             <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
             <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>,
+            <ulink url="&pypi-home;pefile">pefile</ulink>,
             <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>,
             <ulink url='&pypi-home;/pyelftools'>pyelftools</ulink>,
@@ -3195,4 +3195,5 @@
         <seglistitem>
           <seg>
+            <ulink url="&blfs-book;general/asciidoctor.html">Asciidoctor</ulink>,
             <ulink
               url="https://people.redhat.com/sgrubb/libcap-ng/">Libcap-NG</ulink>,
@@ -3203,5 +3204,6 @@
               url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>,
             <ulink
-              url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>, and
+              url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>,
+            <ulink url="https://po4a.org/index.php.en">po4a</ulink>, and
             <ulink url="&blfs-book;general/slang.html">slang</ulink>
           </seg>
Index: appendices/license.xml
===================================================================
--- appendices/license.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/license.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/mit-lic.xml
===================================================================
--- appendices/mit-lic.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/mit-lic.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/scripts.xml
===================================================================
--- appendices/scripts.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/scripts.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: appendices/udev-rules.xml
===================================================================
--- appendices/udev-rules.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ appendices/udev-rules.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter01/askforhelp.xml
===================================================================
--- chapter01/askforhelp.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/askforhelp.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/changelog.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -40,4 +40,312 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2024-02-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to tzdata-2024a.  Fixes
+          <ulink url='&lfs-ticket-root;5428'>#5428</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to glibc-2.39 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5426'>#5426</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.7.3.  Fixes
+          <ulink url='&lfs-ticket-root;5427'>#5427</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2024-02-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.2.1 (security fix). Fixes
+          <ulink url='&lfs-ticket-root;5425'>#5425</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zlib-1.3.1. Fixes
+          <ulink url='&lfs-ticket-root;5419'>#5419</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.4.6. Fixes
+          <ulink url='&lfs-ticket-root;5423'>#5423</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.7.2. Fixes
+          <ulink url='&lfs-ticket-root;5422'>#5422</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20240125. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.42. Fixes
+          <ulink url='&lfs-ticket-root;5424'>#5424</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to acl-2.3.2. Fixes
+          <ulink url='&lfs-ticket-root;5421'>#5421</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update upstream fixes for readline-8.2. Fixes
+          <ulink url='&lfs-ticket-root;5420'>#5420</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Apply upstream fix for bash-5.2.21. Fixes
+          <ulink url='&lfs-ticket-root;5420'>#5420</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2024-01-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Apply upstream fix for pkgconf-2.1.0 regression.
+          Fixes <ulink url='&lfs-ticket-root;5414'>#5414</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.7.5.  Fixes
+          <ulink url='&lfs-ticket-root;5408'>#5408</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to attr-2.5.2.  Fixes
+          <ulink url='&lfs-ticket-root;5412'>#5412</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to ncurses-6.4-20230520 (security fix).
+          Fixes <ulink url='&lfs-ticket-root;5416'>#5416</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to markupsafe-2.1.4.  Fixes
+          <ulink url='&lfs-ticket-root;5418'>#5418</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.7.1.  Fixes
+          <ulink url='&lfs-ticket-root;5406'>#5406</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iproute2-6.7.0.  Fixes
+          <ulink url='&lfs-ticket-root;5410'>#5410</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-9.1.0041.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iana-etc-20240117.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to shadow-4.14.3.  Fixes
+          <ulink url='&lfs-ticket-root;5413'>#5413</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Fix CVE-2024-0684 for coreutils-9.4.  Fixes
+          <ulink url="&lfs-ticket-root;5417">#5417</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2024-01-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Edit a ncurses header to always use the
+          wide-character ABI compatible with libncursesw.so because we
+          are faking the 8-bit libncurses.so with it.  Fixes
+          <ulink url="&lfs-ticket-root;5415">#5415</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2024-01-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix the definition of the C.UTF-8 locale. Fixes
+          <ulink url="&lfs-ticket-root;5409">#5409</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-12-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Add --enable-default-hash-style=gnu configuring
+          binutils.  Fixes
+          <ulink url='&lfs-ticket-root;5401'>#5401</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Fix CVE-2023-7008 for systemd-255.  Fixes
+          <ulink url='&lfs-ticket-root;5405'>#5405</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iana-etc-20231205.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to tzdata-2023d.  Fixes
+          <ulink url='&lfs-ticket-root;5399'>#5399</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.6.8.  Fixes
+          <ulink url='&lfs-ticket-root;5397'>#5397</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to meson-1.3.1.  Fixes
+          <ulink url='&lfs-ticket-root;5402'>#5402</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to grub-2.12.  Fixes
+          <ulink url='&lfs-ticket-root;5396'>#5396</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to inetutils-2.5.  Fixes
+          <ulink url='&lfs-ticket-root;5404'>#5404</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to setuptools-69.0.3.  Fixes
+          <ulink url='&lfs-ticket-root;5400'>#5400</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to xml-parser-2.47.  Fixes
+          <ulink url='&lfs-ticket-root;5403'>#5403</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-9.0.2189.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to autoconf-2.72.  Fixes
+          <ulink url='&lfs-ticket-root;5398'>#5398</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-12-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to <phrase revision='sysv'>udev
+          from </phrase>systemd-255.  Fixes
+          <ulink url='&lfs-ticket-root;5390'>#5390</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-12-14</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Update to util-linux v2.39.3. Fixes
+           <ulink url='&lfs-ticket-root;5388'>#5388</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to python3-3.12.1. Fixes
+           <ulink url='&lfs-ticket-root;5392'>#5392</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to linux-6.6.7. Fixes
+           <ulink url='&lfs-ticket-root;5387'>#5387</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to kbd-2.6.4. Fixes
+           <ulink url='&lfs-ticket-root;5393'>#5393</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to bc-6.7.4. Fixes
+           <ulink url='&lfs-ticket-root;5389'>#5389</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Reformat util-linux configure parameters.  Fixes
+          <ulink url='&lfs-ticket-root;5395'>#5395</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-12-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Modify commands for install Python docs to avoid
+          too restrictive permissions on the files and dirs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision='sysv'>
+      <para>2023-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Restore NIC naming based on physical system
+          characteristics.  Fixes
+          <ulink url='&lfs-ticket-root;5386'>#5386</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-11-30</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Update to vim-9.0.2136. Addresses
+           <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20231117. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.7.3.  Fixes
+          <ulink url='&lfs-ticket-root;5385'>#5385</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wheel-0.42.0 (Python Module).  Fixes
+          <ulink url='&lfs-ticket-root;5384'>#5384</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.38.2.  Fixes
+          <ulink url='&lfs-ticket-root;5383'>#5383</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pkgconf-2.1.0.  Fixes
+          <ulink url='&lfs-ticket-root;5382'>#5382</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to readline patches 002 through 007.  Fixes
+          <ulink url='&lfs-ticket-root;5381'>#5381</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.2.0.  Fixes
+          <ulink url='&lfs-ticket-root;5380'>#5380</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to setuptools-69.0.2.  Fixes
+          <ulink url='&lfs-ticket-root;5379'>#5379</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.6.3.  Fixes
+          <ulink url='&lfs-ticket-root;5378'>#5378</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.3.0.  Fixes
+          <ulink url='&lfs-ticket-root;5377'>#5377</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.22.4.  Fixes
+          <ulink url='&lfs-ticket-root;5376'>#5376</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-11-13</para>
Index: chapter01/chapter01.xml
===================================================================
--- chapter01/chapter01.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/chapter01.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter01/how.xml
===================================================================
--- chapter01/how.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/how.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter01/resources.xml
===================================================================
--- chapter01/resources.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/resources.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter01/whatsnew.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
@@ -27,13 +27,13 @@
     <para>None</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Attr-&attr-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Autoconf-&autoconf-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Automake-&automake-version;</para>
@@ -45,7 +45,7 @@
       <para>Bc-&bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison-&bison-version;</para>
@@ -102,7 +102,7 @@
       <para>Gettext-&gettext-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
@@ -117,7 +117,7 @@
       <para>Groff-&groff-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GRUB-&grub-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Gzip-&gzip-version;</para>
@@ -126,7 +126,7 @@
       <para>Iana-Etc-&iana-etc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Inetutils-&inetutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
@@ -135,7 +135,7 @@
       <para>IPRoute2-&iproute2-version;</para>
     </listitem>
-    <!--<listitem revision="systemd">
+    <listitem>
       <para>Jinja2-&jinja2-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kbd-&kbd-version;</para>
@@ -154,5 +154,5 @@
     </listitem>-->
     <listitem>
-      <para>Libelf-&elfutils-version; (from elfutils)</para>
+      <para>Libelf from Elfutils-&elfutils-version;</para>
     </listitem>
     <!--<listitem>
@@ -180,7 +180,7 @@
       <para>Man-pages-&man-pages-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem>
       <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Meson-&meson-version;</para>
@@ -192,7 +192,7 @@
       <para>MPFR-&mpfr-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Ncurses-&ncurses-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
@@ -205,9 +205,9 @@
     </listitem>-->
     <listitem>
+      <para>Perl-&perl-version;</para>
+    </listitem>
+    <listitem>
       <para>Pkgconf-&pkgconf-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Perl-&perl-version;</para>
-    </listitem>-->
     <listitem>
       <para>Procps-ng-&procps-ng-version;</para>
@@ -249,9 +249,9 @@
       <para>Texinfo-&texinfo-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Tzdata-&tzdata-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
-       <para>Udev-&systemd-version; (from systemd)</para>
+      <para>Udev from Systemd-&systemd-version;</para>
     </listitem>-->
     <listitem>
@@ -264,7 +264,7 @@
       <para>Wheel-&wheel-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>XML::Parser-&xml-parser-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Xz-&xz-version;</para>
@@ -292,9 +292,17 @@
 
     <listitem>
+      <para>&bash-upstream-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>setuptools-&setuptools-version;</para>
     </listitem>
 
     <listitem>
-      <para>&glibc-upstream-fixes-patch;</para>
+      <para>&pkgconf-upstream-fix-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&readline-fixes-patch;</para>
     </listitem>
 
@@ -309,4 +317,12 @@
     </listitem>
 
+    <listitem>
+      <para>grub-2.06-upstream_fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>readline-8.2-upstream_fix-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
Index: chapter02/aboutlfs.xml
===================================================================
--- chapter02/aboutlfs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/aboutlfs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter02/chapter02.xml
===================================================================
--- chapter02/chapter02.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/chapter02.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter02/creatingfilesystem.xml
===================================================================
--- chapter02/creatingfilesystem.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/creatingfilesystem.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter02/creatingpartition.xml
===================================================================
--- chapter02/creatingpartition.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/creatingpartition.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -41,5 +41,6 @@
   disk drive. Create a Linux native partition and a
   <systemitem class="filesystem">swap</systemitem> partition, if needed. Please
-  refer to <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if
+  refer to <ulink role='man' url='&man;cfdisk.8'>cfdisk(8)</ulink> or
+  <ulink role='man' url='&man;fdisk.8'>fdisk(8)</ulink> if
   you do not yet know how to use the programs.</para>
 
Index: chapter02/hostreqs.xml
===================================================================
--- chapter02/hostreqs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/hostreqs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -35,7 +35,8 @@
     modern Linux distributions. Also note that many distributions will
     place software headers into separate packages, often in the form of
-    <quote>&lt;package-name&gt;-devel</quote> or
-    <quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
-    your distribution provides them.</para>
+    <literal><replaceable>&lt;package-name&gt;</replaceable>-devel</literal>
+    or
+    <literal><replaceable>&lt;package-name&gt;</replaceable>-dev</literal>.
+    Be sure to install those if your distribution provides them.</para>
 
    <para>Earlier versions of the listed software packages may work, but have
Index: chapter02/introduction.xml
===================================================================
--- chapter02/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter02/mounting.xml
===================================================================
--- chapter02/mounting.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/mounting.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -17,5 +17,5 @@
   </para>
   
-  <para>Strictly speaking, one cannot "mount a partition". One mounts the <emphasis>file
+  <para>Strictly speaking, one cannot <quote>mount a partition.</quote> One mounts the <emphasis>file
   system</emphasis> embedded in that partition. But since a single partition can't contain
   more than one file system, people often speak of the partition and the
Index: chapter02/stages.xml
===================================================================
--- chapter02/stages.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter02/stages.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -71,5 +71,5 @@
         <para>A few operations, from
         <quote>Preparing Virtual Kernel File Systems</quote> to
-        <quote>Setting up Environment</quote>, must be done.</para>
+        <quote>Setting up Environment,</quote> must be done.</para>
       </listitem>
 
Index: chapter03/chapter03.xml
===================================================================
--- chapter03/chapter03.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter03/chapter03.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter03/introduction.xml
===================================================================
--- chapter03/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter03/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter03/packages.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter03/patches.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -28,12 +28,12 @@
 -->
 
-<!--    <varlistentry>
-      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
+    <varlistentry>
+      <term>Bash Upstream Fixes Patch - <token>&bash-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&bash-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
 <!--
     <varlistentry>
@@ -77,5 +77,5 @@
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-fixes-patch-size;</token>:</term>
@@ -85,5 +85,5 @@
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
@@ -91,12 +91,4 @@
         <para>Download: <ulink url="&patches-root;&glibc-fhs-patch;"/></para>
         <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GRUB Upstream Fixes Patch - <token>&grub-upstream-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&grub-upstream-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -126,13 +118,12 @@
     </varlistentry>
 -->
-<!--
+
     <varlistentry>
-      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 
     <varlistentry>
Index: chapter04/aboutsbus.xml
===================================================================
--- chapter04/aboutsbus.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/aboutsbus.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter04/abouttestsuites.xml
===================================================================
--- chapter04/abouttestsuites.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/abouttestsuites.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter04/addinguser.xml
===================================================================
--- chapter04/addinguser.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/addinguser.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -97,5 +97,6 @@
   <command>su</command> to start a login shell as opposed to a non-login shell.
   The difference between these two types of shells is described in detail in
-  <filename>bash(1)</filename> and <command>info bash</command>.</para>
+  <ulink role='man' url='&man;bash.1'>bash(1)</ulink> and <command>info
+  bash</command>.</para>
 
 </sect1>
Index: chapter04/chapter04.xml
===================================================================
--- chapter04/chapter04.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/chapter04.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter04/creatingminlayout.xml
===================================================================
--- chapter04/creatingminlayout.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/creatingminlayout.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter04/introduction.xml
===================================================================
--- chapter04/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter04/settingenviron.xml
===================================================================
--- chapter04/settingenviron.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter04/settingenviron.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -80,6 +80,6 @@
   created files and directories are only writable by their owner, but are
   readable and executable by anyone (assuming default modes are used by the
-  <function>open(2)</function> system call, new files will end up with permission
-  mode 644 and directories with mode 755).</para>
+  <ulink role='man' url='&man;open.2'>open(2)</ulink> system call, new files
+  will end up with permission mode 644 and directories with mode 755).</para>
       </listitem>
     </varlistentry>
@@ -228,5 +228,5 @@
       <command>make</command> or set such an option in
       <envar>MAKEFLAGS</envar>.  Doing so will allow <command>make</command>
-      to spawn infinite build jobs and cause system stability issue.
+      to spawn infinite build jobs and cause system stability problems.
     </para>
   </important>
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/binutils-pass1.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -76,5 +76,6 @@
              --disable-nls       \
              --enable-gprofng=no \
-             --disable-werror</userinput></screen>
+             --disable-werror    \
+             --enable-default-hash-style=gnu</userinput></screen>
 
     <variablelist>
@@ -133,4 +134,20 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--enable-default-hash-style=gnu</parameter></term>
+        <listitem>
+          <para>By default, the linker would generate both the GNU-style
+          hash table and the classic ELF hash table for shared libraries and
+          dynamically linked executables.  The hash tables are only intended
+          for a dynamic linker to perform symbol lookup.  On LFS the dynamic
+          linker (provided by the Glibc package) will always use the
+          GNU-style hash table which is faster to query.  So the classic
+          ELF hash table is completely useless.  This makes the linker
+          only generate the GNU-style hash table by default, so we can avoid
+          wasting time to generate the classic ELF hash table when we build
+          the packages, or wasting disk space to store it.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: chapter05/chapter05.xml
===================================================================
--- chapter05/chapter05.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/chapter05.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/gcc-pass1.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/glibc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -62,6 +62,7 @@
         The above command is correct.  The <command>ln</command> command has
         several syntactic versions, so be sure to check
-        <command>info coreutils ln</command> and <filename>ln(1)</filename>
-        before reporting what may appear to be an error.
+        <command>info coreutils ln</command> and <ulink role='man'
+        url='&man;ln.1'>ln(1)</ulink> before reporting what may appear to be
+        an error.
       </para>
     </note>
@@ -163,6 +164,6 @@
 
     <note><para>There have been reports that this package may fail when
-    building as a "parallel make".  If that occurs, rerun the make command
-    with the "-j1" option.</para></note>
+    building as a <quote>parallel make.</quote>  If that occurs, rerun the make command
+    with the <option>-j1</option> option.</para></note>
 
     <para>Compile the package:</para>
Index: chapter05/introduction.xml
===================================================================
--- chapter05/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/libstdc++.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter05/linux-headers.xml
===================================================================
--- chapter05/linux-headers.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter05/linux-headers.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/bash.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/binutils-pass2.xml
===================================================================
--- chapter06/binutils-pass2.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/binutils-pass2.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -73,5 +73,6 @@
     --enable-gprofng=no        \
     --disable-werror           \
-    --enable-64-bit-bfd</userinput></screen>
+    --enable-64-bit-bfd        \
+    --enable-default-hash-style=gnu</userinput></screen>
 
     <variablelist>
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/chapter06.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/coreutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/diffutils.xml
===================================================================
--- chapter06/diffutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/diffutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/file.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -79,9 +79,4 @@
 <screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess)</userinput></screen>
 
-<!-- devs: if using - -build here, the build system wants to compile
-     the signature file with "file" on the build system, but stops if it is not
-     the same version. One possibility would be to build "file" on the build
-     system first, but it is simpler to have the system think it is not
-     cross-compiling, and use the just built "file". -->
     <para>Compile the package:</para>
 
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/findutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/gawk.xml
===================================================================
--- chapter06/gawk.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/gawk.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/gcc-pass2.xml
===================================================================
--- chapter06/gcc-pass2.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/gcc-pass2.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/grep.xml
===================================================================
--- chapter06/grep.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/grep.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/gzip.xml
===================================================================
--- chapter06/gzip.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/gzip.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/introduction.xml
===================================================================
--- chapter06/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/m4.xml
===================================================================
--- chapter06/m4.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/m4.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/make.xml
===================================================================
--- chapter06/make.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/make.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/ncurses.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -79,5 +79,5 @@
         <term><parameter>--with-manpage-format=normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses installing compressed manual
+          <para>This prevents Ncurses from installing compressed manual
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
@@ -95,5 +95,5 @@
         <term><parameter>--without-normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing static C
+          <para>This prevents Ncurses from building and installing static C
           libraries.</para>
         </listitem>
@@ -103,5 +103,5 @@
         <term><parameter>--without-debug</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing debug
+          <para>This prevents Ncurses from building and installing debug
           libraries.</para>
         </listitem>
@@ -157,5 +157,7 @@
 
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
+ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i $LFS/usr/include/curses.h</userinput></screen>
 <!--
     <para>Remove an unneeded static library not handled by
@@ -177,10 +179,26 @@
 
       <varlistentry>
-        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
+        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
         <listitem>
           <para>The <filename>libncurses.so</filename> library is needed by
-          a few packages we will build soon. We create this small linker
-          script, as this is what is done in <xref
-          linkend="chapter-building-system"/>.</para>
+          a few packages we will build soon. We create this symlink to use
+          <filename>libncursesw.so</filename> as a replacement.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>sed -e 's/^#if.*XOPEN.*$/#if 1/' ...</command></term>
+        <listitem>
+          <para>The header file <filename>curses.h</filename> contains
+          the definition of various Ncurses data structures.  With different
+          preprocessor macro definitions two different sets of the data
+          structure definition may be used: the 8-bit definition is
+          compatible with <filename>libncurses.so</filename> and the
+          wide-character definition is compatible with
+          <filename>libncursesw.so</filename>.  Since we are using
+          <filename>libncursesw.so</filename> as a replacement of
+          <filename>libncurses.so</filename>, edit the header file so it
+          will always use the wide-character data structure definition
+          compatible with <filename>libncursesw.so</filename>.</para>
         </listitem>
       </varlistentry>
Index: chapter06/patch.xml
===================================================================
--- chapter06/patch.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/patch.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/sed.xml
===================================================================
--- chapter06/sed.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/sed.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/tar.xml
===================================================================
--- chapter06/tar.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/tar.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter06/xz.xml
===================================================================
--- chapter06/xz.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter06/xz.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/bison.xml
===================================================================
--- chapter07/bison.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/bison.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/changingowner.xml
===================================================================
--- chapter07/changingowner.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/changingowner.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/chapter07.xml
===================================================================
--- chapter07/chapter07.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/chapter07.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/chroot.xml
===================================================================
--- chapter07/chroot.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/chroot.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/cleanup.xml
===================================================================
--- chapter07/cleanup.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/cleanup.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/createfiles.xml
===================================================================
--- chapter07/createfiles.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/createfiles.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/creatingdirs.xml
===================================================================
--- chapter07/creatingdirs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/creatingdirs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/gettext.xml
===================================================================
--- chapter07/gettext.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/gettext.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/kernfs.xml
===================================================================
--- chapter07/kernfs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/kernfs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -33,6 +33,9 @@
     Mount the remaining virtual kernel file systems:</para>
 
+      <!-- Do not put any option after $LFS/${mountpoint} or jhalfs cannot
+           handle it! -->
+
 <screen><userinput>mkdir -pv /dev/{pts,shm}
-mount -vt devpts /dev/pts /dev/pts -o gid=5,mode=620
+mount -vt devpts devpts -o gid=5,mode=0620 /dev/pts
 mount -vt proc  proc  /proc
 mount -vt sysfs sysfs /sys
Index: chapter07/perl.xml
===================================================================
--- chapter07/perl.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/perl.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/python.xml
===================================================================
--- chapter07/python.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/python.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -45,6 +45,6 @@
 
     <note>
-      <para>There are two package files whose name starts with
-      <quote>python</quote>. The one to extract from is
+      <para>There are two package files whose name starts with the
+      <quote>python</quote> prefix. The one to extract from is
       <filename>Python-&python-version;.tar.xz</filename> (notice the
       uppercase first letter).</para>
@@ -84,7 +84,7 @@
       <para>
         Some Python 3 modules can't be built now because the dependencies
-        are not installed yet. The building system still attempts to build
-        them however, so the compilation of some files will fail and the
-        compiler message may seem to indicate <quote>fatal error</quote>.
+        are not installed yet. For the <filename>ssl</filename> module,
+        a message <computeroutput>Python requires a OpenSSL 1.1.1 or
+        newer</computeroutput> is outputted.
         The message should be ignored.  Just make sure the toplevel
         <command>make</command> command has not failed.  The optional
Index: chapter07/texinfo.xml
===================================================================
--- chapter07/texinfo.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/texinfo.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter07/util-linux.xml
===================================================================
--- chapter07/util-linux.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter07/util-linux.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -52,8 +52,6 @@
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
-            --libdir=/usr/lib    \
+<screen><userinput remap="configure">./configure --libdir=/usr/lib    \
             --runstatedir=/run   \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -64,5 +62,7 @@
             --disable-pylibmount \
             --disable-static     \
-            --without-python</userinput></screen>
+            --without-python     \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist>
Index: chapter08/aboutdebug.xml
===================================================================
--- chapter08/aboutdebug.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/aboutdebug.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/acl.xml
===================================================================
--- chapter08/acl.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/acl.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/attr.xml
===================================================================
--- chapter08/attr.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/attr.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/autoconf.xml
===================================================================
--- chapter08/autoconf.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/autoconf.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -42,10 +42,4 @@
     <title>Installation of Autoconf</title>
 
-    <para>First, fix several problems with the tests caused by bash-5.2 and later:</para>
-
-    <screen><userinput remap="pre">sed -e 's/SECONDS|/&amp;SHLVL|/'               \
-    -e '/BASH_ARGV=/a\        /^SHLVL=/ d' \
-    -i.orig tests/local.at</userinput></screen>
-
     <para>Prepare Autoconf for compilation:</para>
 
@@ -62,15 +56,4 @@
  -->
 <screen><userinput remap="test">make check</userinput></screen>
-<!--
-    <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition,
-    several tests are skipped that use Automake. For full test coverage,
-    Autoconf can be re-tested after Automake has been installed.  In addition,
-    two tests fail due to changes in libtool-2.4.3 and later.</para>
--->
-    <note><para>The test time for autoconf can be reduced significantly on a
-    system with multiple cores.  To do this, append
-    <command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above.  For
-    instance, using -j4 can reduce the test time by over 60
-    percent.</para></note>
 
     <para>Install the package:</para>
Index: chapter08/automake.xml
===================================================================
--- chapter08/automake.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/automake.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/bash.xml
===================================================================
--- chapter08/bash.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/bash.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -41,4 +41,8 @@
     <title>Installation of Bash</title>
 
+    <para>First, fix some issues identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-upstream-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
 
@@ -72,5 +76,5 @@
     <para>To prepare the tests, ensure that the <systemitem class="username">tester</systemitem> user can write to the sources tree:</para>
 
-<screen><userinput remap="test">chown -Rv tester .</userinput></screen>
+<screen><userinput remap="test">chown -R tester .</userinput></screen>
 
     <para>The test suite of this package is designed to be run as a non-&root;
@@ -80,5 +84,5 @@
     class="username">tester</systemitem> user:</para>
 
-<screen><userinput remap="test">su -s /usr/bin/expect tester &lt;&lt; EOF
+<screen><userinput remap="test">su -s /usr/bin/expect tester &lt;&lt; "EOF"
 set timeout -1
 spawn make tests
Index: chapter08/bc.xml
===================================================================
--- chapter08/bc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/bc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/binutils.xml
===================================================================
--- chapter08/binutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/binutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -58,7 +58,9 @@
              --disable-werror    \
              --enable-64-bit-bfd \
-             --with-system-zlib</userinput></screen>
+             --with-system-zlib  \
+             --enable-default-hash-style=gnu</userinput></screen>
+
     <variablelist>
-      <title>The meaning of the configure parameters:</title>
+      <title>The meaning of the new configure parameters:</title>
 
       <varlistentry>
@@ -82,12 +84,4 @@
         <listitem>
           <para>Enables plugin support for the linker.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-64-bit-bfd</parameter></term>
-        <listitem>
-           <para>Enables 64-bit support (on hosts with narrower word sizes).
-           May not be needed on 64-bit systems, but does no harm.</para>
         </listitem>
       </varlistentry>
@@ -146,5 +140,5 @@
     <option>--enable-default-ssp</option> options are passed to GCC.</para>
 
-    <para>Three tests in the gprofng suite are also known to fail.</para>
+ <!--    <para>Three tests in the gprofng suite are also known to fail.</para>-->
 
     <para>Install the package:</para>
Index: chapter08/bison.xml
===================================================================
--- chapter08/bison.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/bison.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/bzip2.xml
===================================================================
--- chapter08/bzip2.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/bzip2.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/chapter08.xml
===================================================================
--- chapter08/chapter08.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/chapter08.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/check.xml
===================================================================
--- chapter08/check.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/check.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/cleanup.xml
===================================================================
--- chapter08/cleanup.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/cleanup.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/coreutils.xml
===================================================================
--- chapter08/coreutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/coreutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -54,11 +54,11 @@
     </note>
 
-    <!-- https://bugs.gnu.org/62403 -->
-<!--
-    <para>Fix a bug in checksum utilities causing failed checks not
-    reported correctly:</para>
-
-<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
--->
+    <!-- https://seclists.org/oss-sec/2024/q1/30 -->
+    <para>Fix a security vulnerability in the <command>split</command>
+    utility:</para>
+
+<screen><userinput remap="pre">sed -e '/n_out += n_hold/,+4 s|.*bufsize.*|//&amp;|' \
+    -i src/split.c</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 
@@ -127,5 +127,5 @@
     compile and run the tests:</para>
 
-<screen><userinput remap="test">chown -Rv tester . </userinput></screen>
+<screen><userinput remap="test">chown -R tester . </userinput></screen>
 
     <para>Now run the tests:</para>
@@ -1267,6 +1267,6 @@
         <term><command>yes</command></term>
         <listitem>
-          <para>Repeatedly outputs <quote>y</quote>, or a given string, until
-          killed</para>
+          <para>Repeatedly outputs <literal>y</literal> or a given string,
+          until killed</para>
           <indexterm zone="ch-system-coreutils yes">
             <primary sortas="b-yes">yes</primary>
Index: chapter08/dbus.xml
===================================================================
--- chapter08/dbus.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/dbus.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -57,5 +57,5 @@
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
+            --docdir=/usr/share/doc/dbus-&dbus-version; \
             --with-system-socket=/run/dbus/system_bus_socket</userinput></screen>
 
Index: chapter08/dejagnu.xml
===================================================================
--- chapter08/dejagnu.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/dejagnu.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -55,13 +55,13 @@
 makeinfo --plaintext       -o doc/dejagnu.txt  ../doc/dejagnu.texi</userinput></screen>
 
-    <para>Build and install the package:</para>
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+    <para>Install the package:</para>
 
 <screen><userinput remap="install">make install
 install -v -dm755  /usr/share/doc/dejagnu-&dejagnu-version;
 install -v -m644   doc/dejagnu.{html,txt} /usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
 
   </sect2>
Index: chapter08/diffutils.xml
===================================================================
--- chapter08/diffutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/diffutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/e2fsprogs.xml
===================================================================
--- chapter08/e2fsprogs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/e2fsprogs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -160,5 +160,6 @@
 
     <para>
-      Read the man page <filename>mke2fs.conf(5)</filename> for details.
+      Read the man page <ulink role='man'
+      url='&man;mke2fs.conf.5'>mke2fs.conf(5)</ulink> for details.
     </para>
   </sect2>
Index: chapter08/expat.xml
===================================================================
--- chapter08/expat.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/expat.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/expect.xml
===================================================================
--- chapter08/expect.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/expect.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -49,4 +49,23 @@
     <title>Installation of Expect</title>
 
+    <para>Expect needs PTYs to work.  Verify that the PTYs are working
+    properly inside the chroot environment by performing a simple
+    test:</para>
+
+<screen><userinput remap="test">python3 -c 'from pty import spawn; spawn(["echo", "ok"])'</userinput></screen>
+
+    <para>This command should output <computeroutput>ok</computeroutput>.
+    If, instead, the output includes <computeroutput>OSError: out of pty
+    devices</computeroutput>, then the environment is not set up for proper
+    PTY operation.  You need to exit from the chroot environment, read
+    <xref linkend='ch-tools-kernfs'/> again, and ensure the
+    <systemitem class="filesystem">devpts</systemitem> file system (and
+    other virtual kernel file systems) mounted correctly.  Then reenter
+    the chroot environment following <xref linkend='ch-tools-chroot'/>.
+    This issue needs to be resolved before continuing, or the test suites
+    requring Expect (for example the test suites of Bash, Binutils, GCC,
+    GDBM, and of course Expect itself) will fail catastrophically, and other
+    subtle breakages may also happen.</para>
+
     <para>Prepare Expect for compilation:</para>
 
@@ -83,23 +102,7 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <important>
-      <para>The test suite for Expect is considered critical.
-      Do not skip it under any circumstances.</para>
-    </important>
-
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make test</userinput></screen>
-
-    <para>If any test fails with the message
-    <quote><computeroutput>The system has no more ptys.  Ask your system
-    administrator to create more</computeroutput></quote>, it indicates
-    you've not mounted the
-    <systemitem class="filesystem">devpts</systemitem> file system
-    correctly.  You need to read
-    <xref linkend='ch-tools-kernfs'/> again and ensure the
-    <systemitem class="filesystem">devpts</systemitem> file system (and
-    other virtual kernel file systems) mounted correctly.
-    This issue needs to be resolved before continuing.</para>
 
     <para>Install the package:</para>
Index: chapter08/file.xml
===================================================================
--- chapter08/file.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/file.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/findutils.xml
===================================================================
--- chapter08/findutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/findutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -83,5 +83,5 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "PATH=$PATH make check"</userinput></screen>
 
Index: chapter08/flex.xml
===================================================================
--- chapter08/flex.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/flex.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/flit-core.xml
===================================================================
--- chapter08/flit-core.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/flit-core.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/gawk.xml
===================================================================
--- chapter08/gawk.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gawk.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -55,5 +55,5 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "PATH=$PATH make check"</userinput></screen>
 
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gcc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -158,5 +158,5 @@
     <para>Test the results as a non-privileged user, but do not stop at errors:</para>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "PATH=$PATH make -k check"</userinput></screen>
 
@@ -534,5 +534,5 @@
         <term><filename class="libraryfile">libcc1</filename></term>
         <listitem>
-          <para>The C preprocessing library</para>
+          <para>A library that allows GDB to make use of GCC</para>
           <indexterm zone="ch-system-gcc libcc1">
             <primary sortas="b-libcc1">libcc1</primary>
Index: chapter08/gdbm.xml
===================================================================
--- chapter08/gdbm.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gdbm.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/gettext.xml
===================================================================
--- chapter08/gettext.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gettext.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/glibc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -50,10 +50,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-
+<!--
     <para>Now fix two security vulnerabilities and a regression causing the
     posix_memalign() function very slow in some conditions:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-fixes-patch;</userinput></screen>
-
+-->
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
@@ -74,5 +74,4 @@
              --enable-kernel=&linux-major-version;.&linux-minor-version;                      \
              --enable-stack-protector=strong          \
-             --with-headers=/usr/include              \
              --disable-nscd                           \
              libc_cv_slibdir=/usr/lib</userinput></screen>
@@ -105,13 +104,8 @@
           <para>This option increases system security by adding
           extra code to check for buffer overflows, such as stack
-          smashing attacks.</para>
-        </listitem>
-      </varlistentry>
-<!-- do we need this one? -->
-      <varlistentry>
-        <term><parameter>--with-headers=/usr/include</parameter></term>
-        <listitem>
-          <para>This option tells the build system where to find the
-          kernel API headers.</para>
+          smashing attacks.  Note that Glibc always explicitly overrides
+          the default of GCC, so this option is still needed even though
+          we've already specified <option>--enable-default-ssp</option> for
+          GCC.</para>
         </listitem>
       </varlistentry>
@@ -208,4 +202,120 @@
 
 <screen><userinput remap="install">sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile</userinput></screen>
+
+    <important>
+      <para>
+        If upgrading Glibc to a new minor version (for example, from
+        Glibc-2.36 to Glibc-&glibc-version;) on a running LFS system, you
+        need to take some extra precautions to avoid breaking the system:
+      </para>
+
+      <itemizedlist>
+        <listitem>
+          <!-- There are two reasons we don't support this:
+               1. Upgrading on a system with separate /lib and /usr/lib is
+                  tricky.
+               2. With Glibc prior to 2.34 libc.so.6 etc. are symlinks to
+                  libc-2.33.so etc., again causing the upgradation tricky.
+                  The Glibc NEWS file explicit states they no longer use
+                  symlinks for the ABI names to avoid upgradation
+                  issues.  -->
+          <para>
+            Upgrading Glibc on a LFS system prior to 11.0 (exclusive) is
+            not supported.  Rebuild LFS if you are running such an old LFS
+            system but you need a newer Glibc.
+          </para>
+        </listitem>
+
+        <!-- https://sourceware.org/pipermail/libc-alpha/2024-January/154095.html -->
+        <listitem>
+          <para>
+            If upgrading on a LFS system prior to 12.0 (exclusive), install
+            <application>Libxcrypt</application> following
+            <xref role='.' linkend='ch-system-libxcrypt'/>  In addition to
+            a normal <application>Libxcrypt</application> installation,
+            <emphasis role='bold'>you MUST follow the note in Libxcrypt
+            section to install
+            <filename class='libraryfile'>libcrypt.so.1*</filename>
+            (overwritting
+            <filename class='libraryfile'>libcrypt.so.1</filename> from the
+            prior Glibc installation)</emphasis>.
+          </para>
+        </listitem>
+
+        <!-- Otherwise on lfs-systemd nscd will fail to start on boot,
+             and on both lfs-sysv and lfs-systemd useradd etc. will try
+             to start nscd, then nscd will fail to start as well and
+             produce some spurious error message.  -->
+        <listitem>
+          <para>
+            If upgrading on a LFS system prior to 12.1 (exclusive),
+            remove the <command>nscd</command> program:
+          </para>
+
+          <screen role='nodump'><userinput>rm -f /usr/sbin/nscd</userinput></screen>
+
+          <para>
+            If this system (prior to LFS 12.1, exclusive) is based on
+            Systemd, it's also needed to disable and stop the
+            <command>nscd</command> service now:
+          </para>
+
+          <screen revision='systemd' role='nodump'><userinput>systemctl disable --now nscd</userinput></screen>
+        </listitem>
+
+        <listitem>
+          <para>
+            Upgrade the kernel and reboot if it's older than &min-kernel;
+            (check the current version with <command>uname -r</command>)
+            or if you want to upgrade it anyway, following
+            <xref linkend='ch-bootable-kernel' role='.'/>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Upgrade the kernel API headers if it's older than &min-kernel;
+            (check the current version with
+            <command>cat /usr/include/linux/version.h</command>)
+            or if you want to upgrade it anyway, following
+            <xref linkend='ch-tools-linux-headers'/> (but removing
+            <envar>$LFS</envar> from the <command>cp</command> command).
+          </para>
+        </listitem>
+
+        <!-- This is to ensure we don't start a process at the time point
+             where some Glibc shared libraries are updated but the others
+             are not.  Such mismatches can cause programs crash on startup,
+             esp. a mismatch between ld-linux-x86-64.so.2 and
+             libc.so.6.  Note that a crash in the installation process
+             will leave the system in a state with the mismatch forever,
+             unrecoverable without the help of another distro.  -->
+        <listitem>
+          <para>
+            Perform a <envar>DESTDIR</envar> installation and upgrade
+            the Glibc shared libraries on the system using one single
+            <command>install</command> command:
+          </para>
+
+          <screen role='nodump'><userinput>make DESTDIR=$PWD/dest install
+install -vm755 dest/usr/lib/*.so.* /usr/lib</userinput></screen>
+        </listitem>
+      </itemizedlist>
+
+      <para>
+        It's imperative to strictly follow these steps above unless you
+        completely understand what you are doing.
+        <emphasis role='bold'>Any unexpected deviation may render the
+        system completely unusable.  YOU ARE WARNED.</emphasis>
+      </para>
+
+      <para>
+        Then continue to run the <command>make install</command> command,
+        the <command>sed</command> command against
+        <filename>/usr/bin/ldd</filename>, and the commands to install
+        the locales.  Once they are finished, reboot the system
+        immediately.
+      </para>
+    </important>
 
     <para>Install the package:</para>
@@ -247,5 +357,5 @@
 
 <screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale
-localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
+localedef -i C -f UTF-8 C.UTF-8
 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
 localedef -i de_DE -f ISO-8859-1 de_DE
@@ -299,5 +409,5 @@
     needed for some tests later in this chapter:</para>
 
-<screen role="nodump"><userinput remap="locale-full">localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
+<screen role="nodump"><userinput remap="locale-full">localedef -i C -f UTF-8 C.UTF-8
 localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true</userinput></screen>
 
Index: chapter08/gmp.xml
===================================================================
--- chapter08/gmp.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gmp.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -59,5 +59,5 @@
 
       <!-- To editors: the configure script says "the none host is obsolete,
-           use - -disable-assembly", but don't believe it: with the latter
+           use - -disable-assembly," but don't believe it: with the latter
            CFLAGS is still automatically set to -march=something.  -->
     </note>
@@ -107,6 +107,7 @@
     it is built. Occasionally, the code that detects the processor misidentifies
     the system capabilities and there will be errors in the tests or other
-    applications using the gmp libraries with the message "Illegal
-    instruction".  In this case, gmp should be reconfigured with the option
+    applications using the gmp libraries with the message
+    <computeroutput>Illegal instruction</computeroutput>.
+    In this case, gmp should be reconfigured with the option
     <option>--host=none-linux-gnu</option> and rebuilt.</para></caution>
 
Index: chapter08/gperf.xml
===================================================================
--- chapter08/gperf.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gperf.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/grep.xml
===================================================================
--- chapter08/grep.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/grep.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/groff.xml
===================================================================
--- chapter08/groff.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/groff.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/grub.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -63,11 +63,8 @@
 
     <para>
-      Fix an issue causing <command>grub-install</command> to fail when the
-      <filename class='directory'>/boot</filename> partition (or the root
-      partition if <filename class='directory'>/boot</filename> is not a
-      separate partition) is created by e2fsprogs-1.47.0 or later:
+      Add a file missing from the release tarball:
     </para>
 
-<screen><userinput remap='pre'>patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch</userinput></screen>
+<screen><userinput remap='pre'>echo <literal>depends bli part_gpt</literal> &gt; grub-core/extra_deps.lst</userinput></screen>
 
     <para>Prepare GRUB for compilation:</para>
Index: chapter08/gzip.xml
===================================================================
--- chapter08/gzip.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/gzip.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/iana-etc.xml
===================================================================
--- chapter08/iana-etc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/iana-etc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/inetutils.xml
===================================================================
--- chapter08/inetutils.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/inetutils.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/intltool.xml
===================================================================
--- chapter08/intltool.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/intltool.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/introduction.xml
===================================================================
--- chapter08/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/iproute2.xml
===================================================================
--- chapter08/iproute2.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/iproute2.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -46,7 +46,4 @@
     LFS. However, a directory and a man page for <command>arpd</command> will still
     be installed. Prevent this by running the commands shown below.
-    (If the <command>arpd</command> program is needed,
-    instructions for compiling Berkeley DB can be found in the BLFS book at
-    <ulink url="&blfs-book;server/db.html"/>.)
     </para>
 
Index: chapter08/jinja2.xml
===================================================================
--- chapter08/jinja2.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/jinja2.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/kbd.xml
===================================================================
--- chapter08/kbd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/kbd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/kmod.xml
===================================================================
--- chapter08/kmod.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/kmod.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/less.xml
===================================================================
--- chapter08/less.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/less.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/libcap.xml
===================================================================
--- chapter08/libcap.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libcap.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/libelf.xml
===================================================================
--- chapter08/libelf.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libelf.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/libffi.xml
===================================================================
--- chapter08/libffi.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libffi.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/libpipeline.xml
===================================================================
--- chapter08/libpipeline.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libpipeline.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/libtool.xml
===================================================================
--- chapter08/libtool.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libtool.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -55,14 +55,9 @@
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <note><para>The test time for Libtool can be reduced significantly on a
-    system with multiple cores.  To do this, append
-    <command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above.  For
-    instance, using -j4 can reduce the test time by over 60
-    percent.</para></note>
-
     <para>Five tests are known to fail in the LFS build environment due
     to a circular dependency, but these tests pass if rechecked after
-    automake has been installed.  Additionally, with grep-3.8, two tests will
-    trigger a warning for non-POSIX regular expressions and fail.</para>
+    automake has been installed.  Additionally, with grep-3.8 or newer,
+    two tests will trigger a warning for non-POSIX regular expressions and
+    fail.</para>
 
     <para>Install the package:</para>
Index: chapter08/libxcrypt.xml
===================================================================
--- chapter08/libxcrypt.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/libxcrypt.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/m4.xml
===================================================================
--- chapter08/m4.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/m4.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/make.xml
===================================================================
--- chapter08/make.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/make.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -54,5 +54,5 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "PATH=$PATH make check"</userinput></screen>
 
Index: chapter08/man-db.xml
===================================================================
--- chapter08/man-db.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/man-db.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/man-pages.xml
===================================================================
--- chapter08/man-pages.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/man-pages.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/markupsafe.xml
===================================================================
--- chapter08/markupsafe.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/markupsafe.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/meson.xml
===================================================================
--- chapter08/meson.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/meson.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/mpc.xml
===================================================================
--- chapter08/mpc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/mpc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/mpfr.xml
===================================================================
--- chapter08/mpfr.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/mpfr.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/ncurses.xml
===================================================================
--- chapter08/ncurses.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/ncurses.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -100,7 +100,7 @@
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
           to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
           These wide-character libraries are usable in both multibyte and
           traditional 8-bit locales, while normal libraries work properly
@@ -128,23 +128,30 @@
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
-    <command>install</command> command:</para>
+    <command>install</command> command (the header
+    <filename>curses.h</filename> is also edited to ensure the
+    wide-character ABI to be used as what we've done in
+    <xref linkend='ch-tools-ncurses'/>):</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i dest/usr/include/curses.h
 cp -av dest/* /</userinput></screen>
 
     <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
+    non-wide-character Ncurses libraries. Trick such applications into
+    linking with wide-character libraries by means of symlinks
+    (note that the <filename class='extension'>.so</filename> links are
+    only safe with <filename>curses.h</filename> edited to always use the
+    wide-character ABI):</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
+    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>
 
@@ -153,7 +160,5 @@
     buildable:</para>
 
-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
@@ -207,11 +212,15 @@
         </seg>
         <seg>
-           libcursesw.so (symlink and linker script to libncursesw.so),
+           libcurses.so (symlink),
+           libform.so (symlink),
            libformw.so,
+           libmenu.so (symlink),
            libmenuw.so,
+           libncurses.so (symlink),
            libncursesw.so,
            libncurses++w.so,
-           libpanelw.so, and their non-wide-character counterparts without "w"
-              in the library names.</seg>
+           libpanel.so (symlink),
+           and libpanelw.so,
+        </seg>
         <seg>
            /usr/share/tabset,
@@ -343,14 +352,4 @@
       </varlistentry>
 
-      <varlistentry id="libcursesw">
-        <term><filename class="libraryfile">libcursesw</filename></term>
-        <listitem>
-          <para>A link to <filename>libncursesw</filename></para>
-          <indexterm zone="ch-system-ncurses libcursesw">
-            <primary sortas="c-libcursesw">libcursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libncursesw">
         <term><filename class="libraryfile">libncursesw</filename></term>
Index: chapter08/ninja.xml
===================================================================
--- chapter08/ninja.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/ninja.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/openssl.xml
===================================================================
--- chapter08/openssl.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/openssl.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -164,5 +164,5 @@
             of <application>OpenSSL</application>'s crypto library from the
             shell. It can be used for various functions which are documented in
-            <command>man 1 openssl</command>
+            <ulink role='man' url='&man;openssl.1'>openssl(1)</ulink>
           </para>
           <indexterm zone="ch-system-openssl openssl-prog">
@@ -196,5 +196,6 @@
             implements the Transport Layer Security (TLS v1) protocol.
             It provides a rich API, documentation
-            on which can be found by running <command>man 7 ssl</command>
+            on which can be found in <ulink role='man'
+            url='&man;ssl.7'>ssl(7)</ulink>
           </para>
           <indexterm zone="ch-system-openssl libssl">
Index: chapter08/patch.xml
===================================================================
--- chapter08/patch.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/patch.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/perl.xml
===================================================================
--- chapter08/perl.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/perl.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/pkgconf.xml
===================================================================
--- chapter08/pkgconf.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/pkgconf.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -46,7 +46,7 @@
 
     <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
 
-    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
 
     <para>Prepare Pkgconf for compilation:</para>
Index: chapter08/pkgmgt.xml
===================================================================
--- chapter08/pkgmgt.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/pkgmgt.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -57,5 +57,5 @@
         The system will keep working fine thanks to the well-defined interface
         between the kernel and userspace.  Specifically, Linux API headers
-        need not be (and should not be, see the next item) upgraded
+        need not be upgraded
         along with the kernel.  You will merely need to reboot your system to use the
         upgraded kernel.</para>
@@ -63,20 +63,8 @@
 
       <listitem>
-        <para>If the Linux API headers or Glibc need to be upgraded to a newer
-        version, (e.g.,  from Glibc-2.31 to Glibc-2.32), it is safer to
-        rebuild LFS.  Though you <emphasis>may</emphasis> be able to rebuild
-        all the packages in their dependency order, we do not recommend
-        it.  </para>
-      </listitem>
-
-      <listitem>
-        <para>Reinstalling the same version of Glibc (&glibc-version; for
-        this release of LFS) with patches should be safe when these patches
-        do not change ABI and API.  When a security vulnerability is found
-        in Glibc, we often need to apply such a patch to fix the
-        vulnerability and reinstall Glibc.  Consult
-        <ulink url='&lfs-root;lfs/advisories/'>LFS security
-        advisories</ulink> if you are alerted for a published Glibc security
-        vulnerability but unsure about the action to take.</para>
+        <para>If Glibc needs to be upgraded to a newer
+        version, (e.g.,  from Glibc-2.36 to Glibc-&glibc-version;),
+        some extra steps are needed to avoid breaking the system.
+        Read <xref linkend='ch-system-glibc'/> for details.</para>
       </listitem>
 
Index: chapter08/procps.xml
===================================================================
--- chapter08/procps.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/procps.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/psmisc.xml
===================================================================
--- chapter08/psmisc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/psmisc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/python.xml
===================================================================
--- chapter08/python.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/python.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -156,9 +156,8 @@
 <screen><userinput remap="install">install -v -dm755 /usr/share/doc/python-&python-version;/html
 
-tar --strip-components=1  \
-    --no-same-owner       \
-    --no-same-permissions \
-    -C /usr/share/doc/python-&python-version;/html \
-    -xvf ../python-&python-version;-docs-html.tar.bz2</userinput></screen>
+tar --no-same-owner \
+    -xvf ../python-&python-version;-docs-html.tar.bz2
+cp -R --no-preserve=mode python-&python-version;-docs-html/* \
+    /usr/share/doc/python-&python-version;/html</userinput></screen>
 
     <variablelist>
@@ -166,9 +165,10 @@
 
     <varlistentry>
-      <term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term>
+      <term><option>--no-same-owner</option> (tar) and <option>--no-preserve=mode</option> (cp)</term>
       <listitem>
         <para>Ensure the installed files have the correct ownership and
         permissions.  Without these options, <application>tar</application>
-        will install the package files with the upstream creator's values.
+        will install the package files with the upstream creator's values
+        and files would have restrictive permissions.
         </para>
       </listitem>
Index: chapter08/readline.xml
===================================================================
--- chapter08/readline.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/readline.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/sed.xml
===================================================================
--- chapter08/sed.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/sed.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -52,5 +52,5 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "PATH=$PATH make check"</userinput></screen>
 
Index: chapter08/setuptools.xml
===================================================================
--- chapter08/setuptools.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/setuptools.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/shadow.xml
===================================================================
--- chapter08/shadow.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/shadow.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -204,6 +204,6 @@
     parameter to <command>useradd</command>, or else change the setting of
     <parameter>USERGROUPS_ENAB</parameter> in
-    <filename>/etc/login.defs</filename>. See <filename>useradd(8)</filename>
-    for more information.</para>
+    <filename>/etc/login.defs</filename>. See <ulink role='man'
+    url='&man;useradd.8'>useradd(8)</ulink> for more information.</para>
 
     <para>Second, to change the default parameters, the file
Index: chapter08/stripping.xml
===================================================================
--- chapter08/stripping.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/stripping.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -53,5 +53,5 @@
   and ld-linux.so.2 on 32-bit systems.  The construct below selects the
   correct name for the current architecture, excluding anything ending
-  with <quote>g</quote>, in case the commands below have already been
+  with <literal>g</literal>, in case the commands below have already been
   run.</para></note>
 
Index: chapter08/sysklogd.xml
===================================================================
--- chapter08/sysklogd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/sysklogd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/systemd.xml
===================================================================
--- chapter08/systemd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/systemd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -48,4 +48,11 @@
  <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
+
+    <!-- https://github.com/systemd/systemd/pull/30549 -->
+    <para>Now fix a security vulnerability in the DNSSEC verification of
+    <command>systemd-resolved</command>:</para>
+
+<screen><userinput remap='pre'>sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \
+    -i src/resolve/resolved-dns-transaction.c</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
@@ -63,11 +70,13 @@
       -Dsysusers=false              \
       -Drpmmacrosdir=no             \
-      -Dhomed=false                 \
+      -Dhomed=disabled              \
       -Duserdb=false                \
-      -Dman=false                   \
+      -Dman=disabled                \
       -Dmode=release                \
       -Dpamconfdir=no               \
       -Ddev-kvm-mode=0660           \
       -Dnobody-group=nogroup        \
+      -Dsysupdate=disabled          \
+      -Dukify=disabled              \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
@@ -140,5 +149,6 @@
 
       <varlistentry>
-        <term><parameter>-D{userdb,homed}=false</parameter></term>
+        <term><parameter>-Dhomed=disabled</parameter> and
+        <parameter>-Duserdb=false</parameter></term>
         <listitem>
           <para>Remove two daemons with dependencies that do not fit
@@ -148,5 +158,5 @@
 
       <varlistentry>
-        <term><parameter>-Dman=false</parameter></term>
+        <term><parameter>-Dman=disabled</parameter></term>
         <listitem>
           <para>Prevent the generation of man pages to avoid extra
@@ -188,4 +198,26 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dsysupdate=disabled</parameter></term>
+        <listitem>
+          <para>Do not install the <command>systemd-sysupdate</command>
+          tool.  It's designed for automatically upgrading binary distros,
+          so it's useless for a basic Linux system built from source.
+          And it will report errors on boot if it's enabled but not properly
+          configured.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dukify=disabled</parameter></term>
+        <listitem>
+          <para>Do not install the <command>systemd-ukify</command> script.
+          At runtime this script requires the
+          <application>pefile</application> Python module that neither LFS
+          nor BLFS provides.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
@@ -214,10 +246,4 @@
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
-
-    <para>Disable two services for upgrading binary distros.  They are useless for
-    a basic Linux system built from source, and each one will report an error if
-    it's enabled but not configured:</para>
-
-<screen><userinput remap="adjust">systemctl disable systemd-sysupdate{,-reboot}</userinput></screen>
 
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
Index: chapter08/sysvinit.xml
===================================================================
--- chapter08/sysvinit.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/sysvinit.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/tar.xml
===================================================================
--- chapter08/tar.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/tar.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -73,11 +73,4 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <!-- On one system the -j4 improvement is 167s - 46s = 121s (72.46%) -->
-    <note><para>The test time for Tar can be reduced significantly on a
-    system with multiple cores.  To do this, append
-    <command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above.  For
-    instance, using -j4 can reduce the test time by over 70
-    percent.</para></note>
-
     <para>One test, capabilities: binary store/restore, is known to fail if it is
     run because LFS lacks selinux, but will be skipped if the host kernel does
Index: chapter08/tcl.xml
===================================================================
--- chapter08/tcl.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/tcl.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/texinfo.xml
===================================================================
--- chapter08/texinfo.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/texinfo.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/udev.xml
===================================================================
--- chapter08/udev.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/udev.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -55,4 +55,9 @@
 
  <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen>
+
+    <para>Adjust the hardcoded paths to network configuration files for the
+    standalone udev installation:</para>
+
+ <screen><userinput remap="pre">sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h</userinput></screen>
 
     <para>Prepare Udev for compilation:</para>
@@ -121,13 +126,21 @@
     </variablelist>
 
+    <para>Get the list of the shipped udev helpers and save it into an
+    environment variable (exporting it is not strictly necessary, but it makes
+    building as a regular user or using a package manager easier):</para>
+
+    <screen><userinput remap="make">export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
+                      awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
+
     <para>Only build the components needed for udev:</para>
 
     <screen><userinput remap="make">ninja udevadm systemd-hwdb                                           \
       $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \
-      $(realpath libudev.so --relative-to .)</userinput></screen>
+      $(realpath libudev.so --relative-to .)                         \
+      $udev_helpers</userinput></screen>
 
     <para>Install the package:</para>
 
-    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d
+    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb.d,rules.d,network}
 install -vm755 -d /usr/{lib,share}/pkgconfig
 install -vm755 udevadm                             /usr/bin/
@@ -143,6 +156,6 @@
                       -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
-install -vm755 $(find src/udev \
-                      -type f -not -name '*.*')    /usr/lib/udev</userinput></screen>
+install -vm755 $udev_helpers                       /usr/lib/udev
+install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
@@ -159,11 +172,25 @@
     --no-same-owner --strip-components=1                              \
     -C /usr/share/man --wildcards '*/udev*' '*/libudev*'              \
+                                  '*/systemd.link.5'                  \
                                   '*/systemd-'{hwdb,udevd.service}.8
+
+sed 's|systemd/network|udev/network|'                                 \
+    /usr/share/man/man5/systemd.link.5                                \
+  > /usr/share/man/man5/udev.link.5
+
 sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8   \
                                > /usr/share/man/man8/udev-hwdb.8
+
 sed 's|lib.*udevd|sbin/udevd|'                                        \
     /usr/share/man/man8/systemd-udevd.service.8                       \
   > /usr/share/man/man8/udevd.8
-rm  /usr/share/man/man8/systemd-*.8</userinput></screen>
+
+rm /usr/share/man/man*/systemd*</userinput></screen>
+
+    <para>Finally, unset the <envar>udev_helpers</envar> variable:</para>
+
+    <!-- remap="make" seems confusing but we don't have sth. like
+         remap="clean".  -->
+    <screen><userinput remap="install">unset udev_helpers</userinput></screen>
 
   </sect2>
Index: chapter08/util-linux.xml
===================================================================
--- chapter08/util-linux.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/util-linux.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -49,6 +49,5 @@
     <para>Prepare Util-linux for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-            --bindir=/usr/bin    \
+<screen revision="sysv"><userinput remap="configure">./configure --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --runstatedir=/run   \
@@ -64,9 +63,9 @@
             --without-python     \
             --without-systemd    \
-            --without-systemdsystemunitdir \
+            --without-systemdsystemunitdir        \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-            --bindir=/usr/bin    \
+<screen revision="systemd"><userinput remap="configure">./configure --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --runstatedir=/run   \
@@ -81,4 +80,5 @@
             --disable-static     \
             --without-python     \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
@@ -104,5 +104,5 @@
     </warning>
 
-<screen><userinput remap="test">chown -Rv tester .
+<screen><userinput remap="test">chown -R tester .
 su tester -c "make -k check"</userinput></screen>
 
@@ -585,5 +585,6 @@
         <listitem>
           <para>Displays kernel interrupt counter information in
-          <filename>top(1)</filename> style view</para>
+          <ulink role='man' url='&man;top.1'>top(1)</ulink> style
+          view</para>
           <indexterm zone="ch-system-util-linux irqtop">
             <primary sortas="b-irqtop">irqtop</primary>
Index: chapter08/vim.xml
===================================================================
--- chapter08/vim.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/vim.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -67,5 +67,5 @@
     to the source tree:</para>
 
-<screen><userinput remap="test">chown -Rv tester .</userinput></screen>
+<screen><userinput remap="test">chown -R tester .</userinput></screen>
 
     <para>Now run the tests as user <systemitem
Index: chapter08/wheel.xml
===================================================================
--- chapter08/wheel.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/wheel.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/xml-parser.xml
===================================================================
--- chapter08/xml-parser.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/xml-parser.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/xz.xml
===================================================================
--- chapter08/xz.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/xz.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/zlib.xml
===================================================================
--- chapter08/zlib.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/zlib.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter08/zstd.xml
===================================================================
--- chapter08/zstd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter08/zstd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/bootscripts.xml
===================================================================
--- chapter09/bootscripts.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/bootscripts.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/chapter09.xml
===================================================================
--- chapter09/chapter09.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/chapter09.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -27,12 +27,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
 
   <!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
 
   <!-- common -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
Index: chapter09/clock.xml
===================================================================
--- chapter09/clock.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/clock.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/consoled.xml
===================================================================
--- chapter09/consoled.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/consoled.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -31,5 +31,5 @@
 
   <para>The <filename>/etc/vconsole.conf</filename> file should contain lines
-  of the form: VARIABLE="value". The following variables are recognized:</para>
+  of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
 
   <variablelist>
@@ -74,4 +74,23 @@
 
   </variablelist>
+
+  <para>We'll use <literal>C.UTF-8</literal> as the locale for interactive
+  sessions in the Linux console in <xref role='.'
+  linkend='ch-config-locale'/>  The console fonts shipped by
+  the <application>Kbd</application> package containing the glyphs for
+  all characters from the program messages in the <literal>C.UTF-8</literal>
+  locale are <filename>LatArCyrHeb*.psfu.gz</filename>,
+  <filename>LatGrkCyr*.psfu.gz</filename>,
+  <filename>Lat2-Terminus16.psfu.gz</filename>, and
+  <filename>pancyrillic.f16.psfu.gz</filename> in
+  <filename class='directory'>/usr/share/consolefonts</filename> (the other
+  shipped console fonts lack glyphs of some characters like the Unicode
+  left/right quotation marks and the Unicode English dash). So set one of
+  them, for example <filename>Lat2-Terminus16.psfu.gz</filename> as the
+  default console font:</para>
+
+  <!-- We are using "nodump" for general settings, but not examples.  This
+       is ironic, but needed for the compatibility with jhalfs!  -->
+<screen role='nodump'><userinput>echo <literal>FONT=Lat2-Terminus16</literal> &gt; /etc/vconsole.conf</userinput></screen>
 
   <para>An example for a German keyboard and console is given below:</para>
Index: chapter09/etcshells.xml
===================================================================
--- chapter09/etcshells.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/etcshells.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/inputrc.xml
===================================================================
--- chapter09/inputrc.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/inputrc.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/introduction.xml
===================================================================
--- chapter09/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/introductiond.xml
===================================================================
--- chapter09/introductiond.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/introductiond.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter09/locale.xml
===================================================================
--- chapter09/locale.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/locale.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-config-locale" revision="systemd">
+<sect1 id="ch-config-locale">
   <?dbhtml filename="locale.html"?>
 
@@ -12,10 +12,13 @@
 
   <indexterm zone="ch-config-locale">
-    <primary sortas="e-etc-locale-conf">/etc/locale.conf</primary>
+    <primary sortas="e-/etc/profile">/etc/profile</primary>
   </indexterm>
 
-  <para>The <filename>/etc/locale.conf</filename> file below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
+  <indexterm zone="ch-config-locale" revision='systemd'>
+    <primary sortas="e-/etc/profile">/etc/locale.conf</primary>
+  </indexterm>
+
+  <para>Some environment variables are necessary for native language
+  support. Setting them properly results in:</para>
 
   <itemizedlist>
@@ -40,9 +43,9 @@
 
   <para>Replace <replaceable>&lt;ll&gt;</replaceable> below with the two-letter code
-  for your desired language (e.g., <quote>en</quote>) and
+  for your desired language (e.g., <literal>en</literal>) and
   <replaceable>&lt;CC&gt;</replaceable> with the two-letter code for the appropriate
-  country (e.g., <quote>GB</quote>). <replaceable>&lt;charmap&gt;</replaceable> should
+  country (e.g., <literal>GB</literal>). <replaceable>&lt;charmap&gt;</replaceable> should
   be replaced with the canonical charmap for your chosen locale. Optional
-  modifiers such as <quote>@euro</quote> may also be present.</para>
+  modifiers such as <literal>@euro</literal> may also be present.</para>
 
   <para>The list of all locales supported by Glibc can be obtained by running
@@ -51,22 +54,24 @@
 <screen role="nodump"><userinput>locale -a</userinput></screen>
 
-  <para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
-  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
+  <para>Charmaps can have a number of aliases, e.g.,
+  <literal>ISO-8859-1</literal> is also referred to as
+  <literal>iso8859-1</literal> and <literal>iso88591</literal>.
   Some applications cannot handle the various synonyms correctly (e.g., require
-  that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
-  <quote>utf8</quote>), so it is the safest in most
+  that <literal>UTF-8</literal> is written as <literal>UTF-8</literal>, not
+  <literal>utf8</literal>), so it is the safest in most
   cases to choose the canonical name for a particular locale. To determine
   the canonical name, run the following command, where <replaceable>&lt;locale
   name&gt;</replaceable> is the output given by <command>locale -a</command> for
-  your preferred locale (<quote>en_GB.iso88591</quote> in our example).</para>
+  your preferred locale (<literal>en_GB.iso88591</literal> in our
+  example).</para>
 
 <screen role="nodump"><userinput>LC_ALL=<replaceable>&lt;locale name&gt;</replaceable> locale charmap</userinput></screen>
 
-  <para>For the <quote>en_GB.iso88591</quote> locale, the above command
+  <para>For the <literal>en_GB.iso88591</literal> locale, the above command
   will print:</para>
 
 <screen><computeroutput>ISO-8859-1</computeroutput></screen>
 
-  <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
+  <para>This results in a final locale setting of <literal>en_GB.ISO-8859-1</literal>.
   It is important that the locale found using the heuristic above is tested prior
   to it being added to the Bash startup files:</para>
@@ -91,20 +96,4 @@
   Glibc.</para>
 
-  <!-- FIXME: the xlib example will become obsolete in the future.-->
-  <para>Some packages beyond LFS may also lack support for your chosen locale. One
-  example is the X library (part of the X Window System), which outputs the
-  following error message if the locale does not exactly match one of the character
-  map names in its internal files:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
-  <para>In several cases Xlib expects that the character map will be listed in
-  uppercase notation with canonical dashes. For instance, "ISO-8859-1" rather
-  than "iso88591". It is also  possible to find an appropriate specification by
-  removing the charmap part of the locale specification.  This can be checked
-  by running the <command>locale charmap</command> command in both locales.
-  For example, one would have to change "de_DE.ISO-8859-15@euro" to
-  "de_DE@euro" in order to get this locale recognized by Xlib.</para>
-
   <para>Other packages can also function incorrectly (but may not necessarily
   display any error messages) if the locale name does not meet their expectations.
@@ -112,44 +101,109 @@
   might provide some useful information.</para>
 
-  <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/locale.conf</filename> file:</para>
-
-<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
+  <para revision='systemd'>Once the proper locale settings have been
+  determined, create the <filename>/etc/locale.conf</filename> file:</para>
+
+<screen revision='systemd'><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
 <literal>LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable></literal>
 EOF</userinput></screen>
 
-  <para>Note that you can modify <filename>/etc/locale.conf</filename> with the
+  <para>The shell program <command>/bin/bash</command> (here after referred
+  as <quote>the shell</quote>) uses a collection of startup files to help
+  create the environment to run in. Each file has a specific use and may
+  affect login and interactive environments differently. The files in the
+  <filename class="directory">/etc</filename> directory provide global
+  settings.  If equivalent files exist in the home directory, they
+  may override the global settings.</para>
+
+  <para>An interactive login shell is started after a successful login,
+  using <command>/bin/login</command>, by reading the
+  <filename>/etc/passwd</filename> file.  An interactive non-login shell is
+  started at the command-line (e.g.
+  <prompt>[prompt]$</prompt><command>/bin/bash</command>).  A
+  non-interactive shell is usually present when a shell script is running.
+  It is non-interactive because it is processing a script and not waiting
+  for user input between commands.</para>
+
+  <para><phrase revision='systemd'>The login shells are often unaffected by
+  the settings in <filename>/etc/locale.conf</filename>. </phrase>Create the
+  <filename>/etc/profile</filename>
+  <phrase revision='sysv'>once the proper locale settings have been
+  determined to set the desired locale</phrase><phrase
+  revision='systemd'>to read the locale settings from
+  <filename>/etc/locale.conf</filename> and export them</phrase>,
+  but set the <literal>C.UTF-8</literal> locale instead if running in the Linux
+  console (to prevent programs from outputting characters that the Linux
+  console is unable to render):</para>
+
+<screen revision="systemd"><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+for i in $(locale); do
+  unset ${i%=*}
+done
+
+if [[ "$TERM" = linux ]]; then
+  export LANG=C.UTF-8
+else
+  source /etc/locale.conf
+
+  for i in $(locale); do
+    key=${i%=*}
+    if [[ -v $key ]]; then
+      export $key
+    fi
+  done
+fi
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
+
+<screen revision="sysv"><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+for i in $(locale); do
+  unset ${i%=*}
+done
+
+if [[ "$TERM" = linux ]]; then
+  export LANG=C.UTF-8
+else
+  export LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>
+fi
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
+
+  <para revision='systemd'>Note that you can modify <filename>/etc/locale.conf</filename> with the
   systemd <command>localectl</command> utility. To use
   <command>localectl</command> for the example above, run:</para>
 
-<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>"</userinput></screen>
-
-  <para>You can also specify other language specific environment variables such
-  as <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or
-  any other environment variable from <command>locale</command> output. Just
-  separate them with a space. An example where <envar>LANG</envar> is set as
+<screen revision='systemd' role="nodump"><userinput>localectl set-locale LANG="<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>"</userinput></screen>
+
+  <para revision='systemd'>You can also specify other language specific
+  environment variables such as <envar>LANG</envar>,
+  <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or any other
+  environment variable from <command>locale</command> output. Just separate
+  them with a space. An example where <envar>LANG</envar> is set as
   en_US.UTF-8 but <envar>LC_CTYPE</envar> is set as just en_US is:</para>
 
-<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
-
-  <note><para>Please note that the <command>localectl</command> command
-  doesn't work in the chroot environment.  It can only
-  be used after the LFS system is booted with systemd.</para></note>
-
-  <para>The <quote>C</quote> (default) and <quote>en_US</quote> (the recommended
-  one for United States English users) locales are different. <quote>C</quote>
+<screen revision='systemd' role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
+
+  <note revision='systemd'><para>Please note that the
+  <command>localectl</command> command doesn't work in the chroot
+  environment.  It can only be used after the LFS system is booted with
+  systemd.</para></note>
+
+  <para>The <literal>C</literal> (default) and <literal>en_US</literal>
+  (the recommended one for United States English users) locales are
+  different. <literal>C</literal>
   uses the US-ASCII 7-bit character set, and treats bytes with the high bit set
   as invalid characters. That's why, e.g., the <command>ls</command> command
   substitutes them with question marks in that locale. Also, an attempt to send
   mail with such characters from Mutt or Pine results in non-RFC-conforming
-  messages being sent (the charset in the outgoing mail is indicated as <quote>unknown
-  8-bit</quote>). It's suggested that you use the <quote>C</quote> locale only
+  messages being sent (the charset in the outgoing mail is indicated as
+  <computeroutput>unknown 8-bit</computeroutput>). It's suggested that you
+  use the <literal>C</literal> locale only
   if you are certain that you will never need 8-bit characters.</para>
 
-<!--
-  <para>UTF-8 based locales are not supported well by many programs.
-  Work is in progress to document and, if possible, fix such problems, see
-  <ulink url="&blfs-book;introduction/locale-issues.html"/>.</para>
--->
-
 </sect1>
Index: chapter09/network.xml
===================================================================
--- chapter09/network.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/network.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -63,7 +63,7 @@
     the interfaces up correctly.</para>
 
-    <para>If the <envar>ONBOOT</envar> variable is set to <quote>yes</quote> the
+    <para>If the <envar>ONBOOT</envar> variable is set to <literal>yes</literal> the
     System V network script will bring up the Network Interface Card (NIC) during
-    the system boot process. If set to anything besides <quote>yes</quote>, the NIC
+    the system boot process. If set to anything besides <literal>yes</literal>, the NIC
     will be ignored by the network script and will not be started automatically.
     Interfaces can be manually started or stopped with the
Index: chapter09/networkd.xml
===================================================================
--- chapter09/networkd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/networkd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -51,7 +51,9 @@
     <filename class="extension">.network</filename> files. For detailed
     descriptions and example contents of these configuration files, consult
-    the <filename>systemd-link(5)</filename>,
-    <filename>systemd-netdev(5)</filename> and
-    <filename>systemd-network(5)</filename> manual pages.</para>
+    the <ulink role='man' url='&man;systemd-link.5'>systemd-link(5)</ulink>,
+    <ulink role='man' url='&man;systemd-netdev.5'>systemd-netdev(5)</ulink>,
+    and <ulink role='man'
+    url='&man;systemd-network.5'>systemd-network(5)</ulink> manual
+    pages.</para>
 
     <sect3 id="systemd-network-devices">
@@ -90,5 +92,6 @@
         <listitem>
           <para>
-            Mask udev's .link file for the default policy:
+            Mask udev's <filename class='extension'>.link</filename> file
+            for the default policy:
 <screen role="nodump"><userinput>ln -s /dev/null /etc/systemd/network/99-default.link</userinput></screen>
           </para>
@@ -97,9 +100,10 @@
         <listitem>
           <para>
-             Create a manual naming scheme, for example by naming the
-             interfaces something like "internet0", "dmz0", or "lan0".
-             To do that, create .link files in /etc/systemd/network/ that
-             select an explicit name or a better naming scheme for your
-             network interfaces. For example:
+            Create a manual naming scheme, for example by naming the
+            interfaces something like <literal>internet0</literal>,
+            <literal>dmz0</literal>, or <literal>lan0</literal>.
+            To do that, create <filename class='extension'>.link</filename>
+            files in /etc/systemd/network/ that select an explicit name or a
+            better naming scheme for your network interfaces. For example:
           </para>
 
@@ -114,5 +118,5 @@
 
           <para>
-             See the man page systemd.link(5) for more information.
+            See <ulink role='man' url='&man;systemd.link.5'>systemd.link(5)</ulink> for more information.
           </para>
         </listitem>
@@ -120,6 +124,6 @@
         <listitem>
           <para>
-            In /boot/grub/grub.cfg, pass the option net.ifnames=0 on the
-            kernel command line.
+            In /boot/grub/grub.cfg, pass the option
+            <option>net.ifnames=0</option> on the kernel command line.
           </para>
         </listitem>
@@ -358,5 +362,7 @@
      domain) because they are handled by the
      <systemitem class='library'>myhostname</systemitem> NSS module, read
-     the man page <filename>nss-myhostname(8)</filename> for details.</para>
+     the man page <ulink role='man'
+     url='&man;nss-myhostname.8'>nss-myhostname(8)</ulink> for
+     details.</para>
 
      <para>The ::1 entry is the IPv6 counterpart of 127.0.0.1 and represents
Index: apter09/profile.xml
===================================================================
--- chapter09/profile.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-profile" revision="sysv">
-  <?dbhtml filename="profile.html"?>
-
-  <title>The Bash Shell Startup Files</title>
-
-  <indexterm zone="ch-config-profile">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
-  </indexterm>
-
-  <para>The shell program <command>/bin/bash</command> (hereafter referred to
-  as <quote>the shell</quote>) uses a collection of startup files to help
-  create the environment to run in. Each file has a specific use and may affect
-  login and interactive environments differently. The files in the <filename
-  class="directory">/etc</filename> directory provide global settings. If
-  equivalent files exist in the home directory, they may override the global
-  settings.</para>
-
-  <para>An interactive login shell is started after a successful login, using
-  <command>/bin/login</command>, by reading the <filename>/etc/passwd</filename>
-  file. An interactive non-login shell is started at the command-line (e.g.,
-  <prompt>[prompt]$</prompt><command>/bin/bash</command>). A non-interactive
-  shell is usually present when a shell script is running. It is non-interactive
-  because it is processing a script and not waiting for user input between
-  commands.</para>
-
-<para>For more information, see the <emphasis>Bash Startup Files</emphasis> and
-  <emphasis>Interactive Shells</emphasis> sections in the <emphasis>Bash 
-  Features</emphasis> chapter of the Bash info pages (<command>info bash</command>).</para>
-
-  <para>The files <filename>/etc/profile</filename> and
-  <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell.</para>
-
-  <para>The base <filename>/etc/profile</filename> below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The output of programs translated into the native language</para>
-    </listitem>
-    <listitem>
-      <para>Correct classification of characters into letters, digits and other
-      classes. This is necessary for <command>bash</command> to properly accept
-      non-ASCII characters in command lines in non-English locales</para>
-    </listitem>
-    <listitem>
-      <para>The correct alphabetical sorting order for the country</para>
-    </listitem>
-    <listitem>
-      <para>Appropriate default paper size</para>
-    </listitem>
-    <listitem>
-      <para>Correct formatting of monetary, time, and date values</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Replace <replaceable>&lt;ll&gt;</replaceable> below with the two-letter code
-  for the desired language (e.g., <quote>en</quote>) and
-  <replaceable>&lt;CC&gt;</replaceable> with the two-letter code for the appropriate
-  country (e.g., <quote>GB</quote>). <replaceable>&lt;charmap&gt;</replaceable> should
-  be replaced with the canonical charmap for your chosen locale. Optional
-  modifiers such as <quote>@euro</quote> may also be present.</para>
-
-  <para>The list of all locales supported by Glibc can be obtained by running
-  the following command:</para>
-
-<screen role="nodump"><userinput>locale -a</userinput></screen>
-
-  <para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
-  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
-  Some applications cannot handle the various synonyms correctly (e.g., require
-  that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
-  <quote>utf8</quote>), so it is safest in most
-  cases to choose the canonical name for a particular locale. To determine
-  the canonical name, run the following command, where <replaceable>&lt;locale
-  name&gt;</replaceable> is the output given by <command>locale -a</command> for
-  your preferred locale (<quote>en_GB.iso88591</quote> in our example).</para>
-
-<screen role="nodump"><userinput>LC_ALL=<replaceable>&lt;locale name&gt;</replaceable> locale charmap</userinput></screen>
-
-  <para>For the <quote>en_GB.iso88591</quote> locale, the above command
-  will print:</para>
-
-<screen><computeroutput>ISO-8859-1</computeroutput></screen>
-
-  <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
-  It is important that the locale found using the heuristic above is tested before
-  it is added to the Bash startup files:</para>
-
-<screen role="nodump"><userinput>LC_ALL=&lt;locale name&gt; locale language
-LC_ALL=&lt;locale name&gt; locale charmap
-LC_ALL=&lt;locale name&gt; locale int_curr_symbol
-LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
-
-  <para>The above commands should print the language name, the character
-  encoding used by the locale, the local currency, and the prefix to dial
-  before the telephone number in order to get into the country. If any of the
-  commands above fail with a message similar to the one shown below, this means
-  that your locale was either not installed in <xref linkend="ch-system-glibc"/>
-  or is not supported by the default installation of Glibc.</para>
-
-<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
-
-  <para>If this happens, you should either install the desired locale using the
-  <command>localedef</command> command, or consider choosing a different locale.
-  Further instructions assume that there are no such error messages from
-  Glibc.</para>
-
-  <!-- FIXME: the xlib example will became obsolete real soon -->
-  <!--<para>Some packages beyond LFS may also lack support for your chosen locale. One
-  example is the X library (part of the X Window System), which outputs the
-  following error message if the locale does not exactly match one of the character
-  map names in its internal files:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
-  <para>In several cases Xlib expects that the character map will be listed in
-  uppercase notation with canonical dashes. For instance, "ISO-8859-1" rather
-  than "iso88591". It is also  possible to find an appropriate specification by
-  removing the charmap part of the locale specification.  This can be checked
-  by running the <command>locale charmap</command> command in both locales.
-  For example, one would have to change "de_DE.ISO-8859-15@euro" to
-  "de_DE@euro" in order to get this locale recognized by Xlib.</para>
--->
-  <para>Other packages may also function incorrectly (but will not necessarily
-  display any error messages) if the locale name does not meet their expectations.
-  In such cases, investigating how other Linux distributions support your locale
-  might provide some useful information.</para>
-
-  <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/profile</filename> file:</para>
-
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-
-export LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-  <para>The <quote>C</quote> (default) and <quote>en_US.utf8</quote> (the recommended
-  one for United States English users) locales are different. <quote>C</quote>
-  uses the US-ASCII 7-bit character set, and treats bytes with the high-order bit set
-  <quote>on</quote> as invalid characters. That's why, e.g., the <command>ls</command> command
-  displays them as question marks in that locale. Also, an attempt to send
-  mail with such characters from Mutt or Pine results in non-RFC-conforming
-  messages being sent (the charset in the outgoing mail is indicated as <quote>unknown
-  8-bit</quote>). So you can only use the <quote>C</quote> locale if you are sure
-  you will never need 8-bit characters.</para>
-
-  <para>UTF-8 based locales are not supported well by some programs.
-  Work is in progress to document and, if possible, fix such problems. See
-  <ulink url="&blfs-book;introduction/locale-issues.html"/>.</para>
-
-</sect1>
Index: chapter09/symlinks.xml
===================================================================
--- chapter09/symlinks.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/symlinks.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -113,4 +113,17 @@
       creating your network configuration files.</para>
 
+      <para>Even if the custom udev rule file is created, udev may still
+      assign one or more alternative names for a NIC based on physical
+      characteristics.  If a custom udev rule would rename some NIC using
+      a name already assigned as an alternative name of another NIC, this
+      udev rule will fail.  If this issue happens, you may create the
+      <filename>/etc/udev/network/99-default.link</filename> configuration
+      file with an empty alternative assignment policy, overriding the
+      default configuration file
+      <filename>/usr/lib/udev/network/99-default.link</filename>:</para>
+
+<screen role="nodump"><userinput>sed -e '/^AlternativeNamesPolicy/s/=.*$/=/'  \
+    -i /usr/lib/udev/network/99-default.link \
+     > /etc/udev/network/99-default.link</userinput></screen>
     </sect3>
 
Index: chapter09/systemd-custom.xml
===================================================================
--- chapter09/systemd-custom.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/systemd-custom.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -22,6 +22,7 @@
     entries commented out with the default settings indicated. This file is
     where the log level may be changed as well as some basic logging settings.
-    See the <filename>systemd-system.conf(5)</filename> manual page for details
-    on each configuration option.</para>
+    See the <ulink role='man'
+    url='&man;systemd-system.conf.5'>systemd-system.conf(5)</ulink> manual
+    page for details on each configuration option.</para>
 
   </sect2>
@@ -90,6 +91,6 @@
     files with the same name in
     <filename class="directory">/usr/lib/tmpfiles.d</filename>. See
-    <filename>tmpfiles.d(5)</filename> manual page for file format
-    details.</para>
+    <ulink role='man' url='&man;tmpfiles.d.5'>tmpfiles.d(5)</ulink> manual
+    page for file format details.</para>
 
     <para>
@@ -136,5 +137,6 @@
 EOF</userinput></screen>
 
-     <para>See <filename>systemd.unit(5)</filename> manual page for more
+     <para>See <ulink role='man'
+     url='&man;systemd.unit.5'>systemd.unit(5)</ulink> manual page for more
      information. After creating the configuration file, run
      <userinput>systemctl daemon-reload</userinput> and <userinput>systemctl
@@ -252,8 +254,9 @@
 EOF</userinput></screen>
 
-    <para>See the <filename>systemd-coredump(8)</filename>,
-    <filename>coredumpctl(1)</filename>, and
-    <filename>coredump.conf.d(5)</filename> manual pages for more
-    information.</para>
+    <para>See the <ulink role='man' url='&man;systemd-coredump.8'>systemd-coredump(8)</ulink>,
+    <ulink role='man' url='&man;coredumpctl.1'>coredumpctl(1)</ulink>, and
+    <ulink role='man'
+    url='&man;coredump.conf.d.5'>coredump.conf.d(5)</ulink> manual pages for
+    more information.</para>
   </sect2>
 
Index: chapter09/udev.xml
===================================================================
--- chapter09/udev.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/udev.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -130,5 +130,5 @@
       supported by a module. For example, the <emphasis>snd-fm801</emphasis>
       driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
-      and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
+      and has an alias of <literal>pci:v00001319d00000801sv*sd*bc04sc01i*</literal>.
       For most devices, the bus driver exports the alias of the driver that
       would handle the device via <systemitem
@@ -136,5 +136,5 @@
       <filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
       might contain the string
-      <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
+      <literal>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</literal>.
       The default rules provided with udev will cause <command>udevd</command>
       to call out to <command>/sbin/modprobe</command> with the contents of the
@@ -226,6 +226,7 @@
       <literal>pre:</literal> dependencies, or a mixture of both
       <literal>pre:</literal> and <literal>post:</literal> dependencies.  See
-      the <filename>modprobe.d(5)</filename> manual page for more information
-      on <quote>softdep</quote> syntax and capabilities.</para>
+      the <ulink role='man' url='&man;modprobe.d.5'>modprobe.d(5)</ulink>
+      manual page for more information on <quote>softdep</quote> syntax and
+      capabilities.</para>
 
       <para revision="sysv">If the module in question is not a wrapper and is
@@ -301,5 +302,5 @@
       <para>This is due to the fact that udev, by design, handles uevents and
       loads modules in parallel, and thus in an unpredictable order. This will
-      never be <quote>fixed</quote>. You should not rely upon the kernel device
+      never be <quote>fixed.</quote> You should not rely upon the kernel device
       names being stable. Instead, create your own rules that make symlinks with
       stable names based on some stable attributes of the device, such as a
Index: chapter09/usage.xml
===================================================================
--- chapter09/usage.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter09/usage.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -33,5 +33,6 @@
     uses a run levels scheme. There are seven run levels, numbered 0 to 6.
     (Actually, there are more run levels, but the others are for special cases and are
-    generally not used. See <filename>init(8)</filename> for more details.)
+    generally not used. See <ulink role='man'
+    url='&man;init.8'>init(8)</ulink> for more details.)
     Each one of the seven corresponds to actions the computer is supposed to
     perform when it starts up or shuts down. The default run level is 3. Here are the
@@ -48,9 +49,9 @@
     <note>
        <para>
-          Classically, run level 2 above was defined as
-          "multi-user mode without networking", but this was only the case
-          many years ago when multiple users could connect to a system via
-          serial ports.  In today's environment it makes no sense, and
-          we now say it is "reserved".
+         Classically, run level 2 above was defined as <quote>multi-user
+         mode without networking,</quote> but this was only the case
+         many years ago when multiple users could connect to a system via
+         serial ports.  In today's environment it makes no sense, and
+         we now say it is <quote>reserved.</quote>
        </para>
     </note>
@@ -342,10 +343,11 @@
   doubt, look in the <filename class="directory">/usr/share/keymaps</filename>
   and <filename class="directory">/usr/share/consolefonts</filename> directories
-  for valid keymaps and screen fonts. Read the <filename>loadkeys(1)</filename> and
-  <filename>setfont(8)</filename> manual pages to determine the correct
-  arguments for these programs.</para>
+  for valid keymaps and screen fonts. Read the <ulink role='man'
+  url='&man;loadkeys.1'>loadkeys(1)</ulink> and <ulink role='man'
+  url='&man;setfont.8'>setfont(8)</ulink> manual pages to determine the
+  correct arguments for these programs.</para>
 
   <para>The <filename>/etc/sysconfig/console</filename> file should contain lines
-  of the form: VARIABLE="value". The following variables are recognized:</para>
+  of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
   <variablelist>
 
@@ -355,5 +357,5 @@
         <para>This variable specifies the log level for kernel messages sent
         to the console as set by <command>dmesg -n</command>. Valid levels are
-        from "1" (no messages) to "8". The default level is "7".</para>
+        from <literal>1</literal> (no messages) to <literal>8</literal>. The default level is <literal>7</literal>, which is quite verbose.</para>
       </listitem>
     </varlistentry>
@@ -364,5 +366,5 @@
         <para>This variable specifies the arguments for the
         <command>loadkeys</command> program, typically, the name of the keymap
-        to load, e.g., <quote>it</quote>. If this variable is not set, the
+        to load, e.g., <literal>it</literal>. If this variable is not set, the
         bootscript will not run the <command>loadkeys</command> program,
         and the default kernel keymap will be used.  Note that a few keymaps
@@ -383,5 +385,5 @@
         is not completely satisfactory and a small adjustment has to be made. E.g.,
         to include the Euro sign into a keymap that normally doesn't have it,
-        set this variable to <quote>euro2</quote>.</para>
+        set this variable to <literal>euro2</literal>.</para>
       </listitem>
     </varlistentry>
@@ -392,10 +394,10 @@
         <para>This variable specifies the arguments for the
         <command>setfont</command> program. Typically, this includes the font
-        name, <quote>-m</quote>, and the name of the application character
+        name, <literal>-m</literal>, and the name of the application character
         map to load. E.g., in order to load the <quote>lat1-16</quote> font
         together with the <quote>8859-1</quote> application character map
         (appropriate in the USA),
         <!-- because of the copyright sign -->
-        set this variable to <quote>lat1-16 -m 8859-1</quote>.
+        set this variable to <literal>lat1-16 -m 8859-1</literal>.
         In UTF-8 mode, the kernel uses the application character map to
         convert 8-bit key codes to UTF-8. Therefore
@@ -409,6 +411,6 @@
       <term>UNICODE</term>
       <listitem>
-        <para>Set this variable to <quote>1</quote>, <quote>yes</quote>, or
-        <quote>true</quote> in order to put the
+        <para>Set this variable to <literal>1</literal>, <literal>yes</literal>, or
+        <literal>true</literal> in order to put the
         console into UTF-8 mode. This is useful in UTF-8 based locales and
         harmful otherwise.</para>
@@ -431,4 +433,38 @@
 
   <itemizedlist>
+    <listitem>
+      <para>
+        We'll use <literal>C.UTF-8</literal> as the locale for interactive
+        sessions in the Linux console in <xref role=','
+        linkend='ch-config-locale'/> so we should set
+        <literal>UNICODE</literal> to <literal>1</literal>.  And the console
+        fonts shipped by the <application>Kbd</application> package
+        containing the glyphs for all characters from the program messages
+        in the <literal>C.UTF-8</literal> locale are
+        <filename>LatArCyrHeb*.psfu.gz</filename>,
+        <filename>LatGrkCyr*.psfu.gz</filename>,
+        <filename>Lat2-Terminus16.psfu.gz</filename>, and
+        <filename>pancyrillic.f16.psfu.gz</filename> in
+        <filename class='directory'>/usr/share/consolefonts</filename> (the
+        other shipped console fonts lack glyphs of some characters like the
+        Unicode left/right quotation marks and the Unicode English dash).
+        So set one of them, for example
+        <filename>Lat2-Terminus16.psfu.gz</filename> as the default console
+        font:
+      </para>
+
+      <!-- We are using 'nodump' for the generic setting, but not for an
+           example (see below).  This is deliberate to keep the
+           compatibility with jhalfs.  -->
+<screen role='nodump'><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
+<literal># Begin /etc/sysconfig/console
+
+UNICODE="1"
+FONT="Lat2-Terminus16"
+
+# End /etc/sysconfig/console</literal>
+EOF</userinput></screen>
+
+    </listitem>
 
     <listitem>
@@ -525,5 +561,5 @@
       characters, or two ASCII characters are composed together. However, in
       UTF-8 mode it is a problem; e.g., for the Greek language, where one
-      sometimes needs to put an accent on the letter <quote>alpha</quote>.
+      sometimes needs to put an accent on the letter α.
       The solution is either to avoid the use of UTF-8, or to install the
       X window system, which doesn't have this limitation, in its input
Index: chapter10/chapter10.xml
===================================================================
--- chapter10/chapter10.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/chapter10.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter10/fstab.xml
===================================================================
--- chapter10/fstab.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/fstab.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -53,5 +53,5 @@
   <para>Replace <replaceable>sda</replaceable> to the name of the device
   node for your disk where LFS is being built.  For details on the six
-  fields in this file, see <command>man 5 fstab</command>.</para>
+  fields in this file, see <ulink role='man' url='&man;fstab.5'>fstab(5)</ulink>.</para>
 
   <para>Filesystems with MS-DOS or Windows origin (i.e. vfat, ntfs, smbfs,
Index: chapter10/grub.xml
===================================================================
--- chapter10/grub.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/grub.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -106,15 +106,4 @@
     </note>
 
-<!-- This does not seem to be true any more
-    <note><para><application>grub-install</application> is a script and calls another
-    program, grub-probe, that may fail with a message "cannot stat `/dev/root'".
-    If so, create a temporary symbolic link from your root partition to /dev/root:</para>
-
-<screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen>
-
-    <para>The symbolic link will only be present until the system is rebooted.
-    The link is only needed for the installation procedure.
-    </para></note>
--->
   </sect2>
 
Index: chapter10/introduction.xml
===================================================================
--- chapter10/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter10/kernel.xml
===================================================================
--- chapter10/kernel.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -274,14 +274,16 @@
 
       <varlistentry>
-        <term><parameter>Framebuffer Console support</parameter></term>
-        <listitem>
-          <para>This is needed to display the Linux console on a frame
-          buffer device.  To allow the kernel to print debug messages at an
-          early boot stage, it shouldn't be built as a kernel module
-          unless an initramfs will be used. And, if
-          <option>CONFIG_DRM</option> (Direct Rendering Manager) is enabled,
-          it's likely <option>CONFIG_DRM_FBDEV_EMULATION</option> (Enable
-          legacy fbdev support for your modesetting driver) should be
-          enabled as well.</para>
+        <term>
+          <parameter>
+            Enable legacy fbdev support for your modesetting driver
+          </parameter> and
+          <parameter>Framebuffer Console support</parameter>
+        </term>
+        <listitem>
+          <para>These are needed to display the Linux console on a
+          GPU driven by a DRI (Direct Rendering Infrastructure) driver.
+          If <option>CONFIG_DRM</option> (Direct Rendering Manager) is
+          enabled, you should enable these two options as well or you'll see
+          a blank screen once the DRI driver is loaded.</para>
         </listitem>
       </varlistentry>
@@ -323,5 +325,6 @@
     documentation in the <filename
     class="directory">linux-&linux-version;/Documentation</filename> directory.
-    Also, <filename>modprobe.d(5)</filename> may be of interest.</para>
+    Also, <ulink role='man' url='&man;modprobe.d.5'>modprobe.d(5)</ulink>
+    may be of interest.</para>
 
     <para>Unless module support has been disabled in the kernel configuration,
Index: chapter10/kernel/Makefile
===================================================================
--- chapter10/kernel/Makefile	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/Makefile	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -20,4 +20,7 @@
 	touch s-kernel-version
 
-%.xml: %.toml kernel-config.py kernel_version.py kernel.version
+%.xml.tmp: %.toml kernel-config.py kernel_version.py kernel.version
 	./kernel-config.py $(KERNEL_TREE) $< > $@
+
+%.xml: %.xml.tmp
+	mv $< $@
Index: chapter10/kernel/highmem.xml
===================================================================
--- chapter10/kernel/highmem.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/highmem.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Index: chapter10/kernel/kernel-config.py
===================================================================
--- chapter10/kernel/kernel-config.py	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/kernel-config.py	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -186,4 +186,8 @@
             elif line.startswith('endif'):
                 if_stack = if_stack[:-1]
+
+    if config_buf:
+        r += [parse_config(config_buf)]
+
     return r
 
@@ -248,4 +252,5 @@
 for i0, val, i1, title, arrow, key, menu, comment in r:
     rem = max_line
+    is_choice = (val == '(X)')
 
     if val:
@@ -260,5 +265,7 @@
         title = title[:rem - 3] + '...'
 
-    b = title.lstrip('YyMmNnHh')
+    b = title
+    if not is_choice:
+        b = b.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
     a = title[:len(title) - len(b)]
     b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"
@@ -287,5 +294,5 @@
 from jinja2 import Template
 
-t = Template('''<?xml version="1.0" encoding="ISO-8859-1"?>
+t = Template('''<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Index: chapter10/kernel/kernel.version
===================================================================
--- chapter10/kernel/kernel.version	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/kernel.version	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,1 +1,1 @@
-6.4.8
+6.7.1
Index: chapter10/kernel/nvme.xml
===================================================================
--- chapter10/kernel/nvme.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/nvme.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Index: chapter10/kernel/systemd.toml
===================================================================
--- chapter10/kernel/systemd.toml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/systemd.toml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -14,7 +14,5 @@
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-FB='*'
-FRAMEBUFFER_CONSOLE='*'
-
+DRM=' *M'
 AUDIT=' '
 NET='*'
@@ -29,2 +27,10 @@
 
 revision='systemd'
+
+[DRM_FBDEV_EMULATION]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
+
+[FRAMEBUFFER_CONSOLE]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
Index: chapter10/kernel/systemd.xml
===================================================================
--- chapter10/kernel/systemd.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/systemd.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
@@ -42,8 +42,12 @@
     [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
+    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+                                                                      ...  [DRM]
+    # If [DRM] is selected as * or M, this must be selected:
+    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+                                                      ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]
 
 <emphasis role='blue'>F</emphasis>ile systems ---&gt;
Index: chapter10/kernel/sysv.toml
===================================================================
--- chapter10/kernel/sysv.toml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/sysv.toml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -13,6 +13,13 @@
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-FB='*'
-FRAMEBUFFER_CONSOLE='*'
+DRM=' *M'
 
 revision='sysv'
+
+[DRM_FBDEV_EMULATION]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
+
+[FRAMEBUFFER_CONSOLE]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
Index: chapter10/kernel/sysv.xml
===================================================================
--- chapter10/kernel/sysv.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/sysv.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
@@ -30,6 +30,10 @@
                                                            ...  [DEVTMPFS_MOUNT]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
+    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+                                                                      ...  [DRM]
+    # If [DRM] is selected as * or M, this must be selected:
+    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+                                                      ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]</screen>
Index: chapter10/kernel/x2apic.xml
===================================================================
--- chapter10/kernel/x2apic.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter10/kernel/x2apic.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Index: chapter11/afterlfs.xml
===================================================================
--- chapter11/afterlfs.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/afterlfs.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter11/chapter11.xml
===================================================================
--- chapter11/chapter11.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/chapter11.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter11/getcounted.xml
===================================================================
--- chapter11/getcounted.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/getcounted.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter11/reboot.xml
===================================================================
--- chapter11/reboot.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/reboot.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter11/theend.xml
===================================================================
--- chapter11/theend.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/theend.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: chapter11/whatnow.xml
===================================================================
--- chapter11/whatnow.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ chapter11/whatnow.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: gen-changelog.py
===================================================================
--- gen-changelog.py	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ gen-changelog.py	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -77,4 +77,6 @@
         ticket[pkg] = tic
 
+hold_ticket = {'vim': '4500', 'iana-etc': '5006'}
+
 print("Plain Text:")
 for (s, act) in [(upd, "Update to "), (add, "Add ")]:
@@ -84,4 +86,6 @@
         if pkgver in ticket:
             out += ' (#' + ticket[pkgver] + ')'
+        elif i in hold_ticket:
+            out += ' (#' + hold_ticket[i] + ')'
         print("-", out)
 for i in rem:
@@ -100,8 +104,16 @@
             out += " (security fix)"
         out += "."
+
+        pkg_ticket = None
         if pkgver in ticket:
             out += "  Fixes\n          "
-            out += "<ulink url='&lfs-ticket-root;" + ticket[pkgver] + "'>#"
-            out += ticket[pkgver] + "</ulink>."
+            pkg_ticket = ticket[pkgver]
+        elif i in hold_ticket:
+            out += "  Addresses\n          "
+            pkg_ticket = hold_ticket[i]
+
+        if pkg_ticket:
+            out += "<ulink url='&lfs-ticket-root;" + pkg_ticket + "'>#"
+            out += pkg_ticket + "</ulink>."
         out += "</para>"
         print(out)
Index: general.ent
===================================================================
--- general.ent	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ general.ent	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -93,7 +93,7 @@
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 
-<!-- 4.14 EOL is Jan 2024
-     so for LFS 11.5 we may consider moving to 4.19 -->
-<!ENTITY min-kernel      "4.14">
+<!-- 4.19 EOL is Dec 2024
+     so for LFS 12.3 we may consider moving to 5.4 -->
+<!ENTITY min-kernel      "4.19">
 
 <!--
@@ -126,4 +126,5 @@
 <!ENTITY pypi-home       "https://pypi.org/project">
 <!ENTITY pypi-src        "https://pypi.org/packages/source">
+<!ENTITY man             "https://man.archlinux.org/man/">
 
 <!ENTITY root            "<systemitem class='username'>root</systemitem>">
Index: git-version.sh
===================================================================
--- git-version.sh	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ git-version.sh	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -58,6 +58,6 @@
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-    version="$version+"
-    versiond="$versiond+"
+    version="$version-wip"
+    versiond="$versiond-wip"
 fi
 
Index: index.xml
===================================================================
--- index.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ index.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "general.ent">
Index: lfs-latest-git.php
===================================================================
--- lfs-latest-git.php	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ lfs-latest-git.php	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -153,4 +153,5 @@
 if ( $package == "vim"        ) $dirpath = "https://github.com/vim/vim/tags";
 if ( $package == "wheel"      ) $dirpath = "https://pypi.org/project/wheel/#files";
+if ( $package == "xz"         ) $dirpath = github("tukaani-project/xz");
 if ( $package == "zlib"       ) $dirpath = "https://www.zlib.net";
 if ( $package == "zstd"       ) $dirpath = github("facebook/zstd");
Index: packages.ent
===================================================================
--- packages.ent	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ packages.ent	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Notes:
@@ -14,24 +14,24 @@
 -->
 
-<!ENTITY acl-version "2.3.1">
-<!ENTITY acl-size "348 KB">
+<!ENTITY acl-version "2.3.2">
+<!ENTITY acl-size "363 KB">
 <!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.xz">
-<!ENTITY acl-md5 "95ce715fe09acca7c12d3306d0f076b2">
+<!ENTITY acl-md5 "590765dee95907dbc3c856f7255bd669">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-fin-du "6.1 MB">
 <!ENTITY acl-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY attr-version "2.5.1">
-<!ENTITY attr-size "456 KB">
+<!ENTITY attr-version "2.5.2">
+<!ENTITY attr-size "484 KB">
 <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
-<!ENTITY attr-md5 "ac1c5a7a084f0f83b8cace34211f64d8">
+<!ENTITY attr-md5 "227043ec2f6ca03c0948df5517f9c927">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-fin-du "4.1 MB">
 <!ENTITY attr-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY autoconf-version "2.71">
-<!ENTITY autoconf-size "1,263 KB">
+<!ENTITY autoconf-version "2.72">
+<!ENTITY autoconf-size "1,360 KB">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
-<!ENTITY autoconf-md5 "12cfa1687ffa2606337efe1a64416106">
+<!ENTITY autoconf-md5 "1be79f7106ab6767f18391c5e22be701">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-fin-du "24 MB">
@@ -58,16 +58,16 @@
 <!ENTITY bash-fin-sbu "1.1 SBU">
 
-<!ENTITY bc-version "6.7.2">
-<!ENTITY bc-size "456 KB">
+<!ENTITY bc-version "6.7.5">
+<!ENTITY bc-size "460 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "27c217ea495f73758f548eb2c6e10244">
+<!ENTITY bc-md5 "e249b1f86f886d6fb71c15f72b65dd3d">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.7 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY binutils-version "2.41">
-<!ENTITY binutils-size "26,139 KB">
+<!ENTITY binutils-version "2.42">
+<!ENTITY binutils-size "26,922 KB">
 <!ENTITY binutils-url "https://sourceware.org/pub/binutils/releases/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "256d7e0ad998e423030c84483a7c1e30">
+<!ENTITY binutils-md5 "a075178a9646551379bfb64040487715">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "647 MB">
@@ -246,8 +246,8 @@
 <!ENTITY gdbm-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY gettext-version "0.22.3">
-<!ENTITY gettext-size "9,997 KB">
+<!ENTITY gettext-version "0.22.4">
+<!ENTITY gettext-size "10,016 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "460b38ae5e520253dcd06165dd3e281f">
+<!ENTITY gettext-md5 "2d8507d003ef3ddd1c172707ffa97ed8">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-tmp-du "306 MB">
@@ -256,8 +256,8 @@
 <!ENTITY gettext-fin-sbu "1.4 SBU">
 
-<!ENTITY glibc-version "2.38">
-<!ENTITY glibc-size "18,471 KB">
+<!ENTITY glibc-version "2.39">
+<!ENTITY glibc-size "18,092 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "778cce0ea6bf7f84ca8caacf4a01f45b">
+<!ENTITY glibc-md5 "be81e87f72b5ea2c0ffe2bedfeb680c6">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-tmp-du "858 MB">
@@ -300,8 +300,8 @@
 <!ENTITY groff-fin-sbu "0.2 SBU">
 
-<!ENTITY grub-version "2.06">
-<!ENTITY grub-size "6,428 KB">
+<!ENTITY grub-version "2.12">
+<!ENTITY grub-size "6,524 KB">
 <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363">
+<!ENTITY grub-md5 "60c564b1bdc39d8e43b3aab4bc0fb140">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-fin-du "161 MB">
@@ -320,16 +320,16 @@
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20231107">
+<!ENTITY iana-etc-version "20240125">
 <!ENTITY iana-etc-size "589 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "01331998d26d5beb592c12b06b2eeb24">
+<!ENTITY iana-etc-md5 "aed66d04de615d76c70890233081e584">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.8 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY inetutils-version "2.4">
-<!ENTITY inetutils-size "1,522 KB">
+<!ENTITY inetutils-version "2.5">
+<!ENTITY inetutils-size "1,632 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
-<!ENTITY inetutils-md5 "319d65bb5a6f1847c4810651f3b4ba74">
+<!ENTITY inetutils-md5 "9e5a6dfd2d794dc056a770e8ad4a9263">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-fin-du "31 MB">
@@ -344,8 +344,8 @@
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "6.6.0">
-<!ENTITY iproute2-size "897 KB">
+<!ENTITY iproute2-version "6.7.0">
+<!ENTITY iproute2-size "900 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "6716fc3188dbea226997fa2478a190d7">
+<!ENTITY iproute2-md5 "35d8277d1469596b7edc07a51470a033">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
@@ -354,16 +354,16 @@
 <!ENTITY iproute2-tmp-sbu "less than 0.1 SBU">
 
-<!ENTITY jinja2-version "3.1.2">
-<!ENTITY jinja2-size "262 KB">
+<!ENTITY jinja2-version "3.1.3">
+<!ENTITY jinja2-size "264 KB">
 <!ENTITY jinja2-url "&pypi-src;/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
-<!ENTITY jinja2-md5 "d31148abd89c1df1cdb077a55db27d02">
-<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
+<!ENTITY jinja2-md5 "caf5418c851eac59e70a78d9730d4cea">
+<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.1.x/">
 <!ENTITY jinja2-fin-du "3.4 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY kbd-version "2.6.3">
-<!ENTITY kbd-size "1,468 KB">
+<!ENTITY kbd-version "2.6.4">
+<!ENTITY kbd-size "1,470 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "4764775cac0415f1d35a0cd311249941">
+<!ENTITY kbd-md5 "e2fd7adccf6b1e98eb1ae8d5a1ce5762">
 <!ENTITY kbd-home "https://kbd-project.org/">
 <!ENTITY kbd-fin-du "35 MB">
@@ -435,11 +435,11 @@
 
 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-minor-version "7">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "136,730 KB">
+<!ENTITY linux-size "138,128 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "90291279ca684fb8cfa59b2ae75b6fe0">
+<!ENTITY linux-md5 "a542a2aea4db4cf09e932fff02c8d1d1">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
@@ -495,16 +495,16 @@
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.1.3">
-<!ENTITY markupsafe-size "19 KB">
+<!ENTITY markupsafe-version "2.1.4">
+<!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "ca33f119bd0551ce15837f58bb180214">
+<!ENTITY markupsafe-md5 "8138329a11cf4bd0f9db780b2af26c66">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "548 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "1.2.3">
-<!ENTITY meson-size "2,134 KB">
+<!ENTITY meson-version "1.3.1">
+<!ENTITY meson-size "2,172 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "69da4c63ef06c9d3bcc00ce89abb306f">
+<!ENTITY meson-md5 "dd404b8c0f8b79f80181b4a58bb81768">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "42 MB">
@@ -527,8 +527,11 @@
 <!ENTITY mpfr-fin-sbu "0.2 SBU">
 
-<!ENTITY ncurses-version "6.4">
-<!ENTITY ncurses-size "3,528 KB">
-<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "5a62487b5d4ac6b132fe2bf9f8fad29b">
+<!ENTITY ncurses-release "6.4">
+<!ENTITY ncurses-version "&ncurses-release;-20230520">
+<!ENTITY ncurses-size "2,156 KB">
+<!-- switch back to invisible-mirror.net for 6.5 -->
+<!--ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz"-->
+<!ENTITY ncurses-url "&anduin-sources;/ncurses-&ncurses-version;.tar.xz">
+<!ENTITY ncurses-md5 "c5367e829b6d9f3f97b280bb3e6bfbc3">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-tmp-du "51 MB">
@@ -545,8 +548,8 @@
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.1.4">
-<!ENTITY openssl-size "15,205 KB">
+<!ENTITY openssl-version "3.2.1">
+<!ENTITY openssl-size "17,318 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "653ad58812c751b887e8ec37e02bba70">
+<!ENTITY openssl-md5 "c239213887804ba00654884918b37441">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "587 MB">
@@ -565,10 +568,10 @@
 <!ENTITY perl-version-major "5">
 <!ENTITY perl-version-minor "38">
-<!ENTITY perl-version-patch "0">
+<!ENTITY perl-version-patch "2">
 <!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
 <!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
-<!ENTITY perl-size "13,248 KB">
+<!ENTITY perl-size "13,359 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "e1c8aaec897dd386c741f97eef9f2e87">
+<!ENTITY perl-md5 "d3957d75042918a23ec0abac4a2b7e0a">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-tmp-du "280 MB">
@@ -577,8 +580,8 @@
 <!ENTITY perl-fin-sbu "7.1 SBU">
 
-<!ENTITY pkgconf-version "2.0.3">
-<!ENTITY pkgconf-size "304 KB">
+<!ENTITY pkgconf-version "2.1.0">
+<!ENTITY pkgconf-size "305 KB">
 <!ENTITY pkgconf-url "https://distfiles.ariadne.space/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
-<!ENTITY pkgconf-md5 "b82ca48ed3097adfa007ee71489b6719">
+<!ENTITY pkgconf-md5 "0f2eadbb9dea5aed95147272ae1592cc">
 <!ENTITY pkgconf-home "http://pkgconf.org/">
 <!ENTITY pkgconf-fin-du "4.6 MB">
@@ -604,9 +607,9 @@
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.12.0">
+<!ENTITY python-version "3.12.1">
 <!ENTITY python-minor "3.12">
-<!ENTITY python-size "20,093 KB">
+<!ENTITY python-size "20,102 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "f6f4616584b23254d165f4db90c247d6">
+<!ENTITY python-md5 "50f827c800483776c8ef86e6a53831fa">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "533 MB">
@@ -615,6 +618,6 @@
 <!ENTITY python-fin-sbu "1.9 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "ae9d19bb613ae8ef2457496bd2893915">
-<!ENTITY python-docs-size "8,009 KB">
+<!ENTITY python-docs-md5 "d5c21b804c219b06256495eae30fd153">
+<!ENTITY python-docs-size "7,998 KB">
 
 <!ENTITY readline-version "8.2">
@@ -637,16 +640,16 @@
 <!ENTITY sed-fin-sbu "0.3 SBU">
 
-<!ENTITY setuptools-version "68.2.2">
-<!ENTITY setuptools-size "2,152 KB">
+<!ENTITY setuptools-version "69.0.3">
+<!ENTITY setuptools-size "2,168 KB">
 <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "d967ca2ba7f46db887daee2d5c9bd6a2">
+<!ENTITY setuptools-md5 "b82de45aaa6b9bb911226660212ebb83">
 <!ENTITY setuptools-home "&pypi-home;/setuptools/">
 <!ENTITY setuptools-fin-du "30 MB">
 <!ENTITY setuptools-fin-sbu "0.1 SBU">
 
-<!ENTITY shadow-version "4.14.2">
-<!ENTITY shadow-size "1,758 KB">
+<!ENTITY shadow-version "4.14.3">
+<!ENTITY shadow-size "1,760 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "effc1aa17590305647413125b966f1dd">
+<!ENTITY shadow-md5 "b9a7f56d0c63297c0d11d742be2f8ffd">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "46 MB">
@@ -661,18 +664,18 @@
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "254">
+<!ENTITY systemd-version  "255">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "13,985 KB">
+<!ENTITY systemd-size     "14,516 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "0d266e5361dc72097b6c18cfde1c0001">
+<!ENTITY systemd-md5      "521cda27409a9edf0370c128fae3e690">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "254">
-<!ENTITY systemd-man-size "626 KB">
+<!ENTITY systemd-man-version "255">
+<!ENTITY systemd-man-size "652 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
-<!ENTITY systemd-man-md5  "fc32faeac581e1890ca27fcea3858410">
+<!ENTITY systemd-man-md5  "1ebe54d7a80f9abf8f2d14ddfeb2432d">
 <!ENTITY systemd-fin-du   "238 MB">
 <!ENTITY systemd-fin-sbu  "0.7 SBU">
@@ -718,8 +721,8 @@
 <!ENTITY texinfo-fin-sbu "0.3 SBU">
 
-<!ENTITY tzdata-version "2023c">
-<!ENTITY tzdata-size "436 KB">
+<!ENTITY tzdata-version "2024a">
+<!ENTITY tzdata-size "444 KB">
 <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "5aa672bf129b44dd915f8232de38e49a">
+<!ENTITY tzdata-md5 "2349edd8335245525cc082f2755d5bf4">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
@@ -734,8 +737,8 @@
 
 <!ENTITY util-linux-minor "2.39">
-<!ENTITY util-linux-version "2.39.2"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "8,167 KB">
+<!ENTITY util-linux-version "2.39.3"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "8,327 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 "2feb3e7c306f336a3d22a182dfffc942">
+<!ENTITY util-linux-md5 "f3591e6970c017bb4bcd24ae762a98f5">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "169 MB">
@@ -747,35 +750,35 @@
 <!ENTITY mount-setsid-sbu "less than 0.1 SBU">
 
-<!ENTITY vim-version "9.0.2103">
+<!ENTITY vim-version "9.1.0041">
 <!-- <!ENTITY vim-majmin "90"> -->
-<!ENTITY vim-docdir "vim/vim90">
-<!ENTITY vim-size "11,193 KB">
-<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
-<!ENTITY vim-md5 "1af1d018026234d085a82348703461ce">
+<!ENTITY vim-docdir "vim/vim91">
+<!ENTITY vim-size "17,224 KB">
+<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
+<!ENTITY vim-md5 "79dfe62be5d347b1325cbd5ce2a1f9b3">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "229 MB">
 <!ENTITY vim-fin-sbu "2.3 SBU">
 
-<!ENTITY wheel-version "0.41.3">
+<!ENTITY wheel-version "0.42.0">
 <!ENTITY wheel-size "97 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "c66db2f3a50d5659994fa974138d4002">
+<!ENTITY wheel-md5 "802ad6e5f9336fcb1c76b7593f0cd22d">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "1.5 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY xml-parser-version "2.46">
-<!ENTITY xml-parser-size "249 KB">
+<!ENTITY xml-parser-version "2.47">
+<!ENTITY xml-parser-size "276 KB">
 <!ENTITY xml-parser-url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
-<!ENTITY xml-parser-md5 "80bb18a8e6240fcf7ec2f7b57601c170">
+<!ENTITY xml-parser-md5 "89a8e82cfd2ad948b349c0a69c494463">
 <!ENTITY xml-parser-home "&github;/chorny/XML-Parser">
 <!ENTITY xml-parser-fin-du "2.3 MB">
 <!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.4.5">
-<!ENTITY xz-size "1,642 KB">
-<!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "1d33e0be05c53e7a5641acf5c8b35fdd">
+<!ENTITY xz-version "5.4.6">
+<!ENTITY xz-size "1,645 KB">
+<!ENTITY xz-url "https://github.com/tukaani-project/xz/releases/download/v&xz-version;/xz-&xz-version;.tar.xz">
+<!ENTITY xz-md5 "7ade7bd1181a731328f875bec62a9377">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-tmp-du "22 MB">
@@ -784,6 +787,6 @@
 <!ENTITY xz-fin-sbu "0.1 SBU">
 
-<!ENTITY zlib-version "1.3">
-<!ENTITY zlib-size "1,461 KB">
+<!ENTITY zlib-version "1.3.1">
+<!ENTITY zlib-size "1,478 KB">
 <!-- DO NOT remove "fossils"!
      The upstream removes https://zlib.net/zlib-&zlib-version;.tar.xz
@@ -791,5 +794,5 @@
      Unfortunately there is no .xz files in fossils directory.  -->
 <!ENTITY zlib-url "https://zlib.net/fossils/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "60373b133d630f74f4a1f94c1185a53f">
+<!ENTITY zlib-md5 "9855b6d802d7fe5b7bd5b196a2271655">
 <!ENTITY zlib-home "https://zlib.net/">
 <!ENTITY zlib-fin-du "6.2 MB">
Index: part3intro/generalinstructions.xml
===================================================================
--- part3intro/generalinstructions.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ part3intro/generalinstructions.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: part3intro/introduction.xml
===================================================================
--- part3intro/introduction.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ part3intro/introduction.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: part3intro/part3intro.xml
===================================================================
--- part3intro/part3intro.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ part3intro/part3intro.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: part3intro/toolchaintechnotes.xml
===================================================================
--- part3intro/toolchaintechnotes.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ part3intro/toolchaintechnotes.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -57,5 +57,5 @@
       <varlistentry><term>The build</term><listitem>
         <para>is the machine where we build programs. Note that this machine
-        is also referred to as the <quote>host</quote>.</para></listitem>
+        is also referred to as the <quote>host.</quote></para></listitem>
       </varlistentry>
 
Index: patches.ent
===================================================================
--- patches.ent	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ patches.ent	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Start of Common Patches -->
+
+<!ENTITY bash-upstream-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-upstream-fixes-patch-md5 "2d1691a629c558e894dbb78ee6bf34ef">
+<!ENTITY bash-upstream-fixes-patch-size "5.9 KB">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -14,20 +18,20 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
-
-<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-3.patch">
-<!ENTITY glibc-upstream-fixes-patch-md5 "545977e0b5c341ba945cf4b5de92f1e2">
-<!ENTITY glibc-upstream-fixes-patch-size "28 KB">
-
-<!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">
-<!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174">
-<!ENTITY grub-upstream-fixes-patch-size "8 KB">
-
+<!--
+<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-4.patch">
+<!ENTITY glibc-upstream-fixes-patch-md5 "66e843b00688c641c9bdda684db45b43">
+<!ENTITY glibc-upstream-fixes-patch-size "36 KB">
+-->
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fix-1.patch">
-<!ENTITY readline-fixes-patch-md5 "dd1764b84cfca6b677f44978218a75da">
-<!ENTITY readline-fixes-patch-size "1.3 KB">
+<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
+<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
+<!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
+
+<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
+<!ENTITY readline-fixes-patch-md5 "9ed497b6cb8adcb8dbda9dee9ebce791">
+<!ENTITY readline-fixes-patch-size "13 KB">
 
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
Index: prologue/architecture.xml
===================================================================
--- prologue/architecture.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/architecture.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/audience.xml
===================================================================
--- prologue/audience.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/audience.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/bookinfo.xml
===================================================================
--- prologue/bookinfo.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/bookinfo.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/dedication.xml
===================================================================
--- prologue/dedication.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/dedication.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dedication PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/errata.xml
===================================================================
--- prologue/errata.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/errata.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/foreword.xml
===================================================================
--- prologue/foreword.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/foreword.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/organization.xml
===================================================================
--- prologue/organization.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/organization.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/preface.xml
===================================================================
--- prologue/preface.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/preface.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/prerequisites.xml
===================================================================
--- prologue/prerequisites.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/prerequisites.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: prologue/standards.xml
===================================================================
--- prologue/standards.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/standards.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -50,5 +50,5 @@
 
     <para>While it is possible to create a complete system that will pass the LSB
-    certification tests "from scratch", this can't be done without many additional packages
+    certification tests <quote>from scratch,</quote> this can't be done without many additional packages
     that are beyond the scope of the LFS book.  Installation instructions for these
     additional packages can be found in BLFS. </para>
Index: prologue/typography.xml
===================================================================
--- prologue/typography.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/typography.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -75,5 +75,5 @@
   <para>This format is used to encapsulate text that is optional.</para>
 
-  <para><filename>passwd(5)</filename></para>
+  <para><ulink role='man' url='&man;passwd.5'>passwd(5)</ulink></para>
 
   <para>This format is used to refer to a specific manual (man) page. The number inside parentheses
@@ -82,13 +82,18 @@
   those two man pages will be located at
   <filename>/usr/share/man/man1/passwd.1</filename> and
-  <filename>/usr/share/man/man5/passwd.5</filename>. When the book uses <filename>passwd(5)</filename> it is
+  <filename>/usr/share/man/man5/passwd.5</filename>. When the book uses
+  <ulink role='man' url='&man;/passwd.5'>passwd(5)</ulink> it is
   specifically referring to <filename>/usr/share/man/man5/passwd.5</filename>.
   <command>man passwd</command> will print the first man page it finds that
-  matches <quote>passwd</quote>, which will be
+  matches <quote>passwd,</quote> which will be
   <filename>/usr/share/man/man1/passwd.1</filename>. For this example, you will
   need to run <command>man 5 passwd</command> in order to read the page
   being specified. Note that most man pages do not have duplicate
   page names in different sections. Therefore, <command>man <replaceable>&lt;program
-  name&gt;</replaceable></command> is generally sufficient.</para>
+  name&gt;</replaceable></command> is generally sufficient.  In the LFS
+  book these references to man pages are also hyperlinks, so clicking on
+  such a reference will open the man page rendered in HTML from
+  <ulink url='https://man.archlinux.org/'>Arch Linux manual
+  pages</ulink>.</para>
 
 </sect1>
Index: prologue/why.xml
===================================================================
--- prologue/why.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ prologue/why.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
Index: stylesheets/dump-commands.xsl
===================================================================
--- stylesheets/dump-commands.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/dump-commands.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:exsl="http://exslt.org/common"
-    extension-element-prefixes="exsl"
-    version="1.0">
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
+                version="1.0">
 
 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
Index: stylesheets/lfs-chunked.xsl
===================================================================
--- stylesheets/lfs-chunked.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-chunked.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-nochunks.xsl
===================================================================
--- stylesheets/lfs-nochunks.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-nochunks.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-pdf.xsl
===================================================================
--- stylesheets/lfs-pdf.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-pdf.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-master.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/chunk-master.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-slave.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/chunk-slave.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -11,6 +11,11 @@
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
 
-  <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
+  <xsl:param name="chunker.output.method" select="'xml'"/>
+  <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+  <xsl:param name="chunker.output.media-type" select="'application/xhtml+xml'"/>
+  <xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/>
+  <xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/>
+  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
+  <xsl:param name="chunker.output.indent" select="'no'"/>
 
   <!-- Including our customized elements templates -->
@@ -34,7 +39,4 @@
   <xsl:param name="ulink.target" select="''"/>
   <xsl:param name="css.decoration" select="0"/>
-
-  <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
 
   <!-- Control generation of ToCs and LoTs -->
Index: stylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- stylesheets/lfs-xsl/chunkfast.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/chunkfast.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/common.xsl
===================================================================
--- stylesheets/lfs-xsl/common.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/common.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- stylesheets/lfs-xsl/lfs-l10n.xml	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/lfs-l10n.xml	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE l:i18n SYSTEM "https://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
 
 <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
@@ -72,9 +73,9 @@
           language="es" english-language-name="Spanish">
 
-    <l:gentext key="description" text="descripci&#243;n"/>
+    <l:gentext key="description" text="descripción"/>
     <l:gentext key="Bootscripts" text="Guiones de arranque"/>
-    <l:gentext key="Configuration Files" text="Ficheros de configuraci&#243;n"/>
-    <l:gentext key="Kernel Configuration" text="Configuraci&#243;n del n&#250;cleo"/>
-    <l:gentext key="Libraries" text="Librer&#237;as"/>
+    <l:gentext key="Configuration Files" text="Ficheros de configuración"/>
+    <l:gentext key="Kernel Configuration" text="Configuración del núcleo"/>
+    <l:gentext key="Libraries" text="Librerías"/>
     <l:gentext key="Others" text="Otros"/>
     <l:gentext key="Packages" text="Paquetes"/>
Index: stylesheets/lfs-xsl/lfs.css
===================================================================
--- stylesheets/lfs-xsl/lfs.css	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/lfs.css	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,5 +1,5 @@
 /* Global settings */
 body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
+  font-family: verdana, tahoma, arial, sans-serif;
   text-align: left;
   background: #fff;
@@ -8,5 +8,5 @@
   padding: 0;
   font-size: 1em;
-  line-height: 1.2em
+  line-height: 1.2em;
 }
 
@@ -39,8 +39,34 @@
 }
 
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
+/* Section titles */
+h1.sect1, h1.preface, h1.part, h1.chapter, h1.appendix, .glossary h1, .index h1
+ {
+  background: #f5f6f7;
+  border-bottom: .1em solid #dbddec;
+  margin-bottom:1em;
+  margin-top: 0;
+  padding: .4em;
+}
+
+/* Scrolling parts
+   The header is taller for sect1 and chapter pages than on the
+   other pages.  Since we want fixed boxes, their top has to be calculated
+   by trial and errors to fit below the static header box.*/
+
+div.sect1, div.chapter, div.appendix, div.wrap {
+  top: 11.55em;
+}
+div.preface, div.part, .index div.index {
+  top: 10.15em;
+}
+div.sect1, div.appendix, div.preface, div.part, div.chapter, div.wrap, .index div.index {
+/*  padding-left: .3em;*/
+  overflow:auto;
+  height: auto;
+  position: fixed;
+  left:1em;
+  right:1em;
+  bottom: 1em;
+  border-bottom: 1em solid #dbddec;
 }
 
@@ -64,6 +90,10 @@
   border-bottom: 0.2em solid #dbddec;
   padding-top: .1em;
+/*  margin-top: 0;*/
+}
+/*
+.lfs .package p:first-child {
   margin-top: 0;
-}
+}*/
 
 .lfs .configuration {
@@ -75,8 +105,8 @@
   background: #f5f6f7;
   border-top: 0.2em solid #dbddec;
+  border-bottom: 0.2em solid #dbddec;
   padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
+  margin-bottom: .5em;
+}
 
 /* Headers */
@@ -97,16 +127,4 @@
 }
 
-.preface h1, .part h1, .chapter h1, .appendix h1, .index h1, .sect1 h1, .glossary h1 {
-  background: #f5f6f7;
-  border-bottom: .1em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 0;
-  padding: .4em;
-}
-
-.sect1 h1, .appendix h1 {
-  margin-left: -.2em;
-}
-
 .wrap h1 {
   background: #f5f6f7;
@@ -158,11 +176,17 @@
 
 div.navheader {
-  border-bottom: 1px solid #dbddec;
-   position: sticky;
-   top: 0;
-}
-
+  border-bottom: .1em solid #dbddec;
+}
+
+/* no need for a footer now that the header is always visible */
 div.navfooter {
-  border-top: 1px solid #dbddec;
+  display:none;
+}
+
+/* Except for the first page (TOC), where the bottom is the only
+   place where navigation is displayed. */
+
+div.book + div.navfooter {
+  display:block
 }
 
@@ -180,5 +204,5 @@
 
 div.navheader ul, div.navfooter ul {
-  padding: .2em .5em .5em 0;
+  padding: .2em .5em .5em .5em; /*top right bottom left*/
   margin: .5em 0;
   position: relative;
@@ -197,5 +221,5 @@
   text-align: left;
   padding: 0.2em 1em;
-  margin-left: 6px;
+  margin-left: .4em;
 }
 
@@ -204,7 +228,7 @@
   display: block;
   text-align: right;
-  right: 5px;
-  padding: 0.2em 0.5em;
-  margin-right: 7px;
+  right: 0;
+  padding: 0.2em 1em;
+  margin-right: .4em;
 }
 
@@ -212,5 +236,5 @@
 div.navheader ul li.next p, div.navfooter ul li.next p {
   padding: 0;
-  margin: 1px 0px;
+  margin: .1em 0;
 }
 
@@ -219,5 +243,5 @@
   text-align: center;
   padding: 0;
-  margin: 0px auto;
+  margin: 0 auto;
   display: block;
   color: #dbddec;
Index: stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- stylesheets/lfs-xsl/nochunks.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/nochunks.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -11,7 +11,11 @@
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
 
-  <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
-  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
-
+  <xsl:output method="xml"
+              encoding="UTF-8"
+              media-type="application/xhtml+xml"
+              doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+              omit-xml-declaration="yes"
+              indent="no" />
   <!-- Include our customized templates -->
   <xsl:include href="common.xsl"/>
Index: stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -52,5 +52,7 @@
   <!-- Allow URLs to be automatically hyphenated.
        We have expanded the support to several inline tags.
-       See pdf/lfs-mixed.xsl -->
+       See pdf/lfs-mixed.xsl.
+       Note: the argument in select= is a zero-width space
+       (unicode 200b)-->
   <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
 
Index: stylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
+<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂăĄąǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌǅǲȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚǈȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠǋǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'">
 <!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
 <!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
Index: stylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -50,5 +50,5 @@
                   keep-together.within-column="always" font-weight="bold"
                   keep-with-next.within-column="always" text-align="left">
-          <xsl:text>&#x2022;   </xsl:text>
+          <xsl:text>•   </xsl:text>
           <xsl:apply-templates select="term"/>
         </fo:block>
Index: stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,8 +1,6 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="xlink"
                 version="1.0">
 
@@ -17,21 +15,11 @@
 
      <!--  xref:
-           Added role variable and use it when calling mode xref-to.-->
+           Added role variable and use it when calling mode xref-to.
+           Also remove code for xlink:href attribute in xref elements,
+           since we don't use it.-->
     <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
   <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#')
-                    and (not(contains($xhref,'&#40;'))
-                    or starts-with($xhref, '#xpointer&#40;id&#40;'))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-    </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
     <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
+    <xsl:param name="target" select="$linkend.targets[1]"/>
     <xsl:param name="refelem" select="local-name($target)"/>
       <!-- Added role variable -->
@@ -90,5 +78,5 @@
             <xsl:message>
               <xsl:text>ERROR: xref linking to </xsl:text>
-              <xsl:value-of select="@linkend|@xlink:href"/>
+              <xsl:value-of select="@linkend"/>
               <xsl:text> has no generated link text.</xsl:text>
             </xsl:message>
Index: stylesheets/lfs-xsl/profile.xsl
===================================================================
--- stylesheets/lfs-xsl/profile.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/profile.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -19,4 +19,5 @@
   <!-- Generate DocBook instance with correct DOCTYPE -->
   <xsl:output method="xml"
+              encoding="UTF-8"
               doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
               doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
Index: stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
+<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂăĄąǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌǅǲȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚǈȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠǋǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'">
 <!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
 <!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
@@ -23,4 +23,28 @@
   <xsl:template match="index" mode="recursive-chunk-filename">
     <xsl:text>longindex.html</xsl:text>
+  </xsl:template>
+
+  <!-- The original template in {docbook-xsl}/xhtml/autoidx.xsl has
+  a bug (https://github.com/docbook/xslt10-stylesheets/issues/239)
+  that generates a <div> with a wrong xmlns:xlink attribute. So copy it
+  here where the bug does not occur, (and simplify it a lot).-->
+
+  <xsl:template name="generate-basic-index">
+    <xsl:param name="scope" select="NOTANODE"/>
+
+    <xsl:variable name="terms" select="//indexterm
+      [count(.|key('letter',
+                   translate(substring(&primary;, 1, 1),
+                             &lowercase;,
+                             &uppercase;
+                            )
+                  ) [&scope;][1]) = 1]"/>
+    <div class="index">
+      <xsl:apply-templates select="$terms" mode="index-div-basic">
+        <xsl:with-param name="position" select="position()"/>
+        <xsl:with-param name="scope" select="$scope"/>
+        <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
+      </xsl:apply-templates>
+    </div>
   </xsl:template>
 
Index: stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -295,5 +295,7 @@
         </xsl:when>
         <xsl:when test="$numcols &gt; 3">
-          <td>&#160;</td>
+        <!-- The space between <td> and </td> is a non breakable
+             space (unicode A0) encoded in utf-8.-->
+          <td> </td>
         </xsl:when>
         <xsl:otherwise/>
Index: stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -12,8 +12,12 @@
 
     <!-- preface:
-           Output non sect1 child elements before the TOC -->
+         Output non sect1 child elements before the TOC
+         Output title outside of the <div> because we want to be able to
+         use it at a fixed position -->
     <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
   <xsl:template match="preface">
     <xsl:call-template name="id.warning"/>
+    <xsl:call-template name="preface.titlepage"/>
+    <xsl:call-template name="component.separator"/>
     <div>
       <xsl:apply-templates select="." mode="class.attribute"/>
@@ -27,6 +31,4 @@
         </xsl:attribute>
       </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="preface.titlepage"/>
       <xsl:apply-templates/>
       <xsl:variable name="toc.params">
@@ -45,9 +47,40 @@
   </xsl:template>
 
+    <!-- part:
+         Output non sect1 child elements before the TOC
+         Output title outside of the <div> because we want to be able to
+         use it at a fixed position -->
+    <!-- The original template is in {docbook-xsl}/xhtml/divisions.xsl -->
+  <xsl:template match="part">
+    <xsl:call-template name="id.warning"/>
+
+    <xsl:call-template name="part.titlepage"/>
+
+    <div>
+      <xsl:apply-templates select="." mode="common.html.attributes"/>
+      <xsl:call-template name="id.attribute">
+        <xsl:with-param name="conditional" select="0"/>
+      </xsl:call-template>
+
+      <xsl:apply-templates/>
+      <xsl:variable name="toc.params">
+        <xsl:call-template name="find.path.params">
+          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
+        <xsl:call-template name="division.toc"/>
+      </xsl:if>
+    </div>
+  </xsl:template>
+
     <!-- chapter:
-           Output non sect1 child elements before the TOC -->
+           Output non sect1 child elements before the TOC
+           Output title before div to be able to fix the title position -->
     <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
   <xsl:template match="chapter">
     <xsl:call-template name="id.warning"/>
+    <xsl:call-template name="chapter.titlepage"/>
+    <xsl:call-template name="component.separator"/>
     <div>
       <xsl:apply-templates select="." mode="class.attribute"/>
@@ -61,6 +94,4 @@
         </xsl:attribute>
       </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="chapter.titlepage"/>
       <xsl:apply-templates/>
       <xsl:variable name="toc.params">
@@ -79,10 +110,48 @@
   </xsl:template>
 
+    <!-- appendix:
+           Output non sect1 child elements before the TOC
+           Output title before div to be able to fix the title position -->
+    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
+  <xsl:template match="appendix">
+
+    <xsl:call-template name="id.warning"/>
+
+    <xsl:call-template name="appendix.titlepage"/>
+
+    <xsl:element name="div" namespace="http://www.w3.org/1999/xhtml">
+      <xsl:call-template name="common.html.attributes">
+        <xsl:with-param name="inherit" select="1"/>
+      </xsl:call-template>
+      <xsl:call-template name="id.attribute">
+        <xsl:with-param name="conditional" select="0"/>
+      </xsl:call-template>
+
+      <xsl:apply-templates/>
+
+      <xsl:variable name="toc.params">
+        <xsl:call-template name="find.path.params">
+          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:if test="contains($toc.params, 'toc')">
+        <xsl:call-template name="component.toc">
+          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
+      </xsl:if>
+
+    </xsl:element>
+  </xsl:template>
+
     <!-- sect1:
            When there is a role attibute, use it as the class value.
            Process the SVN keywords found in sect1info as a footnote.
+           Output title before the containing <div> so that the title
+           can be at a fixed position.
            Removed unused code. -->
     <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
   <xsl:template match="sect1">
+    <xsl:call-template name="sect1.titlepage"/>
     <div>
       <xsl:choose>
@@ -97,5 +166,4 @@
       </xsl:choose>
       <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect1.titlepage"/>
       <xsl:apply-templates/>
       <xsl:apply-templates select="sect1info" mode="svn-keys"/>
Index: stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,8 +1,6 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="xlink"
                 version="1.0">
 
@@ -16,20 +14,11 @@
 
     <!-- xref:
-           Added role variable and use it when calling mode xref-to.-->
+           Added role variable and use it when calling mode xref-to.
+           Also remove code for xlink:href attributes in xref elements
+           since we don't use it.-->
     <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
   <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#') and (not(contains($xhref,'('))
-                    or starts-with($xhref, '#xpointer(id('))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
     <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
+    <xsl:param name="target" select="$linkend.targets[1]"/>
       <!-- Added role variable -->
     <xsl:variable name="role" select="@role"/>
@@ -86,5 +75,5 @@
           <xsl:message>
             <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend|@xlink:href"/>
+            <xsl:value-of select="@linkend"/>
             <xsl:text> has no generated link text.</xsl:text>
           </xsl:message>
Index: stylesheets/md5sum.xsl
===================================================================
--- stylesheets/md5sum.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/md5sum.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
-<!-- Create a md5 list for packages and pathces used. -->
+<!-- Create a md5 list for packages and patches used. -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
+                version="1.0">
 
   <xsl:output method="text"/>
@@ -32,5 +32,5 @@
 
       <!-- Add a newline -->
-      <xsl:text>&#x0a;</xsl:text>
+      <xsl:text>&#xA;</xsl:text>
 
     </xsl:if>
@@ -56,3 +56,2 @@
 
 </xsl:stylesheet>
-
Index: stylesheets/patcheslist.xsl
===================================================================
--- stylesheets/patcheslist.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/patcheslist.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -23,24 +23,28 @@
 }
 
-umask 002 &#x0a;&#x0a;</xsl:text>
+umask 002
 
-      <!-- Create dest.dir if it don't exist -->
-    <xsl:text>install -d -m 775 -g lfswww </xsl:text>
+# Create dest.dir if it doesn't exist
+# Remove old patches
+# Copy the patches
+# Ensure correct ownership
+install -d -m 775 -g lfswww </xsl:text>
     <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;&#x0a;</xsl:text>
-    <xsl:text>cd </xsl:text>
+    <xsl:text> &amp;&amp;
+cd </xsl:text>
     <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;&#x0a;&#x0a;</xsl:text>
-      <!-- Remove old patches -->
-    <xsl:text>rm -f *.patch copyerrs &amp;&amp; &#x0a;&#x0a;</xsl:text>
+    <xsl:text> &amp;&amp;
+rm -f *.patch copyerrs &amp;&amp;
+
+</xsl:text>
     <xsl:apply-templates/>
-      <!-- Ensure correct owneship -->
-    <xsl:text>&#x0a;chgrp lfswww *.patch &amp;&amp;&#x0a;</xsl:text>
     <xsl:text>
+chgrp lfswww *.patch &amp;&amp;
 if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then
   mail -s "Missing LFS patches" lfs-book@lists.linuxfromscratch.org &lt; copyerrs
-fi&#x0a;&#x0a;</xsl:text>
+fi
 
-    <xsl:text>exit&#x0a;</xsl:text>
+exit
+</xsl:text>
   </xsl:template>
 
@@ -60,8 +64,9 @@
       </xsl:variable>
       <xsl:text>copy /srv/www/www.linuxfromscratch.org/patches/downloads/</xsl:text>
-          <xsl:value-of select="substring-before($patch.name2, '-0')"/>
+      <xsl:value-of select="substring-before($patch.name2, '-0')"/>
       <xsl:text>/</xsl:text>
       <xsl:value-of select="$patch.name"/>
-      <xsl:text> . &#x0a;</xsl:text>
+      <xsl:text> .
+</xsl:text>
     </xsl:if>
   </xsl:template>
Index: stylesheets/wget-list.xsl
===================================================================
--- stylesheets/wget-list.xsl	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ stylesheets/wget-list.xsl	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -1,3 +1,3 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <!-- Create a list of upstream URLs for packages and patches to be used
@@ -5,5 +5,5 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
+                version="1.0">
 
   <xsl:output method="text"/>
@@ -29,5 +29,5 @@
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:text>&#x0a;</xsl:text>
+      <xsl:text>&#xA;</xsl:text>
     </xsl:if>
   </xsl:template>
Index: tidy.conf
===================================================================
--- tidy.conf	(revision e49e2ea26119d5fe32b5d37ef0cac553944f9fa0)
+++ tidy.conf	(revision 9e76c64bee29fcf6d7f31ac5fcf32dca365a318d)
@@ -2,6 +2,4 @@
 wrap: 78
 tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
 write-back: yes
 markup: yes
