Author: matthew
Date: 2009-08-12 13:16:30 -0600 (Wed, 12 Aug 2009)
New Revision: 9037
Modified:
trunk/BOOK/appendices/acronymlist.xml
trunk/BOOK/chapter05/gcc-pass1.xml
trunk/BOOK/chapter05/gcc-pass2.xml
trunk/BOOK/chapter05/glibc.xml
trunk/BOOK/chapter06/gcc.xml
trunk/BOOK/chapter06/glibc.xml
trunk/BOOK/chapter06/gmp.xml
trunk/BOOK/chapter06/mpfr.xml
trunk/BOOK/chapter06/udev.xml
trunk/BOOK/general.ent
Log:
Various text corrections from Chris Staub. Fixes #2470.
Modified: trunk/BOOK/appendices/acronymlist.xml
===================================================================
--- trunk/BOOK/appendices/acronymlist.xml 2009-08-12 18:49:43 UTC (rev
9036)
+++ trunk/BOOK/appendices/acronymlist.xml 2009-08-12 19:16:30 UTC (rev
9037)
@@ -177,6 +177,13 @@
</varlistentry>
<varlistentry>
+ <term><emphasis role="bold">ext4</emphasis></term>
+ <listitem>
+ <para>fourth extended file system</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><emphasis role="bold">FAQ</emphasis></term>
<listitem>
<para>Frequently Asked Questions</para>
@@ -214,7 +221,7 @@
<varlistentry>
<term><emphasis role="bold">GB</emphasis></term>
<listitem>
- <para>Gibabytes</para>
+ <para>Gigabytes</para>
</listitem>
</varlistentry>
Modified: trunk/BOOK/chapter05/gcc-pass1.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-pass1.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter05/gcc-pass1.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -127,7 +127,7 @@
<parameter>-lgcc_eh</parameter> within its build system. This dependency
can be satisfied by creating a symlink to <filename>libgcc.a</filename>,
since that file will end up containing the objects normally contained in
- <filename>libgcc_eh.a</filename>.</para>
+ <filename>libgcc_eh.a</filename>:</para>
<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc
-print-libgcc-file-name | \
sed 's/libgcc/&_eh/'`</userinput></screen>
Modified: trunk/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-pass2.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter05/gcc-pass2.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -100,7 +100,8 @@
done</userinput></screen>
<para>In case the above seems hard to follow, let's break it down a bit.
- First we find all the files under the gcc/config directory that are named
+ First we find all the files under the
+ <filename class="directory">gcc/config</filename> directory that are named
either <filename>linux.h</filename>, <filename>linux64.h</filename> or
<filename>sysv4.h</filename>.
For each file found, we copy it to a file of the same name but with an
added
@@ -112,7 +113,7 @@
to the end of the file.
Finally, we use <command>touch</command> to update the timestamp on the
copied files.
When used in conjunction with <command>cp -u</command>, this prevents
unexpected
- changes to the original files in case the command is inadvertently run
twice.
+ changes to the original files in case the commands are inadvertently run
twice.
</para>
<para>On x86_64, unsetting the multilib spec for GCC ensures that it
Modified: trunk/BOOK/chapter05/glibc.xml
===================================================================
--- trunk/BOOK/chapter05/glibc.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter05/glibc.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -157,12 +157,8 @@
</blockquote>
<para>The missing or incompatible <command>msgfmt</command> program is
- generally harmless, but it can sometimes cause issues when running the
- test suite. This <command>msgfmt</command> program is part of the
- Gettext package which the host distribution should provide. If
- <command>msgfmt</command> is present but deemed incompatible, upgrade
- the host system's Gettext package or continue without it and see if
- the test suite runs without problems regardless.</para>
+ generally harmless. This <command>msgfmt</command> program is part of the
+ Gettext package which the host distribution should provide.</para>
<para>Compile the package:</para>
Modified: trunk/BOOK/chapter06/gcc.xml
===================================================================
--- trunk/BOOK/chapter06/gcc.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter06/gcc.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -167,8 +167,9 @@
after <filename class="directory">/usr/lib/gcc</filename>. If your machine is
a 64-bit system, you may also see a directory named <filename
class="directory">lib64</filename>
towards the end of the string. The important thing to
- look for here is that gcc has found all three <filename>crt*.o</filename>
files under
- the <filename class="directory">/usr/lib</filename> directory.</para>
+ look for here is that <command>gcc</command> has found all three
+ <filename>crt*.o</filename> files under the
+ <filename class="directory">/usr/lib</filename> directory.</para>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readjusting.xml"
Modified: trunk/BOOK/chapter06/glibc.xml
===================================================================
--- trunk/BOOK/chapter06/glibc.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter06/glibc.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -719,8 +719,8 @@
<listitem>
<para>Used internally by Glibc for handling internationalized domain
names in the <function>getaddrinfo()</function> function</para>
- <indexterm zone="ch-system-glibc libcrypt">
- <primary sortas="c-libcrypt">libcrypt</primary>
+ <indexterm zone="ch-system-glibc libcidn">
+ <primary sortas="c-libcidn">libcidn</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: trunk/BOOK/chapter06/gmp.xml
===================================================================
--- trunk/BOOK/chapter06/gmp.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter06/gmp.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -120,7 +120,7 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libgmp">
- <term><command>libgmp</command></term>
+ <term><filename class="libraryfile">libgmp</filename></term>
<listitem>
<para>Contains precision math functions.</para>
<indexterm zone="ch-system-gmp libgmp">
@@ -130,7 +130,7 @@
</varlistentry>
<varlistentry id="libgmpxx">
- <term><command>libgmpxx</command></term>
+ <term><filename class="libraryfile">libgmpxx</filename></term>
<listitem>
<para>Contains C++ precision math functions.</para>
<indexterm zone="ch-system-gmp libgmpxx">
@@ -140,7 +140,7 @@
</varlistentry>
<varlistentry id="libmp">
- <term><command>libmp</command></term>
+ <term><filename class="libraryfile">libmp</filename></term>
<listitem>
<para>Contains the Berkeley MP math functions.</para>
<indexterm zone="ch-system-gmp libmp">
Modified: trunk/BOOK/chapter06/mpfr.xml
===================================================================
--- trunk/BOOK/chapter06/mpfr.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter06/mpfr.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -88,7 +88,7 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libmpfr">
- <term><command>libmpfr</command></term>
+ <term><filename class="libraryfile">libmpfr</filename></term>
<listitem>
<para>Contains multiple-precision math functions.</para>
<indexterm zone="ch-system-mpfr libmpfr">
Modified: trunk/BOOK/chapter06/udev.xml
===================================================================
--- trunk/BOOK/chapter06/udev.xml 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/chapter06/udev.xml 2009-08-12 19:16:30 UTC (rev 9037)
@@ -182,7 +182,7 @@
<seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd,
usb_id, write_cd_rules, and write_net_rules</seg>
- <seg>libudev</seg>
+ <seg>libudev.{a,so}</seg>
<seg>/etc/udev</seg>
</seglistitem>
</segmentedlist>
@@ -351,7 +351,7 @@
</varlistentry>
<varlistentry id="libudev">
- <term><command>libudev</command></term>
+ <term><filename class="libraryfile">libudev</filename></term>
<listitem>
<para>A library interface to udev device information</para>
<indexterm zone="ch-system-udev libudev">
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2009-08-12 18:49:43 UTC (rev 9036)
+++ trunk/BOOK/general.ent 2009-08-12 19:16:30 UTC (rev 9037)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090801">
-<!ENTITY releasedate "August 1, 2009">
+<!ENTITY version "SVN-20090812">
+<!ENTITY releasedate "August 12, 2009">
<!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "6.5">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
