Author: bdubbs
Date: 2008-11-05 22:37:07 -0700 (Wed, 05 Nov 2008)
New Revision: 8735
Modified:
branches/6.4/BOOK/appendices/dependencies.xml
branches/6.4/BOOK/appendices/license.xml
branches/6.4/BOOK/appendices/mit-lic.xml
branches/6.4/BOOK/appendices/scripts.xml
branches/6.4/BOOK/appendices/udev-rules.xml
branches/6.4/BOOK/chapter01/how.xml
branches/6.4/BOOK/chapter05/gcc-pass2.xml
branches/6.4/BOOK/chapter05/perl.xml
branches/6.4/BOOK/chapter05/tcl.xml
branches/6.4/BOOK/chapter06/e2fsprogs.xml
branches/6.4/BOOK/chapter06/man-db.xml
branches/6.4/BOOK/chapter06/perl.xml
branches/6.4/BOOK/chapter07/console.xml
Log:
Merge changes from trunk -- typos and tabs
Modified: branches/6.4/BOOK/appendices/dependencies.xml
===================================================================
--- branches/6.4/BOOK/appendices/dependencies.xml 2008-11-06 05:23:09 UTC
(rev 8734)
+++ branches/6.4/BOOK/appendices/dependencies.xml 2008-11-06 05:37:07 UTC
(rev 8735)
@@ -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>
Modified: branches/6.4/BOOK/appendices/license.xml
===================================================================
--- branches/6.4/BOOK/appendices/license.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/appendices/license.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/appendices/mit-lic.xml
===================================================================
--- branches/6.4/BOOK/appendices/mit-lic.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/appendices/mit-lic.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/appendices/scripts.xml
===================================================================
--- branches/6.4/BOOK/appendices/scripts.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/appendices/scripts.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/appendices/udev-rules.xml
===================================================================
--- branches/6.4/BOOK/appendices/udev-rules.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/appendices/udev-rules.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/chapter01/how.xml
===================================================================
--- branches/6.4/BOOK/chapter01/how.xml 2008-11-06 05:23:09 UTC (rev 8734)
+++ branches/6.4/BOOK/chapter01/how.xml 2008-11-06 05:37:07 UTC (rev 8735)
@@ -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,
Modified: branches/6.4/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/6.4/BOOK/chapter05/gcc-pass2.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter05/gcc-pass2.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -205,8 +205,8 @@
<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>
Modified: branches/6.4/BOOK/chapter05/perl.xml
===================================================================
--- branches/6.4/BOOK/chapter05/perl.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter05/perl.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/chapter05/tcl.xml
===================================================================
--- branches/6.4/BOOK/chapter05/tcl.xml 2008-11-06 05:23:09 UTC (rev 8734)
+++ branches/6.4/BOOK/chapter05/tcl.xml 2008-11-06 05:37:07 UTC (rev 8735)
@@ -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>
Modified: branches/6.4/BOOK/chapter06/e2fsprogs.xml
===================================================================
--- branches/6.4/BOOK/chapter06/e2fsprogs.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter06/e2fsprogs.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -147,9 +147,9 @@
<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 @@
<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 @@
<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>
Modified: branches/6.4/BOOK/chapter06/man-db.xml
===================================================================
--- branches/6.4/BOOK/chapter06/man-db.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter06/man-db.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/chapter06/perl.xml
===================================================================
--- branches/6.4/BOOK/chapter06/perl.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter06/perl.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
Modified: branches/6.4/BOOK/chapter07/console.xml
===================================================================
--- branches/6.4/BOOK/chapter07/console.xml 2008-11-06 05:23:09 UTC (rev
8734)
+++ branches/6.4/BOOK/chapter07/console.xml 2008-11-06 05:37:07 UTC (rev
8735)
@@ -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>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
