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

appendixa/bison-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Bison Installation Dependencies</title>
 

appendixa/bison-desc.xml

@@ -1,15 +1,12 @@
-<sect2><title>Contents of Bison</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &bison-contversion;.</para>
-
-<sect3><title>Program Files</title>
+<sect2><title>Descriptions</title>
 
-<para>bison and yacc</para></sect3>
+<para>Last checked against version &bison-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>bison</title>
-
 <para>bison is a parser generator, a replacement for yacc. yacc stands for Yet
 Another Compiler Compiler. What is bison then? It is a program that
 generates a program that analyzes the structure of a text file. Instead of
@@ -46,7 +43,6 @@ answer. Of course, bison isn't only used for calculators
 alone.</para></sect4>
 
 <sect4><title>yacc</title>
-
 <para>This bash script calls bison using the -y option. This is for
 compatibility purposes for programs which use yacc instead of
 bison.</para></sect4>

appendixa/bison-shortdesc.xml

@@ -0,0 +1,14 @@
+<sect2><title>Contents of Bison</title>
+
+<para>Last checked against version &bison-contversion;.</para>
+
+<para>Bison is a parser generator, a replacement for yacc. Bison
+generates a program that analyzes the structure of a text file.</para>
+
+<para>Bison installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>bison and yacc</para></sect3>
+
+</sect2>
+

appendixa/bison.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="bison.html" dir="appendixa"?>
 
 &aa-bison-down;
+&aa-bison-shortdesc;
 &aa-bison-desc;
 &aa-bison-dep;
 

appendixa/fileutils-shortdesc.xml

@@ -3,7 +3,7 @@
 <para>Last checked against version &fileutils-contversion;.</para>
 
 <para>Fileutils is a package containing basic file manipulation programs.
-Included are programs to list directories, create directories, update
+Included are programs to list and create directories, update
 timestamps, change permissions and so forth.</para>
 
 <para>Fileutils installs the following files:</para>

appendixa/flex-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Flex Installation Dependencies</title>
 

appendixa/flex-desc.xml

@@ -1,11 +1,10 @@
-<sect2><title>Contents of Flex</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &flex-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>flex, flex++ (link to flex) and lex</para></sect3>
+<para>Last checked against version &flex-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>flex</title>
 <para>flex is a tool for generating programs which recognize 
@@ -26,10 +25,7 @@ of flex.</para></sect4>
 
 </sect3>
 
-<sect3><title>Library Files</title>
-<para>libfl.a</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
 
 <sect4><title>libfl</title>
 <para>libfl is the flex library.</para></sect4>

appendixa/flex-shortdesc.xml

@@ -0,0 +1,17 @@
+<sect2><title>Contents of Flex</title>
+
+<para>Last checked against version &flex-contversion;.</para>
+
+<para>The Flex package is used to generate programs which recognize
+patterns in text.</para>
+
+<para>Flex installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>flex, flex++ (link to flex) and lex</para></sect3>
+
+<sect3><title>Library Files</title>
+<para>libfl.a</para></sect3>
+
+</sect2>
+

appendixa/flex.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="flex.html" dir="appendixa"?>
 
 &aa-flex-down;
+&aa-flex-shortdesc;
 &aa-flex-desc;
 &aa-flex-dep;
 

appendixa/gettext-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Gettext Installation Dependencies</title>
 

appendixa/gettext-desc.xml

@@ -1,14 +1,10 @@
-<sect2><title>Contents of Gettext</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &gettext-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>config.charset, config.rpath, gettext, gettextize, hostname,
-msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter,
-msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext, project-id,
-team-address, trigger, urlget, user-email and xgettext</para></sect3>
+<para>Last checked against version &gettext-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>config.charset</title>
 <para>The config.charset script outputs a system-dependent table of
@@ -119,10 +115,7 @@ files. It's used to make the first translation template.</para></sect4>
 
 </sect3>
 
-<sect3><title>Library Files</title>
-<para>libgettextlib[a,so], libgettextsrc[a,so]</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
 
 <sect4><title>libgettextlib</title>
 <para>No description is currently available.</para></sect4>

appendixa/gettext-shortdesc.xml

@@ -0,0 +1,21 @@
+<sect2><title>Contents of Gettext</title>
+
+<para>Last checked against version &gettext-contversion;.</para>
+
+<para>The Gettext package is used for internationalization and
+localization. Programs can be compiled with Native Language Support
+(NLS) which enable them to output messages in the user's native
+language.</para>
+
+<para>Gettext installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>config.charset, config.rpath, gettext, gettextize, hostname,
+msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter,
+msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext, project-id,
+team-address, trigger, urlget, user-email and xgettext</para></sect3>
+
+<sect3><title>Library Files</title>
+<para>libgettextlib[a,so], libgettextsrc[a,so]</para></sect3>
+
+</sect2>

appendixa/gettext.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="gettext.html" dir="appendixa"?>
 
 &aa-gettext-down;
