reworded for consistency

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2312 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

13 files changed, 81 insertions, 33 deletions

diff --git a/appendixa/gawk-dep.xml b/appendixa/gawk-dep.xml
index c9352b78b..4f2673553 100644
--- a/appendixa/gawk-dep.xml
+++ b/appendixa/gawk-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Gawk Installation Dependencies</title>
 
diff --git a/appendixa/gawk-desc.xml b/appendixa/gawk-desc.xml
index 5eb82948e..a49055726 100644
--- a/appendixa/gawk-desc.xml
+++ b/appendixa/gawk-desc.xml
@@ -1,19 +1,17 @@
-<sect2><title>Contents of Gawk</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &gawk-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>awk, gawk, gawk-3.1.1, grcat, igawk, pgawk, pgawk-3.1.1,
-pwcat</para></sect3>
+<para>Last checked against version &gawk-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program files descriptions</title>
 
 <sect4><title>awk</title>
 <para>awk is a symbolic link to gawk.</para></sect4>
 
 <sect4><title>gawk, gawk-3.1.1</title>
-<para>gawk is the GNU implementation of awk,
-a pattern scanning and processing language.</para></sect4>
+<para>gawk is the GNU implementation of awk, a pattern scanning and
+processing language.</para></sect4>
 
 <sect4><title>grcat</title>
 <para>grcat concatenates the group database,
diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml
new file mode 100644
index 000000000..4c4e68a36
--- /dev/null
+++ b/appendixa/gawk-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Gawk</title>
+
+<para>Last checked against version &gawk-contversion;.</para>
+
+<para>Gawk is an awk implementation that is used to manipulate text
+files.</para>
+
+<para>Gawk installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>awk, gawk, gawk-3.1.1, grcat, igawk, pgawk, pgawk-3.1.1,
+pwcat</para></sect3>
+
+</sect2>
diff --git a/appendixa/gawk.xml b/appendixa/gawk.xml
index 6e06297b1..8b3adbe8e 100644
--- a/appendixa/gawk.xml
+++ b/appendixa/gawk.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="gawk.html" dir="appendixa"?>
 
 &aa-gawk-down;
+&aa-gawk-shortdesc;
 &aa-gawk-desc;
 &aa-gawk-dep;
 
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index c455d1bac..612bc973f 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -54,7 +54,7 @@ That package requires ncurses, and termcap can't reliably be used
 there.</para></listitem>
 </itemizedlist>
 
-<para>Now we can continue compiling Bash:</para>
+<para>Now we can continue with compiling Bash:</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 0a4954fce..329074627 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -29,10 +29,9 @@ static programs and nls often causes problems when you're linking
 statically.</para></listitem>
 </itemizedlist>
 
-<para>We'll finish off by compiling and installing the package:</para>
+<para>Continue with compiling the package:</para>
 
-<para><screen><userinput>make LDFLAGS="-all-static" &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make LDFLAGS="-all-static"</userinput></screen></para>
 
 <para>The meaning of the make option is:</para>
 
@@ -46,5 +45,9 @@ are different ways of setting up the <emphasis>LDFLAGS</emphasis>
 variable.</para></listitem>
 </itemizedlist>
 
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
 </sect2>
 
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index f6f8183c2..bb50a64fb 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -8,19 +8,25 @@ for compilation. Instead we just run the <userinput>make</userinput>
 program and start compiling, with a few variables changed to suit our
 environment:</para>
 
-<para><screen><userinput>make CC="gcc -static -s"
-make PREFIX=$LFS/static install</userinput></screen></para>
+<para><screen><userinput>make CC="gcc -static -s"</userinput></screen></para>
 
-<para>The meaning of the make options are:</para>
+<para>The meaning of the make option is:</para>
 
 <itemizedlist>
-
 <listitem><para><userinput>CC="gcc -static -s":</userinput> The Bzip2 package
 does not honour the <emphasis>LDFLAGS</emphasis> variable, so instead we set
 the <emphasis>CC</emphasis> variable which defines which compiler to use.
 The <emphasis>-static</emphasis> option tells the compiler to link all
 programs statically.</para></listitem>
+</itemizedlist>
+
+<para>And finish off installing the package:</para>
 
+<para><screen><userinput>make PREFIX=$LFS/static install</userinput></screen></para>
+
+<para>The meaning of the make option is:</para>
+
+<itemizedlist>
 <listitem><para><userinput>PREFIX=$LFS/static:</userinput> Instead of
 passing a <emphasis>--prefix=$LFS/static</emphasis> to a configure script,
 we set the <emphasis>PREFIX</emphasis> variable to accomplish the same goal
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index e197fa674..9110d0918 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -29,10 +29,13 @@ linking statically on systems that run an older Glibc version and this
 construction fixes that problem.</para></listitem>
 </itemizedlist>
 
-<para>Finish off by compiling and installing the package:</para>
+<para>Continue with compiling the package:</para>
 
-<para><screen><userinput>make
-make install</userinput></screen></para>
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 7e6275aeb..42be9cda4 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -25,12 +25,18 @@ than likely result in all kinds of compile time problems.</para>
 
 <para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-patch-version;.patch</userinput></screen></para>
 
-<para>Install Fileutils by running the following commands:</para>
+<para>Prepare the package to be compiled:</para>
 
 <para><screen><userinput>LDFLAGS="-static" \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure --disable-nls --prefix=$LFS/static
-make
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --disable-nls --prefix=$LFS/static</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finsh off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 <para>Once you have installed Fileutils, you can test whether the
 segmentation fault problem has been avoided by running
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index df3da659a..b05c8089f 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -10,11 +10,17 @@ with:</para>
 
 <para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para>
 
-<para>Install Findutils by running the following:</para>
+<para>Prepare Findutils to be compiled:</para>
 
 <para><screen><userinput>CPPFLAGS="-Dre_max_failures=re_max_failures2" \
-&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static
-make
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index e4366b5b9..320ecdef8 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -1,12 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Gawk</title>
 
-<para>Install Gawk by running the following commands:</para>
+<para>Prepare Gawk to be compiled:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 97fc91345..76a1cba0e 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &gawk-time-static;
 Estimated required disk space:  &gawk-compsize-static;</screen>
 
-&c5-gawk-inst;
-&aa-gawk-desc;
+&aa-gawk-shortdesc;
 &aa-gawk-dep;
+&c5-gawk-inst;
 
 </sect1>
 
diff --git a/entities/gawk.ent b/entities/gawk.ent
index e6960a4d5..4b01b3cb8 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -9,6 +9,7 @@
 <!ENTITY c6-gawk-exp SYSTEM "../chapter06/gawk-exp.xml">
 
 <!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
+<!ENTITY aa-gawk-shortdesc SYSTEM "../appendixa/gawk-shortdesc.xml">
 <!ENTITY aa-gawk-desc SYSTEM "../appendixa/gawk-desc.xml">
 <!ENTITY aa-gawk-dep SYSTEM "../appendixa/gawk-dep.xml">
 <!ENTITY aa-gawk-down SYSTEM "../appendixa/gawk-down.xml">