From 673b0d84ba9591e07c0bdf0ee49d92eba10f502c Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 3 May 2004 10:59:46 +0000
Subject: * Merged newxml into HEAD

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/bash.xml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'chapter05/bash.xml')

diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 45e12e64e..a2ec5683e 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -1,14 +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-tools-bash">
-<title>Installing Bash-&bash-version;</title>
-<?dbhtml filename="bash.html" dir="chapter05"?>
+<title>Bash-&bash-version;</title>
+<?dbhtml filename="bash.html"?>
 
-<screen>&buildtime; &bash-time-tools; 
-&diskspace; &bash-compsize-tools;</screen>
+<indexterm zone="ch-tools-bash">
+<primary sortas="a-Bash">Bash</primary>
+<secondary>tools</secondary></indexterm>
 
-&aa-bash-down;
-&aa-bash-dep;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/para[1])"/>
+
+<screen>&buildtime; 1.2 SBU
+&diskspace; 27 MB</screen>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/para[2])"/>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Bash</title>
@@ -16,7 +25,7 @@
 <para>Bash contains several known bugs. Fix these with the following
 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-2.patch</userinput></screen>
 
 <para>Now prepare Bash for compilation:</para>
 
@@ -40,9 +49,8 @@ for a shell:</para>
 
 </sect2>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para>
+<sect2><title> </title><para> </para>
 <para>The details on this package are found in <xref linkend="contents-bash"/>.</para>
-<para>&nbsp;</para></sect2>
+<para> </para></sect2>
 
 </sect1>
-
-- 
cgit v1.2.3-54-g00ecf