Converted m4, bison, less, groff, textutils, sed, flex, binutils, fileutils, shellutils, gettext and net-tools to new layout.

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

28 files changed, 240 insertions, 156 deletions

diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml
deleted file mode 100644
index 4d875e0d5..000000000
--- a/chapter06/binutils-exp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>tooldir=/usr:</userinput> Normally, the tooldir (the
-directory where the executables from binutils end up) is set to
-$(exec_prefix)/$(target_alias) which expands into, for example, 
-/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
-need this target specific directory in /usr. That setup would be used
-if the system was used to cross-compile (for example 
-compiling a package on the Intel machine that generates code that can be
-executed on Apple PowerPC machines).</para>
-
-<para><userinput>make tooldir=/usr install-info:</userinput> This will
-install binutils' info pages.</para>
-
-<para><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include:</userinput>
-The libiberty.h header file is needed in order for certain software to
-compile.</para>
-
-</sect2>
-
diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
index 3ccc05b91..4027d7791 100644
--- a/chapter06/binutils-inst.xml
+++ b/chapter06/binutils-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2><title>Installation of Binutils</title>
 
 <para>This package is known to behave badly when you have changed its
@@ -7,15 +9,40 @@ that override default optimizations, such as CFLAGS and CXXFLAGS, we
 recommend unsetting or modifying them when building binutils. You have
 been warned.</para>
 
-<para>Install Binutils by running the following commands:</para>
+<para>It is recommended by the Binutils installation documentation to build
+Binutils outside of the source directory. Create the build directory:</para>
 
 <para><screen><userinput>mkdir ../binutils-build &amp;&amp;
-cd ../binutils-build &amp;&amp;
-../binutils-&binutils-version;/configure --prefix=/usr --enable-shared &amp;&amp;
-make tooldir=/usr &amp;&amp;
-make tooldir=/usr install &amp;&amp;
-make tooldir=/usr install-info &amp;&amp;
-cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para>
+cd ../binutils-build</userinput></screen></para>
+
+<para>Next, prepare Binutils to be compiled:</para>
+
+<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make tooldir=/usr</userinput></screen></para>
+
+<para>Normally, the <emphasis>tooldir</emphasis> (the directory where the
+executables end up) is set to $(exec_prefix)/$(target_alias) which expands
+into, for example, /usr/i686-pc-linux-gnu. Since we only build for our
+own system, we don't need this target specific directory in /usr. That
+setup would be used if the system was used to cross-compile (for example
+compiling a package on the Intel machine that generates code that can be
+executed on Apple PowerPC machines).</para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make tooldir=/usr install</userinput></screen></para>
+
+<para>Install the info pages:</para>
+
+<para><screen><userinput>make tooldir=/usr install-info</userinput></screen></para>
+
+<para>Some packages require the <emphasis>libiberty</emphasis> header
+in order to build. To honor those packages, install the file:</para>
+
+<para><screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 095f044d1..2acece44f 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &binutils-time;
 Estimated required disk space:  &binutils-compsize;</screen>
 
-&c6-binutils-inst;
-&c6-binutils-exp;
-&aa-binutils-desc;
+&aa-binutils-shortdesc;
 &aa-binutils-dep;
+&c6-binutils-inst;
 
 </sect1>
diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml
index 362dcbf8a..d44fe385c 100644
--- a/chapter06/bison-inst.xml
+++ b/chapter06/bison-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Bison</title>
 
-<para>Install Bison by running the following commands:</para>
+<para>Prepare Bison to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 7d4c6129e..3e469dcc9 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &bison-time;
 Estimated required disk space:  &bison-compsize;</screen>
 
-&c6-bison-inst;
-&aa-bison-desc;
+&aa-bison-shortdesc;
 &aa-bison-dep;
+&c6-bison-inst;
 
 </sect1>
 
diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml
index 79ca45d1d..4e2345135 100644
--- a/chapter06/fileutils-inst.xml
+++ b/chapter06/fileutils-inst.xml
@@ -1,12 +1,26 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Fileutils</title>
 
