aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorJeremy Huntwork <jhuntwork@linuxfromscratch.org>2006-04-06 17:31:00 +0000
committerJeremy Huntwork <jhuntwork@linuxfromscratch.org>2006-04-06 17:31:00 +0000
commit3685bb6f5102f5047d4cb59ad0a1d23bfad7152b (patch)
tree09c4b35840f487bac84063e7b995029cb44f756c /chapter05
parent7f6e6e913332a699e911f8fde816149d3b7ed235 (diff)
Merged alphabetical branch to trunk.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7489 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/chapter05.xml22
-rw-r--r--chapter05/dejagnu.xml4
-rw-r--r--chapter05/expect.xml2
3 files changed, 13 insertions, 15 deletions
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 45d2081b4..02739479f 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -23,26 +23,24 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
- <!--<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="stripping.xml"/>
</chapter>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 06957da9f..bfb09165b 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -34,8 +34,8 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
- Make, and Sed</seg>
+ <seg>Bash, Binutils, Coreutils, Diffutils, Expect, GCC, Glibc, Grep,
+ Make, Sed, and Tcl</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 49a53b6b7..7aebef9d0 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -35,7 +35,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
- Sed, and Tcl</seg>
+ Patch, Sed, and Tcl</seg>
</seglistitem>
</segmentedlist>