MultiLib: Merge changes from trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11801 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 74 insertions, 13 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b0c1e8ee9..a3be8d036 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2020-03-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Textual updates thanks to Kevin Buckley.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>2020-03-19</para>
       <itemizedlist>
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 7722ff7c5..3b3c10718 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -32,8 +32,8 @@ EOF</userinput></screen>
   ensuring a clean environment.</para>
 
   <para>The new instance of the shell is a <emphasis>non-login</emphasis>
-  shell, which does not read the <filename>/etc/profile</filename> or
-  <filename>.bash_profile</filename> files, but rather reads the
+  shell, which does not read, and execute, the conten of <filename>/etc/profile</filename> or
+  <filename>.bash_profile</filename> files, but rather reads, and executes, the
   <filename>.bashrc</filename> file instead. Create the
   <filename>.bashrc</filename> file now:</para>
 
@@ -46,7 +46,6 @@ LFS_TGT=$(uname -m)-lfs-linux-gnu
 PATH=/tools/bin:/bin:/usr/bin
 export LFS LC_ALL LFS_TGT PATH</literal>
 EOF</userinput></screen>
-
 <screen arch="ml_32,ml_x32,ml_all"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
 <literal>set +h
 umask 022
@@ -59,6 +58,12 @@ PATH=/tools/bin:/bin:/usr/bin
 export LFS LC_ALL LFS_TGT LFS_TGT32 LFS_TGTX32 PATH</literal>
 EOF</userinput></screen>
 
+  <variablelist>
+    <title>The meaning of the command line options in <filename>.bashrc</filename></title>
+
+    <varlistentry>
+      <term><parameter>set +h</parameter></term>
+      <listitem>
   <para>The <command>set +h</command> command turns off
   <command>bash</command>'s hash function. Hashing is ordinarily a useful
   feature&mdash;<command>bash</command> uses a hash table to remember the
@@ -70,33 +75,70 @@ EOF</userinput></screen>
   <filename class="directory">$LFS/tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term><parameter>umask 022</parameter></term>
+      <listitem>
   <para>Setting the user file-creation mask (umask) to 022 ensures that newly
   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>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term><parameter>LFS=/mnt/lfs</parameter></term>
+      <listitem>
   <para>The <envar>LFS</envar> variable should be set to the chosen mount
   point.</para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term><parameter>LC_ALL=POSIX</parameter></term>
+      <listitem>
   <para>The <envar>LC_ALL</envar> variable controls the localization of certain
   programs, making their messages follow the conventions of a specified country.
   Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
   (the two are equivalent) ensures that everything will work as expected in
   the chroot environment.</para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term><parameter>LFS_TGT=(uname -m)-lfs-linux-gnu</parameter></term>
+      <listitem>
   <para>The <envar>LFS_TGT</envar> variable sets a non-default, but compatible machine
   description for use when building our cross compiler and linker and when cross
   compiling our temporary toolchain. More information is contained in
   <xref linkend="ch-tools-toolchaintechnotes" role=""/>.</para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term><parameter>PATH=/tools/bin:/bin:/usr/bin</parameter></term>
+      <listitem>
   <para>By putting <filename class="directory">/tools/bin</filename> ahead of the
   standard <envar>PATH</envar>, all the programs installed in <xref
   linkend="chapter-temporary-tools"/> are picked up by the shell immediately after
   their installation. This, combined with turning off hashing, limits the risk
   that old programs are used from the host when the same programs are available in
-  the chapter 5 environment.</para>
+  the Chapter 5 environment.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>export LFS LC_ALL LFS_TGT PATH</parameter></term>
+      <listitem>
+        <para>While the above commands have set some variables, in order
+        to make them visible within any sub-shells, we export them</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
 
   <para>Finally, to have the environment fully prepared for building the
   temporary tools, source the just-created user profile:</para>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index bae0ed7d9..a821e9bba 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -23,8 +23,9 @@
   <sect2 role="package">
     <title/>
 
-    <para>The DejaGNU package contains a framework for testing other
-    programs.</para>
+    <para>The <application>DejaGnu</application> package contains a framework for running test
+      suites on GNU tools. It is written in <command>expect</command>, which itself
+      uses <application>Tcl</application> (Tool Command Language).</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index ae6f50026..a2cc67d0e 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -23,8 +23,15 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
+    <para>The <application>Expect</application> package contains tools for
+    automating, via scripted dialogues, interactive applications such as
+    <command>telnet</command>, <command>ftp</command>,
+    <command>passwd</command>, <command>fsck</command>,
+    <command>rlogin</command>, and <command>tip</command>.
+    <application>Expect</application> is also useful for testing these same
+    applications as well as easing all sorts of tasks that are prohibitively
+    difficult with anything else. The <application>DejaGnu</application>
+    framework is written in <application>Expect</application>.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 10cfe1474..0534ee057 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -96,7 +96,7 @@ sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/
     <para>In case the above seems hard to follow, let's break it down a bit.
     First we copy the files <filename>gcc/config/linux.h</filename>,
     <filename>gcc/config/i386/linux.h</filename>, and
-    <filename>gcc/config/i368/linux64.h</filename> to a file of
+    <filename>gcc/config/i386/linux64.h</filename> to a file of
     the same name but with an added suffix of <quote>.orig</quote>. Then the
     first sed expression prepends <quote>/tools</quote> to every instance of
     <quote>/lib/ld</quote>, <quote>/lib64/ld</quote> or
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index a186e0fde..f2265fd8d 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -23,7 +23,9 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Tcl package contains the Tool Command Language.</para>
+    <para>The <application>Tcl</application> package contains the Tool Command Language,
+    a robust general-purpose scripting language. The <application>Expect</application> package
+    is written in the <application>Tcl</application> language.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
diff --git a/general.ent b/general.ent
index f8ae867aa..99ec601f1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200319">
+<!ENTITY version         "SVN-20200329">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200319-systemd">
+<!ENTITY versiond        "20200329-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 19th, 2020">
+<!ENTITY releasedate     "March 29th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->