+&aa-gettext-shortdesc;
 &aa-gettext-desc;
 &aa-gettext-dep;
 

appendixa/groff-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Groff Installation Dependencies</title>
 

appendixa/groff-desc.xml

@@ -1,4 +1,6 @@
-<sect2><title>Contents of Groff</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Descriptions</title>
 
 <para>Last checked against version &groff-contversion;.</para>
 

appendixa/groff-shortdesc.xml

@@ -0,0 +1,19 @@
+<sect2><title>Contents of Groff</title>
+
+<para>Last checked against version &groff-contversion;.</para>
+
+<para>The Groff package includes several text processing programs
+for text formatting. Groff translates standard text and special
+commands into formatted output, such as what you see in a manual
+page.</para>
+
+<para>Groff installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>addftinfo, afmtodit, eqn, geqn (link to eqn), grn, grodvi,
+groff, grog, grolbp, grolj4, grops, grotty, gtbl (link to tbl),
+hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pfbtops,
+pic, post-grohtml, pre-grohtml, refer, soelim, tbl, tfmtodit,
+troff and zsoelim (link to soelim)</para></sect3>
+
+</sect2>

appendixa/groff.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="groff.html" dir="appendixa"?>
 
 &aa-groff-down;
+&aa-groff-shortdesc;
 &aa-groff-desc;
 &aa-groff-dep;
 

appendixa/less-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Less Installation Dependencies</title>
 

appendixa/less-desc.xml

@@ -1,11 +1,10 @@
-<sect2><title>Contents of Less</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &less-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>less, lessecho and lesskey</para></sect3>
+<para>Last checked against version &less-contversion;.</para>
 
-<sect3><title>Description</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>less</title>
 <para>The less program is a file pager (or text viewer). It 

appendixa/less-shortdesc.xml

@@ -0,0 +1,16 @@
+<sect2><title>Contents of Less</title>
+
+<para>Last checked against version &less-contversion;.</para>
+
+<para>Less is a file pager, or text viewer. It displays the contents
+of a file, or stream, and has the ability to scroll. Less has a few
+features not included in the <userinput>more</userinput> pager,
+such as the ability to scroll backwards.</para>
+
+<para>Less installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>less, lessecho and lesskey</para></sect3>
+
+</sect2>
+

appendixa/less.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="less.html" dir="appendixa"?>
 
 &aa-less-down;
+&aa-less-shortdesc;
 &aa-less-desc;
 &aa-less-dep;
 

appendixa/m4-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>M4 Installation Dependencies</title>
 

appendixa/m4-desc.xml

@@ -1,11 +1,10 @@
-<sect2><title>Contents of M4</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &m4-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>m4</para></sect3>
+<para>Last checked against version &m4-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>m4</title>
 <para>m4 is a macro processor. It copies input to output, expanding macros as it

appendixa/m4-shortdesc.xml

@@ -0,0 +1,18 @@
+<sect2><title>Contents of M4</title>
+
+<para>Last checked against version &m4-contversion;.</para>
+
+<para>M4 is a macro processor. It copies input to output, expanding
+macros as it goes. Macros are either built-in or user-defined and can
+take any number of arguments. Besides just doing macro expansion, m4
+has built-in functions for including named files, running Unix
+commands, doing integer arithmetic, manipulating text in various ways,
+recursion, etc. The m4 program can be used either as a front-end to a
+compiler or as a macro processor in its own right.</para>
+
+<para>M4 installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>m4</para></sect3>
+
+</sect2>

appendixa/m4.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="m4.html" dir="appendixa"?>
 
 &aa-m4-down;
+&aa-m4-shortdesc;
 &aa-m4-desc;
 &aa-m4-dep;
 

appendixa/nettools-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Net-tools Installation Dependencies</title>
 

appendixa/nettools-desc.xml

@@ -1,15 +1,10 @@
-<sect2><title>Contents of Net-tools</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &net-tools-contversion;.</para>
-
-<sect3><title>Program Files</title>
+<sect2><title>Descriptions</title>
 
-<para>arp, dnsdomainname (link to hostname), domainname (link to
-hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to
-hostname), plipconfig, rarp, route, slattach and ypdomainname (link to
-hostname)</para></sect3>
+<para>Last checked against version &net-tools-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>arp</title>
 <para>arp is used to manipulate the kernel's ARP cache, usually to add

appendixa/nettools-shortdesc.xml

@@ -0,0 +1,17 @@
+<sect2><title>Contents of Net-tools</title>
+
+<para>Last checked against version &net-tools-contversion;.</para>
+
+<para>The Net-tools package contains a collection of programs
+which form the base of Linux networking.</para>
+
+<para>Net-tools installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>arp, dnsdomainname (link to hostname), domainname (link to
+hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to
+hostname), plipconfig, rarp, route, slattach and ypdomainname (link to
+hostname)</para></sect3>
+
+</sect2>
+

appendixa/nettools.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="net-tools.html" dir="appendixa"?>
 
 &aa-nettools-down;
