aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter08/kernel.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f2b16682a..b7f458f7e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -75,6 +75,10 @@ first a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>June 14, 2004 [matt]: Removed GNU/Linux in line with common
+usage regarding the recurring GNU/Linux vs. Linux debate (Larry Lawrence).
+</para></listitem>
+
<listitem><para>June 14, 2004 [winkie]: Upgraded to GRUB 0.95. Removed the
<quote>--no-mem-option</quote> argument from GRUB's
<filename>menu.lst</filename>, since it is now the default.</para></listitem>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 8995f4264..4209f3cf8 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -173,7 +173,7 @@ and the System.map</seg></seglistitem>
<term>The <emphasis>kernel</emphasis></term>
<listitem>
<indexterm zone="ch-bootable-kernel kernel"><primary sortas="b-kernel">kernel</primary></indexterm>
-<para>is the engine of your GNU/Linux system.
+<para>is the engine of your 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