Fixed bug 1569. Ported from trunk r6044 and r6045.

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

chapter01/changelog.xml

@@ -84,11 +84,15 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 20th, 2005 [manuel]: kernel.xml: Added a warning
+about /usr/src/linux symlink and kernel headers, plus fixed the list
+of installed files. Bug 1569.</para></listitem>
+
 <listitem><para>June 19th, 2005 [jhuntwork]: Changed listing of IRC servers to show
-only irc.linuxfromscratch.org</para></listitem>
+only irc.linuxfromscratch.org.</para></listitem>
 
 <listitem><para>June 19th, 2005 [jhuntwork]: Removed outdated bootcd page and added a brief
-description of the LiveCD to section 1.1</para></listitem>
+description of the LiveCD to section 1.1.</para></listitem>
 
 <listitem><para>June 16th, 2005 [archaic]: Added installation dependencies for
 hotplug.</para></listitem>

chapter08/kernel.xml

@@ -182,7 +182,13 @@ all files are owned by user <emphasis>root</emphasis>.</para>
 source directory.  This is specific to kernels prior to the 2.6 series and
 <emphasis>must not</emphasis> be created on an LFS system as it can cause
 problems for packages you may wish to build once your base LFS system is
-complete.</para></warning>
+complete.</para>
+
+<para>Also, the headers in the system's
+<filename class="directory">include</filename> directory should
+<emphasis>always</emphasis> be the ones against which Glibc was compiled,
+that is, the ones from the Linux-Libc-Headers package, and therefore, should
+<emphasis>never</emphasis> be replaced by the kernel headers.</para></warning>
 
 </sect2>
 
@@ -191,47 +197,42 @@ complete.</para></warning>
 
 <segmentedlist>
 <segtitle>Installed files</segtitle>
-<seglistitem><seg>kernel, kernel headers,
+<seglistitem><seg>config-&linux-version;, lfskernel-&linux-version;,
-and System.map</seg></seglistitem>
+and System.map-&linux-version;</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 <?dbhtml list-presentation="table"?>
 
-<varlistentry id="kernel">
+<varlistentry id="config">
-<term><filename>kernel</filename></term>
+<term><filename>config-&linux-version;</filename></term>
+<listitem>
+<para>Contains all the configuration selections for the kernel</para>
+<indexterm zone="ch-bootable-kernel config"><primary sortas="e-/boot/config">/boot/config-&linux-version;</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="lfskernel">
+<term><filename>lfskernel-&linux-version;</filename></term>
 <listitem>
 <para>The engine of the Linux system. When turning on the computer,
 the kernel is the first part of the operating system that gets loaded.
 It detects and initializes all components of the computer's hardware,
 then makes these components available as a tree of files to the
 software and turns a single CPU into a multitasking machine capable
-of running scores of programs seemingly at the same time.</para>
+of running scores of programs seemingly at the same time</para>
-<indexterm zone="ch-bootable-kernel kernel"><primary sortas="b-kernel">kernel</primary></indexterm>
+<indexterm zone="ch-bootable-kernel lfskernel"><primary sortas="b-lfskernel">lfskernel-&linux-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="kernel-headers">
-<term><filename>kernel headers</filename></term>
-<listitem>
-<para>Defines the interface to the services that the kernel provides.
-The headers in the system's <filename
-class="directory">include</filename> directory should
-<emphasis>always</emphasis> be the ones against which Glibc was
-compiled and therefore, should <emphasis>not</emphasis> be replaced
-when upgrading the kernel.</para>
-<indexterm zone="ch-bootable-kernel kernel-headers"><primary sortas="e-kernel-headers">kernel headers</primary></indexterm>
 </listitem>
 </varlistentry>
 
 <varlistentry id="System.map">
-<term><filename>System.map</filename></term>
+<term><filename>System.map-&linux-version;</filename></term>
 <listitem>
 <para>A list of addresses and symbols; it maps the entry points and
 addresses of all the functions and data structures in the
 kernel</para>
-<indexterm zone="ch-bootable-kernel System.map"><primary sortas="e-/boot/System.map">/boot/System.map</primary></indexterm>
+<indexterm zone="ch-bootable-kernel System.map"><primary sortas="e-/boot/System.map">/boot/System.map-&linux-version;</primary></indexterm>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -239,4 +240,3 @@ kernel</para>
 </sect2>
 
 </sect1>
-

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050616">
+<!ENTITY version "TESTING-20050620">
-<!ENTITY releasedate "June 16, 2005">
+<!ENTITY releasedate "June 20, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">