* Merged newxml into HEAD

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

1 files changed, 47 insertions, 13 deletions

diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index fa5394355..a7c7ff1bc 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -1,16 +1,23 @@
+<?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-system-grub" xreflabel="Grub">
-<title>Installing Grub-&grub-version;</title>
-<?dbhtml filename="grub.html" dir="chapter06"?>
+<title>Grub-&grub-version;</title>
+<?dbhtml filename="grub.html"?>
+
+<indexterm zone="ch-system-grub"><primary sortas="a-Grub">Grub</primary></indexterm>
 
 <para>The Grub package contains the GRand Unified Bootloader.</para>
 
-<screen>&buildtime; &grub-time;
-&diskspace; &grub-compsize;</screen>
+<screen>&buildtime; 0.2 SBU
+&diskspace; 10 MB</screen>
+
+<para>Grub installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 
-&aa-grub-down;
-&aa-grub-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Grub</title>
@@ -18,10 +25,10 @@
 <para>This package is known to behave badly when you have changed its default
 optimization flags (including the -march and -mcpu options). Therefore, if you
 have defined any environment variables that override default optimizations,
-such as CFLAGS and CXXFLAGS, we recommend unsetting them when building
+such as CFLAGS and CXXFLAGS, we recommend un-setting them when building
 Grub.</para>
 
-<para>Prepare Grub for compilation:</para>
+<para>First prepare Grub for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
@@ -29,7 +36,7 @@ Grub.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>And install it:</para>
+<para>Now install it:</para>
 
 <screen><userinput>make install
 mkdir /boot/grub
@@ -47,8 +54,35 @@ and/or <filename>reiserfs_stage1_5</filename> files.</para>
 
 </sect2>
 
-&aa-grub-shortdesc;
-&aa-grub-desc;
 
-</sect1>
+<sect2 id="contents-grub"><title>Contents of Grub</title>
+
+<para><emphasis>Installed programs</emphasis>: grub, grub-install,
+grub-md5-crypt, grub-terminfo and mbchk</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-grub grub"><primary sortas="b-grub">grub</primary></indexterm>
+<para id="grub"><command>grub</command> is the GRand Unified Bootloader's command
+shell.</para>
 
+<indexterm zone="ch-system-grub grub-install"><primary sortas="b-grub-install">grub-install</primary></indexterm>
+<para id="grub-install"><command>grub-install</command> installs GRUB on the given device.</para>
+
+<indexterm zone="ch-system-grub grub-md5-crypt"><primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary></indexterm>
+<para id="grub-md5-crypt"><command>grub-md5-crypt</command> encrypts a password in MD5
+format.</para>
+
+<indexterm zone="ch-system-grub grub-terminfo"><primary sortas="b-grub-terminfo">grub-terminfo</primary></indexterm>
+<para id="grub-terminfo"><command>grub-terminfo</command> generates a terminfo command from a
+terminfo name. It can be used if you have an uncommon terminal.</para>
+
+<indexterm zone="ch-system-grub mbchk"><primary sortas="b-mbchk">mbchk</primary></indexterm>
+<para id="mbchk"><command>mbchk</command> checks the format of a multi-boot kernel.</para>
+
+</sect2>
+
+
+</sect1>