aboutsummaryrefslogtreecommitdiffstats
path: root/chapter04
diff options
context:
space:
mode:
Diffstat (limited to 'chapter04')
-rw-r--r--chapter04/all.xml13
-rw-r--r--chapter04/autoconf.xml13
-rw-r--r--chapter04/automake.xml13
-rw-r--r--chapter04/bash.xml13
-rw-r--r--chapter04/bin86.xml13
-rw-r--r--chapter04/binutils.xml13
-rw-r--r--chapter04/bison.xml13
-rw-r--r--chapter04/bzip2.xml13
-rw-r--r--chapter04/chapter04.xml1
-rw-r--r--chapter04/consoledata.xml13
-rw-r--r--chapter04/consoletools-patch.xml15
-rw-r--r--chapter04/consoletools.xml15
-rw-r--r--chapter04/diffutils.xml13
-rw-r--r--chapter04/e2fsprogs.xml13
-rw-r--r--chapter04/ed.xml13
-rw-r--r--chapter04/file.xml12
-rw-r--r--chapter04/fileutils-patch.xml13
-rw-r--r--chapter04/fileutils.xml4
-rw-r--r--chapter04/findutils-patch.xml4
-rw-r--r--chapter04/findutils.xml4
-rw-r--r--chapter04/flex.xml4
-rw-r--r--chapter04/gcc.xml4
-rw-r--r--chapter04/gettext.xml4
-rw-r--r--chapter04/glibc-threads.xml4
-rw-r--r--chapter04/glibc.xml4
-rw-r--r--chapter04/grep.xml4
-rw-r--r--chapter04/groff.xml4
-rw-r--r--chapter04/gzip-patch.xml4
-rw-r--r--chapter04/gzip.xml4
-rw-r--r--chapter04/kernel.xml4
-rw-r--r--chapter04/ldso.xml4
-rw-r--r--chapter04/less.xml4
-rw-r--r--chapter04/libtool.xml4
-rw-r--r--chapter04/lilo.xml3
-rw-r--r--chapter04/m4.xml4
-rw-r--r--chapter04/make.xml4
-rw-r--r--chapter04/makedev-patch.xml4
-rw-r--r--chapter04/makedev.xml4
-rw-r--r--chapter04/man.xml4
-rw-r--r--chapter04/manpages.xml4
-rw-r--r--chapter04/mawk.xml4
-rw-r--r--chapter04/modutils.xml4
-rw-r--r--chapter04/ncurses.xml4
-rw-r--r--chapter04/netkitbase.xml4
-rw-r--r--chapter04/nettools.xml4
-rw-r--r--chapter04/packages.xml6
-rw-r--r--chapter04/patch.xml4
-rw-r--r--chapter04/perl.xml4
-rw-r--r--chapter04/procinfo.xml4
-rw-r--r--chapter04/procps.xml4
-rw-r--r--chapter04/psmisc.xml4
-rw-r--r--chapter04/sed.xml4
-rw-r--r--chapter04/shadowpwd.xml4
-rw-r--r--chapter04/shellutils.xml4
-rw-r--r--chapter04/sysklogd-patch.xml4
-rw-r--r--chapter04/sysklogd.xml4
-rw-r--r--chapter04/sysvinit-patch.xml4
-rw-r--r--chapter04/sysvinit.xml4
-rw-r--r--chapter04/tar-patch.xml4
-rw-r--r--chapter04/tar.xml4
-rw-r--r--chapter04/texinfo.xml4
-rw-r--r--chapter04/textutils.xml4
-rw-r--r--chapter04/toplevel.xml7
-rw-r--r--chapter04/utillinux.xml4
-rw-r--r--chapter04/vim.xml7
65 files changed, 87 insertions, 324 deletions
diff --git a/chapter04/all.xml b/chapter04/all.xml
index aa06bfe7d..155b83b80 100644
--- a/chapter04/all.xml
+++ b/chapter04/all.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-All LFS Packages - 61,480 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/intel-packages/lfs-packages.tar">
-ftp://packages.linuxfromscratch.org/intel-packages/lfs-packages.tar</ulink>
-
-</para></listitem>
+All LFS Packages - 61,480 KB:
+<ulink url="&ftp-common;/lfs-packages.tar">
+&ftp-common;/lfs-packages.tar</ulink>
+<ulink url="&http-common;/lfs-packages.tar">
+&http-common;/lfs-packages.tar</ulink>
diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml
index 1d726944d..1876cd75d 100644
--- a/chapter04/autoconf.xml
+++ b/chapter04/autoconf.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Autoconf (2.13) 333 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/autoconf-2.13.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/autoconf-2.13.tar.bz2</ulink>
-
-</para></listitem>
+Autoconf (&autoconf-version;) - 333 KB:
+<ulink url="&ftp-common;/autoconf-&autoconf-version;.tar.bz2">
+&ftp-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&http-common;/autoconf-&autoconf-version;.tar.bz2">
+&http-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
diff --git a/chapter04/automake.xml b/chapter04/automake.xml
index 79cefff51..fe4cd8a30 100644
--- a/chapter04/automake.xml
+++ b/chapter04/automake.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Automake (1.4) 277 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/automake-1.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/automake-1.4.tar.bz2</ulink>
-
-</para></listitem>
+Automake (&automake-version;) - 277 KB:
+<ulink url="&ftp-intel;/automake-&automake-version;.tar.bz2">
+&ftp-intel;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&http-intel;/automake-&automake-version'.tar.bz2">
+&http-intel;/automake-&automake-version;.tar.bz2</ulink>
diff --git a/chapter04/bash.xml b/chapter04/bash.xml
index bd88171c6..7206542da 100644
--- a/chapter04/bash.xml
+++ b/chapter04/bash.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bash (2.04) - 1,307 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bash-2.04.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bash-2.04.tar.bz2</ulink>
-
-</para></listitem>
+Bash (&bash-version;) - 1,307 KB:
+<ulink url="&ftp-common;/bash-&bash-version;.tar.bz2">
+&ftp-common;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bash-&bash-version;.tar.bz2">
+&http-common;/bash-&bash-version;.tar.bz2</ulink>
diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml
index d7b86c12b..e232363a2 100644
--- a/chapter04/bin86.xml
+++ b/chapter04/bin86.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bin86 (0.15.4) 111 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bin86-0.15.4.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bin86-0.15.4.tar.bz2</ulink>
-
-</para></listitem>
+Bin86 (&bin86-version;) - 111 KB:
+<ulink url="&ftp-common;/bin86-$bin86-version;.tar.bz2">
+&ftp-common;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bin86-&bin86-version;.tar.bz2">
+&http-common;/bin86-&bin86-version;.tar.bz2</ulink>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index a5db87d2a..6db608679 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Binutils (2.10.1) 5,523 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/binutils-2.10.1.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/binutils-2.10.1.tar.bz2</ulink>
-
-</para></listitem>
+Binutils (&binutils-version;) - 5,523 KB:
+<ulink url="&ftp-common;/binutils-&binutils-version;.tar.bz2">
+&ftp-common;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/binutils-&binutils-version;.tar.bz2">
+&http-common;/binutils-&binutils-version;.tar.bz2</ulink>
diff --git a/chapter04/bison.xml b/chapter04/bison.xml
index 13351e9ba..d6be0993c 100644
--- a/chapter04/bison.xml
+++ b/chapter04/bison.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bison (1.28) 321 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bison-1.28.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/bison-1.28.tar.bz2</ulink>
-
-</para></listitem>
+Bison (&bison-version;) - 321 KB:
+<ulink url="&ftp-common;/bison-&bison-version;.tar.bz2">
+&ftp-common;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bison-&bison-version;.tar.bz2">
+&http-common;/bison-&bison-version;.tar.bz2</ulink>
diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml
index 32de499e4..1cf2b4629 100644
--- a/chapter04/bzip2.xml
+++ b/chapter04/bzip2.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Bzip2 (1.0.1) 454 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/bzip2-1.0.1.tar.gz">
-ftp://packages.linuxfromscratch.org/common-packages/bzip2-1.0.1.tar.gz</ulink>
-
-</para></listitem>
+Bzip2 (&bzip2-version;) - 454 KB:
+<ulink url="&ftp-common;/bzip2-&bzip2-version;.tar.bz2">
+&ftp-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&http-common;/bzip2-&bzip2-version;.tar.bz2">
+&http-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 17532763b..f0bd5a88a 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -5,3 +5,4 @@
&c3-packages;
</chapter>
+
diff --git a/chapter04/consoledata.xml b/chapter04/consoledata.xml
index 8ca7784a8..10a5b8f0e 100644
--- a/chapter04/consoledata.xml
+++ b/chapter04/consoledata.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Console-data (1999.08.29) 418 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-data-1999.08.29.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/console-data-1999.08.29.tar.bz2</ulink>
-
-</para></listitem>
+Console-data (&console-data-version;) - 418 KB:
+<ulink url="&ftp-common;/console-data-&console-data-version;.tar.bz2">
+&ftp-common;/console-data-&console-data-version;.tar.bz2</ulink>
+<ulink url="&http-common;/console-data-&console-data-version;.tar.bz2">
+&http-common;/console-data-&console-data-version;.tar.bz2</ulink>
diff --git a/chapter04/consoletools-patch.xml b/chapter04/consoletools-patch.xml
index 708b0074b..d52a995f9 100644
--- a/chapter04/consoletools-patch.xml
+++ b/chapter04/consoletools-patch.xml
@@ -1,9 +1,8 @@
-<listitem><para>
-
-Console-tools (0.2.3) Patch: 4 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.patch.gz">
-ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.patch.gz</ulink>
-
-</para></listitem>
+Console-tools Patch (&console-tools-version;) - 4 KB:
+<ulink
+url="&ftp-common;/console-tools-&console-tools-version;.patch.bz2">
+&ftp-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
+<ulink
+url="&http-common;/console-tools-&console-tools-version;.patch.bz2">
+&http-common;/console-tools-&console-tools-version;.patch.bz2</ulink>
diff --git a/chapter04/consoletools.xml b/chapter04/consoletools.xml
index ac0f25ff3..c0d500b84 100644
--- a/chapter04/consoletools.xml
+++ b/chapter04/consoletools.xml
@@ -1,9 +1,8 @@
-<listitem><para>
-
-Console-tools (0.2.3) 490 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/console-tools-0.2.3.tar.bz2</ulink>
-
-</para></listitem>
+Console-tools (&console-tools-version;) - 490 KB:
+<ulink
+url="&ftp-common;/console-tools-&console-tools-version;.tar.bz2">
+&ftp-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
+<ulink
+url="&http-common;/console-tools-&console-tools-version;.tar.bz2">
+&http-common;/console-tools-&console-tools-version;.tar.bz2</ulink>
diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml
index f1ce458a4..366707a72 100644
--- a/chapter04/diffutils.xml
+++ b/chapter04/diffutils.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Diff Utils (2.7) 247 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/diffutils-2.7.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/diffutils-2.7.tar.bz2</ulink>
-
-</para></listitem>
+Diff Utils (&diffutils-version;) - 247 KB:
+<ulink url="&ftp-common;/diffutils-&diffutils-version;.tar.bz2">
+&ftp-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&http-common;/diffutils-&diffutils-version;.tar.bz2">
+&http-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml
index 6c4d13a94..896551466 100644
--- a/chapter04/e2fsprogs.xml
+++ b/chapter04/e2fsprogs.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-E2fsprogs (1.19) 808 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/e2fsprogs-1.19.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/e2fsprogs-1.19.tar.bz2</ulink>
-
-</para></listitem>
+E2fsprogs (&e2fsprogs-version;) - 808 KB:
+<ulink url="&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
diff --git a/chapter04/ed.xml b/chapter04/ed.xml
index 887e8b0bf..75c29af07 100644
--- a/chapter04/ed.xml
+++ b/chapter04/ed.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Ed (0.2) 158 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/ed-0.2.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/ed-0.2.tar.bz2</ulink>
-
-</para></listitem>
+Ed (&ed-version;) - 158 KB:
+<ulink url="&ftp-common;/ed-&ed-version;.tar.bz2">
+&ftp-common;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&http-common;/ed-&ed-version;.tar.bz2">
+&http-common;/ed-&ed-version;.tar.bz2</ulink>
diff --git a/chapter04/file.xml b/chapter04/file.xml
index 47a462fc9..35f2f109f 100644
--- a/chapter04/file.xml
+++ b/chapter04/file.xml
@@ -1,9 +1,7 @@
-<listitem><para>
+File (&file-version;) - 126 KB:
+<ulink url="&ftp-common;/file-&file-version;.tar.bz2">
+&ftp-common;/file-&file-version;.tar.bz2</ulink>
+<ulink url="&http-common;/file-&file-version;.tar.bz2">
+&http-common;/file-&file-version;.tar.bz2</ulink>
-File (3.33) 126 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/common-packages/file-3.33.tar.bz2">
-ftp://packages.linuxfromscratch.org/common-packages/file-3.33.tar.bz2</ulink>
-
-</para></listitem>
diff --git a/chapter04/fileutils-patch.xml b/chapter04/fileutils-patch.xml
index 99953b37f..64e4e0a46 100644
--- a/chapter04/fileutils-patch.xml
+++ b/chapter04/fileutils-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-File Utils Patch (4.0) 0.2 KB:
- <ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2</ulink>
-
-</para></listitem>
+File Utils Patch (&fileutils-version;) - 0.2 KB:
+<ulink url="&ftp-common;/fileutils-&fileutils-version;.patch.bz2">
+&ftp-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&http-common;/fileutils-&fileutils-version;.patch;bz2">
+&http-common;/fileutils-&fileutils-version;.patch.bz2</ulink>
diff --git a/chapter04/fileutils.xml b/chapter04/fileutils.xml
index 57721c164..aa58869d8 100644
--- a/chapter04/fileutils.xml
+++ b/chapter04/fileutils.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
File Utils (4.0) 801 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/fileutils-4.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml
index e300ca4ed..ba318aabe 100644
--- a/chapter04/findutils-patch.xml
+++ b/chapter04/findutils-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Find Utils Patch (4.1) 1 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz">
ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.patch.gz</ulink>
-</para></listitem>
-
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
index 6f4886f3a..3b9866db6 100644
--- a/chapter04/findutils.xml
+++ b/chapter04/findutils.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Find Utils (4.1) 226 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/findutils-4.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/flex.xml b/chapter04/flex.xml
index f44eecff4..b054286a1 100644
--- a/chapter04/flex.xml
+++ b/chapter04/flex.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Flex (2.5.4a) 278 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/flex-2.5.4a.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index 096c303f4..564514953 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
GCC (2.95.2.1) 9,551 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2">
ftp://packages.linuxfromscratch.org/new-in-cvs/gcc-2.95.2.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml
index b621fb9ad..25ac91aa9 100644
--- a/chapter04/gettext.xml
+++ b/chapter04/gettext.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Gettext (0.10.35) 525 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/gettext-0.10.35.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml
index 3bedf34dd..9c76465ec 100644
--- a/chapter04/glibc-threads.xml
+++ b/chapter04/glibc-threads.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Glibc-linuxthreads (2.2.1) 149 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2">
ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-linuxthreads-2.2.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml
index 4d0e01831..e6b1c6163 100644
--- a/chapter04/glibc.xml
+++ b/chapter04/glibc.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Glibc (2.2.1) 10,137 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2">
ftp://packages.linuxfromscratch.org/new-in-cvs/glibc-2.2.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/grep.xml b/chapter04/grep.xml
index 67c4b95f2..4307723bd 100644
--- a/chapter04/grep.xml
+++ b/chapter04/grep.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Grep (2.4.2) 382 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/grep-2.4.2.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/groff.xml b/chapter04/groff.xml
index 46578699f..5d411bfe4 100644
--- a/chapter04/groff.xml
+++ b/chapter04/groff.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Groff (1.16.1) 1,173 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/groff-1.16.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml
index 3d017ecca..d26dffcbf 100644
--- a/chapter04/gzip-patch.xml
+++ b/chapter04/gzip-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Gzip Patch (1.2.4a) 1 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz">
ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.patch.gz</ulink>
-</para></listitem>
-
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
index 5dcb48833..a7a3a2441 100644
--- a/chapter04/gzip.xml
+++ b/chapter04/gzip.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Gzip (1.2.4a) 178 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/gzip-1.2.4a.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml
index e515eb2ad..3360dd227 100644
--- a/chapter04/kernel.xml
+++ b/chapter04/kernel.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Linux Kernel (2.4.1) 19,505 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2">
ftp://packages.linuxfromscratch.org/new-in-cvs/linux-2.4.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/ldso.xml b/chapter04/ldso.xml
index e928b3f25..98f29540b 100644
--- a/chapter04/ldso.xml
+++ b/chapter04/ldso.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Ld.so (1.9.9) 280 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/ld.so-1.9.9.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/less.xml b/chapter04/less.xml
index 1ef4e115f..cb0b99081 100644
--- a/chapter04/less.xml
+++ b/chapter04/less.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Less (358) 178 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/less-358.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml
index 6faa63014..b600d239d 100644
--- a/chapter04/libtool.xml
+++ b/chapter04/libtool.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Libtool (1.3.5) 361 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/libtool-1.3.5.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml
index aa15b531a..7de366a16 100644
--- a/chapter04/lilo.xml
+++ b/chapter04/lilo.xml
@@ -1,8 +1,5 @@
-<listitem><para>
Lilo (21.6) 172 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2">
ftp://packages.linuxfromscratch.org/intel-packages/lilo-21.6.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/m4.xml b/chapter04/m4.xml
index e6ace13f5..0993ac8a4 100644
--- a/chapter04/m4.xml
+++ b/chapter04/m4.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
M4 (1.4) 249 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/m4-1.4.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/make.xml b/chapter04/make.xml
index 16d83e81e..3759c2f44 100644
--- a/chapter04/make.xml
+++ b/chapter04/make.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Make (3.79.1) 749 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/make-3.79.1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/makedev-patch.xml b/chapter04/makedev-patch.xml
index ea9189216..27359ef9c 100644
--- a/chapter04/makedev-patch.xml
+++ b/chapter04/makedev-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
MAKEDEV Patch (2.5) - 0.5 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2">
ftp://packages.linuxfromscratch.org/new-in-cvs/MAKEDEV-2.5.patch.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml
index b3910a666..02f5bfa14 100644
--- a/chapter04/makedev.xml
+++ b/chapter04/makedev.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
MAKEDEV (2.5) - 11 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/MAKEDEV-2.5.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/man.xml b/chapter04/man.xml
index 0193a4949..4140b9e68 100644
--- a/chapter04/man.xml
+++ b/chapter04/man.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Man (1.5h1) 156 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/man-1.5h1.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml
index 72d9a8f24..41c6f1b0e 100644
--- a/chapter04/manpages.xml
+++ b/chapter04/manpages.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Man-pages (1.33) 475 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/man-pages-1.33.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/mawk.xml b/chapter04/mawk.xml
index ff312b013..4d727d945 100644
--- a/chapter04/mawk.xml
+++ b/chapter04/mawk.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Mawk (1.3.3) 168 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/mawk1.3.3.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml
index 4acb4ce2e..9ab8ad944 100644
--- a/chapter04/modutils.xml
+++ b/chapter04/modutils.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Modutils (2.4.0) 195 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/modutils-2.4.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml
index 0bc911bee..f4c8d0163 100644
--- a/chapter04/ncurses.xml
+++ b/chapter04/ncurses.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Ncurses (5.2) 1,307 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2">
ftp://packages.linuxfromscratch.org/intel-packages/ncurses-5.2.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml
index 177d0d5fe..77e73517d 100644
--- a/chapter04/netkitbase.xml
+++ b/chapter04/netkitbase.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Netkit-base (0.17) 49 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/netkit-base-0.17.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml
index 4ed3976ae..1f9881fb2 100644
--- a/chapter04/nettools.xml
+++ b/chapter04/nettools.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Net-tools (1.57) 187 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/net-tools-1.57.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index f201b8680..af790b07e 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -1,7 +1,7 @@
<sect1 id="ch03-packages">
<title>Packages you need to download</title>
-<itemizedlist>
+<literallayout>
&c3-toplevel;
&c3-all;
@@ -67,11 +67,9 @@
&c3-netkitbase;
&c3-nettools;
-<listitem><para>
Total size of all intel-packages: 69,823 KB (68,19 MB)
-</para></listitem>
-</itemizedlist>
+</literallayout>
</sect1>
diff --git a/chapter04/patch.xml b/chapter04/patch.xml
index aaf5680dd..d92471a76 100644
--- a/chapter04/patch.xml
+++ b/chapter04/patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Patch (2.5.4) 149 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/patch-2.5.4.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/perl.xml b/chapter04/perl.xml
index 3dba9286b..3c7fdb8a8 100644
--- a/chapter04/perl.xml
+++ b/chapter04/perl.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Perl (5.6.0) 4,327 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/perl-5.6.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml
index 9488fa8a0..a76270014 100644
--- a/chapter04/procinfo.xml
+++ b/chapter04/procinfo.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Procinfo (17) 21 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/procinfo-17.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/procps.xml b/chapter04/procps.xml
index d7069530b..bea34f895 100644
--- a/chapter04/procps.xml
+++ b/chapter04/procps.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Procps (2.0.7) 153 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/procps-2.0.7.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml
index 20fef0b10..b9f7f144c 100644
--- a/chapter04/psmisc.xml
+++ b/chapter04/psmisc.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Psmisc (19) 20 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/psmisc-19.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/sed.xml b/chapter04/sed.xml
index b5e2ebd48..d59cbb54b 100644
--- a/chapter04/sed.xml
+++ b/chapter04/sed.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sed (3.02) 221 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/sed-3.02.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
index 4c8e4b1c3..d9710bad1 100644
--- a/chapter04/shadowpwd.xml
+++ b/chapter04/shadowpwd.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Shadow Password Suite (20000902) 557 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/shadow-20000902.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/shellutils.xml b/chapter04/shellutils.xml
index 05b973887..7cb472681 100644
--- a/chapter04/shellutils.xml
+++ b/chapter04/shellutils.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sh-utils (2.0) 824 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/sh-utils-2.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/sysklogd-patch.xml b/chapter04/sysklogd-patch.xml
index ec61b8a6c..ff5120f72 100644
--- a/chapter04/sysklogd-patch.xml
+++ b/chapter04/sysklogd-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sysklogd Patch (1.4) 0.5 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2">
ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.patch.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
index 6bfa7a35b..ea7b1339c 100644
--- a/chapter04/sysklogd.xml
+++ b/chapter04/sysklogd.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sysklogd (1.4) 67 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/sysklogd-1.4.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/sysvinit-patch.xml b/chapter04/sysvinit-patch.xml
index d44cc1117..6ac4835ba 100644
--- a/chapter04/sysvinit-patch.xml
+++ b/chapter04/sysvinit-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sysvinit Patch (2.78) 1 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch">
ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.patch</ulink>
-</para></listitem>
-
diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml
index 7cafd0aa9..b74743186 100644
--- a/chapter04/sysvinit.xml
+++ b/chapter04/sysvinit.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Sysvinit (2.78) 90 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/sysvinit-2.78.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml
index 858aca76e..4da091e7b 100644
--- a/chapter04/tar-patch.xml
+++ b/chapter04/tar-patch.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Tar Patch (1.13) 2 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt">
ftp://packages.linuxfromscratch.org/common-packages/gnutarpatch.txt</ulink>
-</para></listitem>
-
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
index fa1c26d54..8904dddc4 100644
--- a/chapter04/tar.xml
+++ b/chapter04/tar.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Tar (1.13) 730 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/tar-1.13.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml
index 1efbeadfd..ea4b4f0fa 100644
--- a/chapter04/texinfo.xml
+++ b/chapter04/texinfo.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Texinfo (4.0) 812 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/texinfo-4.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/textutils.xml b/chapter04/textutils.xml
index 989a25968..dc1ce68f2 100644
--- a/chapter04/textutils.xml
+++ b/chapter04/textutils.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Text Utils (2.0) 1,040 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/textutils-2.0.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/toplevel.xml b/chapter04/toplevel.xml
index 505fe8f27..961b3671a 100644
--- a/chapter04/toplevel.xml
+++ b/chapter04/toplevel.xml
@@ -1,17 +1,10 @@
-<listitem><para>
-
Browse FTP:
<ulink
url="ftp://packages.linuxfromscratch.org/">
ftp://packages.linuxfromscratch.org</ulink>
-</para></listitem>
-
-<listitem><para>
-
Browse HTTP:
<ulink
url="http://packages.linuxfromscrach.org/">
http://packages.linuxfromscratch.org</ulink>
-</para></listitem>
diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml
index 176aa80bb..a489d28c8 100644
--- a/chapter04/utillinux.xml
+++ b/chapter04/utillinux.xml
@@ -1,9 +1,5 @@
-<listitem><para>
-
Util Linux (2.10r) 883 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/util-linux-2.10r.tar.bz2</ulink>
-</para></listitem>
-
diff --git a/chapter04/vim.xml b/chapter04/vim.xml
index e9e294d69..970d8c5df 100644
--- a/chapter04/vim.xml
+++ b/chapter04/vim.xml
@@ -1,17 +1,10 @@
-<listitem><para>
-
Vim-rt (5.7) 905 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-rt.tar.bz2</ulink>
-</para></listitem>
-
-<listitem><para>
-
Vim-src (5.7) 963 KB:
<ulink
url="ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2">
ftp://packages.linuxfromscratch.org/common-packages/vim-5.7-src.tar.bz2</ulink>
-</para></listitem>