-<para>Install Fileutils by running the following commands:</para>
+<para>Prepare Fileutils to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Some packages hardwire the path to the
+<userinput>install</userinput> program as
+<emphasis>/usr/bin/install</emphasis>. Create a symlink
+to account for this:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-ln -s ../../bin/install /usr/bin</userinput></screen></para>
+<para><screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/fileutils.xml b/chapter06/fileutils.xml
index 2d9749dec..5b0d77af4 100644
--- a/chapter06/fileutils.xml
+++ b/chapter06/fileutils.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &fileutils-time;
 Estimated required disk space:  &fileutils-compsize;</screen>
 
-&c6-fileutils-inst;
-&aa-fileutils-desc;
+&aa-fileutils-shortdesc;
 &aa-fileutils-dep;
+&c6-fileutils-inst;
 
 </sect1>
diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml
index bdd9ff3c2..92634e350 100644
--- a/chapter06/flex-inst.xml
+++ b/chapter06/flex-inst.xml
@@ -1,20 +1,30 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Flex</title>
 
-<para>Install Flex by running the following commands:</para>
+<para>Prepare Flex to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-ln -s libfl.a /usr/lib/libl.a</userinput></screen></para>
+<para>There are which packages expect to find the flex library
+in the <filename>/usr/lib</filename> directory. Create a symlink
+to account for this:</para>
 
-<para>Some programs don't know about flex and try to find the lex program
-(flex is a (better) alternative for lex). So to please those few
-programs out there we'll create a bash script called lex that calls flex
-and have it emulate lex.</para>
+<para><screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen></para>
 
-<para>Create a new file <filename>/usr/bin/lex</filename> by running the
-following:</para>
+<para>Some programs don't know about flex and try to find the lex
+program (flex is a (better) alternative for lex). To please those
+programs, create a shell script named lex which calls flex in
+emulation mode:</para>
 
 <para><screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 #!/bin/sh
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index b333d82f5..bf7ddd59f 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &flex-time;
 Estimated required disk space:  &flex-compsize;</screen>
 
-&c6-flex-inst;
-&aa-flex-desc;
+&aa-flex-shortdesc;
 &aa-flex-dep;
+&c6-flex-inst;
 
 </sect1>
diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml
index 8eb08d5b3..19d883e0e 100644
--- a/chapter06/gettext-inst.xml
+++ b/chapter06/gettext-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Gettext</title>
 
-<para>Install Gettext by running the following commands:</para>
+<para>Prepare Gettext to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index b54146e27..1c240346d 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &gettext-time;
 Estimated required disk space:  &gettext-compsize;</screen>
 
-&c6-gettext-inst;
-&aa-gettext-desc;
+&aa-gettext-shortdesc;
 &aa-gettext-dep;
+&c6-gettext-inst;
 
 </sect1>
diff --git a/chapter06/groff-exp.xml b/chapter06/groff-exp.xml
deleted file mode 100644
index 99a7c8281..000000000
--- a/chapter06/groff-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>ln -s ...</userinput>: These symlinks are needed for some
-<userinput>xman</userinput> and other groff/man document programs to work
-properly.</para>
-
-</sect2>
-
diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml
index bb995fa75..4c2e6d4ef 100644
--- a/chapter06/groff-inst.xml
+++ b/chapter06/groff-inst.xml
@@ -1,12 +1,24 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Groff</title>
 
-<para>Install Groff by running the following commands:</para>
+<para>Prepare Groff to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Some groff/man document programs, such as <userinput>xman</userinput>,
+will not work work properly without the following symlinks:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-ln -s soelim /usr/bin/zsoelim &amp;&amp;
+<para><screen><userinput>ln -s soelim /usr/bin/zsoelim &amp;&amp;
 ln -s eqn /usr/bin/geqn &amp;&amp;
 ln -s tbl /usr/bin/gtbl</userinput></screen></para>
 
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 1308f2058..6699b0c81 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &groff-time;
 Estimated required disk space:  &groff-compsize;</screen>
 
