Console(tools|data) -> Kbd

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

26 files changed, 293 insertions, 497 deletions

diff --git a/Attic/appendixc/consoledata.xml b/Attic/appendixc/consoledata.xml
deleted file mode 100644
index c52c2e069..000000000
--- a/Attic/appendixc/consoledata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Console-data (&console-data-version;):
-<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
-ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/</ulink>
-
diff --git a/Attic/appendixc/consoletools-patch.xml b/Attic/appendixc/consoletools-patch.xml
deleted file mode 100644
index cdd7573ba..000000000
--- a/Attic/appendixc/consoletools-patch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-Console-tools Patch (&console-tools-version;):
-<ulink url="&ftp-common;/">
-&ftp-common;/</ulink>
-<ulink url="&http-common;/">
-&http-common;/</ulink>
-
diff --git a/Attic/appendixc/consoletools.xml b/Attic/appendixc/consoletools.xml
deleted file mode 100644
index ff6ed99b4..000000000
--- a/Attic/appendixc/consoletools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Console-tools (&console-tools-version;):
-<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
-ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/</ulink>
-
diff --git a/Attic/appendixc/kbd.xml b/Attic/appendixc/kbd.xml
new file mode 100644
index 000000000..fb0039080
--- /dev/null
+++ b/Attic/appendixc/kbd.xml
@@ -0,0 +1,4 @@
+Kbd (&kbd-version;):
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/">
+ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</ulink>
+
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index d0c5eb910..75a9b1a8c 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -49,9 +49,7 @@ package quicker.
 &ac-libtool;
 &ac-bin86;
 &ac-gettext;
-&ac-consoletools;
-&ac-consoletools-patch;
-&ac-consoledata;
+&ac-kbd;
 &ac-e2fsprogs;
 &ac-ed;
 &ac-ldso;
diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml
index a999ada8d..42134a4b5 100644
--- a/appendixa/appendixa.xml
+++ b/appendixa/appendixa.xml
@@ -48,8 +48,7 @@
 &aa-tar;
 &aa-textutils;
 &aa-utillinux;
-&aa-consoletools;
-&aa-consoledata;
+&aa-kbd;
 &aa-manpages;
 &aa-ns-netkitbase;
 &aa-ns-nettools;
