aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter02/chapter02.xml3
-rw-r--r--chapter02/hostreqs.xml (renamed from prologue/hostreqs.xml)27
-rw-r--r--chapter02/introduction.xml7
-rw-r--r--prologue/preface.xml1
5 files changed, 26 insertions, 16 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f99e13f6d..2ca396a2c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
<para>2016-05-16</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Moved Host System Requirements to Chapter 2
+ and made minor editorial changes.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Updated to tar-1.29. Fixes
<ulink url="&lfs-ticket-root;3932">#3932</ulink>.</para>
</listitem>
diff --git a/chapter02/chapter02.xml b/chapter02/chapter02.xml
index aa62827bb..35d265bb7 100644
--- a/chapter02/chapter02.xml
+++ b/chapter02/chapter02.xml
@@ -9,9 +9,10 @@
<?dbhtml dir="chapter02"?>
<?dbhtml filename="chapter02.html"?>
- <title>Preparing a New Partition</title>
+ <title>Preparing the Host System</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingpartition.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingfilesystem.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>
diff --git a/prologue/hostreqs.xml b/chapter02/hostreqs.xml
index c52f81e0f..5e92f8a8b 100644
--- a/prologue/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -18,8 +18,8 @@
<quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
your distribution provides them.</para>
- <para>Earlier versions of the listed software packages may work, but has not
- been tested.</para>
+ <para>Earlier versions of the listed software packages may work, but have
+ not been tested.</para>
<itemizedlist spacing="compact">
@@ -143,16 +143,21 @@
</itemizedlist>
- <para>Note that the symlinks mentioned above are required to build an LFS
- system using the instructions contained within this book. Symlinks that
- point to other software (such as dash, mawk, etc.) may work, but are not
- tested or supported by the LFS development team, and may require either
- deviation from the instructions or additional patches to some
- packages.</para>
+ <important>
+ <para>Note that the symlinks mentioned above are required to build an LFS
+ system using the instructions contained within this book. Symlinks that
+ point to other software (such as dash, mawk, etc.) may work, but are not
+ tested or supported by the LFS development team, and may require either
+ deviation from the instructions or additional patches to some
+ packages.</para>
+ </important>
<!-- Use an empty sect2 element to prevent a pdf warning. -->
- <sect2 id="version-check" xreflabel="Section vii, Host System Requirements">
- <title> </title>
+ <bridgehead renderas="sect2"
+ id="version-check"
+ xreflabel="Host System Requirements">
+ </bridgehead>
+ <!--<title> </title>-->
<para >To see whether your host system has all the appropriate versions, and
the ability to compile programs, run the following:</para>
@@ -234,5 +239,5 @@ bash library-check.sh</userinput></screen>
or all absent, but not only one or two present.</para>
-</sect2>
+<!--</sect2>-->
</sect1>
diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml
index 11e4e1883..007bdad8b 100644
--- a/chapter02/introduction.xml
+++ b/chapter02/introduction.xml
@@ -10,8 +10,9 @@
<title>Introduction</title>
- <para>In this chapter, the partition which will host the LFS system is
- prepared. We will create the partition itself, create a file system
- on it, and mount it.</para>
+ <para>In this chapter, the host tools needed for building LFS
+ are checked and, if necessary, installed. Then a partition which will
+ host the LFS system is prepared. We will create the partition
+ itself, create a file system on it, and mount it.</para>
</sect1>
diff --git a/prologue/preface.xml b/prologue/preface.xml
index bd2139857..21317757f 100644
--- a/prologue/preface.xml
+++ b/prologue/preface.xml
@@ -17,7 +17,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="standards.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="why.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prerequisites.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typography.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="organization.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errata.xml"/>