Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

chapter08/libxcrypt.xml

@@ -100,10 +100,10 @@
       them at runtime. However, the only known binary-only applications
       that link against these functions require ABI version 1.  If you must
       have such functions because of some binary-only application or to be
-      to be compliant with LSB, build the package again with the following
+      compliant with LSB, build the package again with the following
       commands:</para>
 
-<screen><userinput remap="nodump">make distclean
+<screen role="nodump"><userinput>make distclean
 ./configure --prefix=/usr                \
             --enable-hashes=strong,glibc \
             --enable-obsolete-api=glibc  \

chapter10/grub.xml

@@ -19,8 +19,10 @@
   <note>
     <para>
       If your system has UEFI support and you wish to boot LFS with UEFI,
-      you should skip this page, and configure GRUB with UEFI support
-      using the instructions provided in
+      you should skip the instructions in this page but still learn the
+      syntax of <filename>grub.cfg</filename> and the method to specify
+      a partition in the file from this page, and configure GRUB with UEFI
+      support using the instructions provided in
       <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>.
     </para>
   </note>

packages.ent

@@ -765,7 +765,7 @@
 
 <!ENTITY zlib-version "1.2.13">
 <!ENTITY zlib-size "1267 KB">
-<!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
+<!ENTITY zlib-url "&anduin-sources;/zlib-&zlib-version;.tar.xz">
 <!ENTITY zlib-md5 "7d9fc1d78ae2fa3e84fe98b77d006c63">
 <!ENTITY zlib-home "https://www.zlib.net/">
 <!ENTITY zlib-fin-du "6.2 MB">