diff --git a/appendixa/consoledata-desc.xml b/appendixa/consoledata-desc.xml
deleted file mode 100644
index d4a110a46..000000000
--- a/appendixa/consoledata-desc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>
-The console-data package contains the data files that are used and
-needed by the console-tools package.
-</para>
-
-</sect2>
-
diff --git a/appendixa/consoledata.xml b/appendixa/consoledata.xml
deleted file mode 100644
index d024c2f0e..000000000
--- a/appendixa/consoledata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="aa-console-data">
-<title>Console-data</title>
-
-&aa-consoledata-desc;
-
-</sect1>
-
diff --git a/appendixa/consoletools-desc.xml b/appendixa/consoletools-desc.xml
deleted file mode 100644
index 0071e2d07..000000000
--- a/appendixa/consoletools-desc.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>
-The Console-tools package contains the charset, chvt, consolechars,
-deallocvt, dumpkeys, fgconsole, fix_bs_and_del, font2psf, getkeycodes,
-kbd_mode, loadkeys, loadunimap, mapscrn, mk_modmap, openvt, psfaddtable,
-psfgettable, psfstriptable, resizecons, saveunimap, screendump, setfont,
-setkeycodes, setleds, setmetamode, setvesablank, showcfont, showkey,
-splitfont, unicode_start, unicode_stop, vcstime, vt-is-URF8, writevt
-</para>
-
-</sect2>
-
-<sect2>
-<title>Description</title>
-
-<sect3>
-<title>charset</title>
-
-<para>
-charset sets an ACM for use in one of the G0/G1 charsets slots.
-</para>
-
-</sect3>
-
-<sect3>
-<title>chvt</title>
-
-<para>
-chvt changes foreground virtual terminal.
-</para>
-
-</sect3>
-
-<sect3>
-<title>codepage</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>consolechars</title>
-
-<para>
-consolechars loads EGA/VGA console screen fonts, screen font maps and/or
-application-charset maps.
-</para>
-
-</sect3>
-
-<sect3>
-<title>deallocvt</title>
-
-<para>
-deallocvt deallocates unused virtual terminals.
-</para>
-
-</sect3>
-
-<sect3>
-<title>dumpkeys</title>
-
-<para>
-dumpkeys dumps keyboard translation tables.
-</para>
-
-</sect3>
-
-<sect3>
-<title>fgconsole</title>
-
-<para>
-fgconsole prints the number of the active virtual terminal.
-</para>
-
-</sect3>
-
-<sect3>
-<title>fix_bs_and_del</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>font2psf</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>getkeycodes</title>
-
-<para>
-getkeycodes prints the kernel scancode-to-keycode mapping table.
-</para>
-
-</sect3>
-
-<sect3>
-<title>kbd_mode</title>
-
-<para>
-kbd_mode reports or sets the keyboard mode.
-</para>
-
-</sect3>
-
-<sect3>
-<title>loadkeys</title>
-
-<para>
-loadkeys loads keyboard translation tables.
-</para>
-
-</sect3>
-
-<sect3>
-<title>loadunimap</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>mapscrn</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>mk_modmap</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>openvt</title>
-
-<para>
-openvt starts a program on a new virtual terminal.
-</para>
-
-</sect3>
-
-<sect3>
-<title>psfaddtable</title>
-
-<para>
-psfaddtable adds a Unicode character table to a console font.
-</para>
-
-</sect3>
-
-<sect3>
-<title>psfgettable</title>
-
-<para>
-psfgettable extracts the embedded Unicode character table from a console
-font.
-</para>
-
-</sect3>
-
-<sect3>
-<title>psfstriptable</title>
-
-<para>
-psfstriptable removes the embedded Unicode character table from a
-console font.
-</para>
-
-</sect3>
-
-<sect3>
-<title>resizecons</title>
-
-<para>
-resizecons changes the kernel idea of the console size.
-</para>
-
-</sect3>
-
-<sect3>
-<title>saveunimap</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>screendump</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>setfont</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>setkeycodes</title>
-
-<para>
-setkeycodes loads kernel scancode-to-keycode mapping table entries.
-</para>
-
-</sect3>
-
-<sect3>
-<title>setleds</title>
-
-<para>
-setleds sets the keyboard leds.
-</para>
-
-</sect3>
-
-<sect3>
-<title>setmetamode</title>
-
-<para>
-setmetamode defines the keyboard meta key handling.
-</para>
-
-</sect3>
-
-<sect3>
-<title>setvesablank</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>showcfont</title>
-
-<para>
-showcfont displays all character in the current screenfont.
-</para>
-
-</sect3>
-
-<sect3>
-<title>showkey</title>
-
-<para>
-showkey examines the scancodes and keycodes sent by the keyboard.
-</para>
-
-</sect3>
-
-<sect3>
-<title>splitfont</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>unicode_start</title>
-
-<para>
-unicode_start puts the console in Unicode mode.
-</para>
-
-</sect3>
-
-<sect3>
-<title>unicode_stop</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>vcstime</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-<sect3>
-<title>vt-is-UTF8</title>
-
-<para>
-vt-is-UTF8 checks whether the current virtual terminal is in UTF8- or
-byte-mode.
-</para>
-
-</sect3>
-
-<sect3>
-<title>writevt</title>
-
-<para>
-No description available.
-</para>
-
-</sect3>
-
-</sect2>
-
diff --git a/appendixa/consoletools.xml b/appendixa/consoletools.xml
deleted file mode 100644
index e4b1fa6b2..000000000
--- a/appendixa/consoletools.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="aa-console-tools">
-<title>Console-tools</title>
-
-&aa-consoletools-desc;
-
-</sect1>
-
diff --git a/appendixa/kbd-desc.xml b/appendixa/kbd-desc.xml
new file mode 100644
index 000000000..80b622ff9
--- /dev/null
+++ b/appendixa/kbd-desc.xml
@@ -0,0 +1,228 @@
+<sect2>
+<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>
+
+</sect2>
+
+<sect2>
+<title>Description</title>
+
+<sect3>
+<title>chvt</title>
+
+<para>
+chvt changes foreground virtual terminal.
+</para>
+
+</sect3>
+
+<sect3>
+<title>deallocvt</title>
+
+<para>
+deallocvt deallocates unused virtual terminals.
+</para>
+
+</sect3>
+
+<sect3>
+<title>dumpkeys</title>
+
+<para>
+dumpkeys dumps keyboard translation tables.
+</para>
+
+</sect3>
+
+<sect3>
+<title>fgconsole</title>
+
+<para>
+fgconsole prints the number of the active virtual terminal.
+</para>
+
+</sect3>
+
+<sect3>
+<title>getkeycodes</title>
+
+<para>
+getkeycodes prints the kernel scancode-to-keycode mapping table.
+</para>
+
+</sect3>
+
+<sect3>
+<title>kbd_mode</title>
+
+<para>
+kbd_mode reports or sets the keyboard mode.
+</para>
+
+</sect3>
+
+<sect3>
+<title>kbdrate</title>
+
+<para>
+kbdrate sets the keyboard repeat and delay rates.
+</para>
+
+</sect3>
+
+<sect3>
+<title>loadkeys</title>
+
+<para>
+loadkeys loads keyboard translation tables.
+</para>
+
+</sect3>
+
+<sect3>
+<title>loadunimap</title>
+
+<para>
+loadunimap loads the kernel unicode-to-font mapping table.
+</para>
+
+</sect3>
+
+<sect3>
+<title>mapscrn</title>
+
+<para>
+mapscrn loads a user defined output character
+mapping table into the console driver. Note that it is obsolete and that its
+features are built into setfont.
+</para>
+
+</sect3>
+
+<sect3>
+<title>psfxtable</title>
+
+<para>
+psfxtable is a tool for handling Unicode character tables for 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 screenshot utility for the console.
+</para>
+
+</sect3>
+
+<sect3>
+<title>setfont</title>
+
+<para>
+This lets you change the EGA/VGA fonts in console.
+</para>
+
+</sect3>
+
+<sect3>
+<title>setkeycodes</title>
+
+<para>
+setkeycodes loads kernel scancode-to-keycode mapping table entries.
+</para>
+
+</sect3>
+
+<sect3>
+<title>setleds</title>
+
+<para>
+setleds sets the keyboard leds. Many people find it useful to have numlock
+enabled by default, and it is by using this program that you can achieve this.
+</para>
+
+</sect3>
+
+<sect3>
+<title>setmetamode</title>
+
+<para>
+setmetamode defines the keyboard meta key handling.
+</para>
+
+</sect3>
+
+<sect3>
+<title>setvesablank</title>
+
+<para>
+This lets you fiddle with the built-in hardware screensaver (not toasters, only
+a blank screen).
+</para>
+
+</sect3>
+
+<sect3>
+<title>showfont</title>
+
+<para>
+showfont displays data about a font. The information shown includes font
+information, font properties, character metrics, and character bitmaps.
+</para>
+
+</sect3>
+
+<sect3>
+<title>showkey</title>
+
+<para>
+showkey examines the scancodes and keycodes sent by the keyboard.
+</para>
+
+</sect3>
+
+</sect3>
+
+<sect3>
+<title>unicode_start</title>
+
+<para>
+unicode_start puts the console in Unicode mode.
+</para>
+
+</sect3>
+
+<sect3>
+<title>unicode_stop</title>
+
+<para>
+unicode_stop reverts keyboard and console from unicode mode.
+</para>
+
+</sect3>
+
+</sect2>
+
diff --git a/appendixa/kbd.xml b/appendixa/kbd.xml
new file mode 100644
index 000000000..d3bc8b4ab
--- /dev/null
+++ b/appendixa/kbd.xml
@@ -0,0 +1,7 @@
+<sect1 id="aa-kbd">
+<title>Kbd</title>
+
+&aa-kbd-desc;
+
+</sect1>
+
diff --git a/chapter04/consoledata.xml b/chapter04/consoledata.xml
deleted file mode 100644
index 10a5b8f0e..000000000
--- a/chapter04/consoledata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-Console-data (&console-data-version;) - 418 KB:
-<ulink url="&ftp-common;/console-data-&console-data-version;.tar.bz2">
-&ftp-common;/console-data-&console-data-version;.tar.bz2</ulink>
-<ulink url="&http-common;/console-data-&console-data-version;.tar.bz2">
-&http-common;/console-data-&console-data-version;.tar.bz2</ulink>
-
diff --git a/chapter04/consoletools-patch.xml b/chapter04/consoletools-patch.xml
deleted file mode 100644
index d52a995f9..000000000
--- a/chapter04/consoletools-patch.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-Console-tools Patch (&console-tools-version;) - 4 KB:
-<ulink
-url="&ftp-common;/console-tools-&console-tools-version;.patch.bz2">
-&ftp-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
-<ulink
-url="&http-common;/console-tools-&console-tools-version;.patch.bz2">
-&http-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
-
diff --git a/chapter04/consoletools.xml b/chapter04/consoletools.xml
deleted file mode 100644
index c0d500b84..000000000
--- a/chapter04/consoletools.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-Console-tools (&console-tools-version;) - 490 KB:
-<ulink
-url="&ftp-common;/console-tools-&console-tools-version;.tar.bz2">
-&ftp-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
-<ulink
-url="&http-common;/console-tools-&console-tools-version;.tar.bz2">
-&http-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
-
diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml
new file mode 100644
index 000000000..cb7fce373
--- /dev/null
+++ b/chapter04/kbd.xml
@@ -0,0 +1,6 @@
+Kbd (&kbd-version;) 905 KB:
+<ulink url="&ftp-common;/kbd-&kbd-version;.tar.bz2">
+&ftp-common;/kbd-&kbd-version;.tar.bz2</ulink>
+<ulink url="&http-common;/kbd-&kbd-version;.tar.bz2">
+&http-common;/kbd-&kbd-version;.tar.bz2</ulink>
+
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 372bc2d29..bbc4ab0bb 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -48,9 +48,7 @@
 &c3-file;
 &c3-libtool;
 &c3-bin86;
