From 9aff8c45233d87f8d589efc7e7933c9e14770f6c Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 6 Dec 2022 10:27:41 -0600 Subject: [PATCH 1/8] Corrected capitalization and modified some descriptions of libraries, for consistency of style. --- chapter08/gettext.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 libasprintf - defines the autosprintf class, which makes + Defines the autosprintf class, which makes C formatted output routines usable in C++ programs, for use with the <string> strings and the <iostream> streams @@ -359,7 +359,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so libgettextlib - a private library containing common routines used by the + Contains common routines used by the various Gettext programs; these are not intended for general use libgettextlib @@ -385,7 +385,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so libgettextsrc - A private library containing common routines used by the + Provides common routines used by the various Gettext programs; these are not intended for general use libgettextsrc @@ -406,8 +406,8 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so preloadable_libintl - A library, intended to be used by LD_PRELOAD that assists - libintl in logging + A library, intended to be used by LD_PRELOAD, that helps + libintl log untranslated messages preloadable_libintl From 79ac947fda4fbd84a40b4666a3138e79b24811af Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 6 Dec 2022 11:04:37 -0600 Subject: [PATCH 2/8] Correct capitalization. Correct spellig: "test suite" is two words. Use the personal relative pronoun "who" when referring to a person. --- chapter08/bash.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapter08/bash.xml b/chapter08/bash.xml index 4ea981d5b..a004f7ac3 100644 --- a/chapter08/bash.xml +++ b/chapter08/bash.xml @@ -23,7 +23,7 @@ - <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> From 7c263b6db0e67d2d76aa008c1cf861f61a417673 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 11:33:02 -0600 Subject: [PATCH 3/8] Clean up capitalization. Improve English idiom. Use the present perfect tense when appropriate. Replace "dlopening" with "opening dynamically linked libraries" ... "dlopen" may be a Linux command, but that doesn't make it a verb in English. --- chapter08/libtool.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index e7eeb3ad9..5f1d3c36d 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<N></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 linked libraries</para> <indexterm zone="ch-system-libtool libltdl"> <primary sortas="c-libltdl">libltdl</primary> </indexterm> From ee65db462676a6955778aeb2eec769ce5ef5b208 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 11:59:03 -0600 Subject: [PATCH 4/8] Fix a grammatical error (subject and verb must agree in number) and improve English idiom. --- chapter08/gdbm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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> From 8199f8e631779eaa98561e74a4b47baa7757a591 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 12:55:34 -0600 Subject: [PATCH 5/8] Removed some circomlocutions. Made "option" singular; "des" only appears once. Improved idiom ("as shown below"). "command line" is two words; "front end" is two words. "Swiss Army" is a trademark; it should be caputalized. --- chapter08/perl.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/chapter08/perl.xml b/chapter08/perl.xml index 461eb7980..1e237ddc6 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 @@ -56,8 +56,8 @@ 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 + <quote>-des</quote> option from the following command and hand-pick the way + 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,33 @@ 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> + reinstalling all of the modules.</para> </listitem> </varlistentry> @@ -185,7 +185,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 +250,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 +284,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> From 67dfc3b3717972e37eaa78b042504ce07c389a3a Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 14:07:23 -0600 Subject: [PATCH 6/8] Revert a previous change; -des is actually three options, -d, -e, & -s. Thanks to Pierre for pointing this out. --- chapter08/perl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/perl.xml b/chapter08/perl.xml index 1e237ddc6..112780c4a 100644 --- a/chapter08/perl.xml +++ b/chapter08/perl.xml @@ -56,7 +56,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> option from the following command and hand-pick the way + <quote>-des</quote> options from the following command and hand-pick the way this package is built. Alternatively, use the command exactly as shown below to use the defaults that Perl auto-detects:</para> From 5042efcc2f694301ebaae0646a8aacb5eeb1b131 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 14:45:38 -0600 Subject: [PATCH 7/8] Fix a grammatical error (subject / verb number). Improve English idiom. --- chapter08/openssl.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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> From 8f10e6fa4909f5d01d207091dac303510b722206 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Tue, 6 Dec 2022 14:56:58 -0600 Subject: [PATCH 8/8] Patch up English idiom here and there. --- chapter08/libelf.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 - Libelf is part of elfutils-&elfutils-version; package. Use - the elfutils-&elfutils-version;.tar.bz2 as the source tarball. + Libelf is part of the elfutils-&elfutils-version; package. Use + the elfutils-&elfutils-version;.tar.bz2 file as the source tarball. Prepare Libelf for compilation: @@ -59,7 +59,7 @@ make check One test named run-low_high_pc.sh is known to - fail on 32-bit x86 system. + fail on 32-bit x86 systems. Install only Libelf: