converted sh-utils

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

12 files changed, 42 insertions, 26 deletions

diff --git a/appendixa/sed-dep.xml b/appendixa/sed-dep.xml
index 9edc82fce..d5868302a 100644
--- a/appendixa/sed-dep.xml
+++ b/appendixa/sed-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Sed Installation Dependencies</title>
 
diff --git a/appendixa/sed-desc.xml b/appendixa/sed-desc.xml
index a77c4661c..06391989e 100644
--- a/appendixa/sed-desc.xml
+++ b/appendixa/sed-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Sed</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &sed-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>sed</para></sect3>
+<para>Last checked against version &sed-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>sed</title>
 <para>sed is a stream editor. A stream editor is used to perform basic text 
diff --git a/appendixa/sed.xml b/appendixa/sed.xml
index 11b2c784a..a46af37a7 100644
--- a/appendixa/sed.xml
+++ b/appendixa/sed.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="sed.html" dir="appendixa"?>
 
 &aa-sed-down;
+&aa-sed-shortdesc;
 &aa-sed-desc;
 &aa-sed-dep;
 
diff --git a/appendixa/shellutils-dep.xml b/appendixa/shellutils-dep.xml
index 01ab6f206..3bcd7248e 100644
--- a/appendixa/shellutils-dep.xml
+++ b/appendixa/shellutils-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Sh-utils Installation Dependencies</title>
 
diff --git a/appendixa/shellutils-desc.xml b/appendixa/shellutils-desc.xml
index 02cd024a1..f8a9ae50e 100644
--- a/appendixa/shellutils-desc.xml
+++ b/appendixa/shellutils-desc.xml
@@ -1,15 +1,10 @@
-<sect2><title>Contents of Sh-utils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &sh-utils-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>basename, chroot, date, dirname,
-echo, env, expr, factor, false, groups, hostid, id, logname,
-nice, nohup, pathchk, pinky, printenv, printf, pwd, seq, sleep, stty,
-su, tee, test, true, tty, uname, uptime, users, who, whoami and
-yes</para></sect3>
+<para>Last checked against version &sh-utils-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>basename</title>
 <para>basename strips directory and suffixes from filenames.</para></sect4>
diff --git a/appendixa/shellutils.xml b/appendixa/shellutils.xml
index 04931e20c..e058ee405 100644
--- a/appendixa/shellutils.xml
+++ b/appendixa/shellutils.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="sh-utils.html" dir="appendixa"?>
 
 &aa-shellutils-down;
+&aa-shellutils-shortdesc;
 &aa-shellutils-desc;
 &aa-shellutils-dep;
 
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index f2bdf1b86..f0e2dc7a5 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -1,12 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Sed</title>
 
-<para>Install Sed by running the following commands:</para>
+<para>Prepare Sed 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 installing 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/sed.xml b/chapter05/sed.xml
index 67f74ea86..2f0ceaee5 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &sed-time-static;
 Estimated required disk space:  &sed-compsize-static;</screen>
 
-&c5-sed-inst;
-&aa-sed-desc;
+&aa-sed-shortdesc;
 &aa-sed-dep;
+&c5-sed-inst;
 
 </sect1>
 
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index b9b2659e5..c0384a4d1 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -10,12 +10,18 @@ it.</para>
 
 <para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
 
-<para>Install Sh-utils by running the following commands:</para>
+<para>Prepare Sh-utils to be compiled:</para>
 
 <para><screen><userinput>LDFLAGS="-static" ./configure --prefix=$LFS/static \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--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>
 
 <para>During the make install stage you will see the following warning:</para>
 
diff --git a/chapter05/shellutils.xml b/chapter05/shellutils.xml
index cf8814310..cd11c4ebf 100644
--- a/chapter05/shellutils.xml
+++ b/chapter05/shellutils.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &sh-utils-time-static;
 Estimated required disk space:  &sh-utils-compsize-static;</screen>
 
-&c5-shellutils-inst;
-&aa-shellutils-desc;
+&aa-shellutils-shortdesc;
 &aa-shellutils-dep;
+&c5-shellutils-inst;
 
 </sect1>
 
diff --git a/entities/sed.ent b/entities/sed.ent
index 3f80e59d6..56c122779 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -7,6 +7,7 @@
 <!ENTITY c6-sed-inst SYSTEM "../chapter06/sed-inst.xml">
 
 <!ENTITY aa-sed SYSTEM "../appendixa/sed.xml">
+<!ENTITY aa-sed-shortdesc SYSTEM "../appendixa/sed-shortdesc.xml">
 <!ENTITY aa-sed-desc SYSTEM "../appendixa/sed-desc.xml">
 <!ENTITY aa-sed-dep SYSTEM "../appendixa/sed-dep.xml">
 <!ENTITY aa-sed-down SYSTEM "../appendixa/sed-down.xml">
diff --git a/entities/shellutils.ent b/entities/shellutils.ent
index 01d2c2dd0..89a80082e 100644
--- a/entities/shellutils.ent
+++ b/entities/shellutils.ent
@@ -10,6 +10,7 @@
 <!ENTITY c6-shellutils-exp SYSTEM "../chapter06/shellutils-exp.xml">
 
 <!ENTITY aa-shellutils SYSTEM "../appendixa/shellutils.xml">
+<!ENTITY aa-shellutils-shortdesc SYSTEM "../appendixa/shellutils-shortdesc.xml">
 <!ENTITY aa-shellutils-desc SYSTEM "../appendixa/shellutils-desc.xml">
 <!ENTITY aa-shellutils-dep SYSTEM "../appendixa/shellutils-dep.xml">
 <!ENTITY aa-shellutils-down SYSTEM "../appendixa/shellutils-down.xml">