+&aa-nettools-shortdesc;
 &aa-nettools-desc;
 &aa-nettools-dep;
 

chapter06/binutils-exp.xml

@@ -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>
-

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>
 

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>

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>
 

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>
 

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>
 

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>

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

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>

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>
 

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>

chapter06/groff-exp.xml

@@ -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>
-

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

chapter06/nettools-exp.xml

@@ -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>
-

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>
 

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>
 

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>
 

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>

chapter06/shellutils-exp.xml

@@ -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>
-

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>
 

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>

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>
 

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>

entities/binutils.ent

@@ -5,7 +5,6 @@
 
 <!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml">
 <!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml">
-<!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml">
 
 <!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
 <!ENTITY aa-binutils-shortdesc SYSTEM "../appendixa/binutils-shortdesc.xml">

entities/bison.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-bison-desc SYSTEM "../appendixa/bison-desc.xml">
 <!ENTITY aa-bison-dep SYSTEM "../appendixa/bison-dep.xml">
 <!ENTITY aa-bison-down SYSTEM "../appendixa/bison-down.xml">
+<!ENTITY aa-bison-shortdesc SYSTEM "../appendixa/bison-shortdesc.xml">
 
 <!ENTITY bison-version "1.875">
 <!ENTITY bison-depversion "1.31">

entities/flex.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-flex-desc SYSTEM "../appendixa/flex-desc.xml">
 <!ENTITY aa-flex-dep SYSTEM "../appendixa/flex-dep.xml">
 <!ENTITY aa-flex-down SYSTEM "../appendixa/flex-down.xml">
+<!ENTITY aa-flex-shortdesc SYSTEM "../appendixa/flex-shortdesc.xml">
 
 <!ENTITY flex-version "2.5.4a">
 <!ENTITY flex-depversion "2.5.4a">

entities/gettext.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-gettext-desc SYSTEM "../appendixa/gettext-desc.xml">
 <!ENTITY aa-gettext-dep SYSTEM "../appendixa/gettext-dep.xml">
 <!ENTITY aa-gettext-down SYSTEM "../appendixa/gettext-down.xml">
+<!ENTITY aa-gettext-shortdesc SYSTEM "../appendixa/gettext-shortdesc.xml">
 
 <!ENTITY gettext-version "0.11.5">
 <!ENTITY gettext-depversion "0.10.40">

entities/groff.ent

@@ -8,6 +8,7 @@
 <!ENTITY aa-groff-desc SYSTEM "../appendixa/groff-desc.xml">
 <!ENTITY aa-groff-dep SYSTEM "../appendixa/groff-dep.xml">
 <!ENTITY aa-groff-down SYSTEM "../appendixa/groff-down.xml">
+<!ENTITY aa-groff-shortdesc SYSTEM "../appendixa/groff-shortdesc.xml">
 
 <!ENTITY groff-version "1.18.1">
 <!ENTITY groff-depversion "1.17.2">

entities/less.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-less-desc SYSTEM "../appendixa/less-desc.xml">
 <!ENTITY aa-less-dep SYSTEM "../appendixa/less-dep.xml">
 <!ENTITY aa-less-down SYSTEM "../appendixa/less-down.xml">
+<!ENTITY aa-less-shortdesc SYSTEM "../appendixa/less-shortdesc.xml">
 
 <!ENTITY less-version "378">
 <!ENTITY less-depversion "358">

entities/m4.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-m4-desc SYSTEM "../appendixa/m4-desc.xml">
 <!ENTITY aa-m4-dep SYSTEM "../appendixa/m4-dep.xml">
 <!ENTITY aa-m4-down SYSTEM "../appendixa/m4-down.xml">
+<!ENTITY aa-m4-shortdesc SYSTEM "../appendixa/m4-shortdesc.xml">
 
 <!ENTITY m4-version "1.4">
 <!ENTITY m4-depversion "1.4">

entities/nettools.ent

@@ -2,12 +2,12 @@
 
 <!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml">
 <!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml">
-<!ENTITY c6-nettools-exp SYSTEM "../chapter06/nettools-exp.xml">
 
 <!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml">
 <!ENTITY aa-nettools-desc SYSTEM "../appendixa/nettools-desc.xml">
 <!ENTITY aa-nettools-dep SYSTEM "../appendixa/nettools-dep.xml">
 <!ENTITY aa-nettools-down SYSTEM "../appendixa/nettools-down.xml">
+<!ENTITY aa-nettools-shortdesc SYSTEM "../appendixa/nettools-shortdesc.xml">
 
 <!ENTITY net-tools-version "1.60">
 <!ENTITY net-tools-depversion "1.60">

entities/shellutils.ent

@@ -7,7 +7,6 @@
 
 <!ENTITY c6-shellutils SYSTEM "../chapter06/shellutils.xml">
 <!ENTITY c6-shellutils-inst SYSTEM "../chapter06/shellutils-inst.xml">
-<!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">