aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bryant <davidbryant@gvtc.com>2022-11-17 12:08:13 -0600
committerDavid Bryant <davidbryant@gvtc.com>2022-11-17 12:08:13 -0600
commit091d624df5c599faef288f4d2c447f167003392a (patch)
treee2da0620a67f9354ef9efcc13fa91c67982bf613
parentebecd08c0582ef9c01f784452f87f3a39cf40cdd (diff)
Correct capitalization, spelling, grammar, and idiom. Tighten the
prose by removing some circumlocutions.
-rw-r--r--chapter08/glibc.xml20
-rw-r--r--chapter08/introduction.xml24
-rw-r--r--chapter08/pkgmgt.xml15
3 files changed, 30 insertions, 29 deletions
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 0bc9a5dcf..a85559d24 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -43,7 +43,7 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
- <para>First, fix an issue building Glibc with parallel jobs and make-4.4
+ <para>First, fix an issue building Glibc with parallel jobs and Make-4.4
or later:</para>
<screen><userinput remap="pre">sed '/MAKEFLAGS :=/s/)r/) -r/' -i Makerules</userinput></screen>
@@ -82,7 +82,7 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--disable-werror</parameter></term>
<listitem>
- <para>This option disables the -Werror option passed to
+ <para>This option disables the -werror option passed to
GCC. This is necessary for running the test suite.</para>
</listitem>
</varlistentry>
@@ -90,7 +90,7 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--enable-kernel=&min-kernel;</parameter></term>
<listitem>
- <para>This option tells the build system that this glibc may
+ <para>This option tells the build system that this Glibc may
be used with kernels as old as &min-kernel;. This means generating
workarounds in case a system call introduced in a later version
cannot be used.</para>
@@ -217,7 +217,7 @@ esac</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
- <para>Fix hardcoded path to the executable loader in
+ <para>Fix a hardcoded path to the executable loader in the
<command>ldd</command> script:</para>
<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i /usr/bin/ldd</userinput></screen>
@@ -235,9 +235,9 @@ mkdir -pv /var/cache/nscd</userinput></screen>
install -v -Dm644 ../nscd/nscd.service /usr/lib/systemd/system/nscd.service</userinput></screen>
<para>Next, install the locales that can make the system respond in a
- different language. None of the locales are required, but if some of them
- are missing, the test suites of future packages would skip important
- testcases.</para>
+ different language. None of these locales are required, but if some of them
+ are missing, the test suites of some packages will skip important
+ test cases.</para>
<para>Individual locales can be installed using the
<command>localedef</command> program. E.g., the second
@@ -290,7 +290,7 @@ localedef -i zh_TW -f UTF-8 zh_TW.UTF-8</userinput></screen>
<para>In addition, install the locale for your own country, language and
character set.</para>
- <para>Alternatively, install all locales listed in the
+ <para>Alternatively, install all the locales listed in the
<filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
(it includes every locale listed above and many more) at once with the
following time-consuming command:</para>
@@ -326,7 +326,7 @@ localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true</userinput></scr
</indexterm>
<sect3>
- <title>Adding nsswitch.conf</title>
+ <title>Adding Nsswitch.conf</title>
<para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
because the Glibc defaults do not work well in a networked environment.
@@ -356,7 +356,7 @@ EOF</userinput></screen>
</sect3>
<sect3>
- <title>Adding time zone data</title>
+ <title>Adding Time Zone Data</title>
<para>Install and set up the time zone data with the following:</para>
<screen><userinput>tar -xf ../../tzdata&tzdata-version;.tar.gz
diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml
index b23175b3f..b05a9761a 100644
--- a/chapter08/introduction.xml
+++ b/chapter08/introduction.xml
@@ -22,17 +22,17 @@
<para>We do not recommend using optimizations. They can make
a program run slightly faster, but they may also cause compilation
- difficulties and problems when running the program. If a package refuses to
+ difficulties, and problems when running the program. If a package refuses to
compile when using optimization, try to compile it without optimization and
see if that fixes the problem. Even if the package does compile when using
optimization, there is the risk it may have been compiled incorrectly because
- of the complex interactions between the code and build tools. Also note that
+ of the complex interactions between the code and the build tools. Also note that
the <option>-march</option> and <option>-mtune</option> options using values
not specified in the book have not been tested. This may cause problems with
the toolchain packages (Binutils, GCC and Glibc). The small potential gains
- achieved in using compiler optimizations are often outweighed by the risks.
+ achieved by using compiler optimizations are often outweighed by the risks.
First-time builders of LFS are encouraged to build without custom
- optimizations. The subsequent system will still run very fast and be stable
+ optimizations. The resulting system will still run very fast, and be stable
at the same time.</para>
<para>Before the installation instructions, each installation page provides
@@ -42,31 +42,31 @@
instructions, there is a list of programs and libraries (along with brief
descriptions) that the package installs.</para>
- <note><para>The SBU values and required disk space includes test suite data
+ <note><para>The SBU values and required disk space include test suite data
for all applicable packages in <xref linkend="chapter-building-system"/>. SBU
values have been calculated using a single CPU core (-j1) for all
operations.</para></note>
<sect2>
- <title>About libraries</title>
+ <title>About Libraries</title>
<para>In general, the LFS editors discourage building and installing static
- libraries. The original purpose for most static libraries has been made
+ libraries. Most static libraries have been made
obsolete in a modern Linux system. In addition, linking a static library
into a program can be detrimental. If an update to the library is needed
- to remove a security problem, all programs that use the static library will
- need to be relinked to the new library. Since the use of static libraries
+ to remove a security problem, every program that uses the static library will
+ need to be relinked with the new library. Since the use of static libraries
is not always obvious, the relevant programs (and the procedures needed to
do the linking) may not even be known.</para>
- <para>In the procedures in this chapter, we remove or disable installation of
+ <para>The procedures in this chapter remove or disable installation of
most static libraries. Usually this is done by passing a
<option>--disable-static</option> option to <command>configure</command>.
In other cases, alternate means are needed. In a few cases, especially
- glibc and gcc, the use of static libraries remains essential to the general
+ Glibc and GCC, the use of static libraries remains an essential feature of the
package building process. </para>
- <para>For a more complete discussion of libraries, see the discussion
+ <para>For a more complete discussion of libraries, see
<ulink url="&blfs-book;introduction/libraries.html">
Libraries: Static or shared?</ulink> in the BLFS book.</para>
diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml
index 60c472ad4..7496f09a4 100644
--- a/chapter08/pkgmgt.xml
+++ b/chapter08/pkgmgt.xml
@@ -12,10 +12,10 @@
<para>Package Management is an often requested addition to the LFS Book. A
Package Manager tracks the installation of files, making it easier to
- remove and upgrade packages. As well as the binary and library files, a
- package manager will handle the installation of configuration files. Before
+ remove and upgrade packages. A good package manager will handle the
+ installation of configuration files, and also install the executable files. Before
you begin to wonder, NO&mdash;this section will not talk about nor recommend
- any particular package manager. What it provides is a roundup of the more
+ any particular package manager. What it does provide is a roundup of the more
popular techniques and how they work. The perfect package manager for you may
be among these techniques, or it may be a combination of two or more of these
techniques. This section briefly mentions issues that may arise when upgrading
@@ -61,8 +61,8 @@
</listitem>
<listitem>
- <para>If Linux API headers or glibc need to be upgraded to a newer
- version, (e.g., from glibc-2.31 to glibc-2.32), it is safer to
+ <para>If the Linux API headers or Glibc need to be upgraded to a newer
+ version, (e.g., from Glibc-2.31 to Glibc-2.32), it is safer to
rebuild LFS. Though you <emphasis>may</emphasis> be able to rebuild
all the packages in their dependency order, we do not recommend
it. </para>
@@ -202,7 +202,7 @@
it is installed in <filename class="directory">/usr</filename> though in
reality it is installed in the
<filename class="directory">/usr/pkg</filename> hierarchy. Installing in
- this manner is not usually a trivial task. For example, consider that you
+ this manner is not usually a trivial task. For example, suppose you
are installing a package libfoo-1.1. The following instructions may
not install the package properly:</para>
@@ -321,7 +321,8 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
depend on the position of files on a disk system. Cloning an LFS build to
another computer with the same architecture as the base system is as
simple as using <command>tar</command> on the LFS partition that contains
- the root directory (about 250MB uncompressed for a base LFS build), copying
+ the root directory (about 900MB uncompressed for a basic LFS build), copying
+ <!-- D. Bryant created LFS 11.2 in October 2022; 900MB is (roughly) the size of his rsync archive. -->
that file via network transfer or CD-ROM / USB stick to the new system, and expanding
it. After that, a few configuration files will have to be changed.
Configuration files that may need to be updated include: