diff options
| -rw-r--r-- | appendices/dependencies.xml | 10 | ||||
| -rw-r--r-- | appendices/license.xml | 14 | ||||
| -rw-r--r-- | appendices/mit-lic.xml | 24 | ||||
| -rw-r--r-- | appendices/scripts.xml | 16 | ||||
| -rw-r--r-- | appendices/udev-rules.xml | 6 | ||||
| -rw-r--r-- | chapter01/how.xml | 18 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 4 | ||||
| -rw-r--r-- | chapter05/perl.xml | 2 | ||||
| -rw-r--r-- | chapter05/tcl.xml | 6 | ||||
| -rw-r--r-- | chapter06/e2fsprogs.xml | 12 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 2 | ||||
| -rw-r--r-- | chapter06/perl.xml | 2 | ||||
| -rw-r--r-- | chapter07/console.xml | 16 |
13 files changed, 66 insertions, 66 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index edf655271..da56a369e 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -95,7 +95,7 @@ <seglistitem> <seg>Bash, Bison, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make, - Ncurses, Patch, Readline, Sed, and Texinfo</seg> + Ncurses, Patch, Readline, Sed, and Texinfo</seg> </seglistitem> </segmentedlist> @@ -289,8 +289,8 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep, - Make, Patch, Sed, and Texinfo</seg> + <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep, + Make, Patch, Sed, and Texinfo</seg> </seglistitem> </segmentedlist> @@ -373,8 +373,8 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, - Make, Sed, and Zlib</seg> + <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, + Make, Sed, and Zlib</seg> </seglistitem> </segmentedlist> diff --git a/appendices/license.xml b/appendices/license.xml index da2b891be..079552b0a 100644 --- a/appendices/license.xml +++ b/appendices/license.xml @@ -11,15 +11,15 @@ <title>LFS Licenses</title> - <para>This book is licensed under the Creative Commons - Attribution-NonCommercial-ShareAlike 2.0 License.</para> + <para>This book is licensed under the Creative Commons + Attribution-NonCommercial-ShareAlike 2.0 License.</para> - <para>Computer instructions may be extracted from the book under the MIT - License.</para> + <para>Computer instructions may be extracted from the book under the MIT + License.</para> - - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creat-comm.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mit-lic.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creat-comm.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mit-lic.xml"/> </appendix> diff --git a/appendices/mit-lic.xml b/appendices/mit-lic.xml index 9f02067e7..1e8ed4d03 100644 --- a/appendices/mit-lic.xml +++ b/appendices/mit-lic.xml @@ -13,21 +13,21 @@ <para>Copyright © ©rightdate; Gerard Beekmans</para> <para>Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions:</para> + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions:</para> <para>The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software.</para> + all copies or substantial portions of the Software.</para> <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE.</para> + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE.</para> </sect1> diff --git a/appendices/scripts.xml b/appendices/scripts.xml index 7730a9198..15e57b3d3 100644 --- a/appendices/scripts.xml +++ b/appendices/scripts.xml @@ -39,14 +39,14 @@ <title>Boot and sysconfig scripts version-&lfs-bootscripts-version;</title> - <para>The scripts in this appendix are listed by the directory where they - normally reside. The order is <filename - class='directory'>/etc/rc.d/init.d</filename>, <filename - class='directory'>/etc/sysconfig</filename>, <filename - class='directory'>/etc/sysconfig/network-devices</filename>, and <filename - class='directory'>/etc/sysconfig/network-devices/services</filename>. Within - each section, the files are listed in the order they are normally called. - </para> + <para>The scripts in this appendix are listed by the directory where they + normally reside. The order is <filename + class='directory'>/etc/rc.d/init.d</filename>, <filename + class='directory'>/etc/sysconfig</filename>, <filename + class='directory'>/etc/sysconfig/network-devices</filename>, and <filename + class='directory'>/etc/sysconfig/network-devices/services</filename>. Within + each section, the files are listed in the order they are normally called. + </para> <sect1 id="rc" role="wrap"> <title>/etc/rc.d/init.d/rc</title> diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index 362732fb9..76758bf44 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -13,9 +13,9 @@ <title>Udev configuration rules</title> - <para>The rules from &udev-config;.tar.bz2 in this appendix are listed for - convenience. Installation is normally done via instructions in <xref - linkend='ch-system-udev'/>. </para> + <para>The rules from &udev-config;.tar.bz2 in this appendix are listed for + convenience. Installation is normally done via instructions in <xref + linkend='ch-system-udev'/>. </para> <sect1 id="lfsrules" role="wrap"> <title>55-lfs.rules</title> diff --git a/chapter01/how.xml b/chapter01/how.xml index c20389147..0637dc8d8 100644 --- a/chapter01/how.xml +++ b/chapter01/how.xml @@ -18,15 +18,15 @@ during the distribution installation to be able to access these tools.</para> - <para>As an alternative to installing a separate distribution onto your - machine, you may wish to use the Linux From Scratch LiveCD or a LiveCD from a - commercial distribution. The LFS LiveCD works well as a host system, - providing all the tools you need to successfully follow the instructions in - this book. Unfortunately, development of the LiveCD has not progressed - recently and it only contains older versions of the source packages and - patches (for those ISOs not labels -nosrc or -min), and this book. For more - information about the LFS LiveCD or to download a copy, visit <ulink - url="&livecd-root;"/>.</para> + <para>As an alternative to installing a separate distribution onto your + machine, you may wish to use the Linux From Scratch LiveCD or a LiveCD from a + commercial distribution. The LFS LiveCD works well as a host system, + providing all the tools you need to successfully follow the instructions in + this book. Unfortunately, development of the LiveCD has not progressed + recently and it only contains older versions of the source packages and + patches (for those ISOs not labels -nosrc or -min), and this book. For more + information about the LFS LiveCD or to download a copy, visit <ulink + url="&livecd-root;"/>.</para> <note> <para>The LFS LiveCD might not work on newer hardware configurations, diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 98fd8b9ad..5a41c879d 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -205,8 +205,8 @@ cd ../gcc-build</userinput></screen> <term><parameter>--disable-bootstrap</parameter></term> <listitem> <para>Bootstrapping the compiler is now the default for GCC. However, - our build method should provide us with a solid compiler without the - need to bootstrap each time.</para> + our build method should provide us with a solid compiler without the + need to bootstrap each time.</para> </listitem> </varlistentry> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 1b00465b3..7483b65ef 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -44,7 +44,7 @@ <title>Installation of Perl</title> <para>First apply a series of patches to address security issues and adapt some - hard-wired paths to the C library by applying the following patch:</para> + hard-wired paths to the C library by applying the following patch:</para> <screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen> diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml index a907bb08c..8e5146d08 100644 --- a/chapter05/tcl.xml +++ b/chapter05/tcl.xml @@ -57,9 +57,9 @@ <screen><userinput remap="make">make</userinput></screen> - <para>Compilation is now complete. As discussed earlier, running the test - suite is not mandatory for the temporary tools here in this chapter. To run - the Tcl test suite anyway, issue the following command:</para> + <para>Compilation is now complete. As discussed earlier, running the test + suite is not mandatory for the temporary tools here in this chapter. To run + the Tcl test suite anyway, issue the following command:</para> <screen><userinput remap="test">TZ=UTC make test</userinput></screen> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 36ae6bda2..7f8514871 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -147,9 +147,9 @@ install -v -m644 -D ../doc/libblkid.txt \ <seglistitem> <seg>badblocks, blkid, chattr, compile_et, debugfs, dumpe2fs, e2fsck, e2image, e2label, e2undo, filefrag, findfs, fsck, fsck.ext2, fsck.ext3, - fsck.ext4, fsck.ext4dev, logsave, lsattr, + fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, fsck.ext4, fsck.ext4dev, - mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg> + mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg> <seg>libblkid.{a,so}, libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so}, libss.{a,so}, and libuuid.{a,so}</seg> </seglistitem> @@ -269,9 +269,9 @@ install -v -m644 -D ../doc/libblkid.txt \ <varlistentry id="e2undo"> <term><command>e2undo</command></term> <listitem> - <para>Replayd the undo log undo_log for an ext2/ext3/ext4 filesystem - found on a device. This can be used to undo a failed operation by an - e2fsprogs program.</para> + <para>Replays the undo log undo_log for an ext2/ext3/ext4 filesystem + found on a device. This can be used to undo a failed operation by an + e2fsprogs program.</para> <indexterm zone="ch-system-e2fsprogs e2undo"> <primary sortas="b-e2undo">e2undo</primary> </indexterm> @@ -347,7 +347,7 @@ install -v -m644 -D ../doc/libblkid.txt \ <listitem> <para>By default checks <systemitem class="filesystem">ext4</systemitem> development file systems. This is a hard link to - <command>fsck</command>.</para> + <command>fsck</command>.</para> <indexterm zone="ch-system-e2fsprogs fsck.ext4dev"> <primary sortas="b-fsck.ext4dev">fsck.ext4dev</primary> </indexterm> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index d107896ac..542ff47f9 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -215,7 +215,7 @@ <entry>Dutch (nl)</entry> <entry>ISO-8859-1</entry> </row> - <!-- FIXME: BUG: "no" is deprecated, should use "nb" or "nn" and + <!-- FIXME: BUG: "no" is deprecated, should use "nb" or "nn" and symlinks --> <row> <entry>Norwegian (no)</entry> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index c467c3236..d159db493 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -48,7 +48,7 @@ <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> <para>The following patch fixes known vulnerabilities and other issues - identified by the developers:</para> + identified by the developers:</para> <screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen> diff --git a/chapter07/console.xml b/chapter07/console.xml index 4becd8d3b..9296952e6 100644 --- a/chapter07/console.xml +++ b/chapter07/console.xml @@ -59,8 +59,8 @@ <para>This variable specifies the arguments for the <command>loadkeys</command> program, typically, the name of keymap to load, e.g., <quote>es</quote>. If this variable is not set, the - bootscript will not run the <command>loadkeys</command> program, - and the default kernel keymap will be used.</para> + bootscript will not run the <command>loadkeys</command> program, + and the default kernel keymap will be used.</para> </listitem> </varlistentry> @@ -82,11 +82,11 @@ <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 - 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 - (as it is appropriate in the USA), + 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 + (as it is appropriate in the USA), <!-- because of the copyright sign --> - set this variable to <quote>lat1-16 -m 8859-1</quote>. + set this variable to <quote>lat1-16 -m 8859-1</quote>. In UTF-8 mode, the kernel uses the application character map for conversion of composed 8-bit key codes in the keymap to UTF-8, and thus the argument of the "-m" parameter should be set to the encoding of the @@ -99,7 +99,7 @@ <term>UNICODE</term> <listitem> <para>Set this variable to <quote>1</quote>, <quote>yes</quote> or - <quote>true</quote> in order to put the + <quote>true</quote> in order to put the console into UTF-8 mode. This is useful in UTF-8 based locales and harmful otherwise.</para> </listitem> @@ -111,7 +111,7 @@ <para>For many keyboard layouts, there is no stock Unicode keymap in the Kbd package. The <command>console</command> bootscript will convert an available keymap to UTF-8 on the fly if this variable is - set to the encoding of the available non-UTF-8 keymap.</para> + set to the encoding of the available non-UTF-8 keymap.</para> </listitem> </varlistentry> |