Billy's kbd conversion.

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

8 files changed, 51 insertions, 28 deletions

diff --git a/appendixa/kbd-dep.xml b/appendixa/kbd-dep.xml
index 41a6321e9..b57b0b545 100644
--- a/appendixa/kbd-dep.xml
+++ b/appendixa/kbd-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Kbd Installation Dependencies</title>
 
diff --git a/appendixa/kbd-desc.xml b/appendixa/kbd-desc.xml
index c1347f5b2..149ae2ac8 100644
--- a/appendixa/kbd-desc.xml
+++ b/appendixa/kbd-desc.xml
@@ -1,17 +1,10 @@
-<sect2><title>Contents of Kbd</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &kbd-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>chvt, deallocvt, dumpkeys, fgconsole, 
-getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
-mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
-psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons, 
-setfont, setkeycodes, setleds, setlogcons,
-setmetamode, setvesablank, showfont, showkey, unicode_start, and
-unicode_stop</para></sect3>
+<para>Last checked against version &kbd-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>chvt</title>
 <para>chvt changes foreground virtual terminal.</para></sect4>
diff --git a/appendixa/kbd-shortdesc.xml b/appendixa/kbd-shortdesc.xml
new file mode 100644
index 000000000..590a701f6
--- /dev/null
+++ b/appendixa/kbd-shortdesc.xml
@@ -0,0 +1,19 @@
+<sect2><title>Contents of Kbd</title>
+
+<para>Last checked against version &kbd-contversion;.</para>
+
+<para>Kbd contains keytable files and keyboard utilities.</para>
+
+<para>Kbd installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>chvt, deallocvt, dumpkeys, fgconsole, 
+getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
+mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
+psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons, 
+setfont, setkeycodes, setleds, setlogcons,
+setmetamode, setvesablank, showfont, showkey, unicode_start, and
+unicode_stop</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/kbd.xml b/appendixa/kbd.xml
index 52a70b238..9ecb3d7d0 100644
--- a/appendixa/kbd.xml
+++ b/appendixa/kbd.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="kbd.html" dir="appendixa"?>
 
 &aa-kbd-down;
+&aa-kbd-shortdesc;
 &aa-kbd-desc;
 &aa-kbd-dep;
 
diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml
deleted file mode 100644
index 2654d238d..000000000
--- a/chapter06/kbd-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput>:
-This patch changes a Makefile so some utilities that are not installed by
-default (setlogcons, setvesablank and getunimap) are installed.</para>
-
-</sect2>
-
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index 04539cf33..bdf52b636 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Kbd</title>
 
@@ -9,11 +11,27 @@ utilities.</para>
 
 <para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
 
-<para>Install Kbd by running the following commands:</para>
+<para>Prepare Kbd to be compiled:</para>
+
+<para><screen><userinput>
+./configure</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>
+
+<sect2>
+<title>Command explanations</title>
 
-<para><screen><userinput>./configure &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput>:
+This patch changes a Makefile so some utilities that are not installed by
+default (setlogcons, setvesablank and getunimap) are installed.</para>
 
 </sect2>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 126c78a19..5e9fc3830 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &kbd-time;
 Estimated required disk space:  &kbd-compsize;</screen>
 
-&c6-kbd-inst;
-&c6-kbd-exp;
-&aa-kbd-desc;
+&aa-kbd-shortdesc;
 &aa-kbd-dep;
+&c6-kbd-inst;
 
 </sect1>
 
diff --git a/entities/kbd.ent b/entities/kbd.ent
index 4eb9a60d8..7865d70ed 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -3,9 +3,9 @@
 
 <!ENTITY c6-kbd SYSTEM "../chapter06/kbd.xml">
 <!ENTITY c6-kbd-inst SYSTEM "../chapter06/kbd-inst.xml">
-<!ENTITY c6-kbd-exp SYSTEM "../chapter06/kbd-exp.xml">
 
 <!ENTITY aa-kbd SYSTEM "../appendixa/kbd.xml">
+<!ENTITY aa-kbd-shortdesc SYSTEM "../appendixa/kbd-shortdesc.xml">
 <!ENTITY aa-kbd-desc SYSTEM "../appendixa/kbd-desc.xml">
 <!ENTITY aa-kbd-dep SYSTEM "../appendixa/kbd-dep.xml">
 <!ENTITY aa-kbd-down SYSTEM "../appendixa/kbd-down.xml">