aboutsummaryrefslogtreecommitdiffstats
path: root/chapter04
diff options
context:
space:
mode:
Diffstat (limited to 'chapter04')
-rw-r--r--chapter04/all.xml6
-rw-r--r--chapter04/autoconf.xml6
-rw-r--r--chapter04/automake.xml6
-rw-r--r--chapter04/bash.xml6
-rw-r--r--chapter04/bin86.xml6
-rw-r--r--chapter04/binutils.xml6
-rw-r--r--chapter04/bison.xml6
-rw-r--r--chapter04/bzip2.xml6
-rw-r--r--chapter04/diffutils.xml6
-rw-r--r--chapter04/e2fsprogs.xml6
-rw-r--r--chapter04/ed.xml6
-rw-r--r--chapter04/file.xml6
-rw-r--r--chapter04/fileutils.xml6
-rw-r--r--chapter04/findutils-patch.xml6
-rw-r--r--chapter04/findutils.xml6
-rw-r--r--chapter04/flex.xml6
-rw-r--r--chapter04/gcc-patch.xml6
-rw-r--r--chapter04/gcc.xml6
-rw-r--r--chapter04/gettext.xml6
-rw-r--r--chapter04/glibc-threads.xml6
-rw-r--r--chapter04/glibc.xml6
-rw-r--r--chapter04/grep.xml6
-rw-r--r--chapter04/groff.xml6
-rw-r--r--chapter04/gzip-patch.xml6
-rw-r--r--chapter04/gzip.xml6
-rw-r--r--chapter04/introduction.xml26
-rw-r--r--chapter04/kbd.xml6
-rw-r--r--chapter04/kernel.xml6
-rw-r--r--chapter04/less.xml6
-rw-r--r--chapter04/libtool.xml6
-rw-r--r--chapter04/lilo.xml6
-rw-r--r--chapter04/m4.xml6
-rw-r--r--chapter04/make.xml6
-rw-r--r--chapter04/makedev.xml6
-rw-r--r--chapter04/man-patch.xml6
-rw-r--r--chapter04/man.xml6
-rw-r--r--chapter04/manpages-patch.xml6
-rw-r--r--chapter04/manpages.xml6
-rw-r--r--chapter04/mawk.xml6
-rw-r--r--chapter04/modutils.xml6
-rw-r--r--chapter04/ncurses-patch.xml6
-rw-r--r--chapter04/ncurses.xml6
-rw-r--r--chapter04/netkitbase.xml6
-rw-r--r--chapter04/nettools.xml6
-rw-r--r--chapter04/patch.xml6
-rw-r--r--chapter04/perl.xml6
-rw-r--r--chapter04/procinfo.xml6
-rw-r--r--chapter04/procps.xml6
-rw-r--r--chapter04/psmisc.xml6
-rw-r--r--chapter04/sed.xml6
-rw-r--r--chapter04/shadowpwd-patch.xml6
-rw-r--r--chapter04/shadowpwd.xml6
-rw-r--r--chapter04/shellutils-patch.xml6
-rw-r--r--chapter04/shellutils.xml6
-rw-r--r--chapter04/sysklogd.xml6
-rw-r--r--chapter04/sysvinit-patch.xml6
-rw-r--r--chapter04/sysvinit.xml6
-rw-r--r--chapter04/tar-patch.xml6
-rw-r--r--chapter04/tar.xml6
-rw-r--r--chapter04/texinfo-patch.xml6
-rw-r--r--chapter04/texinfo.xml6
-rw-r--r--chapter04/textutils.xml6
-rw-r--r--chapter04/toplevel.xml6
-rw-r--r--chapter04/utillinux.xml6
-rw-r--r--chapter04/vim.xml12
65 files changed, 139 insertions, 277 deletions
diff --git a/chapter04/all.xml b/chapter04/all.xml
index f0ed24459..dbff46163 100644
--- a/chapter04/all.xml
+++ b/chapter04/all.xml
@@ -3,10 +3,8 @@ to compile an LFS system:
All LFS Packages - &all-size-kb;:
-<ulink url="&ftp;/lfs-packages-&all-version;.tar">
-&ftp;/lfs-packages-&all-version;.tar</ulink>
-<ulink url="&http;/lfs-packages-&all-version;.tar">
-&http;/lfs-packages-&all-version;.tar</ulink>
+<ulink url="&ftp;/lfs-packages-&all-version;.tar">&ftp;/lfs-packages-&all-version;.tar</ulink>
+<ulink url="&http;/lfs-packages-&all-version;.tar">&http;/lfs-packages-&all-version;.tar</ulink>
Or download the following packages individually:
diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml
index 2f1fb3f0d..e2fd4cee5 100644
--- a/chapter04/autoconf.xml
+++ b/chapter04/autoconf.xml
@@ -1,6 +1,4 @@
Autoconf (&autoconf-version;) - &autoconf-size;:
-<ulink url="&ftp;/autoconf-&autoconf-version;.tar.bz2">
-&ftp;/autoconf-&autoconf-version;.tar.bz2</ulink>
-<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2">
-&http;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&ftp;/autoconf-&autoconf-version;.tar.bz2">&ftp;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2">&http;/autoconf-&autoconf-version;.tar.bz2</ulink>
diff --git a/chapter04/automake.xml b/chapter04/automake.xml
index 767887ea3..9304cb35d 100644
--- a/chapter04/automake.xml
+++ b/chapter04/automake.xml
@@ -1,6 +1,4 @@
Automake (&automake-version;) - &automake-size;:
-<ulink url="&ftp;/automake-&automake-version;.tar.bz2">
-&ftp;/automake-&automake-version;.tar.bz2</ulink>
-<ulink url="&http;/automake-&automake-version;.tar.bz2">
-&http;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&ftp;/automake-&automake-version;.tar.bz2">&ftp;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&http;/automake-&automake-version;.tar.bz2">&http;/automake-&automake-version;.tar.bz2</ulink>
diff --git a/chapter04/bash.xml b/chapter04/bash.xml
index f900ba134..c2ea9d93f 100644
--- a/chapter04/bash.xml
+++ b/chapter04/bash.xml
@@ -1,6 +1,4 @@
Bash (&bash-version;) - &bash-size;:
-<ulink url="&ftp;/bash-&bash-version;.tar.bz2">
-&ftp;/bash-&bash-version;.tar.bz2</ulink>
-<ulink url="&http;/bash-&bash-version;.tar.bz2">
-&http;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bash-&bash-version;.tar.bz2">&ftp;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&http;/bash-&bash-version;.tar.bz2">&http;/bash-&bash-version;.tar.bz2</ulink>
diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml
index 2ad1d7912..c5640ad87 100644
--- a/chapter04/bin86.xml
+++ b/chapter04/bin86.xml
@@ -1,6 +1,4 @@
Bin86 (&bin86-version;) - &bin86-size;:
-<ulink url="&ftp;/bin86-&bin86-version;.tar.bz2">
-&ftp;/bin86-&bin86-version;.tar.bz2</ulink>
-<ulink url="&http;/bin86-&bin86-version;.tar.bz2">
-&http;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bin86-&bin86-version;.tar.bz2">&ftp;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&http;/bin86-&bin86-version;.tar.bz2">&http;/bin86-&bin86-version;.tar.bz2</ulink>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index 0bb181119..8432e3bf8 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,6 +1,4 @@
Binutils (&binutils-version;) - &binutils-size;:
-<ulink url="&ftp;/binutils-&binutils-version;.tar.bz2">
-&ftp;/binutils-&binutils-version;.tar.bz2</ulink>
-<ulink url="&http;/binutils-&binutils-version;.tar.bz2">
-&http;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/binutils-&binutils-version;.tar.bz2">&ftp;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&http;/binutils-&binutils-version;.tar.bz2">&http;/binutils-&binutils-version;.tar.bz2</ulink>
diff --git a/chapter04/bison.xml b/chapter04/bison.xml
index 40a39b993..013d31dc1 100644
--- a/chapter04/bison.xml
+++ b/chapter04/bison.xml
@@ -1,6 +1,4 @@
Bison (&bison-version;) - &bison-size;:
-<ulink url="&ftp;/bison-&bison-version;.tar.bz2">
-&ftp;/bison-&bison-version;.tar.bz2</ulink>
-<ulink url="&http;/bison-&bison-version;.tar.bz2">
-&http;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bison-&bison-version;.tar.bz2">&ftp;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&http;/bison-&bison-version;.tar.bz2">&http;/bison-&bison-version;.tar.bz2</ulink>
diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml
index d7fc95864..d6e672ac3 100644
--- a/chapter04/bzip2.xml
+++ b/chapter04/bzip2.xml
@@ -1,6 +1,4 @@
Bzip2 (&bzip2-version;) - &bzip2-size;:
-<ulink url="&ftp;/bzip2-&bzip2-version;.tar.bz2">
-&ftp;/bzip2-&bzip2-version;.tar.bz2</ulink>
-<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2">
-&http;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bzip2-&bzip2-version;.tar.bz2">&ftp;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2">&http;/bzip2-&bzip2-version;.tar.bz2</ulink>
diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml
index 402c3022c..4214ea2c4 100644
--- a/chapter04/diffutils.xml
+++ b/chapter04/diffutils.xml
@@ -1,6 +1,4 @@
Diff Utils (&diffutils-version;) - &diffutils-size;:
-<ulink url="&ftp;/diffutils-&diffutils-version;.tar.bz2">
-&ftp;/diffutils-&diffutils-version;.tar.bz2</ulink>
-<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2">
-&http;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/diffutils-&diffutils-version;.tar.bz2">&ftp;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2">&http;/diffutils-&diffutils-version;.tar.bz2</ulink>
diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml
index 84538f390..24c7f6978 100644
--- a/chapter04/e2fsprogs.xml
+++ b/chapter04/e2fsprogs.xml
@@ -1,6 +1,4 @@
E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:
-<ulink url="&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
-&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
-<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
-&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2">&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2">&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
diff --git a/chapter04/ed.xml b/chapter04/ed.xml
index ec7336862..7c91a8996 100644
--- a/chapter04/ed.xml
+++ b/chapter04/ed.xml
@@ -1,6 +1,4 @@
Ed (&ed-version;) - &ed-size;:
-<ulink url="&ftp;/ed-&ed-version;.tar.bz2">
-&ftp;/ed-&ed-version;.tar.bz2</ulink>
-<ulink url="&http;/ed-&ed-version;.tar.bz2">
-&http;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&ftp;/ed-&ed-version;.tar.bz2">&ftp;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&http;/ed-&ed-version;.tar.bz2">&http;/ed-&ed-version;.tar.bz2</ulink>
diff --git a/chapter04/file.xml b/chapter04/file.xml
index 882854be6..ccdc1f236 100644
--- a/chapter04/file.xml
+++ b/chapter04/file.xml
@@ -1,7 +1,5 @@
File (&file-version;) - &file-size;:
-<ulink url="&ftp;/file-&file-version;.tar.bz2">
-&ftp;/file-&file-version;.tar.bz2</ulink>
-<ulink url="&http;/file-&file-version;.tar.bz2">
-&http;/file-&file-version;.tar.bz2</ulink>
+<ulink url="&ftp;/file-&file-version;.tar.bz2">&ftp;/file-&file-version;.tar.bz2</ulink>
+<ulink url="&http;/file-&file-version;.tar.bz2">&http;/file-&file-version;.tar.bz2</ulink>
diff --git a/chapter04/fileutils.xml b/chapter04/fileutils.xml
index cfa7140a6..92717b29b 100644
--- a/chapter04/fileutils.xml
+++ b/chapter04/fileutils.xml
@@ -1,6 +1,4 @@
File Utils (&fileutils-version;) - &fileutils-size;:
-<ulink url="&ftp;/fileutils-&fileutils-version;.tar.bz2">
-&ftp;/fileutils-&fileutils-version;.tar.bz2</ulink>
-<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2">
-&http;/fileutils-&fileutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/fileutils-&fileutils-version;.tar.bz2">&ftp;/fileutils-&fileutils-version;.tar.bz2</ulink>
+<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2">&http;/fileutils-&fileutils-version;.tar.bz2</ulink>
diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml
index ca603e94c..41e712a83 100644
--- a/chapter04/findutils-patch.xml
+++ b/chapter04/findutils-patch.xml
@@ -1,6 +1,4 @@
Find Utils Patch (&findutils-version;) - &findutils-size;:
-<ulink url="&ftp;/findutils-&findutils-version;.patch.bz2">
-&ftp;/findutils-&findutils-version;.patch.bz2</ulink>
-<ulink url="&http;/findutils-&findutils-version;.patch.bz2">
-&http;/findutils-&findutils-version;.patch.bz2</ulink>
+<ulink url="&ftp;/findutils-&findutils-version;.patch.bz2">&ftp;/findutils-&findutils-version;.patch.bz2</ulink>
+<ulink url="&http;/findutils-&findutils-version;.patch.bz2">&http;/findutils-&findutils-version;.patch.bz2</ulink>
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
index c36ee7b86..14416b57a 100644
--- a/chapter04/findutils.xml
+++ b/chapter04/findutils.xml
@@ -1,6 +1,4 @@
Find Utils (&findutils-version;) - &findutils-size;:
-<ulink url="&ftp;/findutils-&findutils-version;.tar.bz2">
-&ftp;/findutils-&findutils-version;.tar.bz2</ulink>
-<ulink url="&http;/findutils-&findutils-version;.tar.bz2">
-&http;/findutils-&findutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/findutils-&findutils-version;.tar.bz2">&ftp;/findutils-&findutils-version;.tar.bz2</ulink>
+<ulink url="&http;/findutils-&findutils-version;.tar.bz2">&http;/findutils-&findutils-version;.tar.bz2</ulink>
diff --git a/chapter04/flex.xml b/chapter04/flex.xml
index 8092a1841..39de1f18d 100644
--- a/chapter04/flex.xml
+++ b/chapter04/flex.xml
@@ -1,6 +1,4 @@
Flex (&flex-version;) - &flex-size;:
-<ulink url="&ftp;/flex-&flex-version;.tar.bz2">
-&ftp;/flex-&flex-version;.tar.bz2</ulink>
-<ulink url="&http;/flex-&flex-version;.tar.bz2">
-&http;/flex-&flex-version;.tar.bz2</ulink>
+<ulink url="&ftp;/flex-&flex-version;.tar.bz2">&ftp;/flex-&flex-version;.tar.bz2</ulink>
+<ulink url="&http;/flex-&flex-version;.tar.bz2">&http;/flex-&flex-version;.tar.bz2</ulink>
diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml
index 34ba4ef19..09a24c068 100644
--- a/chapter04/gcc-patch.xml
+++ b/chapter04/gcc-patch.xml
@@ -1,6 +1,4 @@
GCC Patch (&gcc-version;) - &gcc-patch-size;:
-<ulink url="&ftp;/gcc-&gcc-version;.patch.bz2">
-&ftp;/gcc-&gcc-version;.patch.bz2</ulink>
-<ulink url="&http;/gcc-&gcc-version;.patch.bz2">
-&http;/gcc-&gcc-version;.patch.bz2</ulink>
+<ulink url="&ftp;/gcc-&gcc-version;.patch.bz2">&ftp;/gcc-&gcc-version;.patch.bz2</ulink>
+<ulink url="&http;/gcc-&gcc-version;.patch.bz2">&http;/gcc-&gcc-version;.patch.bz2</ulink>
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index 492e2d7eb..6fdb2869b 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -1,6 +1,4 @@
GCC (&gcc-version;) - &gcc-size;:
-<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2">
-&ftp;/gcc-&gcc-version;.tar.bz2</ulink>
-<ulink url="&http;/gcc-&gcc-version;.tar.bz2">
-&http;/gcc-&gcc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2">&ftp;/gcc-&gcc-version;.tar.bz2</ulink>
+<ulink url="&http;/gcc-&gcc-version;.tar.bz2">&http;/gcc-&gcc-version;.tar.bz2</ulink>
diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml
index 5914bdadc..c3bcdf980 100644
--- a/chapter04/gettext.xml
+++ b/chapter04/gettext.xml
@@ -1,6 +1,4 @@
Gettext (&gettext-version;) - &gettext-size;:
-<ulink url="&ftp;/gettext-&gettext-version;.tar.bz2">
-&ftp;/gettext-&gettext-version;.tar.bz2</ulink>
-<ulink url="&http;/gettext-&gettext-version;.tar.bz2">
-&http;/gettext-&gettext-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gettext-&gettext-version;.tar.bz2">&ftp;/gettext-&gettext-version;.tar.bz2</ulink>
+<ulink url="&http;/gettext-&gettext-version;.tar.bz2">&http;/gettext-&gettext-version;.tar.bz2</ulink>
diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml
index d9475d578..1da3d1b5b 100644
--- a/chapter04/glibc-threads.xml
+++ b/chapter04/glibc-threads.xml
@@ -1,6 +1,4 @@
Glibc-linuxthreads (&glibc-version;) - &glibc-threads-size;:
-<ulink url="&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2">
-&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
-<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2">
-&http;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2">&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2">&http;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml
index e3cc063da..f3502eb6e 100644
--- a/chapter04/glibc.xml
+++ b/chapter04/glibc.xml
@@ -1,6 +1,4 @@
Glibc (&glibc-version;) - &glibc-size;:
-<ulink url="&ftp;/glibc-&glibc-version;.tar.bz2">
-&ftp;/glibc-&glibc-version;.tar.bz2</ulink>
-<ulink url="&http;/glibc-&glibc-version;.tar.bz2">
-&http;/glibc-&glibc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/glibc-&glibc-version;.tar.bz2">&ftp;/glibc-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http;/glibc-&glibc-version;.tar.bz2">&http;/glibc-&glibc-version;.tar.bz2</ulink>
diff --git a/chapter04/grep.xml b/chapter04/grep.xml
index a0523b2cf..20a4bc43b 100644
--- a/chapter04/grep.xml
+++ b/chapter04/grep.xml
@@ -1,6 +1,4 @@
Grep (&grep-version;) - &grep-size;:
-<ulink url="&ftp;/grep-&grep-version;.tar.bz2">
-&ftp;/grep-&grep-version;.tar.bz2</ulink>
-<ulink url="&http;/grep-&grep-version;.tar.bz2">
-&http;/grep-&grep-version;.tar.bz2</ulink>
+<ulink url="&ftp;/grep-&grep-version;.tar.bz2">&ftp;/grep-&grep-version;.tar.bz2</ulink>
+<ulink url="&http;/grep-&grep-version;.tar.bz2">&http;/grep-&grep-version;.tar.bz2</ulink>
diff --git a/chapter04/groff.xml b/chapter04/groff.xml
index d330af586..faa1ba6c5 100644
--- a/chapter04/groff.xml
+++ b/chapter04/groff.xml
@@ -1,6 +1,4 @@
Groff (&groff-version;) - &groff-size;:
-<ulink url="&ftp;/groff-&groff-version;.tar.bz2">
-&ftp;/groff-&groff-version;.tar.bz2</ulink>
-<ulink url="&http;/groff-&groff-version;.tar.bz2">
-&http;/groff-&groff-version;.tar.bz2</ulink>
+<ulink url="&ftp;/groff-&groff-version;.tar.bz2">&ftp;/groff-&groff-version;.tar.bz2</ulink>
+<ulink url="&http;/groff-&groff-version;.tar.bz2">&http;/groff-&groff-version;.tar.bz2</ulink>
diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml
index fe38d012b..0cceaea3c 100644
--- a/chapter04/gzip-patch.xml
+++ b/chapter04/gzip-patch.xml
@@ -1,6 +1,4 @@
Gzip Patch (&gzip-version;) - &gzip-patch-size;:
-<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2">
-&ftp;/gzip-&gzip-version;.patch.bz2</ulink>
-<ulink url="&http;/gzip-&gzip-version;.patch.bz2">
-&http;/gzip-&gzip-version;.patch.bz2</ulink>
+<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2">&ftp;/gzip-&gzip-version;.patch.bz2</ulink>
+<ulink url="&http;/gzip-&gzip-version;.patch.bz2">&http;/gzip-&gzip-version;.patch.bz2</ulink>
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
index d1ac3c7db..1b79ca635 100644
--- a/chapter04/gzip.xml
+++ b/chapter04/gzip.xml
@@ -1,6 +1,4 @@
Gzip (&gzip-version;) - &gzip-size;:
-<ulink url="&ftp;/gzip-&gzip-version;.tar.bz2">
-&ftp;/gzip-&gzip-version;.tar.bz2</ulink>
-<ulink url="&http;/gzip-&gzip-version;.tar.bz2">
-&http;/gzip-&gzip-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gzip-&gzip-version;.tar.bz2">&ftp;/gzip-&gzip-version;.tar.bz2</ulink>
+<ulink url="&http;/gzip-&gzip-version;.tar.bz2">&http;/gzip-&gzip-version;.tar.bz2</ulink>
diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml
index 12fb9f13b..83b69e8a1 100644
--- a/chapter04/introduction.xml
+++ b/chapter04/introduction.xml
@@ -1,41 +1,33 @@
<sect1 id="ch03-introduction">
<title>Introduction</title>
-<para>
-Below is a list of all the packages that are needed to download for building
-the basic system. The version numbers printed correspond to versions of
+<para>Below is a list of all the packages that are needed to download for
+building the basic system. The version numbers printed correspond to versions of
the software that is known to work and which this book is based on.
If you
experience problems which you can't solve yourself, then please download the
version that
-is assumed in this book (in case you downloaded a newer version).
-</para>
+is assumed in this book (in case you downloaded a newer version).</para>
-<para>
-If the packages.linuxfromscratch.org server isn't allowing connections
+<para>If the packages.linuxfromscratch.org server isn't allowing connections
anymore try one of our mirror sites. The addresses of the mirror sites
can be found in <ulink url="ch01-version.html">Chapter 1 - Book
-Version</ulink>
-</para>
+Version</ulink></para>
-<para>
-We have provided a list of official download sites of the packages below
+<para>We have provided a list of official download sites of the packages below
in <ulink url="appendixc.html">Appendix C - Official download locations
</ulink>. The LFS FTP archive only contains the versions of packages
that are recommended for use in this book. You can check the official
sites in Appendix C to determine whether a newer package is available.
If you do download a newer package, we would appreciate hearing
whether you were able to install the package using this book's
-instructions or not.
-</para>
+instructions or not.</para>
-<para>
-Please note that all files downloaded from the LFS FTP archive are files
+<para>Please note that all files downloaded from the LFS FTP archive are files
compressed with bzip2 instead of gz. If you don't know how to
handle bz2 files, check out
<ulink url="ch02-install.html">Chapter 2 - How to install the
-software</ulink>.
-</para>
+software</ulink>.</para>
</sect1>
diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml
index 30ed9cbfd..2784baa0b 100644
--- a/chapter04/kbd.xml
+++ b/chapter04/kbd.xml
@@ -1,6 +1,4 @@
Kbd (&kbd-version;) - &kbd-size;:
-<ulink url="&ftp;/kbd-&kbd-version;.tar.bz2">
-&ftp;/kbd-&kbd-version;.tar.bz2</ulink>
-<ulink url="&http;/kbd-&kbd-version;.tar.bz2">
-&http;/kbd-&kbd-version;.tar.bz2</ulink>
+<ulink url="&ftp;/kbd-&kbd-version;.tar.bz2">&ftp;/kbd-&kbd-version;.tar.bz2</ulink>
+<ulink url="&http;/kbd-&kbd-version;.tar.bz2">&http;/kbd-&kbd-version;.tar.bz2</ulink>
diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml
index b7baa71bc..5b80427eb 100644
--- a/chapter04/kernel.xml
+++ b/chapter04/kernel.xml
@@ -1,6 +1,4 @@
Linux Kernel (&kernel-version;) - &kernel-size;:
-<ulink url="&ftp;/linux-&kernel-version;.tar.bz2">
-&ftp;/linux-&kernel-version;.tar.bz2</ulink>
-<ulink url="&http;/linux-&kernel-version;.tar.bz2">
-&http;/linux-&kernel-version;.tar.bz2</ulink>
+<ulink url="&ftp;/linux-&kernel-version;.tar.bz2">&ftp;/linux-&kernel-version;.tar.bz2</ulink>
+<ulink url="&http;/linux-&kernel-version;.tar.bz2">&http;/linux-&kernel-version;.tar.bz2</ulink>
diff --git a/chapter04/less.xml b/chapter04/less.xml
index 834b11af2..0d923f4cf 100644
--- a/chapter04/less.xml
+++ b/chapter04/less.xml
@@ -1,6 +1,4 @@
Less (&less-version;) - &less-size;:
-<ulink url="&ftp;/less-&less-version;.tar.bz2">
-&ftp;/less-&less-version;.tar.bz2</ulink>
-<ulink url="&http;/less-&less-version;.tar.bz2">
-&http;/less-&less-version;.tar.bz2</ulink>
+<ulink url="&ftp;/less-&less-version;.tar.bz2">&ftp;/less-&less-version;.tar.bz2</ulink>
+<ulink url="&http;/less-&less-version;.tar.bz2">&http;/less-&less-version;.tar.bz2</ulink>
diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml
index dc6f40da4..c6cce7251 100644
--- a/chapter04/libtool.xml
+++ b/chapter04/libtool.xml
@@ -1,6 +1,4 @@
Libtool (&libtool-version;) - &libtool-size;:
-<ulink url="&ftp;/libtool-&libtool-version;.tar.bz2">
-&ftp;/libtool-&libtool-version;.tar.bz2</ulink>
-<ulink url="&http;/libtool-&libtool-version;.tar.bz2">
-&http;/libtool-&libtool-version;.tar.bz2</ulink>
+<ulink url="&ftp;/libtool-&libtool-version;.tar.bz2">&ftp;/libtool-&libtool-version;.tar.bz2</ulink>
+<ulink url="&http;/libtool-&libtool-version;.tar.bz2">&http;/libtool-&libtool-version;.tar.bz2</ulink>
diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml
index 2c05b48c3..a8a0be3ec 100644
--- a/chapter04/lilo.xml
+++ b/chapter04/lilo.xml
@@ -1,6 +1,4 @@
Lilo (&lilo-version;) - &lilo-size;:
-<ulink url="&ftp;/lilo-&lilo-version;.tar.bz2">
-&ftp;/lilo-&lilo-version;.tar.bz2</ulink>
-<ulink url="&http;/lilo-&lilo-version;.tar.bz2">
-&http;/lilo-&lilo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/lilo-&lilo-version;.tar.bz2">&ftp;/lilo-&lilo-version;.tar.bz2</ulink>
+<ulink url="&http;/lilo-&lilo-version;.tar.bz2">&http;/lilo-&lilo-version;.tar.bz2</ulink>
diff --git a/chapter04/m4.xml b/chapter04/m4.xml
index 8ee58b48c..53ffdebb0 100644
--- a/chapter04/m4.xml
+++ b/chapter04/m4.xml
@@ -1,6 +1,4 @@
M4 (&m4-version;) - &m4-size;:
-<ulink url="&ftp;/m4-&m4-version;.tar.bz2">
-&ftp;/m4-&m4-version;.tar.bz2</ulink>
-<ulink url="&http;/m4-&m4-version;.tar.bz2">
-&http;/m4-&m4-version;.tar.bz2</ulink>
+<ulink url="&ftp;/m4-&m4-version;.tar.bz2">&ftp;/m4-&m4-version;.tar.bz2</ulink>
+<ulink url="&http;/m4-&m4-version;.tar.bz2">&http;/m4-&m4-version;.tar.bz2</ulink>
diff --git a/chapter04/make.xml b/chapter04/make.xml
index 68d18e134..99c2d0a4a 100644
--- a/chapter04/make.xml
+++ b/chapter04/make.xml
@@ -1,6 +1,4 @@
Make (&make-version;) - &make-size;:
-<ulink url="&ftp;/make-&make-version;.tar.bz2">
-&ftp;/make-&make-version;.tar.bz2</ulink>
-<ulink url="&http;/make-&make-version;.tar.bz2">
-&http;/make-&make-version;.tar.bz2</ulink>
+<ulink url="&ftp;/make-&make-version;.tar.bz2">&ftp;/make-&make-version;.tar.bz2</ulink>
+<ulink url="&http;/make-&make-version;.tar.bz2">&http;/make-&make-version;.tar.bz2</ulink>
diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml
index 9931e4fd5..00daa67a3 100644
--- a/chapter04/makedev.xml
+++ b/chapter04/makedev.xml
@@ -1,6 +1,4 @@
MAKEDEV (&makedev-version;) - &makedev-size;:
-<ulink url="&ftp;/MAKEDEV-&makedev-version;.bz2">
-&ftp;/MAKEDEV-&makedev-version;.bz2</ulink>
-<ulink url="&http;/MAKEDEV-$makedev-version;.bz2">
-&http;/MAKEDEV-&makedev-version;.bz2</ulink>
+<ulink url="&ftp;/MAKEDEV-&makedev-version;.bz2">&ftp;/MAKEDEV-&makedev-version;.bz2</ulink>
+<ulink url="&http;/MAKEDEV-$makedev-version;.bz2">&http;/MAKEDEV-&makedev-version;.bz2</ulink>
diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml
index e1e4be735..3b191c374 100644
--- a/chapter04/man-patch.xml
+++ b/chapter04/man-patch.xml
@@ -1,6 +1,4 @@
Man Patch (&man-version;) - &man-patch-size;:
-<ulink url="&ftp;/man-&man-version;.patch.bz2">
-&ftp;/man-&man-version;.patch.bz2</ulink>
-<ulink url="&http;/man-&man-version;.patch.bz2">
-&http;/man-&man-version;.patch.bz2</ulink>
+<ulink url="&ftp;/man-&man-version;.patch.bz2">&ftp;/man-&man-version;.patch.bz2</ulink>
+<ulink url="&http;/man-&man-version;.patch.bz2">&http;/man-&man-version;.patch.bz2</ulink>
diff --git a/chapter04/man.xml b/chapter04/man.xml
index 97ff25789..a719276d0 100644
--- a/chapter04/man.xml
+++ b/chapter04/man.xml
@@ -1,6 +1,4 @@
Man (&man-version;) - &man-size;:
-<ulink url="&ftp;/man-&man-version;.tar.bz2">
-&ftp;/man-&man-version;.tar.bz2</ulink>
-<ulink url="&http;/man-&man-version;.tar.bz2">
-&http;/man-&man-version;.tar.bz2</ulink>
+<ulink url="&ftp;/man-&man-version;.tar.bz2">&ftp;/man-&man-version;.tar.bz2</ulink>
+<ulink url="&http;/man-&man-version;.tar.bz2">&http;/man-&man-version;.tar.bz2</ulink>
diff --git a/chapter04/manpages-patch.xml b/chapter04/manpages-patch.xml
index 52bad5c67..d82920b08 100644
--- a/chapter04/manpages-patch.xml
+++ b/chapter04/manpages-patch.xml
@@ -1,6 +1,4 @@
Man-pages Patch (&man-pages-version;) - &man-pages-patch-size;:
-<ulink url="&ftp;/man-pages-&man-pages-version;.patch.bz2">
- &ftp;/man-pages-&man-pages-version;.patch.bz2</ulink>
-<ulink url="&http;/man-pages-&man-pages-version;.patch.bz2">
- &http;/man-pages-&man-pages-version;.patch.bz2</ulink>
+<ulink url="&ftp;/man-pages-&man-pages-version;.patch.bz2">&ftp;/man-pages-&man-pages-version;.patch.bz2</ulink>
+<ulink url="&http;/man-pages-&man-pages-version;.patch.bz2">&http;/man-pages-&man-pages-version;.patch.bz2</ulink>
diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml
index 81dfd736d..31d33ed3b 100644
--- a/chapter04/manpages.xml
+++ b/chapter04/manpages.xml
@@ -1,6 +1,4 @@
Man-pages (&man-pages-version;) - &man-pages-size;:
-<ulink url="&ftp;/man-pages-&man-pages-version;.tar.bz2">
-&ftp;/man-pages-&man-pages-version;.tar.bz2</ulink>
-<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2">
-&http;/man-pages-&man-pages-version;.tar.bz2</ulink>
+<ulink url="&ftp;/man-pages-&man-pages-version;.tar.bz2">&ftp;/man-pages-&man-pages-version;.tar.bz2</ulink>
+<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2">&http;/man-pages-&man-pages-version;.tar.bz2</ulink>
diff --git a/chapter04/mawk.xml b/chapter04/mawk.xml
index 7da3e1287..b54ea11e4 100644
--- a/chapter04/mawk.xml
+++ b/chapter04/mawk.xml
@@ -1,6 +1,4 @@
Mawk (&mawk-version;) - &mawk-size;:
-<ulink url="&ftp;/mawk&mawk-version;.tar.bz2">
-&ftp;/mawk&mawk-version;.tar.bz2</ulink>
-<ulink url="&http;/mawk&mawk-version;.tar.bz2">
-&http;/mawk&mawk-version;.tar.bz2</ulink>
+<ulink url="&ftp;/mawk&mawk-version;.tar.bz2">&ftp;/mawk&mawk-version;.tar.bz2</ulink>
+<ulink url="&http;/mawk&mawk-version;.tar.bz2">&http;/mawk&mawk-version;.tar.bz2</ulink>
diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml
index 69c23dc10..8e17a38c8 100644
--- a/chapter04/modutils.xml
+++ b/chapter04/modutils.xml
@@ -1,6 +1,4 @@
Modutils (&modutils-version;) - &modutils-size;:
-<ulink url="&ftp;/modutils-&modutils-version;.tar.bz2">
-&ftp;/modutils-&modutils-version;.tar.bz2</ulink>
-<ulink url="&http;/modutils-&modutils-version;.tar.bz2">
-&http;/modutils-&modutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/modutils-&modutils-version;.tar.bz2">&ftp;/modutils-&modutils-version;.tar.bz2</ulink>
+<ulink url="&http;/modutils-&modutils-version;.tar.bz2">&http;/modutils-&modutils-version;.tar.bz2</ulink>
diff --git a/chapter04/ncurses-patch.xml b/chapter04/ncurses-patch.xml
index 8f4226b25..80646f189 100644
--- a/chapter04/ncurses-patch.xml
+++ b/chapter04/ncurses-patch.xml
@@ -1,6 +1,4 @@
Ncurses Patch (&ncurses-version;) - &ncurses-patch-size;:
-<ulink url="&ftp;/ncurses-&ncurses-version;.patch.bz2">
-&ftp;/ncurses-&ncurses-version;.patch.bz2</ulink>
-<ulink url="&http;/ncurses-&ncurses-version;.patch.bz2">
-&http;/ncurses-&ncurses-version;.patch.bz2</ulink>
+<ulink url="&ftp;/ncurses-&ncurses-version;.patch.bz2">&ftp;/ncurses-&ncurses-version;.patch.bz2</ulink>
+<ulink url="&http;/ncurses-&ncurses-version;.patch.bz2">&http;/ncurses-&ncurses-version;.patch.bz2</ulink>
diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml
index 225ac62cc..e1d2cf382 100644
--- a/chapter04/ncurses.xml
+++ b/chapter04/ncurses.xml
@@ -1,6 +1,4 @@
Ncurses (&ncurses-version;) - &ncurses-size;:
-<ulink url="&ftp;/ncurses-&ncurses-version;.tar.bz2">
-&ftp;/ncurses-&ncurses-version;.tar.bz2</ulink>
-<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2">
-&http;/ncurses-&ncurses-version;.tar.bz2</ulink>
+<ulink url="&ftp;/ncurses-&ncurses-version;.tar.bz2">&ftp;/ncurses-&ncurses-version;.tar.bz2</ulink>
+<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2">&http;/ncurses-&ncurses-version;.tar.bz2</ulink>
diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml
index 5857393a0..01cbf64d8 100644
--- a/chapter04/netkitbase.xml
+++ b/chapter04/netkitbase.xml
@@ -1,6 +1,4 @@
Netkit-base (&netkit-base-version;) - &netkit-base-size;:
-<ulink url="&ftp;/netkit-base-&netkit-base-version;.tar.bz2">
-&ftp;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
-<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2">
-&http;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
+<ulink url="&ftp;/netkit-base-&netkit-base-version;.tar.bz2">&ftp;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
+<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2">&http;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml
index ca4299480..9adda8efd 100644
--- a/chapter04/nettools.xml
+++ b/chapter04/nettools.xml
@@ -1,6 +1,4 @@
Net-tools (&net-tools-version;) - &net-tools-size;:
-<ulink url="&ftp;/net-tools-&net-tools-version;.tar.bz2">
-&ftp;/net-tools-&net-tools-version;.tar.bz2</ulink>
-<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2">
-&http;/net-tools-&net-tools-version;.tar.bz2</ulink>
+<ulink url="&ftp;/net-tools-&net-tools-version;.tar.bz2">&ftp;/net-tools-&net-tools-version;.tar.bz2</ulink>
+<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2">&http;/net-tools-&net-tools-version;.tar.bz2</ulink>
diff --git a/chapter04/patch.xml b/chapter04/patch.xml
index 5328766ca..6c4611b55 100644
--- a/chapter04/patch.xml
+++ b/chapter04/patch.xml
@@ -1,6 +1,4 @@
Patch (&patch-version;) - &patch-size;:
-<ulink url="&ftp;/patch-&patch-version;.tar.bz2">
-&ftp;/patch-&patch-version;.tar.bz2</ulink>
-<ulink url="&http;/patch-&patch-version;.tar.bz2">
-&http;/patch-&patch-version;.tar.bz2</ulink>
+<ulink url="&ftp;/patch-&patch-version;.tar.bz2">&ftp;/patch-&patch-version;.tar.bz2</ulink>
+<ulink url="&http;/patch-&patch-version;.tar.bz2">&http;/patch-&patch-version;.tar.bz2</ulink>
diff --git a/chapter04/perl.xml b/chapter04/perl.xml
index 0619a6ba8..47569e100 100644
--- a/chapter04/perl.xml
+++ b/chapter04/perl.xml
@@ -1,6 +1,4 @@
Perl (&perl-version;) - &perl-size;:
-<ulink url="&ftp;/perl-&perl-version;.tar.bz2">
-&ftp;/perl-&perl-version;.tar.bz2</ulink>
-<ulink url="&http;/perl-&perl-version;.tar.bz2">
-&http;/perl-&perl-version;.tar.bz2</ulink>
+<ulink url="&ftp;/perl-&perl-version;.tar.bz2">&ftp;/perl-&perl-version;.tar.bz2</ulink>
+<ulink url="&http;/perl-&perl-version;.tar.bz2">&http;/perl-&perl-version;.tar.bz2</ulink>
diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml
index e20b55318..b7d1e6074 100644
--- a/chapter04/procinfo.xml
+++ b/chapter04/procinfo.xml
@@ -1,6 +1,4 @@
Procinfo (&procinfo-version;) - &procinfo-size;:
-<ulink url="&ftp;/procinfo-&procinfo-version;.tar.bz2">
-&ftp;/procinfo-&procinfo-version;.tar.bz2</ulink>
-<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2">
-&http;/procinfo-&procinfo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/procinfo-&procinfo-version;.tar.bz2">&ftp;/procinfo-&procinfo-version;.tar.bz2</ulink>
+<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2">&http;/procinfo-&procinfo-version;.tar.bz2</ulink>
diff --git a/chapter04/procps.xml b/chapter04/procps.xml
index bd15fa2e9..bbd22dc57 100644
--- a/chapter04/procps.xml
+++ b/chapter04/procps.xml
@@ -1,6 +1,4 @@
Procps (&procps-version;) - &procps-size;:
-<ulink url="&ftp;/procps-&procps-version;.tar.bz2">
-&ftp;/procps-&procps-version;.tar.bz2</ulink>
-<ulink url="&http;/procps-&procps-version;.tar.bz2">
-&http;/procps-&procps-version;.tar.bz2</ulink>
+<ulink url="&ftp;/procps-&procps-version;.tar.bz2">&ftp;/procps-&procps-version;.tar.bz2</ulink>
+<ulink url="&http;/procps-&procps-version;.tar.bz2">&http;/procps-&procps-version;.tar.bz2</ulink>
diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml
index d7b528674..e1d95f5b1 100644
--- a/chapter04/psmisc.xml
+++ b/chapter04/psmisc.xml
@@ -1,6 +1,4 @@
Psmisc (&psmisc-version;) - &psmisc-size;:
-<ulink url="&ftp;/psmisc-&psmisc-version;.tar.bz2">
-&ftp;/psmisc-&psmisc-version;.tar.bz2</ulink>
-<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2">
-&http;/psmisc-&psmisc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/psmisc-&psmisc-version;.tar.bz2">&ftp;/psmisc-&psmisc-version;.tar.bz2</ulink>
+<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2">&http;/psmisc-&psmisc-version;.tar.bz2</ulink>
diff --git a/chapter04/sed.xml b/chapter04/sed.xml
index b60cfcc89..49ac970aa 100644
--- a/chapter04/sed.xml
+++ b/chapter04/sed.xml
@@ -1,6 +1,4 @@
Sed (&sed-version;) - &sed-size;:
-<ulink url="&ftp;/sed-&sed-version;.tar.bz2">
-&ftp;/sed-&sed-version;.tar.bz2</ulink>
-<ulink url="&http;/sed-&sed-version;.tar.bz2">
-&http;/sed-&sed-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sed-&sed-version;.tar.bz2">&ftp;/sed-&sed-version;.tar.bz2</ulink>
+<ulink url="&http;/sed-&sed-version;.tar.bz2">&http;/sed-&sed-version;.tar.bz2</ulink>
diff --git a/chapter04/shadowpwd-patch.xml b/chapter04/shadowpwd-patch.xml
index 7ebace2ba..577d66015 100644
--- a/chapter04/shadowpwd-patch.xml
+++ b/chapter04/shadowpwd-patch.xml
@@ -1,6 +1,4 @@
Shadow Password Suite Patch (&shadow-version;) - &shadow-patch-size;:
-<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2">
-&ftp;/shadow-&shadow-version;.patch.bz2</ulink>
-<ulink url="&http;/shadow-&shadow-version;.patch.bz2">
-&http;/shadow-&shadow-version;.patch.bz2</ulink>
+<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2">&ftp;/shadow-&shadow-version;.patch.bz2</ulink>
+<ulink url="&http;/shadow-&shadow-version;.patch.bz2">&http;/shadow-&shadow-version;.patch.bz2</ulink>
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
index 0c763dcb8..b10cacf35 100644
--- a/chapter04/shadowpwd.xml
+++ b/chapter04/shadowpwd.xml
@@ -1,6 +1,4 @@
Shadow Password Suite (&shadow-version;) - &shadow-size;:
-<ulink url="&ftp;/shadow-&shadow-version;.tar.bz2">
-&ftp;/shadow-&shadow-version;.tar.bz2</ulink>
-<ulink url="&http;/shadow-&shadow-version;.tar.bz2">
-&http;/shadow-&shadow-version;.tar.bz2</ulink>
+<ulink url="&ftp;/shadow-&shadow-version;.tar.bz2">&ftp;/shadow-&shadow-version;.tar.bz2</ulink>
+<ulink url="&http;/shadow-&shadow-version;.tar.bz2">&http;/shadow-&shadow-version;.tar.bz2</ulink>
diff --git a/chapter04/shellutils-patch.xml b/chapter04/shellutils-patch.xml
index 07b48c256..8e16fdb78 100644
--- a/chapter04/shellutils-patch.xml
+++ b/chapter04/shellutils-patch.xml
@@ -1,6 +1,4 @@
Sh-utils Patch (&sh-utils-version;) - &sh-utils-patch-size;:
-<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2">
-&ftp;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
-<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2">
-&http;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
+<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2">&ftp;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
+<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2">&http;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
diff --git a/chapter04/shellutils.xml b/chapter04/shellutils.xml
index 4644c5346..bd138cf64 100644
--- a/chapter04/shellutils.xml
+++ b/chapter04/shellutils.xml
@@ -1,6 +1,4 @@
Sh-utils (&sh-utils-version;) - &sh-utils-size;:
-<ulink url="&ftp;/sh-utils-&sh-utils-version;.tar.bz2">
-&ftp;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
-<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2">
-&http;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sh-utils-&sh-utils-version;.tar.bz2">&ftp;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
+<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2">&http;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
index 82d6a0279..9b6847f54 100644
--- a/chapter04/sysklogd.xml
+++ b/chapter04/sysklogd.xml
@@ -1,6 +1,4 @@
Sysklogd (&sysklogd-version;) - &sysklogd-size;:
-<ulink url="&ftp;/sysklogd-&sysklogd-version;.tar.bz2">
-&ftp;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
-<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2">
-&http;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sysklogd-&sysklogd-version;.tar.bz2">&ftp;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
+<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2">&http;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
diff --git a/chapter04/sysvinit-patch.xml b/chapter04/sysvinit-patch.xml
index 295e33daa..5dc0de82f 100644
--- a/chapter04/sysvinit-patch.xml
+++ b/chapter04/sysvinit-patch.xml
@@ -1,6 +1,4 @@
Sysvinit Patch (&sysvinit-version;) - &sysvinit-patch-size;:
-<ulink url="&ftp;/sysvinit-&sysvinit-version;.patch.bz2">
-&ftp;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
-<ulink url="&http;/sysvinit-&sysvinit-version;.patch.bz2">
-&http;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
+<ulink url="&ftp;/sysvinit-&sysvinit-version;.patch.bz2">&ftp;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
+<ulink url="&http;/sysvinit-&sysvinit-version;.patch.bz2">&http;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml
index bdc23cb7a..73d5d99c4 100644
--- a/chapter04/sysvinit.xml
+++ b/chapter04/sysvinit.xml
@@ -1,6 +1,4 @@
Sysvinit (&sysvinit-version;) - &sysvinit-size;:
-<ulink url="&ftp;/sysvinit-&sysvinit-version;.tar.bz2">
-&ftp;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
-<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2">
-&http;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sysvinit-&sysvinit-version;.tar.bz2">&ftp;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
+<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2">&http;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml
index 7cfbd5fe3..65a083e4b 100644
--- a/chapter04/tar-patch.xml
+++ b/chapter04/tar-patch.xml
@@ -1,6 +1,4 @@
Tar Patch (&tar-version;) - &tar-patch-size;:
-<ulink url="&ftp;/gnutarpatch.txt.bz2">
-&ftp;/gnutarpatch.txt.bz2</ulink>
-<ulink url="&http;/gnutarpatch.txt.bz2">
-&http;/gnutarpatch.txt.bz2</ulink>
+<ulink url="&ftp;/gnutarpatch.txt.bz2">&ftp;/gnutarpatch.txt.bz2</ulink>
+<ulink url="&http;/gnutarpatch.txt.bz2">&http;/gnutarpatch.txt.bz2</ulink>
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
index 28288278f..901ba24d9 100644
--- a/chapter04/tar.xml
+++ b/chapter04/tar.xml
@@ -1,6 +1,4 @@
Tar (&tar-version;) - &tar-size;:
-<ulink url="&ftp;/tar-&tar-version;.tar.bz2">
-&ftp;/tar-&tar-version;.tar.bz2</ulink>
-<ulink url="&http;/tar-&tar-version;.tar.bz2">
-&http;/tar-&tar-version;.tar.bz2</ulink>
+<ulink url="&ftp;/tar-&tar-version;.tar.bz2">&ftp;/tar-&tar-version;.tar.bz2</ulink>
+<ulink url="&http;/tar-&tar-version;.tar.bz2">&http;/tar-&tar-version;.tar.bz2</ulink>
diff --git a/chapter04/texinfo-patch.xml b/chapter04/texinfo-patch.xml
index e9fb81b23..e0d6e8c92 100644
--- a/chapter04/texinfo-patch.xml
+++ b/chapter04/texinfo-patch.xml
@@ -1,6 +1,4 @@
Texinfo Patch (&texinfo-version;) - &texinfo-patch-size;:
-<ulink url="&ftp;/texinfo-&texinfo-version;.patch.bz2">
-&ftp;/texinfo-&texinfo-version;.patch.bz2</ulink>
-<ulink url="&http;/texinfo-&texinfo-version;.patch.bz2">
-&http;/texinfo-&texinfo-version;.patch.bz2</ulink>
+<ulink url="&ftp;/texinfo-&texinfo-version;.patch.bz2">&ftp;/texinfo-&texinfo-version;.patch.bz2</ulink>
+<ulink url="&http;/texinfo-&texinfo-version;.patch.bz2">&http;/texinfo-&texinfo-version;.patch.bz2</ulink>
diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml
index 5b51cc86a..0725c64a3 100644
--- a/chapter04/texinfo.xml
+++ b/chapter04/texinfo.xml
@@ -1,6 +1,4 @@
Texinfo (&texinfo-version;) - &texinfo-size;:
-<ulink url="&ftp;/texinfo-&texinfo-version;.tar.bz2">
-&ftp;/texinfo-&texinfo-version;.tar.bz2</ulink>
-<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2">
-&http;/texinfo-&texinfo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/texinfo-&texinfo-version;.tar.bz2">&ftp;/texinfo-&texinfo-version;.tar.bz2</ulink>
+<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2">&http;/texinfo-&texinfo-version;.tar.bz2</ulink>
diff --git a/chapter04/textutils.xml b/chapter04/textutils.xml
index b1d7f31fc..319fa06de 100644
--- a/chapter04/textutils.xml
+++ b/chapter04/textutils.xml
@@ -1,6 +1,4 @@
Text Utils (&textutils-version;) - &textutils-size;:
-<ulink url="&ftp;/textutils-&textutils-version;.tar.bz2">
-&ftp;/textutils-&textutils-version;.tar.bz2</ulink>
-<ulink url="&http;/textutils-&textutils-version;.tar.bz2">
-&http;/textutils-&textutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/textutils-&textutils-version;.tar.bz2">&ftp;/textutils-&textutils-version;.tar.bz2</ulink>
+<ulink url="&http;/textutils-&textutils-version;.tar.bz2">&http;/textutils-&textutils-version;.tar.bz2</ulink>
diff --git a/chapter04/toplevel.xml b/chapter04/toplevel.xml
index 761955676..ec26bbd8c 100644
--- a/chapter04/toplevel.xml
+++ b/chapter04/toplevel.xml
@@ -1,8 +1,6 @@
Browse FTP:
-<ulink url="&ftp-root;/">
-&ftp-root;/</ulink>
+<ulink url="&ftp-root;/">&ftp-root;/</ulink>
Browse HTTP:
-<ulink url="&http-root;/">
-&http-root;/</ulink>
+<ulink url="&http-root;/">&http-root;/</ulink>
diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml
index 76901392c..7fe704892 100644
--- a/chapter04/utillinux.xml
+++ b/chapter04/utillinux.xml
@@ -1,6 +1,4 @@
Util Linux (&util-linux-version;) - &util-linux-size;:
-<ulink url="&ftp;/util-linux-&util-linux-version;.tar.bz2">
-&ftp;/util-linux-&util-linux-version;.tar.bz2</ulink>
-<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2">
-&http;/util-linux-&util-linux-version;.tar.bz2</ulink>
+<ulink url="&ftp;/util-linux-&util-linux-version;.tar.bz2">&ftp;/util-linux-&util-linux-version;.tar.bz2</ulink>
+<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2">&http;/util-linux-&util-linux-version;.tar.bz2</ulink>
diff --git a/chapter04/vim.xml b/chapter04/vim.xml
index b22021b1c..6237cd2a3 100644
--- a/chapter04/vim.xml
+++ b/chapter04/vim.xml
@@ -1,12 +1,8 @@
Vim-rt (&vim-version;) - &vim-rt-size;:
-<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2">
-&ftp;/vim-&vim-version;-rt.tar.bz2</ulink>
-<ulink url="&http;/vim-&vim-version;-rt.tar.bz2">
-&http;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2">&ftp;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&http;/vim-&vim-version;-rt.tar.bz2">&http;/vim-&vim-version;-rt.tar.bz2</ulink>
Vim-src (&vim-version;) - &vim-src-size;:
-<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2">
-&ftp;/vim-&vim-version;-src.tar.bz2</ulink>
-<ulink url="&http;/vim-&vim-version;-src.tar.bz2">
-&http;/vim-&vim-version;-src.tar.bz2</ulink>
+<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2">&ftp;/vim-&vim-version;-src.tar.bz2</ulink>
+<ulink url="&http;/vim-&vim-version;-src.tar.bz2">&http;/vim-&vim-version;-src.tar.bz2</ulink>