* Merged newxml into HEAD

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

1 files changed, 53 insertions, 15 deletions

diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index aa38ef855..af2acf4b5 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -1,25 +1,32 @@
+<?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-bash" xreflabel="Bash">
-<title>Installing Bash-&bash-version;</title>
-<?dbhtml filename="bash.html" dir="chapter06"?>
+<title>Bash-&bash-version;</title>
+<?dbhtml filename="bash.html"?>
+
+<indexterm zone="ch-system-bash"><primary sortas="a-Bash">Bash</primary></indexterm>
 
 <para>The Bash package contains the Bourne-Again SHell.</para>
 
-<screen>&buildtime; &bash-time;
-&diskspace; &bash-compsize;</screen>
+<screen>Approximate build time:  1.2 SBU
+Required disk space:     27 MB</screen>
+
+<para>Bash installation depends on: Binutils, Coreutils, Diffutils, Gawk,
+GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 
-&aa-bash-down;
-&aa-bash-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Bash</title>
 
 <para>Bash has a number of bugs in it that cause it to not behave the 
-way it is expected at times. Fix this behaviour with the following
+way it is expected at times. Fix this behavior 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>
 
@@ -29,21 +36,52 @@ patch:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To have the results tested, issue:
+<para>To test the results, issue:
 <userinput>make tests</userinput>.</para>
 
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And reload the newly compiled <command>bash</command> program:</para>
+<para>Now run the newly compiled <command>bash</command> program (replacing the one you are currently executing):</para>
+
+<screen><userinput>exec /bin/bash --login +h</userinput></screen>
 
-<screen><userinput>exec /bin/bash +h</userinput></screen>
+<para>Note that the parameters used make it an interactive login instance
+(so /etc/profile is read, if it exists, and the first found
+~/.bash_profile, ~/.bash_login or and ~/.profile) and continue to
+disable hashing so that new programs are found as they become
+available.</para>
 
 </sect2>
 
-&aa-bash-shortdesc;
-&aa-bash-desc;
 
-</sect1>
+<sect2 id="contents-bash"><title>Contents of Bash</title>
+
+<para><emphasis>Installed programs</emphasis>: bash, sh (link to bash) and
+bashbug</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
 
+<indexterm zone="ch-system-bash bash"><primary sortas="b-bash">bash</primary></indexterm>
+<para id="bash"><command>bash</command> is a widely-used command interpreter. It
+performs many kinds of expansions and substitutions on a given command line
+before executing it, thus making this interpreter a powerful tool.</para>
+
+<indexterm zone="ch-system-bash bashbug"><primary sortas="b-bashbug">bashbug</primary></indexterm>
+<para id="bashbug"><command>bashbug</command> is a shell script to help the user
+compose and mail bug reports concerning bash in a standard format.</para>
+
+<indexterm zone="ch-system-bash sh"><primary sortas="b-sh">sh</primary></indexterm>
+<para id="sh"><command>sh</command> is a symlink to the bash program. When invoked
+as sh, bash tries to mimic the startup behavior of historical versions of sh as
+closely as possible, while conforming to the POSIX standard as well.</para>
+
+</sect2>
+
+
+
+</sect1>