aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2022-12-15 10:24:33 -0600
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2022-12-15 10:24:33 -0600
commitdbaab9969490a759239eebe887c5af5a5d01ea98 (patch)
treee5da1a80e1995d66192fa513951d78b3b74314ea
parentc9aabf13a1e8e1fb57688a7dea2f2ca2f1a9e1ab (diff)
parent0c4501b5b186b116b90aa19fd7fb6087b3d70a69 (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--bootscripts/ChangeLog2
-rw-r--r--chapter08/bash.xml6
-rw-r--r--chapter08/binutils.xml4
-rw-r--r--chapter08/coreutils.xml42
-rw-r--r--chapter08/diffutils.xml3
-rw-r--r--chapter08/findutils.xml14
-rw-r--r--chapter08/gdbm.xml2
-rw-r--r--chapter08/gettext.xml10
-rw-r--r--chapter08/glibc.xml4
-rw-r--r--chapter08/groff.xml15
-rw-r--r--chapter08/grub.xml52
-rw-r--r--chapter08/iproute2.xml74
-rw-r--r--chapter08/kbd.xml2
-rw-r--r--chapter08/libelf.xml6
-rw-r--r--chapter08/libffi.xml20
-rw-r--r--chapter08/libtool.xml8
-rw-r--r--chapter08/m4.xml2
-rw-r--r--chapter08/meson.xml15
-rw-r--r--chapter08/ninja.xml26
-rw-r--r--chapter08/openssl.xml6
-rw-r--r--chapter08/perl.xml31
-rw-r--r--chapter08/python.xml92
-rw-r--r--chapter08/vim.xml19
-rw-r--r--chapter08/wheel.xml22
24 files changed, 237 insertions, 240 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 1fca16a65..c7a3d9a7b 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1135,7 +1135,7 @@ n/a - January 30, 2004:
* Changed the loadkeys script to run "loadkeys -d" and removed the need
for the /etc/sysconfig/keyboard file. The kbd patch fixes the
- "loadkeys -d" behaviour.
+ "loadkeys -d" behavior.
1.6 - February 26th, 2002:
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 60154f6fd..5eb49505a 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -23,7 +23,7 @@
<sect2 role="package">
<title/>
- <para>The Bash package contains the Bourne-Again SHell.</para>
+ <para>The Bash package contains the Bourne-Again Shell.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -73,8 +73,8 @@
<screen><userinput remap="test">chown -Rv tester .</userinput></screen>
- <para>The testsuite of the package is designed to be run as a non-&root;
- user that owns the terminal connected to standard input. To satisfy the
+ <para>The test suite of this package is designed to be run as a non-&root;
+ user who owns the terminal connected to standard input. To satisfy the
requirement, spawn a new pseudo terminal using
<application>Expect</application> and run the tests as the <systemitem
class="username">tester</systemitem> user:</para>
diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 28d44a9a0..f2061d5b8 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -175,10 +175,10 @@ cd build</userinput></screen>
The test named <filename>ar with versioned solib</filename> is also
known to fail.
<!-- https://sourceware.org/bugzilla/show_bug.cgi?id=29107 -->
- Because of a race between the gas testsuite and the gprofng testsuite,
+ Because of a race between the gas test suite and the gprofng test suite,
some gas tests may fail if parallel jobs are used. If you are not
assured of the correctness of gas, invoke
- <command>make check-gas</command> to run gas testsuite separately and
+ <command>make check-gas</command> to run the gas test suite separately and
all tests should pass. Three gprofng tests yield the
<literal>ERROR</literal> result, and they are counted as
<literal>UNRESOLVED</literal> in the summary.</para>
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 3d2138026..77c6a7a92 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -23,8 +23,8 @@
<sect2 role="package">
<title/>
- <para>The Coreutils package contains utilities for showing and setting the
- basic system characteristics.</para>
+ <para>The Coreutils package contains the basic utility programs
+ needed by every operating system.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -48,9 +48,9 @@
<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
<note>
- <para>In the past, many bugs were found in this patch. When reporting new
- bugs to Coreutils maintainers, please check first if they are reproducible
- without this patch.</para>
+ <para>Many bugs have been found in this patch. When reporting new
+ bugs to the Coreutils maintainers, please check first to see if
+ those bugs are reproducible without this patch.</para>
</note>
<!-- this has been fixed in upstream gnulib, when a new version of
@@ -75,8 +75,8 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><command>autoreconf</command></term>
<listitem>
<para>The patch for internationalization has modified the
- building system of the package, so the configuration files have
- to be regenerated.</para>
+ build system, so the configuration files must
+ be regenerated.</para>
</listitem>
</varlistentry>
@@ -84,7 +84,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
<listitem>
<para>This environment variable allows the package to be
- built as the <systemitem class="username">root</systemitem> user.
+ built by the <systemitem class="username">root</systemitem> user.
</para>
</listitem>
</varlistentry>
@@ -93,7 +93,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><parameter>--enable-no-install-program=kill,uptime</parameter></term>
<listitem>
<para>The purpose of this switch is to prevent Coreutils from
- installing binaries that will be installed by other packages later.
+ installing programs that will be installed by other packages.
</para>
</listitem>
</varlistentry>
@@ -181,7 +181,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="lbracket">
<term><command>[</command></term>
<listitem>
- <para>Is an actual command, /usr/bin/[, that is a synonym
+ <para>Is an actual command, /usr/bin/[; it is a synonym
for the <command>test</command> command</para>
<indexterm zone="ch-system-coreutils lbracket">
<primary sortas="b-111">[</primary>
@@ -275,7 +275,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>chmod</command></term>
<listitem>
<para>Changes the permissions of each file to the given mode; the mode
- can be either a symbolic representation of the changes to make or an
+ can be either a symbolic representation of the changes to be made, or an
octal number representing the new permissions</para>
<indexterm zone="ch-system-coreutils chmod">
<primary sortas="b-chmod">chmod</primary>
@@ -341,7 +341,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>csplit</command></term>
<listitem>
<para>Splits a given file into several new files, separating them
- according to given patterns or line numbers and outputting the byte
+ according to given patterns or line numbers, and outputting the byte
count of each new file</para>
<indexterm zone="ch-system-coreutils csplit">
<primary sortas="b-csplit">csplit</primary>
@@ -363,8 +363,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="date">
<term><command>date</command></term>
<listitem>
- <para>Displays the current time in the given format, or sets the
- system date</para>
+ <para>Displays the current date and time in the given format, or sets the
+ system date and time</para>
<indexterm zone="ch-system-coreutils date">
<primary sortas="b-date">date</primary>
</indexterm>
@@ -420,7 +420,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="dirname">
<term><command>dirname</command></term>
<listitem>
- <para>Strips the non-directory suffix from a file name</para>
+ <para>Extracts the directory portion(s) of the given name(s)</para>
<indexterm zone="ch-system-coreutils dirname">
<primary sortas="b-dirname">dirname</primary>
</indexterm>
@@ -482,7 +482,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="factor">
<term><command>factor</command></term>
<listitem>
- <para>Prints the prime factors of all specified integer numbers</para>
+ <para>Prints the prime factors of the specified integers</para>
<indexterm zone="ch-system-coreutils factor">
<primary sortas="b-factor">factor</primary>
</indexterm>
@@ -587,7 +587,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="link">
<term><command>link</command></term>
<listitem>
- <para>Creates a hard link with the given name to a file</para>
+ <para>Creates a hard link (with the given name) to a file</para>
<indexterm zone="ch-system-coreutils link">
<primary sortas="b-link">link</primary>
</indexterm>
@@ -647,8 +647,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="mkfifo">
<term><command>mkfifo</command></term>
<listitem>
- <para>Creates First-In, First-Outs (FIFOs), a "named
- pipe" in UNIX parlance, with the given names</para>
+ <para>Creates First-In, First-Outs (FIFOs), "named
+ pipes" in UNIX parlance, with the given names</para>
<indexterm zone="ch-system-coreutils mkfifo">
<primary sortas="b-mkfifo">mkfifo</primary>
</indexterm>
@@ -1230,7 +1230,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>wc</command></term>
<listitem>
<para>Reports the number of lines, words, and bytes for each given
- file, as well as a total line when more than one file is given</para>
+ file, as well as grand totals when more than one file is given</para>
<indexterm zone="ch-system-coreutils wc">
<primary sortas="b-wc">wc</primary>
</indexterm>
@@ -1261,7 +1261,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="yes">
<term><command>yes</command></term>
<listitem>
- <para>Repeatedly outputs <quote>y</quote> or a given string until
+ <para>Repeatedly outputs <quote>y</quote>, or a given string, until
killed</para>
<indexterm zone="ch-system-coreutils yes">
<primary sortas="b-yes">yes</primary>
diff --git a/chapter08/diffutils.xml b/chapter08/diffutils.xml
index 8889077d5..2ffb9fa8c 100644
--- a/chapter08/diffutils.xml
+++ b/chapter08/diffutils.xml
@@ -79,8 +79,7 @@
<varlistentry id="cmp">
<term><command>cmp</command></term>
<listitem>
- <para>Compares two files and reports whether or in which bytes they
- differ</para>
+ <para>Compares two files and reports any differences byte by byte</para>
<indexterm zone="ch-system-diffutils cmp">
<primary sortas="b-cmp">cmp</primary>
</indexterm>
diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml
index c37f3aab0..c12452668 100644
--- a/chapter08/findutils.xml
+++ b/chapter08/findutils.xml
@@ -23,10 +23,12 @@
<sect2 role="package">
<title/>
- <para>The Findutils package contains programs to find files. These programs
- are provided to recursively search through a directory tree and to
+ <para>The Findutils package contains programs to find files. Programs
+ are provided to search through all the files in a directory tree and to
create, maintain, and search a database (often faster than the recursive
- find, but is unreliable if the database has not been recently updated).</para>
+ find, but unreliable unless the database has been updated recently).
+ Findutils also supplies the <command>xargs</command> program, which
+ can be used to run a specified command on each file selected by a search.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -63,9 +65,9 @@ esac</userinput></screen>
<varlistentry>
<term><parameter>--localstatedir</parameter></term>
<listitem>
- <para>This option changes the location of the <command>locate</command>
- database to be in <filename class="directory">/var/lib/locate</filename>,
- which is FHS-compliant.</para>
+ <para>This option moves the <command>locate</command>
+ database to <filename class="directory">/var/lib/locate</filename>,
+ which is the FHS-compliant location.</para>
</listitem>
</varlistentry>
diff --git a/chapter08/gdbm.xml b/chapter08/gdbm.xml
index 431987f52..80961a65d 100644
--- a/chapter08/gdbm.xml
+++ b/chapter08/gdbm.xml
@@ -24,7 +24,7 @@
<title/>
<para>The GDBM package contains the GNU Database Manager. It is a library
- of database functions that use extensible hashing and works similar to the
+ of database functions that uses extensible hashing and works like the
standard UNIX dbm. The library provides primitives for storing key/data
pairs, searching and retrieving the data by its key and deleting a key
along with its data. </para>
diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml
index 08b960d44..be1c16d39 100644
--- a/chapter08/gettext.xml
+++ b/chapter08/gettext.xml
@@ -346,7 +346,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
<varlistentry id="libasprintf">
<term><filename class="libraryfile">libasprintf</filename></term>
<listitem>
- <para>defines the <emphasis>autosprintf</emphasis> class, which makes
+ <para>Defines the <emphasis>autosprintf</emphasis> class, which makes
C formatted output routines usable in C++ programs, for use with the
<emphasis>&lt;string&gt;</emphasis> strings and the
<emphasis>&lt;iostream&gt;</emphasis> streams</para>
@@ -359,7 +359,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
<varlistentry id="libgettextlib">
<term><filename class="libraryfile">libgettextlib</filename></term>
<listitem>
- <para>a private library containing common routines used by the
+ <para>Contains common routines used by the
various Gettext programs; these are not intended for general use</para>
<indexterm zone="ch-system-gettext libgettextlib">
<primary sortas="c-libgettextlib">libgettextlib</primary>
@@ -385,7 +385,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
<varlistentry id="libgettextsrc">
<term><filename class="libraryfile">libgettextsrc</filename></term>
<listitem>
- <para>A private library containing common routines used by the
+ <para>Provides common routines used by the
various Gettext programs; these are not intended for general use</para>
<indexterm zone="ch-system-gettext libgettextsrc">
<primary sortas="c-libgettextsrc">libgettextsrc</primary>
@@ -406,8 +406,8 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
<varlistentry id="preloadable_libintl">
<term><filename class="libraryfile">preloadable_libintl</filename></term>
<listitem>
- <para>A library, intended to be used by LD_PRELOAD that assists
- <filename class="libraryfile">libintl</filename> in logging
+ <para>A library, intended to be used by LD_PRELOAD, that helps
+ <filename class="libraryfile">libintl</filename> log
untranslated messages</para>
<indexterm zone="ch-system-gettext preloadable_libintl">
<primary sortas="c-preloadable_libintl">preloadable_libintl</primary>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 0295e0aab..340eb0861 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -387,10 +387,10 @@ unset ZONEINFO</userinput></screen>
<filename class="directory">zoneinfo/posix</filename>. It is
necessary to put the POSIX time zones in
<filename class="directory">zoneinfo</filename>, otherwise various
- test-suites will report errors. On an embedded system, where space is
+ test suites will report errors. On an embedded system, where space is
tight and you do not intend to ever update the time zones, you could save
1.9 MB by not using the <filename class="directory">posix</filename>
- directory, but some applications or test-suites might produce some
+ directory, but some applications or test suites might produce some
failures.</para>
</listitem>
</varlistentry>
diff --git a/chapter08/groff.xml b/chapter08/groff.xml
index 64739ac67..e5ae875f3 100644
--- a/chapter08/groff.xml
+++ b/chapter08/groff.xml
@@ -24,7 +24,7 @@
<title/>
<para>The Groff package contains programs for processing and formatting
- text.</para>
+ text and images.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -168,7 +168,7 @@
<varlistentry id="gperl">
<term><command>gperl</command></term>
<listitem>
- <para>Preprocesor for groff, allowing addition of perl code
+ <para>Preprocesor for groff, allowing the insertion of perl code
into groff files</para>
<indexterm zone="ch-system-groff gperl">
<primary sortas="b-gperl">gperl</primary>
@@ -179,8 +179,8 @@
<varlistentry id="gpinyin">
<term><command>gpinyin</command></term>
<listitem>
- <para>Preprocesor for groff, allowing addition of Chinese
- European-like language Pinyin into groff files.</para>
+ <para>Preprocesor for groff, allowing the insertion of Pinyin
+ (Mandarin Chinese spelled with the Roman alphabet) into groff files.</para>
<indexterm zone="ch-system-groff gpinyin">
<primary sortas="b-gpinyin">gpinyin</primary>
</indexterm>
@@ -190,7 +190,8 @@
<varlistentry id="grap2graph">
<term><command>grap2graph</command></term>
<listitem>
- <para>Converts a grap diagram into a cropped bitmap image</para>
+ <para>Converts a grap program file into a cropped bitmap image
+ (grap is an old Unix programming language for creating diagrams)</para>
<indexterm zone="ch-system-groff grap2graph">
<primary sortas="b-grap2graph">grap2graph</primary>
</indexterm>
@@ -211,7 +212,7 @@
<term><command>grodvi</command></term>
<listitem>
<para>A driver for <command>groff</command> that produces TeX dvi
- format</para>
+ format output files</para>
<indexterm zone="ch-system-groff grodvi">
<primary sortas="b-grodvi">grodvi</primary>
</indexterm>
@@ -221,7 +222,7 @@
<varlistentry id="groff">
<term><command>groff</command></term>
<listitem>
- <para>A front-end to the groff document formatting system; normally, it
+ <para>A front end to the groff document formatting system; normally, it
runs the <command>troff</command> program and a post-processor
appropriate for the selected device</para>
<indexterm zone="ch-system-groff groff">
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 08d2ac175..04fbef91b 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -44,9 +44,9 @@
<para>
If your system has UEFI support and you wish to boot LFS with UEFI,
you can skip this package in LFS,
- and install GRUB with UEFI support (and its dependencies) following
- <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
- at the end of this chapter.
+ and install GRUB with UEFI support (and its dependencies) by following
+ the instructions on
+ <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>.
</para>
</note>
@@ -56,9 +56,9 @@
<screen><userinput remap='pre'>unset {C,CPP,CXX,LD}FLAGS</userinput></screen>
<para>Don't try <quote>tuning</quote> this package with custom
- compilation flags: this package is a bootloader, with low-level
- operations in the source code which is likely to be broken by some
- aggressive optimizations.</para>
+ compilation flags. This package is a bootloader. The low-level
+ operations in the source code may be broken by
+ aggressive optimization.</para>
</warning>
<para>Prepare GRUB for compilation:</para>
@@ -75,7 +75,7 @@
<term><parameter>--disable-werror</parameter></term>
<listitem>
<para>This allows the build to complete with warnings introduced
- by more recent Flex versions.</para>
+ by more recent versions of Flex.</para>
</listitem>
</varlistentry>
@@ -83,7 +83,7 @@
<term><parameter>--disable-efiemu</parameter></term>
<listitem>
<para>This option minimizes what is built by disabling a feature and
- testing programs not needed for LFS.</para>
+ eliminating some test programs not needed for LFS.</para>
</listitem>
</varlistentry>
@@ -102,7 +102,7 @@
<screen><userinput remap="install">make install
mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
- <para>Using GRUB to make your LFS system bootable will be discussed in
+ <para>Making your LFS system bootable with GRUB will be discussed in
<xref linkend="ch-bootable-grub"/>.</para>
</sect2>
@@ -138,7 +138,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-bios-setup">
<term><command>grub-bios-setup</command></term>
<listitem>
- <para>Is a helper program for grub-install</para>
+ <para>Is a helper program for <command>grub-install</command></para>
<indexterm zone="ch-system-grub grub-bios-setup">
<primary sortas="b-grub-bios-setup">grub-bios-setup</primary>
</indexterm>
@@ -148,7 +148,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-editenv">
<term><command>grub-editenv</command></term>
<listitem>
- <para>A tool to edit the environment block</para>
+ <para>Is a tool to edit the environment block</para>
<indexterm zone="ch-system-grub grub-editenv">
<primary sortas="b-grub-editenv">grub-editenv</primary>
</indexterm>
@@ -158,7 +158,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-file">
<term><command>grub-file</command></term>
<listitem>
- <para>Checks if FILE is of the specified type.</para>
+ <para>Checks to see if the given file is of the specified type</para>
<indexterm zone="ch-system-grub grub-file">
<primary sortas="b-grub-file">grub-file</primary>
</indexterm>
@@ -168,7 +168,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-fstest">
<term><command>grub-fstest</command></term>
<listitem>
- <para>Tool to debug the filesystem driver</para>
+ <para>Is a tool to debug the filesystem driver</para>
<indexterm zone="ch-system-grub grub-fstest">
<primary sortas="b-grub-fstest">grub-fstest</primary>
</indexterm>
@@ -178,7 +178,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-glue-efi">
<term><command>grub-glue-efi</command></term>
<listitem>
- <para>Glue 32-bit and 64-bit binary into Apple universal one.</para>
+ <para>Glues 32-bit and 64-bit binaries into a single file (for Apple machines)</para>
<indexterm zone="ch-system-grub grub-glue-efi">
<primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
</indexterm>
@@ -188,7 +188,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-install">
<term><command>grub-install</command></term>
<listitem>
- <para>Install GRUB on your drive</para>
+ <para>Installs GRUB on your drive</para>
<indexterm zone="ch-system-grub grub-install">
<primary sortas="b-grub-install">grub-install</primary>
</indexterm>
@@ -198,7 +198,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-kbdcomp">
<term><command>grub-kbdcomp</command></term>
<listitem>
- <para>Script that converts an xkb layout into one recognized by
+ <para>Is a script that converts an xkb layout into one recognized by
GRUB</para>
<indexterm zone="ch-system-grub grub-kbdcomp">
<primary sortas="b-grub-kbdcomp">grub-kbdcomp</primary>
@@ -209,7 +209,8 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-macbless">
<term><command>grub-macbless</command></term>
<listitem>
- <para>Mac-style bless on HFS or HFS+ files</para>
+ <para>Is the Mac-style bless for HFS or HFS+ file systems (<command>bless</command>
+ is peculiar to Apple machines; it makes a device bootable)</para>
<indexterm zone="ch-system-grub grub-macbless">
<primary sortas="b-grub-macbless">grub-macbless</primary>
</indexterm>
@@ -230,7 +231,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-mkconfig">
<term><command>grub-mkconfig</command></term>
<listitem>
- <para>Generate a grub config file</para>
+ <para>Generates a <filename>grub.cfg</filename> file</para>
<indexterm zone="ch-system-grub grub-mkconfig">
<primary sortas="b-grub-mkconfig">grub-mkconfig</primary>
</indexterm>
@@ -240,7 +241,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-mkimage">
<term><command>grub-mkimage</command></term>
<listitem>
- <para>Make a bootable image of GRUB</para>
+ <para>Makes a bootable image of GRUB</para>
<indexterm zone="ch-system-grub grub-mkimage">
<primary sortas="b-grub-mkimage">grub-mkimage</primary>
</indexterm>
@@ -291,7 +292,8 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-mkrescue">
<term><command>grub-mkrescue</command></term>
<listitem>
- <para>Make a bootable image of GRUB suitable for a floppy disk or CDROM/DVD</para>
+ <para>Makes a bootable image of GRUB suitable for a floppy disk,
+ CDROM/DVD, or a USB drive</para>
<indexterm zone="ch-system-grub grub-mkrescue">
<primary sortas="b-grub-mkrescue">grub-mkrescue</primary>
</indexterm>
@@ -311,7 +313,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-ofpathname">
<term><command>grub-ofpathname</command></term>
<listitem>
- <para>Is a helper program that prints the path of a GRUB device</para>
+ <para>Is a helper program that prints the path to a GRUB device</para>
<indexterm zone="ch-system-grub grub-ofpathname">
<primary sortas="b-grub-ofpathname">grub-ofpathname</primary>
</indexterm>
@@ -321,7 +323,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-probe">
<term><command>grub-probe</command></term>
<listitem>
- <para>Probe device information for a given path or device</para>
+ <para>Probes device information for a given path or device</para>
<indexterm zone="ch-system-grub grub-probe">
<primary sortas="b-grub-probe">grub-probe</primary>
</indexterm>
@@ -341,7 +343,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-render-label">
<term><command>grub-render-label</command></term>
<listitem>
- <para>Render Apple .disk_label for Apple Macs</para>
+ <para>Renders Apple .disk_label for Apple Macs</para>
<indexterm zone="ch-system-grub grub-render-label">
<primary sortas="b-grub-render-label">grub-render-label</primary>
</indexterm>
@@ -351,7 +353,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-script-check">
<term><command>grub-script-check</command></term>
<listitem>
- <para>Checks GRUB configuration script for syntax errors</para>
+ <para>Checks the GRUB configuration script for syntax errors</para>
<indexterm zone="ch-system-grub grub-script-check">
<primary sortas="b-grub-script-check">grub-script-check</primary>
</indexterm>
@@ -381,7 +383,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-syslinux2cfg">
<term><command>grub-syslinux2cfg</command></term>
<listitem>
- <para>Transform a syslinux config file into grub.cfg format</para>
+ <para>Transforms a syslinux config file into grub.cfg format</para>
<indexterm zone="ch-system-grub grub-syslinux2cfg">
<primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
</indexterm>
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index 25e7e81be..bfc25331a 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -42,12 +42,12 @@
<title>Installation of IPRoute2</title>
<para>The <command>arpd</command> program included in this package will not
- be built since it is dependent on Berkeley DB, which is not installed in
- LFS. However, a directory for <command>arpd</command> and a man page will still
- be installed. Prevent this by running the commands below.
- If the <command>arpd</command> binary is needed,
- instructions for compiling Berkeley DB can be found in the BLFS Book at
- <ulink url="&blfs-book;server/db.html"/>.
+ be built since it depends on Berkeley DB, which is not installed in
+ LFS. However, a directory and a man page for <command>arpd</command> will still
+ be installed. Prevent this by running the commands shown below.
+ (If the <command>arpd</command> program is needed,
+ instructions for compiling Berkeley DB can be found in the BLFS book at
+ <ulink url="&blfs-book;server/db.html"/>.)
</para>
<screen><userinput remap="pre">sed -i /ARPD/d Makefile
@@ -93,8 +93,8 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
- nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+ <seg>bridge, ctstat (link to lnstat), genl, ifstat, ip, lnstat,
+ nstat, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
and tc</seg>
<seg>/etc/iproute2, /usr/lib/tc, and /usr/share/doc/iproute2-&iproute2-version;
</seg>
@@ -129,31 +129,18 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="genl">
<term><command>genl</command></term>
<listitem>
- <para>Generic netlink utility frontend</para>
+ <para>Generic netlink utility front end</para>
<indexterm zone="ch-system-iproute2 genl">
<primary sortas="b-genl">genl</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="ifcfg">
- <term><command>ifcfg</command></term>
- <listitem>
- <para>A shell script wrapper for the <command>ip</command> command
- [Note that it requires the <command>arping</command> and
- <command>rdisk</command> programs from the
- iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.]</para>
- <indexterm zone="ch-system-iproute2 ifcfg">
- <primary sortas="b-ifcfg">ifcfg</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="ifstat">
<term><command>ifstat</command></term>
<listitem>
- <para>Shows the interface statistics, including the amount of
- transmitted and received packets by interface</para>
+ <para>Shows interface statistics, including the number of
+ packets transmitted and received, by interface</para>
<indexterm zone="ch-system-iproute2 ifstat">
<primary sortas="b-ifstat">ifstat</primary>
</indexterm>
@@ -163,7 +150,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="ip">
<term><command>ip</command></term>
<listitem>
- <para>The main executable. It has several different functions:</para>
+ <para>The main executable. It has several different functions, including these:</para>
<para><command>ip link <replaceable>&lt;device&gt;</replaceable></command>
allows users to look at the state of devices and to make changes</para>
@@ -213,28 +200,17 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="nstat">
<term><command>nstat</command></term>
<listitem>
- <para>Shows network statistics</para>
+ <para>Displays network statistics</para>
<indexterm zone="ch-system-iproute2 nstat">
<primary sortas="b-nstat">nstat</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="routef">
- <term><command>routef</command></term>
- <listitem>
- <para>A component of <command>ip route</command>. This is for flushing
- the routing tables</para>
- <indexterm zone="ch-system-iproute2 routef">
- <primary sortas="b-routef">routef</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="routel">
<term><command>routel</command></term>
<listitem>
- <para>A component of <command>ip route</command>. This is for listing
+ <para>A component of <command>ip route</command>, for listing
the routing tables</para>
<indexterm zone="ch-system-iproute2 routel">
<primary sortas="b-routel">routel</primary>
@@ -266,7 +242,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="rtpr">
<term><command>rtpr</command></term>
<listitem>
- <para>Converts the output of <command>ip -o</command> back into a
+ <para>Converts the output of <command>ip -o</command> into a
readable form</para>
<indexterm zone="ch-system-iproute2 rtpr">
<primary sortas="b-rtpr">rtpr</primary>
@@ -298,23 +274,21 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="tc">
<term><command>tc</command></term>
<listitem>
- <para>Traffic Controlling Executable; this is for Quality Of Service
- (QOS) and Class Of Service (COS) implementations</para>
+ <para>Traffic control for Quality of Service
+ (QoS) and Class of Service (CoS) implementations</para>
- <para><command>tc qdisc</command> allows users to setup the queueing
+ <para><command>tc qdisc</command> allows users to set up the queueing
discipline</para>
- <para><command>tc class</command> allows users to setup classes based
+ <para><command>tc class</command> allows users to set up classes based
on the queuing discipline scheduling</para>
- <para><command>tc estimator</command> allows users to estimate the
- network flow into a network</para>
-
- <para><command>tc filter</command> allows users to setup the QOS/COS
+ <para><command>tc filter</command> allows users to set up the QoS/CoS
packet filtering</para>
-
- <para><command>tc policy</command> allows users to setup the QOS/COS
- policies</para>
+
+ <para><command>tc monitor</command> can be used to view changes
+ made to Traffic Control in the kernel.</para>
+
<indexterm zone="ch-system-iproute2 ss">
<primary sortas="b-tc">tc</primary>
</indexterm>
diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml
index 25b0a8726..522ddbd72 100644
--- a/chapter08/kbd.xml
+++ b/chapter08/kbd.xml
@@ -41,7 +41,7 @@
<sect2 role="installation">
<title>Installation of Kbd</title>
- <para>The behaviour of the backspace and delete keys is not consistent
+ <para>The behavior of the backspace and delete keys is not consistent
across the keymaps in the Kbd package. The following patch fixes this
issue for i386 keymaps:</para>
diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index 7286d0a4e..9fac415e1 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -41,8 +41,8 @@
<sect2 role="installation">
<title>Installation of Libelf</title>
- <para>Libelf is part of elfutils-&elfutils-version; package. Use
- the elfutils-&elfutils-version;.tar.bz2 as the source tarball.</para>
+ <para>Libelf is part of the elfutils-&elfutils-version; package. Use
+ the elfutils-&elfutils-version;.tar.bz2 file as the source tarball.</para>
<para>Prepare Libelf for compilation:</para>
@@ -59,7 +59,7 @@
<screen><userinput remap="test">make check</userinput></screen>
<para>One test named <filename>run-low_high_pc.sh</filename> is known to
- fail on 32-bit x86 system.</para>
+ fail on 32-bit x86 systems.</para>
<para>Install only Libelf:</para>
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index 4f778961d..579bb6315 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -26,6 +26,11 @@
<para>The Libffi library provides a portable, high level programming
interface to various calling conventions. This allows a programmer to call
any function specified by a call interface description at run time.</para>
+
+ <para>FFI stands for Foreign Function Interface. An FFI allows a program written
+ in one language to call a program written in another language. Specifically,
+ Libffi can provide a bridge between an interpreter like Perl, or Python, and
+ shared library subroutines written in C, or C++.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -43,16 +48,17 @@
<title>Installation of Libffi</title>
<note>
- <para>Similar to GMP, libffi builds with optimizations specific
+ <para>Like GMP, Libffi builds with optimizations specific
to the processor in use. If building for another system, change the
value of the <parameter>--with-gcc-arch=</parameter> parameter in the
following command to an architecture name fully implemented by the
CPU on that system.
- If this is not done, all applications that link to libffi will trigger
+ If this is not done, all applications that link to
+ <filename class='libraryfile'>libffi</filename> will trigger
Illegal Operation Errors.</para>
</note>
- <para>Prepare libffi for compilation:</para>
+ <para>Prepare Libffi for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--disable-static \
@@ -67,7 +73,7 @@
<listitem>
<para>Ensure GCC optimizes for the current system. If this
is not specified, the system is guessed and the code generated
- may not be correct for some systems. If the generated code
+ may not be correct. If the generated code
will be copied from the native system to a less capable
system, use the less capable system as a parameter. For details
about alternative system types, see <ulink
@@ -80,8 +86,8 @@
<!-- To editors: try to remove it once GJS fixed (at GNOME 43) -->
<term><parameter>--disable-exec-static-tramp</parameter></term>
<listitem>
- <para>Disable static trampoline support. It's a new security
- feature in libffi, but some BLFS packages (notably
+ <para>Disable static trampoline support, a new security
+ feature in Libffi. Some BLFS packages (notably
<application>GJS</application>) have not been adapted for it.</para>
</listitem>
</varlistentry>
@@ -121,7 +127,7 @@
<varlistentry id="libffi">
<term><filename class="libraryfile">libffi</filename></term>
<listitem>
- <para>contains the foreign function interface API functions</para>
+ <para>Contains the foreign function interface API functions</para>
<indexterm zone="ch-system-libffi">
<primary sortas="c-libffi">libffi</primary>
</indexterm>
diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml
index e7eeb3ad9..d21d0b751 100644
--- a/chapter08/libtool.xml
+++ b/chapter08/libtool.xml
@@ -24,7 +24,7 @@
<title/>
<para>The Libtool package contains the GNU generic library support script.
- It wraps the complexity of using shared libraries in a consistent, portable
+ It makes the use of shared libraries simpler with a consistent, portable
interface.</para>
<segmentedlist>
@@ -54,7 +54,7 @@
<screen><userinput remap="test">make -k check</userinput></screen>
- <note><para>The test time for libtool can be reduced significantly on a
+ <note><para>The test time for Libtool can be reduced significantly on a
system with multiple cores. To do this, append
<command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above. For
instance, using -j4 can reduce the test time by over 60
@@ -62,7 +62,7 @@
<para>Five tests are known to fail in the LFS build environment due
to a circular dependency, but these tests pass if rechecked after
- automake is installed. Additionally, with grep-3.8, two tests will
+ automake has been installed. Additionally, with grep-3.8, two tests will
trigger a warning for non-POSIX regular expressions and fail.</para>
<para>Install the package:</para>
@@ -123,7 +123,7 @@
<varlistentry id="libltdl">
<term><filename class="libraryfile">libltdl</filename></term>
<listitem>
- <para>Hides the various difficulties of dlopening libraries</para>
+ <para>Hides the various difficulties of opening dynamically loaded libraries</para>
<indexterm zone="ch-system-libtool libltdl">
<primary sortas="c-libltdl">libltdl</primary>
</indexterm>
diff --git a/chapter08/m4.xml b/chapter08/m4.xml
index 13b032a25..14ce93291 100644
--- a/chapter08/m4.xml
+++ b/chapter08/m4.xml
@@ -89,7 +89,7 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
<command>m4</command> has built-in functions for including named
files, running Unix commands, performing integer arithmetic,
manipulating text, recursion, etc. The <command>m4</command> program
- can be used either as a front-end to a compiler or as a macro processor
+ can be used either as a front end to a compiler or as a macro processor
in its own right</para>
<indexterm zone="ch-system-m4 m4">
<primary sortas="b-m4">m4</primary>
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index 0bde43856..1d9c9e3a7 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -23,7 +23,7 @@
<sect2 role="package">
<title/>
- <para>Meson is an open source build system meant to be both extremely fast
+ <para>Meson is an open source build system designed to be both extremely fast
and as user friendly as possible.</para>
<segmentedlist>
@@ -36,9 +36,10 @@
</segmentedlist>
<tip revision="sysv">
- <para>This section is not strictly required for LFS if not using
- systemd. On the other hand, meson/ninja is a powerful build system,
- which is expected to be used more and more often. It is required for
+ <para>This section is not strictly required when LFS does not use
+ systemd. On the other hand, Meson, along with Ninja, makes
+ a powerful build system combination,
+ which will probably be used more and more often. It is required for
several packages in <ulink url="&blfs-book;">the BLFS
book</ulink>.</para>
</tip>
@@ -56,7 +57,7 @@
<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
- <para>The test suite requires some packages out of the scope of LFS.</para>
+ <para>The test suite requires some packages outside the scope of LFS.</para>
<para>Install the package:</para>
@@ -70,7 +71,7 @@ install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/
<varlistentry>
<term><parameter>-w dist</parameter></term>
<listitem>
- <para>Put the created wheels into the
+ <para>Puts the created wheels into the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>
@@ -78,7 +79,7 @@ install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/
<varlistentry>
<term><parameter>--find-links dist</parameter></term>
<listitem>
- <para>Install wheels from the
+ <para>Installs wheels from the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>
diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml
index 4f3a25e88..74626e30c 100644
--- a/chapter08/ninja.xml
+++ b/chapter08/ninja.xml
@@ -36,10 +36,10 @@
</segmentedlist>
<tip revision="sysv">
- <para>This section is not strictly required for LFS if not using
- systemd. On the other hand, ninja associated to meson makes
+ <para>This section is not strictly required when LFS does not use
+ systemd. On the other hand, Ninja, along with Meson, makes
a powerful build system combination,
- which is expected to be used more and more often. It is required for
+ which will probably be used more and more often. It is required for
several packages in <ulink url="&blfs-book;">the BLFS
book</ulink>.</para>
</tip>
@@ -49,12 +49,12 @@
<sect2 role="installation">
<title>Installation of Ninja</title>
- <para>When run, ninja normally runs a maximum number of processes
- in parallel. By default this is the number of cores on the system
- plus two. In some cases this can overheat a CPU or run a system out
- of memory. If run from the command line, passing a -jN parameter
- will limit the number of parallel processes, but some packages
- embed the execution of ninja and do not pass a -j parameter.</para>
+ <para>When run, <command>ninja</command> normally utilizes the greatest
+ possible number of processes in parallel. By default this is the number of cores on the system,
+ plus two. This may overheat the CPU, or make the system run out
+ of memory. When <command>ninja</command> is invoked from the command line, passing the -jN parameter
+ will limit the number of parallel processes. Some packages
+ embed the execution of <command>ninja</command>, and do not pass the -j parameter on to it.</para>
<para>Using the <emphasis>optional</emphasis> procedure below allows a user to
limit the number of parallel processes via an environment variable,
@@ -62,10 +62,10 @@
<screen>export NINJAJOBS=4</screen>
- will limit ninja to four parallel processes.</para>
+ will limit <command>ninja</command> to four parallel processes.</para>
- <para>If desired, add the capability to use the environment variable
- NINJAJOBS by running:</para>
+ <para>If desired, make <command>ninja</command> recognize the environment variable
+ NINJAJOBS by running the stream editor:</para>
<screen><userinput remap="pre">sed -i '/int Guess/a \
int j = 0;\
@@ -84,7 +84,7 @@
<varlistentry>
<term><parameter>--bootstrap</parameter></term>
<listitem>
- <para>This parameter forces ninja to rebuild itself for the current
+ <para>This parameter forces Ninja to rebuild itself for the current
system.</para>
</listitem>
</varlistentry>
diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index 901bf985c..bd436d868 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -89,13 +89,13 @@ make MANSUFFIX=ssl install</userinput></screen>
You should update OpenSSL when a new version which fixes vulnerabilities
is announced. Since OpenSSL 3.0.0, the OpenSSL versioning scheme
follows the MAJOR.MINOR.PATCH format. API/ABI compatibility
- are guaranteed for the same MAJOR version number. Because LFS
+ is guaranteed for the same MAJOR version number. Because LFS
installs only the shared libraries, there is no need to recompile
packages which link to
<filename class="libraryfile">libcrypto.so</filename> or
<filename class="libraryfile">libssl.so</filename>
- <emphasis>when upgrading to a version with MAJOR version number
- unchanged</emphasis>.
+ <emphasis>when upgrading to a version with the same MAJOR version
+ number</emphasis>.
</para>
<para>
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index 461eb7980..b56e0e5e2 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -46,7 +46,7 @@
<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
-->
- <para>This version of Perl now builds the Compress::Raw::Zlib and
+ <para>This version of Perl builds the Compress::Raw::Zlib and
Compress::Raw::BZip2 modules. By
default Perl will use an internal copy of the sources for the build.
Issue the following command so that Perl will use the libraries
@@ -57,7 +57,7 @@ export BUILD_BZIP2=0</userinput></screen>
<para>To have full control over the way Perl is set up, you can remove the
<quote>-des</quote> options from the following command and hand-pick the way
- this package is built. Alternatively, use the command exactly as below to
+ this package is built. Alternatively, use the command exactly as shown below to
use the defaults that Perl auto-detects:</para>
<screen><userinput remap="configure">sh Configure -des \
@@ -82,7 +82,7 @@ export BUILD_BZIP2=0</userinput></screen>
<term><parameter>-Dvendorprefix=/usr</parameter></term>
<listitem>
<para>This ensures <command>perl</command> knows how to
- tell packages where they should install their perl modules.</para>
+ tell packages where they should install their Perl modules.</para>
</listitem>
</varlistentry>
@@ -99,33 +99,34 @@ export BUILD_BZIP2=0</userinput></screen>
-Dman3dir=/usr/share/man/man3</parameter></term>
<listitem>
<para>Since Groff is not installed yet, <command>Configure</command>
- thinks that we do not want man pages for Perl. Issuing these
- parameters overrides this decision.</para>
+ will not create man pages for Perl. These
+ parameters override this behavior.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Duseshrplib</parameter></term>
<listitem>
- <para>Build a shared libperl needed by some perl modules.</para>
+ <para>Build a shared libperl needed by some Perl modules.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dusethreads</parameter></term>
<listitem>
- <para>Build perl with support for threads.</para>
+ <para>Build Perl with support for threads.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
<listitem>
- <para>These settings define where Perl is looking for installed
+ <para>These settings define where Perl looks for installed
modules. The LFS editors chose to put them in a directory structure
- based on the Major.Minor version of Perl (&perl-version-min;) which
- allows upgrading Perl to newer Patch levels (&perl-version;) without
- the need to reinstall all of the modules again.</para>
+ based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
+ allows upgrading Perl to newer patch levels (the patch level is
+ the last dot separated part in the full version string like
+ &perl-version;) without reinstalling all of the modules.</para>
</listitem>
</varlistentry>
@@ -185,7 +186,7 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
<varlistentry id="corelist">
<term><command>corelist</command></term>
<listitem>
- <para>A commandline frontend to Module::CoreList</para>
+ <para>A command line front end to Module::CoreList</para>
<indexterm zone="ch-system-perl corelist">
<primary sortas="b-corelist">corelist</primary>
</indexterm>
@@ -250,8 +251,8 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
<varlistentry id="instmodsh">
<term><command>instmodsh</command></term>
<listitem>
- <para>Shell script for examining installed Perl modules,
- and can create a tarball from an installed module</para>
+ <para>Shell script for examining installed Perl modules;
+ it can create a tarball from an installed module</para>
<indexterm zone="ch-system-perl instmodsh">
<primary sortas="b-instmodsh">instmodsh</primary>
</indexterm>
@@ -284,7 +285,7 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
<listitem>
<para>Combines some of the best features of C, <command>sed</command>,
<command>awk</command> and <command>sh</command> into a single
- swiss-army language</para>
+ Swiss Army language</para>
<indexterm zone="ch-system-perl perl">
<primary sortas="b-perl">perl</primary>
</indexterm>
diff --git a/chapter08/python.xml b/chapter08/python.xml
index b03817629..1ac1b538a 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -25,7 +25,8 @@
<para>The Python 3 package contains the Python development environment. It
is useful for object-oriented programming, writing scripts, prototyping
- large programs, or developing entire applications.</para>
+ large programs, and developing entire applications. Python is an interpreted
+ computer language.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -56,7 +57,7 @@
<varlistentry>
<term><parameter>--with-system-expat</parameter></term>
<listitem>
- <para>This switch enables linking against system version of
+ <para>This switch enables linking against the system version of
<application>Expat</application>.</para>
</listitem>
</varlistentry>
@@ -64,15 +65,19 @@
<varlistentry>
<term><parameter>--with-system-ffi</parameter></term>
<listitem>
- <para>This switch enables linking against system version of
- <application>libffi</application>.</para>
+ <para>This switch enables linking against the system version of
+ <filename class='libraryfile'>libffi.so</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--enable-optimizations</parameter></term>
<listitem>
- <para>This switch enables stable, but expensive, optimizations.</para>
+ <para>This switch enables extensive, but time-consuming, optimization
+ steps. The interpreter is built twice; tests performed on the first
+ build are used to improve the optimized final version.</para>
+ <!-- This description was drawn from the README.rst file
+ in the Python-3.11.0 package. -->
</listitem>
</varlistentry>
@@ -84,7 +89,7 @@
<para>Running the tests at this point is not recommended. The
tests are known to hang indefinitely in the partial LFS environment.
- If desired, the tests can be rerun at the end of this chapter or
+ If desired, the tests can be rerun at the end of this chapter, or
when Python 3 is reinstalled in BLFS. To run the tests anyway,
issue <command>make test</command>.</para>
@@ -92,29 +97,34 @@
<screen><userinput remap="install">make install</userinput></screen>
- <para>In several places we use the <command>pip3</command> command to
+ <para>We use the <command>pip3</command> command to
install Python 3 programs and modules for all users as
- <systemitem class='username'>root</systemitem>. This conflicts
- with the Python developers recommendation to install packages into a
- virtual environment or the home directory of a regular user (by running
- <command>pip3</command> as this user). To this end, a multi-line warning
- is written when using <command>pip3</command> as the
- <systemitem class='username'>root</systemitem> user. The main reason
- of this recommendation is for avoiding a conflict with the system
- package manager (<command>dpkg</command> for example), but LFS does not
- have a system-wide package manager so this is not a problem. And,
- <command>pip3</command> will attempt to check for a new version of
- itself whenever it's run. As domain name resolving is not configured
- yet in LFS chroot environment, it will fail to check for a new version
- and produce a warning. Once we boot the LFS system and set up network
- connection, it will then produce a warning telling the user to update it
- from a pre-built wheel on PyPI if any new version is available. But LFS
- consider <command>pip3</command> a part of Python 3 so it should not be
- updated separately, and an update from a pre-built wheel will deviate
- from our purpose to build a Linux system from source code. So the
- warning for a new <command>pip3</command> version should be ignored as
- well. If desired, suppress these warnings by running the following
- commands:</para>
+ <systemitem class='username'>root</systemitem> in several places in this book.
+ This conflicts with the Python developers' recommendation: to install packages into a
+ virtual environment, or into the home directory of a regular user (by running
+ <command>pip3</command> as this user). A multi-line warning
+ is triggered whenever <command>pip3</command> is issued by the
+ <systemitem class='username'>root</systemitem> user.</para>
+
+ <para>The main reason
+ for the recommendation is to avoid conflicts with the system's
+ package manager (<command>dpkg</command>, for example). LFS does not
+ have a system-wide package manager, so this is not a problem. Also,
+ <command>pip3</command> will check for a new version of
+ itself whenever it's run. Since domain name resolution is not yet configured
+ in the LFS chroot environment, <command>pip3</command> cannot check
+ for a new version of itself, and will
+ produce a warning. </para>
+
+ <para>After we boot the LFS system and set up a network connection,
+ a different warning will be issued, telling the user to update <command>pip3</command>
+ from a pre-built wheel on PyPI (whenever a new version is available). But LFS
+ considers <command>pip3</command> to be a part of Python 3, so it should not be
+ updated separately. Also, an update from a pre-built wheel would deviate
+ from our objective: to build a Linux system from source code. So the
+ warning about a new version of <command>pip3</command> should be ignored as
+ well. If you wish, you can suppress all these warnings by running the following
+ command, which creates a configuration file:</para>
<screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
<literal>[global]
@@ -130,20 +140,20 @@ EOF
<important>
<para>
In LFS and BLFS we normally build and install Python modules with the
- <command>pip3</command> command. Please take care that the
- <command>pip3 install</command> commands in both the books should be
- run as the &root; user unless it's for a Python virtual environment.
- Running a <command>pip3 install</command> as a non-&root; user may seem
- to work fine, but it will cause the installed module to be inaccessible
+ <command>pip3</command> command. Please be sure that the
+ <command>pip3 install</command> commands in both books are
+ run as the &root; user (unless it's for a Python virtual environment).
+ Running <command>pip3 install</command> as a non-&root; user may seem
+ to work, but it will cause the installed module to be inaccessible
by other users.
</para>
<para>
<command>pip3 install</command> will not reinstall an already installed
- module by default. For using the <command>pip3 install</command>
+ module automatically. When using the <command>pip3 install</command>
command to upgrade a module (for example, from meson-0.61.3 to
meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
- the command line. If it's really necessary to downgrade a module or
+ the command line. If it's really necessary to downgrade a module, or
reinstall the same version for some reason, insert
<parameter>--force-reinstall --no-deps</parameter> into the command
line.
@@ -167,7 +177,7 @@ tar --strip-components=1 \
<term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term>
<listitem>
<para>Ensure the installed files have the correct ownership and
- permissions. Without these options, using <application>tar</application>
+ permissions. Without these options, <application>tar</application>
will install the package files with the upstream creator's values.
</para>
</listitem>
@@ -226,8 +236,8 @@ tar --strip-components=1 \
<para>
is a wrapper script that opens a <application>Python</application>
aware GUI editor. For this script to run, you must have installed
- <application>Tk</application> before Python so that the Tkinter
- Python module is built
+ <application>Tk</application> before Python, so that the Tkinter
+ Python module is built.
</para>
<indexterm zone="ch-system-Python">
<primary sortas="b-idle3">idle3</primary>
@@ -240,7 +250,7 @@ tar --strip-components=1 \
<listitem>
<para>
The package installer for Python. You can use pip to install
- packages from Python Package Index and other indexes
+ packages from Python Package Index and other indexes.
</para>
<indexterm zone="ch-system-Python">
<primary sortas="b-pip3">pip3</primary>
@@ -264,8 +274,8 @@ tar --strip-components=1 \
<term><command>python3</command></term>
<listitem>
<para>
- is an interpreted, interactive, object-oriented programming
- language
+ is the interpreter for Python, an interpreted, interactive,
+ object-oriented programming language
</para>
<indexterm zone="ch-system-Python">
<primary sortas="b-python3">python3</primary>
diff --git a/chapter08/vim.xml b/chapter08/vim.xml
index 948650e34..8672ad818 100644
--- a/chapter08/vim.xml
+++ b/chapter08/vim.xml
@@ -54,7 +54,7 @@
<screen><userinput remap="pre">echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
- <para>Prepare vim for compilation:</para>
+ <para>Prepare Vim for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -83,7 +83,7 @@
<screen><userinput remap="install">make install</userinput></screen>
- <para>Many users are used to using <command>vi</command> instead of
+ <para>Many users reflexively type <command>vi</command> instead of
<command>vim</command>. To allow execution of <command>vim</command>
when users habitually enter <command>vi</command>, create a
symlink for both the binary and the man page in the provided
@@ -94,7 +94,7 @@ for L in /usr/share/man/{,*/}man1/vim.1; do
ln -sv vim.1 $(dirname $L)/vi.1
done</userinput></screen>
- <para>By default, vim's documentation is installed in <filename
+ <para>By default, Vim's documentation is installed in <filename
class="directory">/usr/share/vim</filename>. The following symlink
allows the documentation to be accessed via <filename
class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
@@ -103,10 +103,10 @@ done</userinput></screen>
<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
<para>If an X Window System is going to be installed on the LFS
- system, it may be necessary to recompile vim after installing X. Vim
+ system, it may be necessary to recompile Vim after installing X. Vim
comes with a GUI version of the editor that requires X and some
additional libraries to be installed. For more information on this
- process, refer to the vim documentation and the vim installation page
+ process, refer to the Vim documentation and the Vim installation page
in the BLFS book at <ulink
url="&blfs-book;postlfs/vim.html"/>.</para>
@@ -166,8 +166,8 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>vim -c ':options'</userinput></screen>
<note>
- <para>By default, vim only installs spell files for the English language.
- To install spell files for your preferred language, copy the
+ <para>By default, vim only installs spell-checking files for the English language.
+ To install spell-checking files for your preferred language, copy the
<filename class='extension'>.spl</filename> and optionally, the
<filename class='extension'>.sug</filename> files for your language
and character encoding from
@@ -175,7 +175,7 @@ EOF</userinput></screen>
<filename class='directory'>
/usr/share/&vim-docdir;/spell/</filename>.</para>
- <para>To use these spell files, some configuration in
+ <para>To use these spell-checking files, some configuration in
<filename>/etc/vimrc</filename> is needed, e.g.:</para>
<screen><literal>set spelllang=en,ru
@@ -297,7 +297,8 @@ set spell</literal></screen>
<term><command>xxd</command></term>
<listitem>
<para>Creates a hex dump of the given file; it can
- also do the reverse, so it can be used for binary patching</para>
+ also perform the inverse operation, so it can be used for binary
+ patching</para>
<indexterm zone="ch-system-vim xxd">
<primary sortas="b-xxd">xxd</primary>
</indexterm>
diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml
index 5b09fc65b..57457dacc 100644
--- a/chapter08/wheel.xml
+++ b/chapter08/wheel.xml
@@ -40,21 +40,21 @@
<sect2 role="installation">
<title>Installation of Wheel</title>
- <para>Compile wheel with the following command:</para>
+ <para>Compile Wheel with the following command:</para>
<screen><userinput remap="make">PYTHONPATH=src pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
- <para>Install wheel with the following command:</para>
+ <para>Install Wheel with the following command:</para>
<screen><userinput remap="install">pip3 install --no-index --find-links=dist wheel</userinput></screen>
<variablelist>
- <title>The meaning of the pip3 commands:</title>
+ <title>The meaning of the pip3 configuration options and commands:</title>
<varlistentry>
<term><envar>PYTHONPATH=src</envar></term>
<listitem>
- <para>Allow using this package (not installed yet) to build a
+ <para>Allows this package (not installed yet) to build a
wheel archive for itself, to avoid a chicken-or-egg problem.</para>
</listitem>
</varlistentry>
@@ -62,14 +62,14 @@
<varlistentry>
<term><command>wheel</command></term>
<listitem>
- <para>Build wheel archive for this package.</para>
+ <para>This command builds the wheel archive for this package.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-w dist</parameter></term>
<listitem>
- <para>Put the created wheels into the
+ <para>Instructs pip to put the created wheel into the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>
@@ -77,7 +77,7 @@
<varlistentry>
<term><command>install</command></term>
<listitem>
- <para>Install the package.</para>
+ <para>This command installs the package.</para>
</listitem>
</varlistentry>
@@ -86,9 +86,9 @@
<parameter>--no-deps</parameter>, and
<parameter>--no-index</parameter></term>
<listitem>
- <para>Prevent pip from fetching files from the online package
+ <para>These options prevent fetching files from the online package
repository (PyPI). If packages are installed in the correct order,
- then it won't need to fetch any files in the first place, but these
+ pip won't need to fetch any files in the first place; these
options add some safety in case of user error.</para>
</listitem>
</varlistentry>
@@ -96,7 +96,7 @@
<varlistentry>
<term><parameter>--find-links dist</parameter></term>
<listitem>
- <para>Search wheel archives from the
+ <para>Instructs pip to search for wheel archives in the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>
@@ -128,7 +128,7 @@
<term><command>wheel</command></term>
<listitem>
<para>
- is an utility to unpack, pack, or convert wheel packages
+ is a utility to unpack, pack, or convert wheel archives
</para>
<indexterm zone="ch-system-wheel">
<primary sortas="b-wheel">wheel</primary>