Merge remote-tracking branch 'origin/trunk' into xry111/arm64

chapter02/aboutlfs.xml

@@ -14,8 +14,8 @@
   be used several times. You should ensure that this variable is always defined
   throughout the LFS build process. It should be set to the name of the
   directory where you will be building your LFS system - we will use
-  <filename class="directory">/mnt/lfs</filename> as an example, but the
+  <filename class="directory">/mnt/lfs</filename> as an example, but you may
-  directory choice is up to you. If you are building LFS on a separate
+  choose any directory name you want. If you are building LFS on a separate
   partition, this directory will be the mount point for the partition.
   Choose a directory location and set the variable with the
   following command:</para>
@@ -25,7 +25,7 @@
   <para>Having this variable set is beneficial in that commands such as
   <command>mkdir -v $LFS/tools</command> can be typed literally. The shell
   will automatically replace <quote>$LFS</quote> with
-  <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
+  <quote>/mnt/lfs</quote> (or whatever value the variable was set to) when it
   processes the command line.</para>
 
   <caution>
@@ -49,7 +49,7 @@
   personal home directory and in  <filename>/root/.bash_profile</filename> and
   enter the export command above.  In addition, the shell specified in the
   <filename>/etc/passwd</filename> file for all users that need the
-  <envar>LFS</envar> variable needs to be bash to ensure that the
+  <envar>LFS</envar> variable must be bash to ensure that the
   <filename>/root/.bash_profile</filename> file is incorporated as a part of
   the login process.</para>
 
@@ -59,9 +59,9 @@
   a virtual terminal is started.  In this case, add the export command to
   the <filename>.bashrc</filename> file for the user and
   <systemitem class="username">root</systemitem>.  In addition,
-  some distributions have instructions to not run the <filename>.bashrc</filename>
+  some distributions use an "if" test, and do not run the remaining <filename>.bashrc</filename>
-  instructions in a non-interactive bash invocation.  Be sure to add the
+  instructions for a non-interactive bash invocation.  Be sure to place the
-  export command before the test for non-interactive use.</para>
+  export command ahead of the test for non-interactive use.</para>
 
   </note>
 

chapter02/creatingfilesystem.xml

@@ -12,7 +12,7 @@
 
   <para>A partition is just a range of sectors on a disk drive, delimited by
   boundaries set in a partition table. Before the operating system can use
-  a blank partition, the partition must be formatted to contain a file
+  a partition to store any files, the partition must be formatted to contain a file
   system, typically consisting of a label, directory blocks, data blocks, and
   an indexing scheme to locate a particular file on demand. The file system
   also helps the OS keep track of free space on the partition, reserve the

chapter02/mounting.xml

@@ -47,9 +47,9 @@ mount -v -t ext4 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/home</userinpu
   <warning><para>The above instructions assume that you will not restart
   your computer throughout the LFS process.  If you shut down your system,
   you will either need to remount the LFS partition each time you restart
-  the build process, or modify the host system's /etc/fstab file to automatically
+  the build process, or modify the host system's &fstab; file to automatically
   remount it when you reboot. For example, you might add this line to your 
-  /etc/fstab file:
+  &fstab; file:
 
 <screen role="nodump">/dev/<replaceable>&lt;xxx&gt;</replaceable>  /mnt/lfs ext4   defaults      1     1</screen>
 

chapter03/packages.xml

@@ -15,14 +15,14 @@
     before downloading packages to figure out if a newer version of any
     package should be used to avoid security vulnerabilities.</para>
 
-    <para>The upstreams may remove old releases, especially when these
+    <para>The upstream sources may remove old releases, especially when those
     releases contain a security vulnerability.  If one URL below is not
     reachable, you should read the security advisories first to figure out
     if a newer version (with the vulnerability fixed) should be used.  If
     not, try to download the removed package from a mirror.  Although it's
     possible to download an old release from a mirror even if this release
