From 360fdfca9cd146ed32f09df00a4986646b50e467 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Fri, 26 Jan 2024 18:28:53 +0100 Subject: [PATCH] Fix punctuation in quotes, and quote signs - period and comma inside quotes - " to - some " to when it is a var value --- chapter02/hostreqs.xml | 2 +- chapter02/mounting.xml | 2 +- chapter02/stages.xml | 2 +- chapter05/glibc.xml | 4 ++-- chapter06/file.xml | 5 ----- chapter07/python.xml | 2 +- chapter08/coreutils.xml | 2 +- chapter08/expect.xml | 4 ++-- chapter08/gmp.xml | 7 ++++--- chapter08/stripping.xml | 2 +- chapter09/consoled.xml | 2 +- chapter09/locale.xml | 30 +++++++----------------------- chapter09/network.xml | 4 ++-- chapter09/networkd.xml | 11 ++++++----- chapter09/profile.xml | 24 ++++-------------------- chapter09/udev.xml | 6 +++--- chapter09/usage.xml | 28 ++++++++++++++-------------- chapter10/grub.xml | 11 ----------- part3intro/toolchaintechnotes.xml | 2 +- prologue/standards.xml | 2 +- prologue/typography.xml | 2 +- 21 files changed, 54 insertions(+), 100 deletions(-) diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml index 8d9d13567..546555e9b 100644 --- a/chapter02/hostreqs.xml +++ b/chapter02/hostreqs.xml @@ -30,7 +30,7 @@ modern Linux distributions. Also note that many distributions will place software headers into separate packages, often in the form of <package-name>-devel or - <package-name>-dev. Be sure to install those if + <package-name>-dev. Be sure to install those if your distribution provides them. Earlier versions of the listed software packages may work, but have diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml index 6c279ac78..60e5cdc62 100644 --- a/chapter02/mounting.xml +++ b/chapter02/mounting.xml @@ -16,7 +16,7 @@ LFS environment variable described in the previous section. - Strictly speaking, one cannot "mount a partition". One mounts the file + Strictly speaking, one cannot "mount a partition." One mounts the file system embedded in that partition. But since a single partition can't contain more than one file system, people often speak of the partition and the associated file system as if they were one and the same. diff --git a/chapter02/stages.xml b/chapter02/stages.xml index 710ff6585..aeee2588e 100644 --- a/chapter02/stages.xml +++ b/chapter02/stages.xml @@ -69,7 +69,7 @@ A few operations, from Changing Ownership to - Entering the Chroot Environment, must be done as the + Entering the Chroot Environment, must be done as the root user, with the LFS environment variable set for the &root; user. diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 63c4f6387..b8b8171da 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -159,8 +159,8 @@ cd build Gettext package, which the host distribution should provide. There have been reports that this package may fail when - building as a "parallel make". If that occurs, rerun the make command - with the "-j1" option. + building as a parallel make. If that occurs, rerun the make command + with the option. Compile the package: diff --git a/chapter06/file.xml b/chapter06/file.xml index cb952d9bb..ada0dddeb 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -78,11 +78,6 @@ popd ./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess) - Compile the package: make FILE_COMPILE=$(pwd)/build/src/file diff --git a/chapter07/python.xml b/chapter07/python.xml index 84a173426..3729c6ccf 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -45,7 +45,7 @@ There are two package files whose name starts with - python. The one to extract from is + python. The one to extract from is Python-&python-version;.tar.xz (notice the uppercase first letter). diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index e6114461f..3357fabc5 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -1261,7 +1261,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8 yes - Repeatedly outputs y, or a given string, until + Repeatedly outputs y, or a given string, until killed yes diff --git a/chapter08/expect.xml b/chapter08/expect.xml index 90584ced1..95dc8beae 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -92,8 +92,8 @@ make test If any test fails with the message - The system has no more ptys. Ask your system - administrator to create more, it indicates + The system has no more ptys. Ask your system + administrator to create more, it indicates you've not mounted the devpts file system correctly. You need to exit from the chroot environment, read diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml index 2b8f0fa8c..15274cf4b 100644 --- a/chapter08/gmp.xml +++ b/chapter08/gmp.xml @@ -58,7 +58,7 @@ to the configure command. @@ -106,8 +106,9 @@ make html The code in gmp is highly optimized for the processor where it is built. Occasionally, the code that detects the processor misidentifies the system capabilities and there will be errors in the tests or other - applications using the gmp libraries with the message "Illegal - instruction". In this case, gmp should be reconfigured with the option + applications using the gmp libraries with the message + Illegal instruction. + In this case, gmp should be reconfigured with the option and rebuilt. - Some packages beyond LFS may also lack support for your chosen locale. One - example is the X library (part of the X Window System), which outputs the - following error message if the locale does not exactly match one of the character - map names in its internal files: - -Warning: locale not supported by Xlib, locale set to C - - In several cases Xlib expects that the character map will be listed in - uppercase notation with canonical dashes. For instance, "ISO-8859-1" rather - than "iso88591". It is also possible to find an appropriate specification by - removing the charmap part of the locale specification. This can be checked - by running the locale charmap command in both locales. - For example, one would have to change "de_DE.ISO-8859-15@euro" to - "de_DE@euro" in order to get this locale recognized by Xlib. - Other packages can also function incorrectly (but may not necessarily display any error messages) if the locale name does not meet their expectations. In those cases, investigating how other Linux distributions support your locale diff --git a/chapter09/network.xml b/chapter09/network.xml index f8b549eff..a443ada2c 100644 --- a/chapter09/network.xml +++ b/chapter09/network.xml @@ -62,9 +62,9 @@ EOF The values in italics must be changed in each file, to set the interfaces up correctly. - If the ONBOOT variable is set to yes the + If the ONBOOT variable is set to yes the System V network script will bring up the Network Interface Card (NIC) during - the system boot process. If set to anything besides yes, the NIC + the system boot process. If set to anything besides yes, the NIC will be ignored by the network script and will not be started automatically. Interfaces can be manually started or stopped with the ifup and ifdown commands. diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 3b9dd2cda..363e8d883 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -98,11 +98,12 @@ - Create a manual naming scheme, for example by naming the - interfaces something like "internet0", "dmz0", or "lan0". - To do that, create .link files in /etc/systemd/network/ that - select an explicit name or a better naming scheme for your - network interfaces. For example: + Create a manual naming scheme, for example by naming the + interfaces something like internet0, + dmz0, or lan0. + To do that, create .link files in /etc/systemd/network/ that + select an explicit name or a better naming scheme for your + network interfaces. For example: cat > /etc/systemd/network/10-ether0.link << "EOF" diff --git a/chapter09/profile.xml b/chapter09/profile.xml index 8f0f59d1f..55cc5dbb0 100644 --- a/chapter09/profile.xml +++ b/chapter09/profile.xml @@ -75,10 +75,10 @@ locale -a Charmaps can have a number of aliases, e.g., ISO-8859-1 - is also referred to as iso8859-1 and iso88591. + is also referred to as iso8859-1 and iso88591. Some applications cannot handle the various synonyms correctly (e.g., require - that UTF-8 is written as UTF-8, not - utf8), so it is safest in most + that UTF-8 is written as UTF-8, not + utf8), so it is safest in most cases to choose the canonical name for a particular locale. To determine the canonical name, run the following command, where <locale name> is the output given by locale -a for @@ -91,7 +91,7 @@ ISO-8859-1 - This results in a final locale setting of en_GB.ISO-8859-1. + This results in a final locale setting of en_GB.ISO-8859-1. It is important that the locale found using the heuristic above is tested before it is added to the Bash startup files: @@ -114,22 +114,6 @@ LC_ALL=<locale name> locale int_prefix Further instructions assume that there are no such error messages from Glibc. - - Other packages may also function incorrectly (but will not necessarily display any error messages) if the locale name does not meet their expectations. In such cases, investigating how other Linux distributions support your locale diff --git a/chapter09/udev.xml b/chapter09/udev.xml index bd0b75912..06db345a2 100644 --- a/chapter09/udev.xml +++ b/chapter09/udev.xml @@ -129,13 +129,13 @@ program and are usually related to the bus-specific identifiers of devices supported by a module. For example, the snd-fm801 driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801, - and has an alias of pci:v00001319d00000801sv*sd*bc04sc01i*. + and has an alias of pci:v00001319d00000801sv*sd*bc04sc01i*. For most devices, the bus driver exports the alias of the driver that would handle the device via sysfs. E.g., the /sys/bus/pci/devices/0000:00:0d.0/modalias file might contain the string - pci:v00001319d00000801sv00001319sd00001319bc04sc01i00. + pci:v00001319d00000801sv00001319sd00001319bc04sc01i00. The default rules provided with udev will cause udevd to call out to /sbin/modprobe with the contents of the MODALIAS uevent environment variable (which should be the @@ -301,7 +301,7 @@ This is due to the fact that udev, by design, handles uevents and loads modules in parallel, and thus in an unpredictable order. This will - never be fixed. You should not rely upon the kernel device + never be fixed. You should not rely upon the kernel device names being stable. Instead, create your own rules that make symlinks with stable names based on some stable attributes of the device, such as a serial number or the output of various *_id utilities installed by udev. diff --git a/chapter09/usage.xml b/chapter09/usage.xml index 25175c45f..85b35d16d 100644 --- a/chapter09/usage.xml +++ b/chapter09/usage.xml @@ -48,11 +48,11 @@ - Classically, run level 2 above was defined as - "multi-user mode without networking", but this was only the case - many years ago when multiple users could connect to a system via - serial ports. In today's environment it makes no sense, and - we now say it is "reserved". + Classically, run level 2 above was defined as multi-user + mode without networking, but this was only the case + many years ago when multiple users could connect to a system via + serial ports. In today's environment it makes no sense, and + we now say it is reserved. @@ -348,7 +348,7 @@ EOF correct arguments for these programs. The /etc/sysconfig/console file should contain lines - of the form: VARIABLE="value". The following variables are recognized: + of the form: VARIABLE=value. The following variables are recognized: @@ -356,7 +356,7 @@ EOF This variable specifies the log level for kernel messages sent to the console as set by dmesg -n. Valid levels are - from "1" (no messages) to "8". The default level is "7". + from 1 (no messages) to 8. The default level is 7, which is quite verbose. @@ -365,7 +365,7 @@ EOF This variable specifies the arguments for the loadkeys program, typically, the name of the keymap - to load, e.g., it. If this variable is not set, the + to load, e.g., it. If this variable is not set, the bootscript will not run the loadkeys program, and the default kernel keymap will be used. Note that a few keymaps have multiple versions with the same name (cz and its variants in @@ -384,7 +384,7 @@ EOF loadkeys program. This is useful if the stock keymap is not completely satisfactory and a small adjustment has to be made. E.g., to include the Euro sign into a keymap that normally doesn't have it, - set this variable to euro2. + set this variable to euro2. @@ -393,12 +393,12 @@ EOF This variable specifies the arguments for the setfont program. Typically, this includes the font - name, -m, and the name of the application character + name, -m, and the name of the application character map to load. E.g., in order to load the lat1-16 font together with the 8859-1 application character map (appropriate in the USA), - set this variable to lat1-16 -m 8859-1. + set this variable to lat1-16 -m 8859-1. In UTF-8 mode, the kernel uses the application character map to convert 8-bit key codes to UTF-8. Therefore the argument of the "-m" parameter should be set to the encoding of the @@ -410,8 +410,8 @@ EOF UNICODE - Set this variable to 1, yes, or - true in order to put the + Set this variable to 1, yes, or + true in order to put the console into UTF-8 mode. This is useful in UTF-8 based locales and harmful otherwise. @@ -526,7 +526,7 @@ EOF languages, because there accents are added to unaccented ASCII characters, or two ASCII characters are composed together. However, in UTF-8 mode it is a problem; e.g., for the Greek language, where one - sometimes needs to put an accent on the letter alpha. + sometimes needs to put an accent on the letter alpha. The solution is either to avoid the use of UTF-8, or to install the X window system, which doesn't have this limitation, in its input handling. diff --git a/chapter10/grub.xml b/chapter10/grub.xml index cb6518791..1706ccb3c 100644 --- a/chapter10/grub.xml +++ b/chapter10/grub.xml @@ -120,17 +120,6 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso - diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml index c220d24d8..7997b0891 100644 --- a/part3intro/toolchaintechnotes.xml +++ b/part3intro/toolchaintechnotes.xml @@ -56,7 +56,7 @@ The build is the machine where we build programs. Note that this machine - is also referred to as the host. + is also referred to as the host. The host diff --git a/prologue/standards.xml b/prologue/standards.xml index 05fe22745..187264812 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -49,7 +49,7 @@ While it is possible to create a complete system that will pass the LSB - certification tests "from scratch", this can't be done without many additional packages + certification tests from scratch, this can't be done without many additional packages that are beyond the scope of the LFS book. Installation instructions for these additional packages can be found in BLFS. diff --git a/prologue/typography.xml b/prologue/typography.xml index db66b345c..d394e9b17 100644 --- a/prologue/typography.xml +++ b/prologue/typography.xml @@ -85,7 +85,7 @@ EOF passwd(5) it is specifically referring to /usr/share/man/man5/passwd.5. man passwd will print the first man page it finds that - matches passwd, which will be + matches passwd, which will be /usr/share/man/man1/passwd.1. For this example, you will need to run man 5 passwd in order to read the page being specified. Note that most man pages do not have duplicate