* Merged newxml into HEAD

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

1 files changed, 56 insertions, 18 deletions

diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 5f1f69d8d..5ad76a1a4 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -1,16 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-bootable-kernel" xreflabel="Linux">
-<title>Installing Linux-&kernel-version;</title>
-<?dbhtml filename="kernel.html" dir="chapter08"?>
+<title>Linux-&linux-version;</title>
+<?dbhtml filename="kernel.html"?>
+
+<indexterm zone="ch-bootable-kernel"><primary sortas="a-Linux">Linux</primary></indexterm>
 
 <para>The Linux package contains the kernel and the header files.</para>
 
-<screen>Estimated build time:           &kernel-time;
-Estimated required disk space:  &kernel-compsize;</screen>
+<screen>&buildtime; All default options: 4.20 SBU
+&diskspace; All default options: 181 MB</screen>
+
+<para>Linux installation depends on: Bash, Binutils, Coreutils, Findutils,
+GCC, Glibc, Grep, Gzip, Make, Modutils, Perl, Sed.</para>
 
-&aa-kernel-down;
-&aa-kernel-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of the kernel</title>
@@ -27,7 +34,7 @@ methods.</para>
 <para>This ensures that the kernel tree is absolutely clean. The kernel team
 recommends that this command be issued prior to <emphasis>each</emphasis>
 kernel compilation. You shouldn't rely on the source tree being clean after
-untarring.</para>
+un-tarring.</para>
 
 <para>Configure the kernel via a menu-driven interface:</para>
 
@@ -39,15 +46,15 @@ information.</para>
 
 <para>If you wish, you may skip kernel configuration by simply copying the
 kernel config file, <filename>.config</filename>, from your host system
-(assuming it is available) to the unpacked <filename
-class="directory">linux-&kernel-version;</filename> directory. However, we
+(assuming it is available) to the unpacked <filename class="directory">linux-&linux-version;</filename>
+directory. However, we
 don't recommend this option. You're much better off exploring all the
 configuration menus and creating your own kernel configuration from
 scratch.</para>
 
 <para>For POSIX shared memory support, ensure that the kernel config option
-"Virtual memory file system support" is enabled. It resides within the
-"File systems" menu and is normally enabled by default.</para>
+<quote>Virtual memory file system support</quote> is enabled. It resides within
+the <quote>File systems</quote> menu and is normally enabled by default.</para>
 
 <para>Verify dependencies and create dependency information files:</para>
 
@@ -65,9 +72,9 @@ scratch.</para>
 <filename>/etc/modules.conf</filename> file. Information pertaining
 to modules and to kernel configuration in general may be found in the
 kernel documentation, which is found in the
-<filename>linux-&kernel-version;/Documentation</filename> directory. The
+<filename>linux-2.4.25/Documentation</filename> directory. The
 modules.conf man page and the kernel HOWTO at
-<ulink url="&tldp-root;HOWTO/Kernel-HOWTO.html"/> may also be of
+<ulink url="http://www.tldp.org/HOWTO/Kernel-HOWTO.html"/> may also be of
 interest to you.</para>
 
 <para>Install the modules:</para>
@@ -98,7 +105,7 @@ using. Issue the following command to install the kernel:</para>
 <screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel. It maps
-the function entrypoints of every function in the kernel API, as well as the
+the function entry points of every function in the kernel API (Application Programming Interface), as well as the
 addresses of the kernel data structures for the running kernel. Issue the
 following command to install the map file:</para>
 
@@ -123,12 +130,43 @@ person would have write access to the kernel source.</para>
 
 <para>If you are going to keep the kernel source tree around, you may want to
 run <userinput>chown -R 0:0</userinput> on the
-<filename>linux-&kernel-version;</filename> directory to ensure all files are
+<filename>linux-2.4.25</filename> directory to ensure all files are
 owned by user <emphasis>root</emphasis>.</para>
 
 </sect2>
 
-&aa-kernel-shortdesc;
-&aa-kernel-desc;
+
+<sect2 id="contents-kernel"><title>Contents of Linux</title>
+
+<para><emphasis>Installed files</emphasis>: the kernel, the kernel headers,
+and the System.map</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-bootable-kernel kernel"><primary sortas="b-kernel">kernel</primary></indexterm>
+<para id="kernel">The <emphasis>kernel</emphasis> is the engine of your GNU/Linux system.
+When switching on your box, the kernel is the first part of your operating
+system that gets loaded. It detects and initializes all the components of your
+computer's hardware, then makes these components available as a tree of files
+to the software, and turns a single CPU into a multi-tasking machine capable
+of running scores of programs seemingly at the same time.</para>
+
+<indexterm zone="ch-bootable-kernel kernel-headers"><primary sortas="e-kernel-headers">kernel headers</primary></indexterm>
+<para id="kernel-headers">The <emphasis>kernel headers</emphasis> define the interface to the
+services that the kernel provides. The headers in your system's
+<filename>include</filename> directory should <emphasis>always</emphasis> be
+the ones against which Glibc was compiled and should therefore
+<emphasis>not</emphasis> be replaced when upgrading the kernel.</para>
+
+<indexterm zone="ch-bootable-kernel System.map"><primary sortas="e-/boot/System.map">/boot/System.map</primary></indexterm>
+<para id="System.map">The <filename>System.map</filename> file is a list of addresses and
+symbols. It maps the entry points and addresses of all the functions and data
+structures in the kernel.</para>
+
+</sect2>
+
+
 
 </sect1>