Author: manuel
Date: 2005-06-30 12:25:35 -0600 (Thu, 30 Jun 2005)
New Revision: 6259
Modified:
branches/cross-lfs/BOOK/final-preps/aboutsbus.xml
branches/cross-lfs/BOOK/final-preps/abouttestsuites.xml
branches/cross-lfs/BOOK/final-preps/addinguser.xml
branches/cross-lfs/BOOK/final-preps/creatingtoolsdir.xml
branches/cross-lfs/BOOK/final-preps/settingenviron.xml
branches/cross-lfs/BOOK/general.ent
branches/cross-lfs/BOOK/introduction/common/askforhelp.xml
branches/cross-lfs/BOOK/introduction/common/changelog.xml
branches/cross-lfs/BOOK/introduction/common/how.xml
branches/cross-lfs/BOOK/introduction/common/resources.xml
branches/cross-lfs/BOOK/materials/common/introduction.xml
branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
Log:
Text updates ported from trunk. Part 1.
Modified: branches/cross-lfs/BOOK/final-preps/aboutsbus.xml
===================================================================
--- branches/cross-lfs/BOOK/final-preps/aboutsbus.xml 2005-06-30 17:53:21 UTC
(rev 6258)
+++ branches/cross-lfs/BOOK/final-preps/aboutsbus.xml 2005-06-30 18:25:35 UTC
(rev 6259)
@@ -43,14 +43,15 @@
known to be approximately 30 percent slower). SBUs are also not
highly accurate for Symmetric Multi-Processor (SMP)-based machines.</para>
+ <para>In general, SBUs are not entirely accurate because they depend on many
+ factors, including the host system's version of GCC. Note that on Symmetric
+ Multi-Processor (SMP)-based machines, SBUs are even less accurate. They are
+ provided here to give an estimate of how long it might take to install a
+ package, but the numbers can vary by as much as dozens of minutes in some
+ cases.</para>
+
<para>To view actual timings for a number of specific machines, we recommend
<ulink url="&lfs-root;~bdubbs/"/>.</para>
-
- <para>In general, SBUs are not very accurate because they depend on many
- factors, not just the GCC version. They are provided
- here to give an estimate of how long it might take to
- install a package, but the numbers can vary by as much as dozens of
- minutes in some cases.</para>
-->
</sect1>
Modified: branches/cross-lfs/BOOK/final-preps/abouttestsuites.xml
===================================================================
--- branches/cross-lfs/BOOK/final-preps/abouttestsuites.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/final-preps/abouttestsuites.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -48,9 +48,9 @@
correctly. This issue is discussed in greater detail in <xref
linkend="chapter-temporary-tools"/>.</para>
- <para>Sometimes package test suites will give false failures. Consult
- the logs located at <ulink url="&test-results;"/> to verify whether or
- not these failures are expected. This site is valid for all tests
- throughout this book.</para>
+ <para>Sometimes package test suites will fail, but for reasons which the
+ developers are aware of and have deemed non-critical. Consult the logs
located
+ at <ulink url="&test-results;"/> to verify whether or not these failures are
+ expected. This site is valid for all tests throughout this book.</para>
</sect1>
Modified: branches/cross-lfs/BOOK/final-preps/addinguser.xml
===================================================================
--- branches/cross-lfs/BOOK/final-preps/addinguser.xml 2005-06-30 17:53:21 UTC
(rev 6258)
+++ branches/cross-lfs/BOOK/final-preps/addinguser.xml 2005-06-30 18:25:35 UTC
(rev 6259)
@@ -101,6 +101,7 @@
<para>The <quote><parameter>-</parameter></quote> instructs
<command>su</command> to start a login shell as opposed to a non-login
shell. The difference between these two types of shells can be found
- in detail in the Bash man and info pages.</para>
+ in detail in the <command>man</command> and <command>info</command>
+ pages for Bash.</para>
</sect1>
Modified: branches/cross-lfs/BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- branches/cross-lfs/BOOK/final-preps/creatingtoolsdir.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/final-preps/creatingtoolsdir.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -34,8 +34,9 @@
<note>
<para>The above command is correct. The <command>ln</command> command
- has a few syntactic variations, so be sure to check the info and man
- pages before reporting what you may think is an error.</para>
+ has a few syntactic variations, so be sure to check the
+ <command>info</command> and <command>man</command> pages before reporting
+ what you may think is an error.</para>
</note>
<para>TO BE REWRiTTEN - The created symlink enables the toolchain to be
Modified: branches/cross-lfs/BOOK/final-preps/settingenviron.xml
===================================================================
--- branches/cross-lfs/BOOK/final-preps/settingenviron.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/final-preps/settingenviron.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -81,10 +81,10 @@
<para>By putting <filename class="directory">/tools/bin</filename> ahead
of the standard <envar>PATH</envar>, all the programs installed in
- <xref linkend="chapter-temporary-tools"/> are picked up by the shell
+ <xref linkend="chapter-temp-system"/> are picked up by the shell
immediately after their installation. This, combined with turning off
- hashing, limits the risk that old programs from the host are being used
- when they should not be used any longer.</para>
+ hashing, limits the risk that old programs are used from the host when
+ the same programs are available in the temporary system.</para>
<para>Finally, to have the environment fully prepared for building the
temporary tools, source the just-created user profile:</para>
Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent 2005-06-30 17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/general.ent 2005-06-30 18:25:35 UTC (rev 6259)
@@ -19,6 +19,7 @@
<!ENTITY hints-index "&lfs-root;hints/list.html">
<!ENTITY patches-root "http://www.linuxfromscratch.org/patches/downloads/";>
<!ENTITY wiki-root "http://wiki.linuxfromscratch.org/";>
+<!ENTITY livecd-root "http://linuxfromscratch.org/~jhuntwork/livecd/";>
<!ENTITY test-results
"http://linuxfromscratch.org/~archaic/logs-&generic-version;/";>
<!ENTITY errata
"http://www.linuxfromscratch.org/lfs/view/errata-&generic-version;/";>
Modified: branches/cross-lfs/BOOK/introduction/common/askforhelp.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/askforhelp.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/introduction/common/askforhelp.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -18,7 +18,7 @@
<ulink url="&hints-root;errors.txt"/>.</para>
<para>We also have a wonderful LFS community that is willing to offer
- assistance through IRC and the mailing lists (see the <xref
+ assistance through the mailing lists and IRC (see the <xref
linkend="ch-intro-resources"/> section of this book). In order
to assist with diagnosing and solving the problem, please include
all relevant information in your request for help.</para>
@@ -119,16 +119,4 @@
</sect2>
- <sect2>
- <title>Test Suite Problems</title>
-
- <para>Many packages provide a test suite which, depending on the
- importance of the package, should be run. Sometimes packages will
- generate false or expected failures. If these errors are encountered,
- check the LFS Wiki page at <ulink url="&wiki-root;"/> to see if we have
- noted and investigated these issues. If these issues are noted and
- addressed, there is no need to be concerned.</para>
-
- </sect2>
-
</sect1>
Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -13,7 +13,7 @@
<title>Master Changelog</title>
<para>This is version &version; of the Linux From Scratch book, dated
- &releasedate;. If this book is more than two months old, a newer and better
+ &releasedate;. If this book is more than six months old, a newer and better
version is probably already available. To find out, please check one of the
mirrors via <ulink url="&lfs-root;"/>.</para>
@@ -122,9 +122,6 @@
<listitem>
<para>Zlib &zlib-version;</para>
</listitem>
- <listitem>
- <para>udev-config-3.rules</para>
- </listitem>
</itemizedlist>
<itemizedlist>
@@ -213,8 +210,8 @@
</listitem>
<listitem>
<para>[jim] - Fixed console access on MIPS and Sparc based
- architectures. This allowed the removal of openssh and
- openssl on MIPS.</para>
+ architectures. This allowed the removal of openssh and
+ openssl on MIPS.</para>
</listitem>
<listitem>
<para>[jim] - Updated to TCL 8.4.11.</para>
@@ -233,12 +230,12 @@
</listitem>
<listitem>
<para>[jim] - Updated creatingdirs.xml in chroot to
- reflect a multilib environment.
+ reflect a multilib environment.
This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
<listitem>
<para>[jim] - Added Build Flags to multilib builds in chroot.
- This change was only for x86_64, mips64, and sparc64.</para>
+ This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
<listitem>
<para>[jim] - Fixed linux-libc-headers install in sparc64 and
x86_64.</para>
@@ -264,19 +261,19 @@
to r6189.</para>
</listitem>
<listitem>
- <para>[jim] - Removed export CC in udev during final-system.
+ <para>[jim] - Removed export CC in udev during final-system.
This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
<listitem>
- <para>[jim] - Added missing symlink in createfiles.xml for lib32 and
lib64.
+ <para>[jim] - Added missing symlink in createfiles.xml for lib32 and
lib64.
This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
<listitem>
- <para>[jim] - Added missing directories in creatingdirs.xml for
lib32 and lib64.
+ <para>[jim] - Added missing directories in creatingdirs.xml for
lib32 and lib64.
This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
<listitem>
- <para>[jim] - Added missing DESTDIR=${LFS} in udev during reboot
section build.
+ <para>[jim] - Added missing DESTDIR=${LFS} in udev during reboot
section build.
This change was only for x86_64, mips64, and sparc64.</para>
</listitem>
</itemizedlist>
Modified: branches/cross-lfs/BOOK/introduction/common/how.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/how.xml 2005-06-30 17:53:21 UTC
(rev 6258)
+++ branches/cross-lfs/BOOK/introduction/common/how.xml 2005-06-30 18:25:35 UTC
(rev 6259)
@@ -25,8 +25,7 @@
in this book. Additionally, it contains all the source packages, patches
and a copy of this book. So once you have the CD, no network connection
or additional downloads are necessary. For more information about the
- LFS LiveCD or to download a copy, visit
- <ulink url="http://linuxfromscratch.org/~jhuntwork/livecd/"/></para>
+ LFS LiveCD or to download a copy, visit <ulink url="&livecd-root;"/></para>
<!-- -->
<para>THE TEXT BELOW NEED TO BE REWRITTEN</para>
@@ -37,7 +36,7 @@
linkend="chapter-getting-materials"/> explains which packages and
patches need to be downloaded to build an LFS system and how to store
them on the new file system. <xref linkend="chapter-final-preps"/>
- discusses the setup for an appropriate work environment. Please read
+ discusses the setup for an appropriate working environment. Please read
<xref linkend="chapter-final-preps"/> carefully as it explains several
important issues the developer should be aware of before beginning to
work through <xref linkend="chapter-temporary-tools"/> and
@@ -62,22 +61,21 @@
will no longer depend on the host distribution, with the exception of the
running kernel. </para>
- <para>While this may initially seem like a lot of work to get away
- from a host distribution, a full technical explanation is provided at
- the beginning of <xref linkend="chapter-temporary-tools"/>.</para>
+ <para>While this may initially seem like a lot of work to isolate the new
+ syatem from the host distribution, a full technical explanation is provided
+ at the beginning of <xref linkend="chapter-temporary-tools"/>.</para>
<para>In <xref linkend="chapter-building-system"/>, the full LFS system is
- built. The chroot (change root) program is used to enter a virtual
- environment and start a new shell whose root directory will be set to
- the LFS partition. This is very similar to rebooting and instructing
- the kernel to mount the LFS partition as the root partition. The
- system does not actually reboot, but instead chroots because creating a
- bootable system requires additional work which is not necessary just
- yet. The major advantage is that <quote>chrooting</quote> allows the
- builder to continue using the host while LFS is being built. While
- waiting for package compilation to complete, a user can switch to a
- different virtual console (VC) or X desktop and continue using the
- computer as normal.</para>
+ built. The <command>chroot</command> (change root) program is used to enter
+ a virtual environment and start a new shell whose root directory will be set
+ to the LFS partition. This is very similar to rebooting and instructing the
+ kernel to mount the LFS partition as the root partition. The system does not
+ actually reboot, but instead <command>chroot</command>'s because creating a
+ bootable system requires additional work which is not necessary just yet.
+ The major advantage is that <quote>chrooting</quote> allows the builder to
+ continue using the host while LFS is being built. While waiting for package
+ compilation to complete, a user can switch to a different virtual console
+ (VC) or X desktop and continue using the computer as normal.</para>
<para>To finish the installation, the bootscripts are set up in <xref
linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
@@ -91,6 +89,6 @@
<para>This is the process in a nutshell. Detailed information on each
step is discussed in the following chapters and package descriptions.
Items that may seem complicated will be clarified, and everything will
- fall into place as the developer embarks on the LFS adventure.</para>
+ fall into place as the reader embarks on the LFS adventure.</para>
</sect1>
Modified: branches/cross-lfs/BOOK/introduction/common/resources.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/resources.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/introduction/common/resources.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -33,18 +33,6 @@
</sect2>
- <sect2 id="ch-intro-irc">
- <title>IRC</title>
-
- <para>Several members of the LFS community offer assistance on our
- community Internet Relay Chat (IRC) network. Before using this support,
- please make sure that your question is not already answered in the LFS
- FAQ or the mailing list archives. You can find the IRC network at
- <uri>irc.linuxfromscratch.org</uri>. The support channel is named
- #LFS-support.</para>
-
- </sect2>
-
<sect2 id="ch-intro-newsserver">
<title>News Server</title>
@@ -58,6 +46,18 @@
</sect2>
+ <sect2 id="ch-intro-irc">
+ <title>IRC</title>
+
+ <para>Several members of the LFS community offer assistance on our
+ community Internet Relay Chat (IRC) network. Before using this support,
+ please make sure that your question is not already answered in the LFS
+ FAQ or the mailing list archives. You can find the IRC network at
+ <uri>irc.linuxfromscratch.org</uri>. The support channel is named
+ #LFS-support.</para>
+
+ </sect2>
+
<sect2 id="ch-intro-wiki">
<title>Wiki</title>
Modified: branches/cross-lfs/BOOK/materials/common/introduction.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/introduction.xml 2005-06-30
17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/materials/common/introduction.xml 2005-06-30
18:25:35 UTC (rev 6259)
@@ -10,22 +10,18 @@
<title>Introduction</title>
- <para>This chapter includes a list of packages that need to be
- downloaded for building a basic Linux system. The listed version numbers
- correspond to versions of the software that are known to work, and
- this book is based on their use. We highly recommend not using newer
- versions because the build commands for one version may not work with
- a newer version. The newest package versions may also have problems
- that work-arounds have not been developed for yet.</para>
+ <para>This chapter includes a list of packages that need to be downloaded
+ for building a basic Linux system. The listed version numbers correspond
+ to versions of the software that are known to work, and this book is based
+ on their use. We highly recommend not using newer versions because the
+ build commands for one version may not work with a newer version. The
+ newest package versions may also have problems that require work-arounds.
+ These work-arounds will be developed and stabilized in the development
+ version of the book.</para>
- <para>All the URLs, when possible, refer to the package's information
- page at <ulink url="http://www.freshmeat.net/"/>. The Freshmeat pages
- provide easy access to official download sites, as well as project
- websites, mailing lists, FAQ, changelogs, and more.</para>
-
<para>Download locations may not always be accessible. If a download
location has changed since this book was published, Google (<ulink
- url="http://www.google.com"/>) provides a useful search engine for
+ url="http://www.google.com/"/>) provides a useful search engine for
most packages. If this search is unsuccessful, try one of the
alternate means of downloading discussed at <ulink
url="&lfs-root;lfs/packages.html"/>.</para>
Modified: branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
2005-06-30 17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
2005-06-30 18:25:35 UTC (rev 6259)
@@ -58,8 +58,8 @@
</note>
<para>If a swap partition was created, it will need to be initialized
- as a swap partition by using the command below. If you are using an
- existing swap partition, there is no need to format it.</para>
+ for use by issuing the command below. If you are using an existing swap
+ partition, there is no need to format it.</para>
<screen><userinput>mkswap
/dev/<replaceable>[yyy]</replaceable></userinput></screen>
Modified: branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
2005-06-30 17:53:21 UTC (rev 6258)
+++ branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
2005-06-30 18:25:35 UTC (rev 6259)
@@ -25,7 +25,7 @@
This is enough to store all the source tarballs and compile the packages.
However, if the LFS system is intended to be the primary Linux system,
additional software will probably be installed which will require
- additional space (2 or 3 GB). The LFS system itself will not take up this
+ additional space (2-3 GB). The LFS system itself will not take up this
much room. A large portion of this requirement is to provide sufficient
free temporary storage. Compiling packages can require a lot of disk space
which will be reclaimed after the package is installed.</para>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
