Billy's lilo and man conversion.

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

15 files changed, 95 insertions, 48 deletions

diff --git a/appendixa/lilo-dep.xml b/appendixa/lilo-dep.xml
index 5d585ecea..93b119acb 100644
--- a/appendixa/lilo-dep.xml
+++ b/appendixa/lilo-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Lilo Installation Dependencies</title>
 
diff --git a/appendixa/lilo-desc.xml b/appendixa/lilo-desc.xml
index 2cfb5ee9b..0d64959a7 100644
--- a/appendixa/lilo-desc.xml
+++ b/appendixa/lilo-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Lilo</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &lilo-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>lilo, mkrescue and keytab-lilo.pl</para></sect3>
+<para>Last checked against version &lilo-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>lilo</title>
 <para>lilo installs the Linux boot loader which is used to start a Linux
diff --git a/appendixa/lilo-shortdesc.xml b/appendixa/lilo-shortdesc.xml
new file mode 100644
index 000000000..11f399e33
--- /dev/null
+++ b/appendixa/lilo-shortdesc.xml
@@ -0,0 +1,12 @@
+<sect2><title>Contents of Lilo</title>
+
+<para>Last checked against version &lilo-contversion;.</para>
+
+<para>Lilo is the LInux LOader.</para>
+
+<para>Lilo installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>lilo, mkrescue and keytab-lilo.pl</para></sect3>
+
+</sect2>
diff --git a/appendixa/lilo.xml b/appendixa/lilo.xml
index 66ef90ac2..1bf0392ec 100644
--- a/appendixa/lilo.xml
+++ b/appendixa/lilo.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="lilo.html" dir="appendixa"?>
 
 &aa-lilo-down;
+&aa-lilo-shortdesc;
 &aa-lilo-desc;
 &aa-lilo-dep;
 
diff --git a/appendixa/man-dep.xml b/appendixa/man-dep.xml
index 59f75a3d4..2cf6131a6 100644
--- a/appendixa/man-dep.xml
+++ b/appendixa/man-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Man Installation Dependencies</title>
 
diff --git a/appendixa/man-desc.xml b/appendixa/man-desc.xml
index 38833d42c..69455ef79 100644
--- a/appendixa/man-desc.xml
+++ b/appendixa/man-desc.xml
@@ -1,12 +1,10 @@
-<sect2><title>Contents of Man</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &man-contversion;.</para>
+<sect2><title>Description</title>
 
-<sect3><title>Program Files</title>
-<para>apropos, makewhatis, man, man2dvi, man2html and
-whatis</para></sect3>
+<para>Last checked against version &man-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>apropos</title>
 <para>apropos searches for keywords in a set of database files, containing
diff --git a/appendixa/man-shortdesc.xml b/appendixa/man-shortdesc.xml
new file mode 100644
index 000000000..ef72048d8
--- /dev/null
+++ b/appendixa/man-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Man</title>
+
+<para>Last checked against version &man-contversion;.</para>
+
+<para>Man is a man pager.</para>
+
+<para>Man installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>apropos, makewhatis, man, man2dvi, man2html and
+whatis</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/man.xml b/appendixa/man.xml
index 273312825..63ceb57a0 100644
--- a/appendixa/man.xml
+++ b/appendixa/man.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="man.html" dir="appendixa"?>
 
 &aa-man-down;
+&aa-man-shortdesc;
 &aa-man-desc;
 &aa-man-dep;
 
diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml
index 1ea435aa0..60f87bc9c 100644
--- a/chapter06/lilo-inst.xml
+++ b/chapter06/lilo-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Lilo</title>
 
@@ -5,10 +7,13 @@
 may wish to choose another. Fabio Fracassi has written a hint on 
 GRUB, which is available at <ulink url="&hints-root;grub-howto.txt"/>.</para>
 
-<para>Install Lilo by running the following commands:</para>
+<para>Compile Lilo:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
 
-<para><screen><userinput>make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 <para>It appears that compilation of this package fails on certain machines
 when the -g compiler flag is used. If you can't compile Lilo at
diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml
index 64f5829a2..fe4e951c6 100644
--- a/chapter06/lilo.xml
+++ b/chapter06/lilo.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &lilo-time;
 Estimated required disk space:  &lilo-compsize;</screen>
 
-&c6-lilo-inst;
-&aa-lilo-desc;
+&aa-lilo-shortdesc;
 &aa-lilo-dep;