-&c6-groff-inst;
-&c6-groff-exp;
-&aa-groff-desc;
+&aa-groff-shortdesc;
 &aa-groff-dep;
+&c6-groff-inst;
 
 </sect1>
 
diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml
index 592c598c2..99e67233a 100644
--- a/chapter06/less-inst.xml
+++ b/chapter06/less-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Less</title>
 
-<para>Install Less by running the following commands:</para>
+<para>Prepare Less to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/less.xml b/chapter06/less.xml
index a2d56eb07..e65ad3072 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &less-time;
 Estimated required disk space:  &less-compsize;</screen>
 
-&c6-less-inst;
-&aa-less-desc;
+&aa-less-shortdesc;
 &aa-less-dep;
+&c6-less-inst;
 
 </sect1>
 
diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml
index dc1e367b1..b1b9683cd 100644
--- a/chapter06/m4-inst.xml
+++ b/chapter06/m4-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of M4</title>
 
-<para>Install M4 by running the following commands:</para>
+<para>Prepare M4 to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 1f20e7be1..b68c90333 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &m4-time;
 Estimated required disk space:  &m4-compsize;</screen>
 
-&c6-m4-inst;
-&aa-m4-desc;
+&aa-m4-shortdesc;
 &aa-m4-dep;
+&c6-m4-inst;
 
 </sect1>
 
