From 9aff8c45233d87f8d589efc7e7933c9e14770f6c Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 6 Dec 2022 10:27:41 -0600 Subject: Corrected capitalization and modified some descriptions of libraries, for consistency of style. --- chapter08/gettext.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chapter08') 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 -- cgit v1.2.3-54-g00ecf From 79ac947fda4fbd84a40b4666a3138e79b24811af Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 6 Dec 2022 11:04:37 -0600 Subject: 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(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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: 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(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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: 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(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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: 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(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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: 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(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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: Fix a grammatical error (subject / verb number). Improve English idiom. --- chapter08/openssl.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf 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 up English idiom here and there. --- chapter08/libelf.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chapter08') 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: -- cgit v1.2.3-54-g00ecf From e9c46b31c7ddc67020989f5816cbd75474ca4d9a Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 7 Dec 2022 11:10:58 -0600 Subject: Add more details to the descriptiion of what this package does. Correct capitalizatiom throughout, and tweak English idiom. --- chapter08/libffi.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'chapter08') diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml index 4f778961d..9e4b132df 100644 --- a/chapter08/libffi.xml +++ b/chapter08/libffi.xml @@ -26,6 +26,11 @@ 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. + + 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++. &buildtime; @@ -43,7 +48,7 @@ Installation of Libffi - Similar to GMP, libffi builds with optimizations specific + Like GMP, Libffi builds with optimizations specific to the processor in use. If building for another system, change the value of the --with-gcc-arch= parameter in the following command to an architecture name fully implemented by the @@ -52,7 +57,7 @@ Illegal Operation Errors. - Prepare libffi for compilation: + Prepare Libffi for compilation: ./configure --prefix=/usr \ --disable-static \ @@ -67,7 +72,7 @@ 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 --disable-exec-static-tramp - Disable static trampoline support. It's a new security - feature in libffi, but some BLFS packages (notably + Disable static trampoline support, a new security + feature in Libffi. Some BLFS packages (notably GJS) have not been adapted for it. @@ -121,7 +126,7 @@ libffi - contains the foreign function interface API functions + Contains the foreign function interface API functions libffi -- cgit v1.2.3-54-g00ecf From 8e751f73193e7d311a4790540b364e091ad973be Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 7 Dec 2022 12:54:04 -0600 Subject: Added an explanation. Python is a language. python3 is a program. Inserted the definite article where idiom requires it. Added more detail to an option description. Broke an extremely long paragraph into three pieces; cleaned up English idiom and punctuation all the way through this section. In "Short Descriptions", inserted periods where appropriate, and clarified the description of python3, which is a program, not a language. --- chapter08/python.xml | 92 +++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 41 deletions(-) (limited to 'chapter08') diff --git a/chapter08/python.xml b/chapter08/python.xml index b03817629..5b80fa339 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -25,7 +25,8 @@ 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. + large programs, and developing entire applications. Python is an interpreted + computer language. &buildtime; @@ -56,7 +57,7 @@ --with-system-expat - This switch enables linking against system version of + This switch enables linking against the system version of Expat. @@ -64,15 +65,19 @@ --with-system-ffi - This switch enables linking against system version of - libffi. + This switch enables linking against the system version of + libffi.so. --enable-optimizations - This switch enables stable, but expensive, optimizations. + 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. + @@ -84,7 +89,7 @@ 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 make test. @@ -92,29 +97,34 @@ make install - In several places we use the pip3 command to + We use the pip3 command to install Python 3 programs and modules for all users as - root. This conflicts - with the Python developers recommendation to install packages into a - virtual environment or the home directory of a regular user (by running - pip3 as this user). To this end, a multi-line warning - is written when using pip3 as the - root user. The main reason - of this recommendation is for avoiding a conflict with the system - package manager (dpkg for example), but LFS does not - have a system-wide package manager so this is not a problem. And, - pip3 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 pip3 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 pip3 version should be ignored as - well. If desired, suppress these warnings by running the following - commands: + root 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 + pip3 as this user). A multi-line warning + is triggered whenever pip3 is issued by the + root user. + + The main reason + for the recommendation is to avoid conflicts with the system's + package manager (dpkg, for example). LFS does not + have a system-wide package manager, so this is not a problem. Also, + pip3 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, pip3 cannot check + for a new version of itself, and will + produce a warning. + + After we boot the LFS system and set up a network connection, + a different warning will be issued, telling the user to update pip3 + from a pre-built wheel on PyPI (whenever a new version is available). But LFS + considers pip3 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 pip3 should be ignored as + well. If you wish, you can suppress all these warnings by running the following + command, which creates a configuration file: cat > /etc/pip.conf << EOF [global] @@ -130,20 +140,20 @@ EOF In LFS and BLFS we normally build and install Python modules with the - pip3 command. Please take care that the - pip3 install commands in both the books should be - run as the &root; user unless it's for a Python virtual environment. - Running a pip3 install as a non-&root; user may seem - to work fine, but it will cause the installed module to be inaccessible + pip3 command. Please be sure that the + pip3 install commands in both books are + run as the &root; user (unless it's for a Python virtual environment). + Running pip3 install as a non-&root; user may seem + to work, but it will cause the installed module to be inaccessible by other users. pip3 install will not reinstall an already installed - module by default. For using the pip3 install + module automatically. When using the pip3 install command to upgrade a module (for example, from meson-0.61.3 to meson-0.62.0), insert the option --upgrade 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 --force-reinstall --no-deps into the command line. @@ -167,7 +177,7 @@ tar --strip-components=1 \ and Ensure the installed files have the correct ownership and - permissions. Without these options, using tar + permissions. Without these options, tar will install the package files with the upstream creator's values. @@ -226,8 +236,8 @@ tar --strip-components=1 \ is a wrapper script that opens a Python aware GUI editor. For this script to run, you must have installed - Tk before Python so that the Tkinter - Python module is built + Tk before Python, so that the Tkinter + Python module is built. idle3 @@ -240,7 +250,7 @@ tar --strip-components=1 \ 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. pip3 @@ -264,8 +274,8 @@ tar --strip-components=1 \ python3 - is an interpreted, interactive, object-oriented programming - language + is the interpreter for Python, an interpreted, interactive, + object-oriented programming language python3 -- cgit v1.2.3-54-g00ecf From d9883060de3a70a3468c2629b7853b2c54f59647 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 8 Dec 2022 15:13:28 -0600 Subject: Capitalized references to the package. Clarified the descriptions of pip3 -- the pip program processes both commands (e.g., install) and options (e.g., --no-index). Expressed option / command descriptions in the iindicative mood. The imperative mood should only be used to tell the reader what to do, not in explanatory verbiage. Inserted the definite article here and there. Corrected a misspelled instance of the indefinite article: we don't say "an utility" because the initial phoneme in "utility" is pronounced as YOO. --- chapter08/wheel.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'chapter08') diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml index 5b09fc65b..7ab14426a 100644 --- a/chapter08/wheel.xml +++ b/chapter08/wheel.xml @@ -40,21 +40,21 @@ Installation of Wheel - Compile wheel with the following command: + Compile Wheel with the following command: PYTHONPATH=src pip3 wheel -w dist --no-build-isolation --no-deps $PWD - Install wheel with the following command: + Install Wheel with the following command: pip3 install --no-index --find-links=dist wheel - The meaning of the pip3 commands: + The meaning of the pip3 configuration options and commands: PYTHONPATH=src - Allow using this package (not installed yet) to build a + Allows this package (not installed yet) to build a wheel archive for itself, to avoid a chicken-or-egg problem. @@ -62,14 +62,14 @@ wheel - Build wheel archive for this package. + This command builds the wheel archive for this package. -w dist - Put the created wheels into the + Instructs pip to put the created wheel into the dist directory. @@ -77,7 +77,7 @@ install - Install the package. + This command installs the package. @@ -86,9 +86,9 @@ --no-deps, and --no-index - Prevent pip from fetching files from the online package + 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. @@ -96,7 +96,7 @@ --find-links dist - Search wheel archives from the + Instructs pip to search for wheel archives in the dist directory. @@ -128,7 +128,7 @@ wheel - is an utility to unpack, pack, or convert wheel packages + is a utility to unpack, pack, or convert wheel packages wheel -- cgit v1.2.3-54-g00ecf From a3ebe8aa2b3bd19ec757706269fd7e15e5c9c55b Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 8 Dec 2022 17:23:07 -0600 Subject: Corrected capitalization of the package name. This was hard to do because some references appear to refer to the program itself, and not to the package. Corrected English idiom here and there. --- chapter08/ninja.xml | 24 ++++++++++++------------ chapter08/wheel.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'chapter08') diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml index 4f3a25e88..7c72b9598 100644 --- a/chapter08/ninja.xml +++ b/chapter08/ninja.xml @@ -36,10 +36,10 @@ - This section is not strictly required for LFS if not using - systemd. On the other hand, ninja associated to meson makes + 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 the BLFS book. @@ -49,12 +49,12 @@ Installation of Ninja - 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. + When run, ninja 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 ninja is invoked from the command line, passing the -jN parameter + will limit the number of parallel processes. Some packages + embed the execution of ninja, and do not pass the -j parameter on to it. Using the optional procedure below allows a user to limit the number of parallel processes via an environment variable, @@ -64,8 +64,8 @@ will limit ninja to four parallel processes. - If desired, add the capability to use the environment variable - NINJAJOBS by running: + If desired, make ninja recognize the environment variable + NINJAJOBS by running the stream editor: sed -i '/int Guess/a \ int j = 0;\ @@ -84,7 +84,7 @@ --bootstrap - This parameter forces ninja to rebuild itself for the current + This parameter forces Ninja to rebuild itself for the current system. diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml index 7ab14426a..57457dacc 100644 --- a/chapter08/wheel.xml +++ b/chapter08/wheel.xml @@ -128,7 +128,7 @@ wheel - is a utility to unpack, pack, or convert wheel packages + is a utility to unpack, pack, or convert wheel archives wheel -- cgit v1.2.3-54-g00ecf From 3c07bb94887c2bed937289ade14ad208a87802a7 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 9 Dec 2022 15:35:05 +0800 Subject: libtool: libldtl is for dynamic loading, not dynamic linking On wikipedia, "dlopen" redirects to "dynamic loading" and there is a specific warning: "Dynamically loaded library" redirects here. Not to be confused with dynamically linked library. --- chapter08/libtool.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index 5f1d3c36d..d21d0b751 100644 --- a/chapter08/libtool.xml +++ b/chapter08/libtool.xml @@ -123,7 +123,7 @@ libltdl - Hides the various difficulties of opening dynamically linked libraries + Hides the various difficulties of opening dynamically loaded libraries libltdl -- cgit v1.2.3-54-g00ecf From 30f5283fab13237eb27c9736dc45d697f1aa8daf Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 9 Dec 2022 15:38:15 +0800 Subject: python: style "libffi.so" correctly --- chapter08/python.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/python.xml b/chapter08/python.xml index 5b80fa339..1ac1b538a 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -66,7 +66,7 @@ --with-system-ffi This switch enables linking against the system version of - libffi.so. + libffi.so. -- cgit v1.2.3-54-g00ecf From 4640b37d9680598de7979b830c0c9dc05615d9cd Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 9 Dec 2022 15:40:14 +0800 Subject: ninja: style "ninja" (for the program) with Or the mix up of "ninja" and "Ninja" will seem puzzling... --- chapter08/ninja.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chapter08') diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml index 7c72b9598..74626e30c 100644 --- a/chapter08/ninja.xml +++ b/chapter08/ninja.xml @@ -49,12 +49,12 @@ Installation of Ninja - When run, ninja normally utilizes the greatest possible number of processes - in parallel. By default this is the number of cores on the system, + When run, ninja 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 ninja is invoked from the command line, passing the -jN parameter + of memory. When ninja is invoked from the command line, passing the -jN parameter will limit the number of parallel processes. Some packages - embed the execution of ninja, and do not pass the -j parameter on to it. + embed the execution of ninja, and do not pass the -j parameter on to it. Using the optional procedure below allows a user to limit the number of parallel processes via an environment variable, @@ -62,9 +62,9 @@ export NINJAJOBS=4 - will limit ninja to four parallel processes. + will limit ninja to four parallel processes. - If desired, make ninja recognize the environment variable + If desired, make ninja recognize the environment variable NINJAJOBS by running the stream editor: sed -i '/int Guess/a \ -- cgit v1.2.3-54-g00ecf From 02912947e8a276c61d192157406c7dfb63f048cf Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 9 Dec 2022 16:05:26 +0800 Subject: perl: use "MAJOR.MINOR" instead of "Major.Minor", and explain "patch level" We are already using "MAJOR" and "MINOR" in OpenSSL, do the same here. The semantic versioning documentation (https://semver.org/) always use "patch level", not "Patch level". But let's explain it a little to prevent puzzling people. --- chapter08/perl.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chapter08') diff --git a/chapter08/perl.xml b/chapter08/perl.xml index 112780c4a..b56e0e5e2 100644 --- a/chapter08/perl.xml +++ b/chapter08/perl.xml @@ -123,9 +123,10 @@ export BUILD_BZIP2=0 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 - reinstalling all of the modules. + 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. -- cgit v1.2.3-54-g00ecf From 75d64be391e2cc7dcffffd4f2af7fe61391dfcb2 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Fri, 9 Dec 2022 14:27:24 -0600 Subject: Improve English idiom. Use the indicative mood. --- chapter08/meson.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'chapter08') 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 @@ - <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> -- cgit v1.2.3-54-g00ecf From f8ac129f73959ad54ea6dd177c4541e1e77f58d0 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Fri, 9 Dec 2022 15:45:13 -0600 Subject: Corrected English idiom throughout. Clarified the description of the package. Modified some program descriptions to improve their accuracy, or to correct clumsiness of style. --- chapter08/coreutils.xml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'chapter08') diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 3d2138026..34a41163e 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 dae 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> -- cgit v1.2.3-54-g00ecf From 20d6b70237dda66a4b809417a59fc728de19f90c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Sat, 10 Dec 2022 14:23:40 +0800 Subject: libffi: style "libffi" (library name) with XML tag As we are using "Libffi" for package name, I guess "libffi" (lower case) means the library. So decorate it like how we handle other library names. --- chapter08/libffi.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml index 9e4b132df..579bb6315 100644 --- a/chapter08/libffi.xml +++ b/chapter08/libffi.xml @@ -53,7 +53,8 @@ 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> -- cgit v1.2.3-54-g00ecf From b46fa02ee0d9e3ca270951387aefd224f1b06c79 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Sat, 10 Dec 2022 14:50:10 +0800 Subject: coreutils: fix a typo --- chapter08/coreutils.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 34a41163e..77c6a7a92 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -363,7 +363,7 @@ 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 dae and time in the given format, or sets the + <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> -- cgit v1.2.3-54-g00ecf From daad59ec7b7e972ed53be4a79913508c1d749095 Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Sat, 10 Dec 2022 06:58:31 -0600 Subject: Improved the description of "cmp". --- chapter08/diffutils.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf From 2da001c127fdb9348cfd63ff75d87b156315e4dd Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Sat, 10 Dec 2022 11:37:17 -0600 Subject: Clarified the description of what the programs in this package do. Added a note about xargs. Corrected English idiom. --- chapter08/findutils.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'chapter08') 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> -- cgit v1.2.3-54-g00ecf From 9729cec83d91ef8d4027179a36c9381a9e64c96d Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Sat, 10 Dec 2022 12:56:35 -0600 Subject: Corrected description of what the package does: groff processes both text and images. Patched English idiom. Added a little information about Pinyin (Chinese spelled like English) and grap (an old Unix command for creating graphs). --- chapter08/groff.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'chapter08') diff --git a/chapter08/groff.xml b/chapter08/groff.xml index 64739ac67..1b0870d9d 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> -- cgit v1.2.3-54-g00ecf From abc36486d00cd6f16e3fc17764bfa0f951212aef Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Sat, 10 Dec 2022 14:56:15 -0600 Subject: Clarified directions in re: UEFI. Tweaked verbiage to make it more idiomatic. Clarified meaning of configure options. Made several minor revisions in program descriptions to improve readability. Added a little explanatory material. Changed imperative mood to indicative mood where that was appropriate. --- chapter08/grub.xml | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'chapter08') diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 08d2ac175..831041635 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+ files (<command>bless</command> + is peculiar to Apple machiines; 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> -- cgit v1.2.3-54-g00ecf From 85064a128bb2d96019bb4192c7a10c066e359f58 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Sun, 11 Dec 2022 16:33:44 +0800 Subject: grub: fix a typo --- chapter08/grub.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 831041635..316c1f2ac 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -210,7 +210,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin <term><command>grub-macbless</command></term> <listitem> <para>Is the Mac-style bless for HFS or HFS+ files (<command>bless</command> - is peculiar to Apple machiines; it makes a device bootable)</para> + 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> -- cgit v1.2.3-54-g00ecf From 2fe0fd1eb2f6751d14db3c2bc6bf21841d36bf9d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao <xry111@xry111.site> Date: Sun, 11 Dec 2022 16:35:41 +0800 Subject: grub: HFS and HFS+ are file systems, not files --- chapter08/grub.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter08') diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 316c1f2ac..04fbef91b 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -209,7 +209,7 @@ 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>Is the Mac-style bless for HFS or HFS+ files (<command>bless</command> + <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> -- cgit v1.2.3-54-g00ecf From f07d91ba37cc22006413e80eefdc8d9a4b72b36b Mon Sep 17 00:00:00 2001 From: David Bryant <davidbryant@gvtc.com> Date: Sun, 11 Dec 2022 16:29:49 -0600 Subject: Corrected idiom in section about "arpd". Corrected spelling of "front end" -- it's twp words, not one. Changed square brackets to parentheses; square brackets should only be used to delimit editorial remarks. Removed one definite article referring to the plural; "the" implies a single object. Changed "amount" to "number". In English, an amount refers to a continuous quantity, while a number refers to discrete objects (like networking packetts). Added a qualifier in the description of "ip": the list of commands is not exhaustive. Modified a few program descriptons to improve consistency of style. Changed QOS and COS to QoS and CoS after researching these abbreviations on the internet. "Quality of Service" and "Class of Service" appear, to me, to be the most common way of writing these phrases. --- chapter08/iproute2.xml | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'chapter08') diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index 25e7e81be..d57e4725c 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -42,12 +42,12 @@ <title>Installation of IPRoute2 The arpd 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 arpd and a man page will still - be installed. Prevent this by running the commands below. - If the arpd binary is needed, - instructions for compiling Berkeley DB can be found in the BLFS Book at - . + be built since it depends on Berkeley DB, which is not installed in + LFS. However, a directory and a man page for arpd will still + be installed. Prevent this by running the commands shown below. + (If the arpd program is needed, + instructions for compiling Berkeley DB can be found in the BLFS book at + .) sed -i /ARPD/d Makefile @@ -129,7 +129,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; genl - Generic netlink utility frontend + Generic netlink utility front end genl @@ -140,9 +140,9 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;ifcfg A shell script wrapper for the ip command - [Note that it requires the arping and + (Note that this script requires the arping and rdisk programs from the - iputils package found at .] + iputils package found at .) ifcfg @@ -152,8 +152,8 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; ifstat - Shows the interface statistics, including the amount of - transmitted and received packets by interface + Shows interface statistics, including the number of + packets transmitted and received, by interface ifstat @@ -163,7 +163,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; ip - The main executable. It has several different functions: + The main executable. It has several different functions, including these: ip link <device> allows users to look at the state of devices and to make changes @@ -213,7 +213,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; nstat - Shows network statistics + Displays network statistics nstat @@ -223,7 +223,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; routef - A component of ip route. This is for flushing + A component of ip route, for flushing the routing tables routef @@ -234,7 +234,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; routel - A component of ip route. This is for listing + A component of ip route, for listing the routing tables routel @@ -266,7 +266,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; rtpr - Converts the output of ip -o back into a + Converts the output of ip -o into a readable form rtpr @@ -295,25 +295,26 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; + tc - Traffic Controlling Executable; this is for Quality Of Service - (QOS) and Class Of Service (COS) implementations + Traffic control for Quality of Service + (QoS) and Class of Service (CoS) implementations - tc qdisc allows users to setup the queueing + tc qdisc allows users to set up the queueing discipline - tc class allows users to setup classes based + tc class allows users to set up classes based on the queuing discipline scheduling tc estimator allows users to estimate the - network flow into a network + data flow through a network - tc filter allows users to setup the QOS/COS + tc filter allows users to set up the QoS/CoS packet filtering - tc policy allows users to setup the QOS/COS + tc policy allows users to set up the QoS/CoS policies tc -- cgit v1.2.3-54-g00ecf From 75aef881b75eb5e09c067ce8623827dfdff898ea Mon Sep 17 00:00:00 2001 From: David Bryant Date: Sun, 11 Dec 2022 16:47:14 -0600 Subject: Changed "front-end" to "front end". Webster says the hyphenated version is an adjective. When "front end" is a noun, as it is here, it should be spelled as two words. --- chapter08/groff.xml | 2 +- chapter08/m4.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter08') diff --git a/chapter08/groff.xml b/chapter08/groff.xml index 1b0870d9d..e5ae875f3 100644 --- a/chapter08/groff.xml +++ b/chapter08/groff.xml @@ -222,7 +222,7 @@ groff - A front-end to the groff document formatting system; normally, it + A front end to the groff document formatting system; normally, it runs the troff program and a post-processor appropriate for the selected device 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 m4 has built-in functions for including named files, running Unix commands, performing integer arithmetic, manipulating text, recursion, etc. The m4 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 m4 -- cgit v1.2.3-54-g00ecf From c1a6bf9b71a7a8d9d00d9e30ee566feb8247cc80 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 12 Dec 2022 20:24:12 +0800 Subject: iproute2: ifcfg and routef are gone Link: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=adddf30cd85fc0191450218905b37a29814d35a2 Link: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=1eaebad2c536b9ef9bd047a45438ae7ed273ee91 --- chapter08/iproute2.xml | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'chapter08') diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index d57e4725c..878ae22ed 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -93,8 +93,8 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;Installed directories - bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat, - nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss, + bridge, ctstat (link to lnstat), genl, ifstat, ip, lnstat, + nstat, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss, and tc /etc/iproute2, /usr/lib/tc, and /usr/share/doc/iproute2-&iproute2-version; @@ -136,19 +136,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; - - ifcfg - - A shell script wrapper for the ip command - (Note that this script requires the arping and - rdisk programs from the - iputils package found at .) - - ifcfg - - - - ifstat @@ -220,17 +207,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; - - routef - - A component of ip route, for flushing - the routing tables - - routef - - - - routel -- cgit v1.2.3-54-g00ecf From 258e50e86f11d4ec2064fcdb403c5a7dc992a891 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Mon, 12 Dec 2022 11:48:42 -0600 Subject: Modified list of tc subcommands to match the man page. Note that the help screen doesn't match the man page. Also, there's an action ("tc chain") in the synopsis section that is not further explained in the body of man tc. Documentation may be inaccurate. --- chapter08/iproute2.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'chapter08') diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index 878ae22ed..bfc25331a 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -271,7 +271,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; - tc @@ -284,14 +283,12 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;tc class allows users to set up classes based on the queuing discipline scheduling - tc estimator allows users to estimate the - data flow through a network - tc filter allows users to set up the QoS/CoS packet filtering - - tc policy allows users to set up the QoS/CoS - policies + + tc monitor can be used to view changes + made to Traffic Control in the kernel. + tc -- cgit v1.2.3-54-g00ecf From 4ecb5ada8e1cde0bb88abb95437b37161aa43832 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Mon, 12 Dec 2022 14:44:57 -0600 Subject: Changed "behaviour" to "behavior" throughout the LFS book. --- bootscripts/ChangeLog | 2 +- chapter08/kbd.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter08') 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/kbd.xml b/chapter08/kbd.xml index 25b0a8726..522ddbd72 100644 --- a/chapter08/kbd.xml +++ b/chapter08/kbd.xml @@ -41,7 +41,7 @@ Installation of Kbd - The behaviour of the backspace and delete keys is not consistent + 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: -- cgit v1.2.3-54-g00ecf From 769977307109e0d138077ee573a29b7b12952a08 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 13 Dec 2022 10:50:11 -0600 Subject: Test suite is two words. Added the definite article where idiomatic. --- chapter08/binutils.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter08') 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 The test named ar with versioned solib is also known to fail. - 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 - make check-gas to run gas testsuite separately and + make check-gas to run the gas test suite separately and all tests should pass. Three gprofng tests yield the ERROR result, and they are counted as UNRESOLVED in the summary. -- cgit v1.2.3-54-g00ecf From 3c5ecc9121193ac734a9220e0962c5e2ba1c67c4 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 14 Dec 2022 08:47:53 -0600 Subject: "Test suite" is two words. --- chapter08/glibc.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter08') 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 zoneinfo/posix. It is necessary to put the POSIX time zones in zoneinfo, 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 posix - directory, but some applications or test-suites might produce some + directory, but some applications or test suites might produce some failures. -- cgit v1.2.3-54-g00ecf From 0c4501b5b186b116b90aa19fd7fb6087b3d70a69 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 14 Dec 2022 17:36:16 -0600 Subject: Patch capitalization. Substitute "spell-checking" for "spell": "Spell" can be a noun or a verb, but it's never an adjective. Clarify the description of "xxd". --- chapter08/vim.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'chapter08') 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 @@ echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h - Prepare vim for compilation: + Prepare Vim for compilation: ./configure --prefix=/usr @@ -83,7 +83,7 @@ make install - Many users are used to using vi instead of + Many users reflexively type vi instead of vim. To allow execution of vim when users habitually enter vi, 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 - By default, vim's documentation is installed in By default, Vim's documentation is installed in /usr/share/vim. The following symlink allows the documentation to be accessed via /usr/share/doc/vim-&vim-version;, making @@ -103,10 +103,10 @@ done ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version; 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 . @@ -166,8 +166,8 @@ EOF vim -c ':options' - By default, vim only installs spell files for the English language. - To install spell files for your preferred language, copy the + By default, vim only installs spell-checking files for the English language. + To install spell-checking files for your preferred language, copy the .spl and optionally, the .sug files for your language and character encoding from @@ -175,7 +175,7 @@ EOF /usr/share/&vim-docdir;/spell/. - To use these spell files, some configuration in + To use these spell-checking files, some configuration in /etc/vimrc is needed, e.g.: set spelllang=en,ru @@ -297,7 +297,8 @@ set spell xxd Creates a hex dump of the given file; it can - also do the reverse, so it can be used for binary patching + also perform the inverse operation, so it can be used for binary + patching xxd -- cgit v1.2.3-54-g00ecf