Upgraded the kbd patch to 1.06-2 and updated the program descriptions for kbd. (Bug 216)

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

6 files changed, 26 insertions, 26 deletions

diff --git a/appendixa/kbd-desc.xml b/appendixa/kbd-desc.xml
index 51de48468..8ce852a28 100644
--- a/appendixa/kbd-desc.xml
+++ b/appendixa/kbd-desc.xml
@@ -2,13 +2,10 @@
 <title>Contents</title>
 
 <para>The Kbd package contains the chvt, deallocvt, dumpkeys, fgconsole, 
-getkeycodes, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn,
-psfxtable, resizecons, screendump, setfont,
-setkeycodes, setleds, setmetamode, setvesablank, showfont,
-showkey, unicode_start, and unicode_stop programs. 
-There are some other programs that
-don't get installed by default, as they are very optional. Take a look at the
-Kbd package contents if you have trouble with your console.</para>
+getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn,
+psfxtable, resizecons, setfont, setkeycodes, setleds, setlogcons,
+setmetamode, setvesablank, showfont, showkey, unicode_start, and
+unicode_stop programs.</para>
 
 </sect2>
 
@@ -31,6 +28,9 @@ Kbd package contents if you have trouble with your console.</para>
 <para>getkeycodes prints the kernel scancode-to-keycode 
 mapping table.</para></sect3>
 
+<sect3><title>getunimap</title>
+<para>getunimap prints the currently used unimap.</para></sect3>
+
 <sect3><title>kbd_mode</title>
 <para>kbd_mode reports or sets the keyboard mode.</para></sect3>
 
@@ -55,9 +55,6 @@ console fonts.</para></sect3>
 <sect3><title>resizecons</title>
 <para>resizecons changes the kernel idea of the console size.</para></sect3>
 
-<sect3><title>screendump</title>
-<para>A screen shot utility for the console.</para></sect3>
-
 <sect3><title>setfont</title>
 <para>This lets you change the EGA/VGA fonts in console.</para></sect3>
 
@@ -70,6 +67,9 @@ table entries.</para></sect3>
 enabled by default, and it is by using this program that you can 
 achieve this.</para></sect3>
 
+<sect3><title>setlogcons</title>
+<para>setlogcons sends kernel messages to the console.</para></sect3>
+
 <sect3><title>setmetamode</title>
 <para>setmetamode defines the keyboard meta key handling.</para></sect3>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5ec4c6a5d..bf50c5aeb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,6 +6,12 @@
 
 <itemizedlist>
 
+<listitem><para>December 12th, 2001 [marcheerdink]: Chapter 6: Moved
+the kbd patch to the default installation instructions; upgraded to
+kbd-1.06-2.patch to fix installation of some programs; added the
+descriptions for these programs; removed the loadkeys -d warning that
+was a leftover from the time where loadkeys -d wasn't fixed yet.</para></listitem>
+
 <listitem><para>December 11th, 2001 [markh]: Chapter 6: Add the "why we
 cd $LFS before chroot" explanation.</para></listitem>
 
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 420b38a02..7f4cc3f44 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -50,6 +50,7 @@
 &c3-bin86;
 &c3-gettext;
 &c3-kbd;
+&c3-kbd-patch;
 &c3-e2fsprogs;
 &c3-lilo;
 &c3-modutils;
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index 416dbab38..87413069f 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -1,22 +1,12 @@
 <sect2>
 <title>Installation of Kbd</title>
 
-<para>There is a bug in kbd-&kbd-version; which 
-causes <userinput>loadkeys -d</userinput> to behave incorrectly.  To fix 
-this, unpack the kbd-&kbd-patch-version; patch and apply it with the following
-command: </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><screen><userinput>./configure &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch &amp;&amp;
+./configure &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
-<para>When using the loadkeys program from this package, don't use the
--d option to load a default keymap file. It won't work properly
-with keymaps that include other keymaps.</para>
-
 </sect2>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index cad43ec2b..389e4e7d0 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -6,6 +6,7 @@
 Estimated required disk space:  &kbd-compsize;</screen>
 
 &c6-kbd-inst;
+&c6-kbd-exp;
 &aa-kbd-desc;
 &ab-kbd-dep;
 
diff --git a/index.xml b/index.xml
index 0cefae9df..b16d68cc9 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20011211">
-<!ENTITY releasedate "December 11th, 2001">
+<!ENTITY version "20011212">
+<!ENTITY releasedate "December 12th, 2001">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">
@@ -117,6 +117,7 @@
 <!ENTITY c3-libtool SYSTEM "chapter3/libtool.xml">
 <!ENTITY c3-bin86 SYSTEM "chapter3/bin86.xml">
 <!ENTITY c3-kbd SYSTEM "chapter3/kbd.xml">
+<!ENTITY c3-kbd-patch SYSTEM "chapter3/kbd-patch.xml">
 <!ENTITY c3-e2fsprogs SYSTEM "chapter3/e2fsprogs.xml">
 <!ENTITY c3-reiserfs SYSTEM "chapter3/reiserfs.xml">
 <!ENTITY c3-lilo SYSTEM "chapter3/lilo.xml">
@@ -307,6 +308,7 @@
 <!ENTITY c6-utillinux-exp SYSTEM "chapter6/utillinux-exp.xml">
 <!ENTITY c6-kbd SYSTEM "chapter6/kbd.xml">
 <!ENTITY c6-kbd-inst SYSTEM "chapter6/kbd-inst.xml">
+<!ENTITY c6-kbd-exp SYSTEM "chapter6/kbd-exp.xml">
 <!ENTITY c6-manpages SYSTEM "chapter6/manpages.xml">
 <!ENTITY c6-manpages-exp SYSTEM "chapter6/manpages-exp.xml">
 <!ENTITY c6-manpages-inst SYSTEM "chapter6/manpages-inst.xml">
@@ -917,8 +919,8 @@
 <!ENTITY kbd-version "1.06">
 <!ENTITY kbd-depversion "1.06">
 <!ENTITY kbd-size "559 KB">
-<!ENTITY kbd-patch-version "1.06">
-<!ENTITY kbd-patch-size "1 KB">
+<!ENTITY kbd-patch-version "1.06-2">
+<!ENTITY kbd-patch-size "3 KB">
 <!ENTITY kbd-compsize "8 MB">
 <!ENTITY kbd-time "1 minute">