* Merged newxml into HEAD

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

1 files changed, 26 insertions, 21 deletions

diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 1a14968b8..aca02cada 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -1,19 +1,28 @@
+<?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-grub">
 <title>Making the LFS system bootable</title>
-<?dbhtml filename="grub.html" dir="chapter08"?>
+<?dbhtml filename="grub.html"?>
+
+<indexterm zone="ch-bootable-grub">
+<primary sortas="a-Grub">Grub</primary>
+<secondary>configuring</secondary></indexterm>
 
 <para>Your shiny new LFS system is almost complete. One of the last things to
 do is ensure you can boot it. The instructions below apply only to computers of
-IA-32 architecture, meaning mainstream PCs. Information on "boot loading" for
-other architectures should be available in the usual resource specific
-locations for those architectures.</para>
+IA-32 architecture, meaning mainstream PCs. Information on <quote>boot
+loading</quote> for other architectures should be available in the usual
+resource-specific locations for those architectures.</para>
 
 <para>Boot loading can be a complex area. First, a few cautionary words. You
 really should be familiar with your current boot loader and any other
 operating systems present on your hard drive(s) that you might wish to keep
 bootable. Please make sure that you have an emergency boot disk ready, so that
 you can rescue your computer if, by any chance, your computer becomes unusable
-(unbootable).</para>
+(un-bootable).</para>
 
 <para>Earlier, we compiled and installed the Grub boot loader software in
 preparation for this step. The procedure involves writing some special Grub
@@ -44,24 +53,20 @@ following example, we'll assume your root (or separate boot) partition is
 <filename>hda4</filename>.</para>
 
 <para>First, tell Grub where to search for its <filename>stage{1,2}</filename>
-files -- you can use Tab everywhere to make Grub show the alternatives:</para>
+files -- you can use the Tab key everywhere to make Grub show the alternatives:</para>
 
 <screen><userinput>root (hd0,3)</userinput></screen>
 
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
 
 <warning><para>The following command will overwrite your current boot loader.
 Don't run the command if this is not what you want. For example, you may be
 using a third party boot manager to manage your MBR (Master Boot Record). In
 this scenario, it would probably make more sense to install Grub into the
-"boot sector" of the LFS partition, in which case the command would become:
-<userinput>setup (hd0,3)</userinput>.</para></warning>
+<quote>boot sector</quote> of the LFS partition, in which case this next command
+would become: <userinput>setup (hd0,3)</userinput>.</para></warning>
 
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
 
-<para>Then tell it to install itself into the MBR (Master Boot Record) of
+<para>Tell Grub to install itself into the MBR (Master Boot Record) of
 <filename>hda</filename>:</para>
 
 <screen><userinput>setup (hd0)</userinput></screen>
@@ -71,8 +76,8 @@ this scenario, it would probably make more sense to install Grub into the
 
 <screen><userinput>quit</userinput></screen>
 
-<para>Now we need to create a "menu list" file, defining Grub's boot
-menu:</para>
+<para>Now we need to create a <quote>menu list</quote> file, defining Grub's
+boot menu:</para>
 
 <screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
 # Begin /boot/grub/menu.lst
@@ -92,11 +97,12 @@ root (hd0,3)
 kernel --no-mem-option /boot/lfskernel root=/dev/hda4
 <userinput>EOF</userinput></screen>
 
-<note><para>By default, Grub will automatically pass a "mem=xxx" command line
-argument to the kernel. However, Grub occasionally gets the amount of memory
-wrong which can lead to problems in some circumstances. It's best to disable
-this functionality and let the kernel determine the amount of memory itself,
-hence the use of the <emphasis>--no-mem-option</emphasis> above.</para></note>
+<note><para>By default, Grub will automatically pass a <quote>mem=xxx</quote>
+command line argument to the kernel. However, Grub occasionally gets the amount
+of memory wrong which can lead to problems in some circumstances. It's best to
+disable this functionality and let the kernel determine the amount of memory
+itself, hence the use of the <emphasis>--no-mem-option</emphasis> above.</para>
+</note>
 
 <para>You may want to add an entry for your host distribution. It might look
 like this:</para>
@@ -122,4 +128,3 @@ know, you can find more information regarding Grub on its website, located at:
 <ulink url="http://www.gnu.org/software/grub/"/>.</para>
 
 </sect1>
-