diff --git a/chapter06/nettools-exp.xml b/chapter06/nettools-exp.xml
deleted file mode 100644
index 0f8216665..000000000
--- a/chapter06/nettools-exp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>make update:</userinput> This does the same as a
-<userinput>make install</userinput> with the exception that make update
-doesn't make backups of files it's replacing. One of the things
-net-tools replaces is sh-utils's version of
-<filename>/bin/hostname</filename> (net-tools's version is far better
-than sh-utils's version).</para>
-
-<para>Also, if you decide to reinstall this package at some point in the
-future, a <userinput>make update</userinput> won't backup all the files
-from a previous net-tools installation.</para>
-
-</sect2>
-
diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml
index 2a00423bf..f2a6bf127 100644
--- a/chapter06/nettools-inst.xml
+++ b/chapter06/nettools-inst.xml
@@ -1,17 +1,8 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Net-tools</title>
 
-<para>Install Net-tools by running the following commands:</para>
-
-<para><screen><userinput>make &amp;&amp;
-make update</userinput></screen></para>
-
-<para>If you want to accept all the default answers, you can run these
-commands instead:</para>
-
-<para><screen><userinput>yes "" | make &amp;&amp;
-make update</userinput></screen></para>
-
 <para>If you don't know what to answer to all the questions asked during
 the <userinput>make</userinput> phase, then just accept the defaults, which
 will be just fine in the majority of the cases. What you are asked here
@@ -24,5 +15,27 @@ still need to actually enable these protocols in the kernel. What you do
 here is merely telling the programs to be able to use those protocols, but
 it's up to the kernel to make them available to the system.</para>
 
+<para>If you intend to accept the default settings, you may skip
+the questions generated by <emphasis>make</emphasis> by runing
+<userinput>yes "" | make</userinput>.</para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
+
+<para><screen><userinput>make update</userinput></screen></para>
+
+<para>The <emphasis>update</emphasis> option to <userinput>make</userinput>
+works similarly to the <emphasis>install</emphasis> option, with one
+exception: it doesn't make backups of files it's replacing. One of the
+things net-tools replaces is sh-utils's version of /bin/hostname
+(net-tools's version is far better than sh-utils's version).</para>
+
+<para>Also, if you decide to reinstall this package at some point in the
+future, a make update won't backup all the files from a previous net-tools
+installation.</para>
+
 </sect2>
 
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 48bcaf4b6..417bd502d 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &net-tools-time;
 Estimated required disk space:  &net-tools-compsize;</screen>
 
-&c6-nettools-inst;
-&c6-nettools-exp;
-&aa-nettools-desc;
+&aa-nettools-shortdesc;
 &aa-nettools-dep;
+&c6-nettools-inst;
 
 </sect1>
 
diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml
index 0c1923b24..4cfa45522 100644
--- a/chapter06/sed-inst.xml
+++ b/chapter06/sed-inst.xml
@@ -1,11 +1,19 @@
+<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>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Finish installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 888134dca..9cdcf6b69 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &sed-time;
 Estimated required disk space:  &sed-compsize;</screen>
 
-&c6-sed-inst;
-&aa-sed-desc;
+&aa-sed-shortdesc;
 &aa-sed-dep;
+&c6-sed-inst;
 
 </sect1>
diff --git a/chapter06/shellutils-exp.xml b/chapter06/shellutils-exp.xml
deleted file mode 100644
index 3c7e56ef9..000000000
--- a/chapter06/shellutils-exp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch:</userinput> This patch
-suppresses the build of the hostname program which will be installed
-later with the net-tools package. The hostname program from the net-tools
-package is a much better version (and in some cases even required since it
-supports options that are needed by some programs such as XFree86).</para>
-
-</sect2>
-
diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml
index 741911f09..d8060eb0a 100644
--- a/chapter06/shellutils-inst.xml
+++ b/chapter06/shellutils-inst.xml
@@ -1,16 +1,33 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Sh-utils</title>
 
 <para>This package requires its hostname-patch to be applied before you
-can install it.</para>
+can install it. This patch suppresses the build of the hostname program
+which will be installed later with the net-tools package. The hostname
+program from the net-tools package is a much better version (and in some
+cases even required since it supports options that are needed by some
+programs such as XFree86). Apply the patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch</userinput></screen></para>
+
+<para>Prepare Shellutils to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
-<para>Install Sh-utils by running the following commands:</para>
+<para>Finally, move some of the programs to more appropriate
+locations:</para>
 
-<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-mv /usr/bin/{basename,date,echo,false,pwd} /bin &amp;&amp;
+<para><screen><userinput>mv /usr/bin/{basename,date,echo,false,pwd} /bin &amp;&amp;
 mv /usr/bin/{sleep,stty,su,test,true,uname} /bin &amp;&amp;
 mv /usr/bin/chroot /usr/sbin</userinput></screen></para>
 
diff --git a/chapter06/shellutils.xml b/chapter06/shellutils.xml
index 4d238f972..eb5d1df03 100644
--- a/chapter06/shellutils.xml
+++ b/chapter06/shellutils.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &sh-utils-time;
 Estimated required disk space:  &sh-utils-compsize;</screen>
 
-&c6-shellutils-inst;
-&c6-shellutils-exp;
-&aa-shellutils-desc;
+&aa-shellutils-shortdesc;
 &aa-shellutils-dep;
+&c6-shellutils-inst;
 
 </sect1>
diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml
index d9e78da0f..511e52bb5 100644
--- a/chapter06/textutils-inst.xml
+++ b/chapter06/textutils-inst.xml
@@ -1,12 +1,24 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Textutils</title>
 
-<para>Install Textutils by running the following commands:</para>
+<para>Prepare Textutils to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Finally, complete the installation of this package
+by moving some of its programs to the appropriate directory:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-mv /usr/bin/{cat,head} /bin</userinput></screen></para>
+<para><screen><userinput>mv /usr/bin/{cat,head} /bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/textutils.xml b/chapter06/textutils.xml
index a11c403b2..30f89194e 100644
--- a/chapter06/textutils.xml
+++ b/chapter06/textutils.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &textutils-time;
 Estimated required disk space:  &textutils-compsize;</screen>
 
-&c6-textutils-inst;
-&aa-textutils-desc;
+&aa-textutils-shortdesc;
 &aa-textutils-dep;
+&c6-textutils-inst;
 
 </sect1>