Merged some tag/wording changes from trunk (r6219-r6221).

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

chapter01/changelog.xml

@@ -87,6 +87,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 30th, 2005 [archaic]: Added a livecd-root entity.
+</para></listitem>
+
 <listitem><para>June 29th, 2005 [archaic]: Moved the host requirements page to
 the preface section of the book.</para></listitem>
 

chapter01/how.xml

@@ -15,15 +15,13 @@ to build the new system. Select the <quote>development</quote> option
 during the distribution installation to be able to access these
 tools.</para>
 
-<para>As an alternative to installing an entire separate
-distribution onto your machine, you may wish to use the Linux From
-Scratch LiveCD. The CD works well as a host system, providing all
-the tools you need to successfully follow the instructions in this
-book. Additionally, it contains all the source packages, patches and
-a copy of this book. So once you have the CD, no network connection or
-additional downloads are necessary. For more information about the LFS
-LiveCD or to download a copy, visit
-<ulink url="http://linuxfromscratch.org/~jhuntwork/livecd/"/></para>
+<para>As an alternative to installing an entire separate distribution onto your
+machine, you may wish to use the Linux From Scratch LiveCD. The CD works well as
+a host system, providing all the tools you need to successfully follow the
+instructions in this book. Additionally, it contains all the source packages,
+patches and a copy of this book. So once you have the CD, no network connection
+or additional downloads are necessary. For more information about the LFS LiveCD
+or to download a copy, visit <ulink url="&livecd-root;"/>.</para>
 
 <para><xref linkend="chapter-partitioning"/> of this book describes how
 to create a new Linux native partition and file system, the place

chapter08/kernel.xml

@@ -65,12 +65,14 @@ longindex.html#kernel-config-index</phrase></ulink>:</para>
 situations. See the <filename>README</filename> file for more
 information.</para>
 
-<note><para>When configuring the kernel, be sure to enable the
-<quote>Support for hot-pluggable devices</quote> option under the
-<quote>General Setup</quote> menu. This enables hotplug events that
-are used by <command>udev</command> to populate the <filename
-class="directory">/dev</filename> directory with device
-nodes.</para></note>
+<note><para>When configuring the kernel, be sure to enable the <quote>Support
+for hot-pluggable devices</quote> option under the <quote>General Setup</quote>
+menu. This enables hotplug events that are used by <command>udev</command> to
+populate the <filename class="directory">/dev</filename> directory with device
+nodes. Likewise, enable the <quote>Virtual memory file system support</quote>
+option under the <quote>File systems</quote>/<quote>Pseudo filesystems</quote>
+menu. This enables the virtual filesystem that the <filename
+class="directory">/dev</filename> directory will be mounted on.</para></note>
 
 <para>If desired, skip kernel configuration by copying the kernel
 config file, <filename>.config</filename>, from the host system
@@ -80,11 +82,6 @@ we do not recommend this option. It is often better to explore all the
 configuration menus and create the kernel configuration from
 scratch.</para>
 
-<para>For POSIX-shared memory support, ensure that the kernel config
-option <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>LFS Bootscripts make the assumption that both <quote>Support for Host-side
 USB</quote> and <quote>USB device filesystem</quote> have been compiled directly
 into the kernel, or that neither is compiled at all. The bootscripts will not
@@ -139,7 +136,7 @@ required to complete the installation. Some files need to be copied to
 the <filename class="directory">/boot</filename> directory.</para>
 
 <para>The path to the kernel image may vary depending on the platform
-being used. Issue the following command to install the kernel:</para>
+being used. The following command assumes an x86 architecture:</para>
 
 <screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050629">
-<!ENTITY releasedate "June 29, 2005">
+<!ENTITY version "TESTING-20050630">
+<!ENTITY releasedate "June 30, 2005">
 <!ENTITY milestone "6.1">
 <!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -11,6 +11,7 @@
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/svn/testing/">
 <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
+<!ENTITY livecd-root "http://linuxfromscratch.org/~jhuntwork/livecd/">
 <!ENTITY test-results "http://linuxfromscratch.org/~archaic/logs-&generic-version;/">
 <!ENTITY errata "http://www.linuxfromscratch.org/lfs/view/errata-&generic-version;/">
 

prologue/errata.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-scatter-errata">
+<sect1 id="pre-errata">
 <title>Errata</title>
 <?dbhtml filename="errata.html"?>
 

prologue/foreword.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="pf-foreword">
+<sect1 id="pre-foreword">
 <title>Foreword</title>
 <?dbhtml filename="foreword.html"?>
 

prologue/prerequisites.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="pf-prerequisites">
+<sect1 id="pre-prerequisites">
 <title>Prerequisites</title>
 <?dbhtml filename="prerequisites.html"?>