+&c6-lilo-inst;
 
 </sect1>
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
deleted file mode 100644
index 8d4f97011..000000000
--- a/chapter06/man-exp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>PATH=$PATH:/usr/bin:/bin ./configure -default</userinput>:
-The paths to some programs get written into man's files. Unfortunately, the
-configure script picks the last location in PATH rather than the first
-where a program is found. By appending /usr/bin:/bin to PATH for the
-./configure command, we make sure that man doesn't use the /static versions
-of our programs.</para>
-
-<para><userinput>patch...:</userinput>
-These three patches comment out one of the lines in the
-<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
-redundant results when using programs like <userinput>whatis</userinput>.
-It also adds the <emphasis>-R</emphasis> option to the
-<emphasis>PAGER</emphasis> variable so man pages are displayed properly.
-Lastly, the patch fixes the problem where man pages are not formatted with
-more than 80 columns when used with the recent groff versions.</para>
-
-</sect2>
-
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index f07ee1615..4a639b329 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -1,22 +1,56 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Man</title>
 
-<para>Run the following commands to install man:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch &amp;&amp;
+
+<para>Prepare Man to be compiled:</para>
+
+<para><screen><userinput>
+patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch &amp;&amp;
 patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch &amp;&amp;
 patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch &amp;&amp;
 PATH=$PATH:/usr/bin:/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc
+</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>Note: If you wish to disable SGR escape sequences, you should
+<note><para>If you wish to disable SGR escape sequences, you should
 edit the man.conf file and add the <userinput>-c</userinput> argument
-to nroff.</para>
+to nroff.</para></note>
 
 <para>You may want to take a look at the man hint 
 at <ulink url="&hints-root;man.txt"/>, which deals with formatting 
 and compression issues for man pages.</para>
 
 </sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch...:</userinput>
+These three patches comment out one of the lines in the
+<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
+redundant results when using programs like <userinput>whatis</userinput>.
+It also adds the <emphasis>-R</emphasis> option to the
+<emphasis>PAGER</emphasis> variable so man pages are displayed properly.
+Lastly, the patch fixes the problem where man pages are not formatted with
+more than 80 columns when used with the recent groff versions.</para>
+
+<para><userinput>PATH=$PATH:/usr/bin:/bin ./configure -default</userinput>:
+The paths to some programs get written into man's files. Unfortunately, the
+configure script picks the last location in PATH rather than the first
+where a program is found. By appending /usr/bin:/bin to PATH for the
+./configure command, we make sure that man doesn't use the /static versions
+of our programs.</para>
+
+</sect2>
+
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 7e0edc3fd..9c0cd7978 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &man-time;
 Estimated required disk space:  &man-compsize;</screen>
 
-&c6-man-inst;
-&c6-man-exp;
-&aa-man-desc;
+&aa-man-shortdesc;
 &aa-man-dep;
+&c6-man-inst;
 
 </sect1>
 
diff --git a/entities/lilo.ent b/entities/lilo.ent
index d7ea1402c..e53b86ed5 100644
--- a/entities/lilo.ent
+++ b/entities/lilo.ent
@@ -6,6 +6,7 @@
 <!ENTITY c8-lilo SYSTEM "../chapter08/lilo.xml">
 
 <!ENTITY aa-lilo SYSTEM "../appendixa/lilo.xml">
+<!ENTITY aa-lilo-shortdesc SYSTEM "../appendixa/lilo-shortdesc.xml">
 <!ENTITY aa-lilo-desc SYSTEM "../appendixa/lilo-desc.xml">
 <!ENTITY aa-lilo-dep SYSTEM "../appendixa/lilo-dep.xml">
 <!ENTITY aa-lilo-down SYSTEM "../appendixa/lilo-down.xml">
diff --git a/entities/man.ent b/entities/man.ent
index e00e454f2..ca384598c 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -3,9 +3,9 @@
 
 <!ENTITY c6-man SYSTEM "../chapter06/man.xml">
 <!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
-<!ENTITY c6-man-exp SYSTEM "../chapter06/man-exp.xml">
 
 <!ENTITY aa-man SYSTEM "../appendixa/man.xml">
+<!ENTITY aa-man-shortdesc SYSTEM "../appendixa/man-shortdesc.xml">
 <!ENTITY aa-man-desc SYSTEM "../appendixa/man-desc.xml">
 <!ENTITY aa-man-dep SYSTEM "../appendixa/man-dep.xml">
 <!ENTITY aa-man-down SYSTEM "../appendixa/man-down.xml">