-    has been removed because of a vulnerability, it's not recommended to
+    has been removed because of a vulnerability, it's not a good idea to
-    use a release known to be vulnerable for building your system.</para>
+    use a release known to be vulnerable when building your system.</para>
   </note>
 
   <para>Download or otherwise obtain the following packages:</para>
@@ -453,7 +453,7 @@
         <para>MD5 sum: <literal>&linux-md5;</literal></para>
 
         <note>
-          <para>The Linux kernel is updated relatively often, many times due to
+          <para>The Linux kernel is updated quite frequently, many times due to
           discoveries of security vulnerabilities.  The latest available
           <!--&linux-major-version;.&linux-minor-version;.x--> stable kernel
           version <!--should--> may be

chapter04/creatingminlayout.xml

@@ -10,14 +10,14 @@
 
   <title>Creating a limited directory layout in LFS filesystem</title>
 
-  <para>The first task performed in the LFS partition is to create a limited
+  <para>The next task to be performed in the LFS partition is to create a limited
-  directory hierarchy so that programs compiled in <xref
+  directory hierarchy, so that the programs compiled in <xref
   linkend="chapter-temporary-tools"/> (as well as glibc and libstdc++ in <xref
-  linkend="chapter-cross-tools"/>) may be installed in their final
+  linkend="chapter-cross-tools"/>) can be installed in their final
-  location. This is needed so that those temporary programs be overwritten
+  location. We do this so those temporary programs will be overwritten when
-  when rebuilding them in <xref linkend="chapter-building-system"/>.</para>
+  the final versions are built in <xref linkend="chapter-building-system"/>.</para>
 
-  <para>Create the required directory layout by running the following as
+  <para>Create the required directory layout by issuing the following commands as
   <systemitem class="username">root</systemitem>:</para>
 
 <screen><userinput>mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin}
@@ -27,10 +27,10 @@ for i in bin lib sbin; do
 done</userinput></screen>
 
   <para>Programs in <xref linkend="chapter-temporary-tools"/> will be compiled
-  with a cross-compiler (more details in section <xref
+  with a cross-compiler (more details can be found in section <xref
-  linkend="ch-tools-toolchaintechnotes"/>). In order to separate this
+  linkend="ch-tools-toolchaintechnotes"/>). This cross-compiler will be installed
-  cross-compiler from the other programs, it will be installed in a special
+  in a special directory, to separate it from the other programs. Still acting as
-  directory. Create this directory with:</para>
+  &root;, create that directory with this command:</para>
 
 <screen><userinput>mkdir -pv $LFS/tools</userinput></screen>
 

chapter04/introduction.xml

@@ -12,11 +12,11 @@
 
   <para>In this chapter, we will perform a few additional tasks to prepare
   for building the temporary system. We will create a set of directories in
-  <filename class="directory">$LFS</filename> for the installation of the
+  <filename class="directory">$LFS</filename> (in which we will install the
-  temporary tools, add an unprivileged user to reduce risk,
+  temporary tools), add an unprivileged user,
   and create an appropriate build environment for that user. We will also
-  explain the unit of time we use to measure how long LFS packages take to
+  explain the units of time (<quote>SBUs</quote>) we use to measure how
-  build, or <quote>SBUs</quote>, and give some information about package
+  long it takes to build LFS packages, and provide some information about package
   test suites.</para>
 
 </sect1>

chapter08/libelf.xml

@@ -58,7 +58,8 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-<!--    <para>One test, run-elfclassify.sh, is known to fail.</para>-->
+    <para>One test named <filename>run-low_high_pc.sh</filename> is known to
+    fail on 32-bit x86 system.</para>
 
     <para>Install only Libelf:</para>
 

general.ent

@@ -121,6 +121,7 @@
 
 <!ENTITY root            "<systemitem class='username'>root</systemitem>">
 <!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
+<!ENTITY fstab           "<filename>/etc/fstab</filename>">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;