aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2004-06-14 17:19:47 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2004-06-14 17:19:47 +0000
commit3966ace90d61f79b7a0490031c8fdf34462ff3e9 (patch)
tree359c4de9a07fd6bd5cae643c8869c159923e5336
parenteb443a3b8d84568d4bef4b48778e4c824c3cd0e4 (diff)
Replaced GNU/Linux with Linux to maintain consistency with the rest of the book (Larry Lawrence)
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3786 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-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