aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bryant <davidbryant@gvtc.com>2022-10-28 11:37:59 -0500
committerDavid Bryant <davidbryant@gvtc.com>2022-10-28 11:37:59 -0500
commit4e2645304c69a42ce1cfa028904c7aef7db6b975 (patch)
treeb3c2cbbc7a6cf8a755d2b2449bf1e30c663c1eea
parent13702d9f059b4b066b7a40a790e88b8e6adcb09d (diff)
Standardize spelling of "cross-compile" and its derivatives. Clean up
English idiom. Remove some superfluous verbiage here and there.
-rw-r--r--chapter04/settingenviron.xml29
1 files changed, 14 insertions, 15 deletions
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index a57246217..d801aa9ab 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -19,9 +19,9 @@
<literal>exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash</literal>
EOF</userinput></screen>
- <para>When logged on as user <systemitem class="username">lfs</systemitem>
- or switched to the &lfs-user; user using a <command>su</command> command
- with <quote><parameter>-</parameter></quote> option,
+ <para>When logged on as user <systemitem class="username">lfs</systemitem>,
+ or when switched to the &lfs-user; user using an <command>su</command> command
+ with the <quote><parameter>-</parameter></quote> option,
the initial shell is a <emphasis>login</emphasis> shell which reads
the <filename>/etc/profile</filename> of the host (probably containing some
settings and environment variables) and then <filename>.bash_profile</filename>.
@@ -30,8 +30,7 @@ EOF</userinput></screen>
one with a completely empty environment, except for the <envar>HOME</envar>,
<envar>TERM</envar>, and <envar>PS1</envar> variables. This ensures that no
unwanted and potentially hazardous environment variables from the host system
- leak into the build environment. The technique used here achieves the goal of
- ensuring a clean environment.</para>
+ leak into the build environment.</para>
<para>The new instance of the shell is a <emphasis>non-login</emphasis>
shell, which does not read, and execute, the contents of the <filename>/etc/profile</filename> or
@@ -100,7 +99,7 @@ EOF</userinput></screen>
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>
+ the cross-compilation environment.</para>
</listitem>
</varlistentry>
@@ -108,8 +107,8 @@ EOF</userinput></screen>
<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
+ description for use when building our cross-compiler and linker and when
+ cross-compiling our temporary toolchain. More information is provided by
<xref linkend="ch-tools-toolchaintechnotes" role=""/>.</para>
</listitem>
</varlistentry>
@@ -132,7 +131,7 @@ EOF</userinput></screen>
<term><parameter>if [ ! -L /bin ]; then PATH=/bin:$PATH; fi</parameter></term>
<listitem>
<para>If <filename class="directory">/bin</filename> is not a symbolic
- link, then it has to be added to the <envar>PATH</envar> variable.</para>
+ link, it must be added to the <envar>PATH</envar> variable.</para>
</listitem>
</varlistentry>
@@ -163,7 +162,7 @@ EOF</userinput></screen>
<varlistentry>
<term><parameter>export ...</parameter></term>
<listitem>
- <para>While the above commands have set some variables, in order
+ <para>While the preceding commands have set some variables, in order
to make them visible within any sub-shells, we export them.</para>
</listitem>
</varlistentry>
@@ -172,7 +171,7 @@ EOF</userinput></screen>
<important>
- <para>Several commercial distributions add a non-documented instantiation
+ <para>Several commercial distributions add an undocumented instantiation
of <filename>/etc/bash.bashrc</filename> to the initialization of
<command>bash</command>. This file has the potential to modify the
<systemitem class="username">lfs</systemitem>
@@ -185,9 +184,9 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>[ ! -e /etc/bash.bashrc ] || mv -v /etc/bash.bashrc /etc/bash.bashrc.NOUSE</userinput></screen>
- <para>After use of the <systemitem class="username">lfs</systemitem>
- user is finished at the beginning of <xref
- linkend="chapter-chroot-temporary-tools"/>, you can restore
+ <para>When the <systemitem class="username">lfs</systemitem>
+ user is no longer needed (at the beginning of <xref
+ linkend="chapter-chroot-temporary-tools"/>), you may safely restore
<filename>/etc/bash.bashrc</filename> (if desired).</para>
<para>Note that the LFS Bash package we will build in
@@ -196,7 +195,7 @@ EOF</userinput></screen>
completed LFS system.</para>
</important>
- <para>Finally, to have the environment fully prepared for building the
+ <para>Finally, to ensure the environment is fully prepared for building the
temporary tools, force the <command>bash</command> shell to read
the new user profile:</para>