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
<quote><package-name>-devel</quote> or
- <quote><package-name>-dev</quote>. Be sure to install those if
+ <quote><package-name>-dev.</quote> Be sure to install those if
your distribution provides them.</para>
<para>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 @@
<envar>LFS</envar> environment variable described in the previous section.
</para>
- <para>Strictly speaking, one cannot "mount a partition". One mounts the <emphasis>file
+ <para>Strictly speaking, one cannot "mount a partition." One mounts the <emphasis>file
system</emphasis> 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.</para>
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 @@
<listitem>
<para>A few operations, from <quote>Changing Ownership</quote> to
- <quote>Entering the Chroot Environment</quote>, must be done as the
+ <quote>Entering the Chroot Environment,</quote> must be done as the
<systemitem class="username">root</systemitem> user, with the LFS
environment variable set for the &root; user.</para>
</listitem>
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</userinput></screen>
Gettext package, which the host distribution should provide.</para>
<note><para>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.</para></note>
+ building as a <quote>parallel make.</quote> If that occurs, rerun the make command
+ with the <option>-j1</option> option.</para></note>
<para>Compile the package:</para>
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</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess)</userinput></screen>
-<!-- devs: if using - -build here, the build system wants to compile
- the signature file with "file" on the build system, but stops if it is not
- the same version. One possibility would be to build "file" on the build
- system first, but it is simpler to have the system think it is not
- cross-compiling, and use the just built "file". -->
<para>Compile the package:</para>
<screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>
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 @@
<note>
<para>There are two package files whose name starts with
- <quote>python</quote>. The one to extract from is
+ <quote>python.</quote> The one to extract from is
<filename>Python-&python-version;.tar.xz</filename> (notice the
uppercase first letter).</para>
</note>
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</userinput></screen>
<varlistentry id="yes">
<term><command>yes</command></term>
<listitem>
- <para>Repeatedly outputs <quote>y</quote>, or a given string, until
+ <para>Repeatedly outputs <quote>y,</quote> or a given string, until
killed</para>
<indexterm zone="ch-system-coreutils yes">
<primary sortas="b-yes">yes</primary>
diff --git a/chapter08/expect.xml b/chapter08/expect.xml
index 90584ced1..95dc8beae 100644
--- a/chapter08/expect.xml
+++ b/chapter08/expect.xml
@@ -92,8 +92,8 @@
<screen><userinput remap="test">make test</userinput></screen>
<para>If any test fails with the message
- <quote><computeroutput>The system has no more ptys. Ask your system
- administrator to create more</computeroutput></quote>, it indicates
+ <quote><computeroutput>The system has no more ptys. Ask your system
+ administrator to create more</computeroutput>,</quote> it indicates
you've not mounted the
<systemitem class="filesystem">devpts</systemitem> 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 <command>configure</command> command.</para>
<!-- To editors: the configure script says "the none host is obsolete,
- use - -disable-assembly", but don't believe it: with the latter
+ use - -disable-assembly," but don't believe it: with the latter
CFLAGS is still automatically set to -march=something. -->
</note>
@@ -106,8 +106,9 @@ make html</userinput></screen>
<caution><para>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
+ <computeroutput>Illegal instruction</computeroutput>.
+ In this case, gmp should be reconfigured with the option
<option>--host=none-linux-gnu</option> and rebuilt.</para></caution>
<!-- Some tests PASS on a specific uarch but SKIP on other CPUs.
diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index ab79e0dcf..6c3cc7c98 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -52,7 +52,7 @@
<note><para>The ELF loader's name is ld-linux-x86-64.so.2 on 64-bit systems
and ld-linux.so.2 on 32-bit systems. The construct below selects the
correct name for the current architecture, excluding anything ending
- with <quote>g</quote>, in case the commands below have already been
+ with <quote>g,</quote> in case the commands below have already been
run.</para></note>
<important>
diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml
index 94e99ce8d..f35a586fe 100644
--- a/chapter09/consoled.xml
+++ b/chapter09/consoled.xml
@@ -30,7 +30,7 @@
directory for valid screen fonts.</para>
<para>The <filename>/etc/vconsole.conf</filename> file should contain lines
- of the form: VARIABLE="value". The following variables are recognized:</para>
+ of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
<variablelist>
diff --git a/chapter09/locale.xml b/chapter09/locale.xml
index 8b6d2c4b2..c5e55d0da 100644
--- a/chapter09/locale.xml
+++ b/chapter09/locale.xml
@@ -39,11 +39,11 @@
</itemizedlist>
<para>Replace <replaceable><ll></replaceable> below with the two-letter code
- for your desired language (e.g., <quote>en</quote>) and
+ for your desired language (e.g., <literal>en</literal>) and
<replaceable><CC></replaceable> with the two-letter code for the appropriate
- country (e.g., <quote>GB</quote>). <replaceable><charmap></replaceable> should
+ country (e.g., <literal>GB</literal>). <replaceable><charmap></replaceable> should
be replaced with the canonical charmap for your chosen locale. Optional
- modifiers such as <quote>@euro</quote> may also be present.</para>
+ modifiers such as <literal>@euro</literal> may also be present.</para>
<para>The list of all locales supported by Glibc can be obtained by running
the following command:</para>
@@ -51,10 +51,10 @@
<screen role="nodump"><userinput>locale -a</userinput></screen>
<para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
- is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
+ is also referred to as <quote>iso8859-1</quote> and <quote>iso88591.</quote>
Some applications cannot handle the various synonyms correctly (e.g., require
- that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
- <quote>utf8</quote>), so it is the safest in most
+ that <quote>UTF-8</quote> is written as <literal>UTF-8,</literal> not
+ <literal>utf8</literal>), so it is the safest in most
cases to choose the canonical name for a particular locale. To determine
the canonical name, run the following command, where <replaceable><locale
name></replaceable> is the output given by <command>locale -a</command> for
@@ -67,7 +67,7 @@
<screen><computeroutput>ISO-8859-1</computeroutput></screen>
- <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
+ <para>This results in a final locale setting of <literal>en_GB.ISO-8859-1</literal>.
It is important that the locale found using the heuristic above is tested prior
to it being added to the Bash startup files:</para>
@@ -90,22 +90,6 @@ LC_ALL=<locale name> locale int_prefix</userinput></screen>
Further instructions assume that there are no such error messages from
Glibc.</para>
- <!-- FIXME: the xlib example will become obsolete in the future.-->
- <para>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:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
- <para>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 <command>locale charmap</command> 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.</para>
-
<para>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</userinput></screen>
<para>The values in italics must be changed in each file, to set
the interfaces up correctly.</para>
- <para>If the <envar>ONBOOT</envar> variable is set to <quote>yes</quote> the
+ <para>If the <envar>ONBOOT</envar> variable is set to <literal>yes</literal> the
System V network script will bring up the Network Interface Card (NIC) during
- the system boot process. If set to anything besides <quote>yes</quote>, the NIC
+ the system boot process. If set to anything besides <literal>yes</literal>, the NIC
will be ignored by the network script and will not be started automatically.
Interfaces can be manually started or stopped with the
<command>ifup</command> and <command>ifdown</command> commands.</para>
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 @@
<listitem>
<para>
- 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 <literal>internet0</literal>,
+ <literal>dmz0</literal>, or <literal>lan0</literal>.
+ 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:
</para>
<screen role="nodump"><userinput>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 @@
<screen role="nodump"><userinput>locale -a</userinput></screen>
<para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
- is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
+ is also referred to as <quote>iso8859-1</quote> and <quote>iso88591.</quote>
Some applications cannot handle the various synonyms correctly (e.g., require
- that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
- <quote>utf8</quote>), so it is safest in most
+ that <quote>UTF-8</quote> is written as <literal>UTF-8</literal>, not
+ <literal>utf8</literal>), 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 <replaceable><locale
name></replaceable> is the output given by <command>locale -a</command> for
@@ -91,7 +91,7 @@
<screen><computeroutput>ISO-8859-1</computeroutput></screen>
- <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
+ <para>This results in a final locale setting of <literal>en_GB.ISO-8859-1</literal>.
It is important that the locale found using the heuristic above is tested before
it is added to the Bash startup files:</para>
@@ -114,22 +114,6 @@ LC_ALL=<locale name> locale int_prefix</userinput></screen>
Further instructions assume that there are no such error messages from
Glibc.</para>
- <!-- FIXME: the xlib example will became obsolete real soon -->
- <!--<para>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:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
- <para>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 <command>locale charmap</command> 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.</para>
--->
<para>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 <emphasis>snd-fm801</emphasis>
driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
- and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
+ and has an alias of <literal>pci:v00001319d00000801sv*sd*bc04sc01i*</literal>.
For most devices, the bus driver exports the alias of the driver that
would handle the device via <systemitem
class="filesystem">sysfs</systemitem>. E.g., the
<filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
might contain the string
- <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
+ <literal>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</literal>.
The default rules provided with udev will cause <command>udevd</command>
to call out to <command>/sbin/modprobe</command> with the contents of the
<envar>MODALIAS</envar> uevent environment variable (which should be the
@@ -301,7 +301,7 @@
<para>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 <quote>fixed</quote>. You should not rely upon the kernel device
+ never be <quote>fixed.</quote> 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 @@
<note>
<para>
- 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 <quote>multi-user
+ mode without networking,</quote> 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 <quote>reserved.</quote>
</para>
</note>
@@ -348,7 +348,7 @@ EOF</userinput></screen>
correct arguments for these programs.</para>
<para>The <filename>/etc/sysconfig/console</filename> file should contain lines
- of the form: VARIABLE="value". The following variables are recognized:</para>
+ of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
<variablelist>
<varlistentry>
@@ -356,7 +356,7 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the log level for kernel messages sent
to the console as set by <command>dmesg -n</command>. Valid levels are
- from "1" (no messages) to "8". The default level is "7".</para>
+ from <literal>1</literal> (no messages) to <literal>8</literal>. The default level is <literal>7</literal>, which is quite verbose.</para>
</listitem>
</varlistentry>
@@ -365,7 +365,7 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the arguments for the
<command>loadkeys</command> program, typically, the name of the keymap
- to load, e.g., <quote>it</quote>. If this variable is not set, the
+ to load, e.g., <literal>it</literal>. If this variable is not set, the
bootscript will not run the <command>loadkeys</command> 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</userinput></screen>
<command>loadkeys</command> 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 <quote>euro2</quote>.</para>
+ set this variable to <literal>euro2</literal>.</para>
</listitem>
</varlistentry>
@@ -393,12 +393,12 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the arguments for the
<command>setfont</command> program. Typically, this includes the font
- name, <quote>-m</quote>, and the name of the application character
+ name, <literal>-m</literal>, and the name of the application character
map to load. E.g., in order to load the <quote>lat1-16</quote> font
together with the <quote>8859-1</quote> application character map
(appropriate in the USA),
<!-- because of the copyright sign -->
- set this variable to <quote>lat1-16 -m 8859-1</quote>.
+ set this variable to <literal>lat1-16 -m 8859-1</literal>.
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</userinput></screen>
<varlistentry>
<term>UNICODE</term>
<listitem>
- <para>Set this variable to <quote>1</quote>, <quote>yes</quote>, or
- <quote>true</quote> in order to put the
+ <para>Set this variable to <literal>1</literal>, <literal>yes</literal>, or
+ <literal>true</literal> in order to put the
console into UTF-8 mode. This is useful in UTF-8 based locales and
harmful otherwise.</para>
</listitem>
@@ -526,7 +526,7 @@ EOF</userinput></screen>
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 <quote>alpha</quote>.
+ sometimes needs to put an accent on the letter <quote>alpha.</quote>
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.</para>
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</userinput></
command above.</para>
</note>
-<!-- This does not seem to be true any more
- <note><para><application>grub-install</application> is a script and calls another
- program, grub-probe, that may fail with a message "cannot stat `/dev/root'".
- If so, create a temporary symbolic link from your root partition to /dev/root:</para>
-
-<screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen>
-
- <para>The symbolic link will only be present until the system is rebooted.
- The link is only needed for the installation procedure.
- </para></note>
--->
</sect2>
<sect2 id="grub-cfg">
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 @@
<variablelist>
<varlistentry><term>The build</term><listitem>
<para>is the machine where we build programs. Note that this machine
- is also referred to as the <quote>host</quote>.</para></listitem>
+ is also referred to as the <quote>host.</quote></para></listitem>
</varlistentry>
<varlistentry><term>The host</term><listitem>
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 @@
</itemizedlist>
<para>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 <quote>from scratch,</quote> 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. </para>
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</userinput></screen>
<ulink role='man' url='&man;/passwd.5'>passwd(5)</ulink> it is
specifically referring to <filename>/usr/share/man/man5/passwd.5</filename>.
<command>man passwd</command> will print the first man page it finds that
- matches <quote>passwd</quote>, which will be
+ matches <quote>passwd,</quote> which will be
<filename>/usr/share/man/man1/passwd.1</filename>. For this example, you will
need to run <command>man 5 passwd</command> in order to read the page
being specified. Note that most man pages do not have duplicate