-&c3-consoletools;
-&c3-consoletools-patch;
-&c3-consoledata;
+&c3-kbd;
 &c3-e2fsprogs;
 &c3-ldso;
 &c3-lilo;
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 764f9d9b0..75314caa6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -33,8 +33,7 @@
 &c6-binutils;
 &c6-bzip2;
 &c6-gettext;
-&c6-consoletools;
-&c6-consoledata;
+&c6-kbd;
 &c6-diffutils;
 &c6-e2fsprogs;
 &c6-fileutils;
diff --git a/chapter06/consoledata-inst.xml b/chapter06/consoledata-inst.xml
deleted file mode 100644
index 382be9e93..000000000
--- a/chapter06/consoledata-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2>
-<title>Installation of Console-data</title>
-
-<para>
-Replace &lt;path-to-kmap-file&gt; below with the correct path to the
-desired kmap.gz file. An example could be i386/qwerty/us.kmap.gz
-</para>
-
-<para>
-Install Console-data by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/share/keymaps &amp;&amp;</userinput>
-	<userinput>ln -s &lt;path-to-kmap-file&gt; defkeymap.kmap.gz</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter06/consoledata.xml b/chapter06/consoledata.xml
deleted file mode 100644
index 9c8fbe922..000000000
--- a/chapter06/consoledata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="ch06-consoledata">
-<title>Installing Consoledata</title>
-
-&c6-consoledata-inst;
-&aa-consoledata-desc;
-
-</sect1>
diff --git a/chapter06/consoletools-inst.xml b/chapter06/consoletools-inst.xml
deleted file mode 100644
index a274c18da..000000000
--- a/chapter06/consoletools-inst.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<sect2>
-<title>Installation of Console-tools</title>
-
-<para>
-Before starting to install Console-tools a user has to unpack the
-console-tools-0.2.3.patch file.
-</para>
-
-<para>
-Install Console-tools by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>patch -Np1 -i ../console-tools-0.2.3.patch 
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd doc/man &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		consolechars.8.in &gt; consolechars.8 &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		dumpkeys.1.in &gt; dumpkeys.1 &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		loadkeys.1.in &gt; loadkeys.1 &amp;&amp;</userinput>
-	<userinput>cp *.1 /usr/share/man/man1 &amp;&amp;</userinput>
-	<userinput>cp *.4 /usr/share/man/man4 &amp;&amp;</userinput>
-	<userinput>cp *.5 /usr/share/man/man5 &amp;&amp;</userinput>
-	<userinput>cp *.8 /usr/share/man/man8</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter06/consoletools.xml b/chapter06/consoletools.xml
deleted file mode 100644
index d0f92c556..000000000
--- a/chapter06/consoletools.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="ch06-consoletools">
-<title>Installing Consoletools</title>
-
-&c6-consoletools-inst;
-&aa-consoletools-desc;
-
-</sect1>
diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml
new file mode 100644
index 000000000..4aace3cec
--- /dev/null
+++ b/chapter06/kbd-exp.xml
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>
+<userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd data files
+(fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS suggests.
+</para>
+
+</sect2>
+
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
new file mode 100644
index 000000000..bbd4e35d0
--- /dev/null
+++ b/chapter06/kbd-inst.xml
@@ -0,0 +1,17 @@
+<sect2>
+<title>Installation of Kbd</title>
+
+<para>
+Install Kbd by running the following commands:
+</para>
+
+<blockquote><literallayout>
+
+	<userinput>./configure --datadir=/usr/share/kbd &amp;&amp;</userinput>
+	<userinput>make &amp;&amp;</userinput>
+	<userinput>make install</userinput>
+
+</literallayout></blockquote>
+
+</sect2>
+
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
new file mode 100644
index 000000000..016798052
--- /dev/null
+++ b/chapter06/kbd.xml
@@ -0,0 +1,9 @@
+<sect1 id="ch06-kbd">
+<title>Installing Kbd</title>
+
+&c6-kbd-inst;
+&c6-kbd-exp;
+&aa-kbd-desc;
+
+</sect1>
+
diff --git a/index.xml b/index.xml
index 1d2cc4dab..575ffd265 100644
--- a/index.xml
+++ b/index.xml
@@ -117,9 +117,7 @@
 <!ENTITY c3-file SYSTEM "intel/chapter3/file.xml">
 <!ENTITY c3-libtool SYSTEM "intel/chapter3/libtool.xml">
 <!ENTITY c3-bin86 SYSTEM "intel/chapter3/bin86.xml">
-<!ENTITY c3-consoletools SYSTEM "intel/chapter3/consoletools.xml">
-<!ENTITY c3-consoletools-patch SYSTEM "intel/chapter3/consoletools-patch.xml">
-<!ENTITY c3-consoledata SYSTEM "intel/chapter3/consoledata.xml">
+<!ENTITY c3-kbd SYSTEM "intel/chapter3/kbd.xml">
 <!ENTITY c3-e2fsprogs SYSTEM "intel/chapter3/e2fsprogs.xml">
 <!ENTITY c3-ldso SYSTEM "intel/chapter3/ldso.xml">
 <!ENTITY c3-lilo SYSTEM "intel/chapter3/lilo.xml">
@@ -300,10 +298,9 @@
 <!ENTITY c6-utillinux SYSTEM "intel/chapter6/utillinux.xml">
 <!ENTITY c6-utillinux-inst SYSTEM "intel/chapter6/utillinux-inst.xml">
 <!ENTITY c6-utillinux-exp SYSTEM "intel/chapter6/utillinux-exp.xml">
-<!ENTITY c6-consoletools SYSTEM "intel/chapter6/consoletools.xml">
-<!ENTITY c6-consoletools-inst SYSTEM "intel/chapter6/consoletools-inst.xml">
-<!ENTITY c6-consoledata SYSTEM "intel/chapter6/consoledata.xml">
-<!ENTITY c6-consoledata-inst SYSTEM "intel/chapter6/consoledata-inst.xml">
+<!ENTITY c6-kbd SYSTEM "intel/chapter6/kbd.xml">
+<!ENTITY c6-kbd-inst SYSTEM "intel/chapter6/kbd-inst.xml">
+<!ENTITY c6-kbd-exp SYSTEM "intel/chapter6/kbd-exp.xml">
 <!ENTITY c6-manpages SYSTEM "intel/chapter6/manpages.xml">
 <!ENTITY c6-manpages-inst SYSTEM "intel/chapter6/manpages-inst.xml">
 <!ENTITY c6-configure SYSTEM "intel/chapter6/configure.xml">
@@ -454,10 +451,8 @@
 <!ENTITY aa-textutils-desc SYSTEM "intel/appendixa/textutils-desc.xml">
 <!ENTITY aa-utillinux SYSTEM "intel/appendixa/utillinux.xml">
 <!ENTITY aa-utillinux-desc SYSTEM "intel/appendixa/utillinux-desc.xml">
-<!ENTITY aa-consoletools SYSTEM "intel/appendixa/consoletools.xml">
-<!ENTITY aa-consoletools-desc SYSTEM "intel/appendixa/consoletools-desc.xml">
-<!ENTITY aa-consoledata SYSTEM "intel/appendixa/consoledata.xml">
-<!ENTITY aa-consoledata-desc SYSTEM "intel/appendixa/consoledata-desc.xml">
+<!ENTITY aa-kbd SYSTEM "intel/appendixa/kbd.xml">
+<!ENTITY aa-kbd-desc SYSTEM "intel/appendixa/kbd-desc.xml">
 <!ENTITY aa-manpages SYSTEM "intel/appendixa/manpages.xml">
 <!ENTITY aa-manpages-desc SYSTEM "intel/appendixa/manpages-desc.xml">
 <!ENTITY aa-ns-netkitbase SYSTEM "intel/appendixa/netkitbase.xml">
@@ -517,9 +512,7 @@
 <!ENTITY ac-file SYSTEM "intel/appendixc/file.xml">
 <!ENTITY ac-libtool SYSTEM "intel/appendixc/libtool.xml">
 <!ENTITY ac-bin86 SYSTEM "intel/appendixc/bin86.xml">
-<!ENTITY ac-consoletools SYSTEM "intel/appendixc/consoletools.xml">
-<!ENTITY ac-consoletools-patch SYSTEM "intel/appendixc/consoletools-patch.xml">
-<!ENTITY ac-consoledata SYSTEM "intel/appendixc/consoledata.xml">
+<!ENTITY ac-kbd SYSTEM "intel/appendixc/kbd.xml">
 <!ENTITY ac-e2fsprogs SYSTEM "intel/appendixc/e2fsprogs.xml">
 <!ENTITY ac-ldso SYSTEM "intel/appendixc/ldso.xml">
 <!ENTITY ac-lilo SYSTEM "intel/appendixc/lilo.xml">
@@ -573,8 +566,7 @@
 <!ENTITY file-version "3.33">
 <!ENTITY libtool-version "1.3.5">
 <!ENTITY bin86-version "0.15.4">
-<!ENTITY console-tools-version "0.2.3">
-<!ENTITY console-data-version "1999.08.29">
+<!ENTITY kbd-version "1.05">
 <!ENTITY e2fsprogs-version "1.19">
 <!ENTITY ld.so-version "1.9.9">
 <!ENTITY lilo-version "21.6">