Automatic merge of trunk into multilib

chapter01/how.xml

@@ -54,7 +54,7 @@
   cross-compile basic utilities using the just built cross-toolchain.</para>
 
   <para><xref linkend="chapter-chroot-temporary-tools"/> then enters a
-  "chroot" environment, which uses the new tools to build all
+  "chroot" environment, where we use the new tools to build all
   the rest of the tools needed to create the LFS system.</para>
 
   <para>This effort to isolate the new system from the host distribution may

chapter01/resources.xml

@@ -23,11 +23,12 @@
   <sect2 id="ch-intro-maillists" xreflabel="Chapter&nbsp;1 - Mailing Lists">
     <title>Mailing Lists</title>
 
-    <para>The <uri>linuxfromscratch.org</uri> server hosts a number of mailing
+    <para>The <systemitem class='domainname'>linuxfromscratch.org</systemitem>
+    server hosts a number of mailing
     lists used for the development of the LFS project. These lists include the
-    main development and support lists, among others. If the FAQ do not solve
+    main development and support lists, among others. If you cannot find an
-    the problem you are having, the next step would be to search the mailing
+    answer to your problem on the FAQ page, the next step would be to search
-    lists at <ulink url="&lfs-root;search.html"/>.</para>
+    the mailing lists at <ulink url="&lfs-root;search.html"/>.</para>
 
     <para>For information on the different lists, how to subscribe, archive
     locations, and additional information, visit
@@ -56,7 +57,8 @@
     <para>Several members of the LFS community offer assistance via Internet
     Relay Chat (IRC). Before using this support, please make sure your
     question is not already answered in the LFS FAQ or the mailing list
-    archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
+    archives. You can find the IRC network at
+    <systemitem class='domainname'>irc.libera.chat</systemitem>.
     The support channel is named #lfs-support.</para>
 
   </sect2>

chapter01/whatsnew.xml

@@ -14,10 +14,10 @@
   <para>In the 11.3 release, <parameter>--enable-default-pie</parameter>
   and <parameter>--enable-default-ssp</parameter> are enabled for GCC.
   These techniques can mitigate some malicious attacks, but they do not provide
-  perfect security.  If you are reading LFS and a programming textbook,
+  perfect security.  Note that some textbooks assume these options are
+  disabled, so that if you run examples from such a textbook on an LFS system,
   you may need to disable PIE and SSP with the GCC options
-  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>,
+  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>.</para>
-  because some textbooks assume these options are disabled by default.</para>
 
   <para>Here is a list of the packages updated since the previous
   release of LFS.</para>

chapter08/man-pages.xml

@@ -23,7 +23,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Man-pages package contains over 2,200 man pages.</para>
+    <para>The Man-pages package contains over 2,400 man pages.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>

prologue/standards.xml

@@ -31,11 +31,11 @@
         <para><ulink url="https://refspecs.linuxfoundation.org/lsb.shtml">Linux
         Standard Base (LSB) Version 5.0 (2015)</ulink></para>
 
-        <para>The LSB has four separate standards: Core, Desktop,
+        <para>The LSB has four separate specifications: Core, Desktop,
-        Runtime Languages, and Imaging. There are generic requirements,
+        Runtime Languages, and Imaging.  Some parts of Core and Desktop
-        and also architecture specific requirements.  There are also two
+        specifications are architecture specific.  There are also two trial
-        trial standards: Gtk3 and Graphics.  LFS attempts to conform to the
+        specifications: Gtk3 and Graphics.  LFS attempts to conform to the LSB
-        LASB standards for the IA32 / IA64 (Intel) and AMD64 (AMD)
+        specifications for the IA32 (32-bit x86) or AMD64 (x86_64)
         architectures discussed in the previous section.</para>
 
         <note><para>Many people do not agree with these requirements.

prologue/why.xml

@@ -141,7 +141,7 @@
         <para>Eudev</para>
 
         <para>This package is a device manager.  It dynamically controls the ownership,
-        permissions, names, and symbolic links of devices in the /dev directory when
+        permissions, names, and symbolic links of device nodes in the /dev directory when
         devices are added to or removed from the system.
         </para>
       </listitem>
@@ -232,7 +232,9 @@
         <para>Gperf</para>
 
         <para>This package produces a program that generates a perfect hash
-        function from a set of keys. It is required by Eudev.</para>
+        function from a set of keys. It is required by
+        <phrase revision='sysv'>Eudev</phrase>
+        <phrase revision='systemd'>Systemd</phrase>.</para>
       </listitem>
 
       <listitem>
@@ -319,8 +321,8 @@
         <para>Less</para>
 
         <para>This package contains a very nice text file viewer that
-        allows scrolling up or down when viewing a file. It is also used 
+        allows scrolling up or down when viewing a file.
-        when viewing manpages.</para>
+        Many packages use it for paging the output.</para>
       </listitem>
 
       <listitem>