sort out ulink tags (see my mail to lfs-book)

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

59 files changed, 118 insertions, 172 deletions

diff --git a/chapter04/all.xml b/chapter04/all.xml
index 8eb55be39..c0bf15e0d 100644
--- a/chapter04/all.xml
+++ b/chapter04/all.xml
@@ -3,8 +3,8 @@ used 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"/>
+<ulink url="&http;/lfs-packages-&all-version;.tar"/>
 
 
 Or download the following packages individually:
diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml
index e2fd4cee5..0c4f43a15 100644
--- a/chapter04/autoconf.xml
+++ b/chapter04/autoconf.xml
@@ -1,4 +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"/>
+<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2"/>
 
diff --git a/chapter04/automake.xml b/chapter04/automake.xml
index 9304cb35d..b75d3de9b 100644
--- a/chapter04/automake.xml
+++ b/chapter04/automake.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/automake-&automake-version;.tar.bz2"/>
diff --git a/chapter04/bash.xml b/chapter04/bash.xml
index c2ea9d93f..72f2ee87e 100644
--- a/chapter04/bash.xml
+++ b/chapter04/bash.xml
@@ -1,4 +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"/>
+<ulink url="&http;/bash-&bash-version;.tar.bz2"/>
 
diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml
index c5640ad87..432dee0cf 100644
--- a/chapter04/bin86.xml
+++ b/chapter04/bin86.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/bin86-&bin86-version;.tar.bz2"/>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index 8432e3bf8..bd142ec78 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/binutils-&binutils-version;.tar.bz2"/>
diff --git a/chapter04/bison.xml b/chapter04/bison.xml
index 013d31dc1..ef71f0c6e 100644
--- a/chapter04/bison.xml
+++ b/chapter04/bison.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/bison-&bison-version;.tar.bz2"/>
diff --git a/chapter04/bootscripts.xml b/chapter04/bootscripts.xml
index eb08b5929..a1aea6d97 100644
--- a/chapter04/bootscripts.xml
+++ b/chapter04/bootscripts.xml
@@ -1,4 +1,3 @@
 LFS-Bootscripts (&bootscripts-version;) - &bootscripts-size;:
-<ulink url="&ftp;/lfs-bootscripts-&bootscripts-version;.tar.bz2">&ftp;/lfs-bootscripts-&bootscripts-version;.tar.bz2</ulink>
-<ulink url="&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2">&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2</ulink>
-
+<ulink url="&ftp;/lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
+<ulink url="&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml
index d6e672ac3..d8a7a0e0a 100644
--- a/chapter04/bzip2.xml
+++ b/chapter04/bzip2.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2"/>
diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml
index 8f0ce2741..f73cf45f0 100644
--- a/chapter04/diffutils.xml
+++ b/chapter04/diffutils.xml
@@ -1,4 +1,3 @@
 Diffutils (&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"/>
+<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2"/>
diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml
index 24c7f6978..2df8b37f0 100644
--- a/chapter04/e2fsprogs.xml
+++ b/chapter04/e2fsprogs.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2"/>
diff --git a/chapter04/ed.xml b/chapter04/ed.xml
index 7c91a8996..f9fcd05b6 100644
--- a/chapter04/ed.xml
+++ b/chapter04/ed.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/ed-&ed-version;.tar.bz2"/>
diff --git a/chapter04/file.xml b/chapter04/file.xml
index ac7c5e2cd..57f620cee 100644
--- a/chapter04/file.xml
+++ b/chapter04/file.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/file-&file-version;.tar.bz2"/>
diff --git a/chapter04/fileutils.xml b/chapter04/fileutils.xml
index c640e16a0..9ed28b5c9 100644
--- a/chapter04/fileutils.xml
+++ b/chapter04/fileutils.xml
@@ -1,4 +1,3 @@
 Fileutils (&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"/>
+<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2"/>
diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml
index e371d8c70..1a116d871 100644
--- a/chapter04/findutils-patch.xml
+++ b/chapter04/findutils-patch.xml
@@ -1,4 +1,3 @@
 Findutils Patch (&findutils-version;) - &findutils-patch-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"/>
+<ulink url="&http;/findutils-&findutils-version;.patch.bz2"/>
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
index 768964cbc..f5925de2f 100644
--- a/chapter04/findutils.xml
+++ b/chapter04/findutils.xml
@@ -1,4 +1,3 @@
 Findutils (&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"/>
+<ulink url="&http;/findutils-&findutils-version;.tar.bz2"/>
diff --git a/chapter04/flex.xml b/chapter04/flex.xml
index 39de1f18d..649683dcc 100644
--- a/chapter04/flex.xml
+++ b/chapter04/flex.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/flex-&flex-version;.tar.bz2"/>
diff --git a/chapter04/gawk.xml b/chapter04/gawk.xml
index 72187fc29..33f1b6367 100644
--- a/chapter04/gawk.xml
+++ b/chapter04/gawk.xml
@@ -1,4 +1,3 @@
 Gawk (&gawk-version;) - &gawk-size;:
-<ulink url="&ftp;/gawk-&gawk-version;.tar.bz2">&ftp;/gawk-&gawk-version;.tar.bz2</ulink>
-<ulink url="&http;/gawk-&gawk-version;.tar.bz2">&http;/gawk-&gawk-version;.tar.bz2</ulink>
-
+<ulink url="&ftp;/gawk-&gawk-version;.tar.bz2"/>
+<ulink url="&http;/gawk-&gawk-version;.tar.bz2"/>
diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml
index ca638df52..f93b6248e 100644
--- a/chapter04/gcc-patch.xml
+++ b/chapter04/gcc-patch.xml
@@ -1,4 +1,3 @@
 GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
-<ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2">&ftp;/gcc-&gcc-patch-version;.patch.bz2</ulink>
-<ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2">&http;/gcc-&gcc-patch-version;.patch.bz2</ulink>
-
+<ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/>
+<ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/>
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index 6fdb2869b..84f9d9ca6 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/gcc-&gcc-version;.tar.bz2"/>
diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml
index c3bcdf980..545cb3dd7 100644
--- a/chapter04/gettext.xml
+++ b/chapter04/gettext.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/gettext-&gettext-version;.tar.bz2"/>
diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml
index 1da3d1b5b..8bc386a93 100644
--- a/chapter04/glibc-threads.xml
+++ b/chapter04/glibc-threads.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2"/>
diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml
index f3502eb6e..5f837042e 100644
--- a/chapter04/glibc.xml
+++ b/chapter04/glibc.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/glibc-&glibc-version;.tar.bz2"/>
diff --git a/chapter04/grep.xml b/chapter04/grep.xml
index 20a4bc43b..d1bd51c45 100644
--- a/chapter04/grep.xml
+++ b/chapter04/grep.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/grep-&grep-version;.tar.bz2"/>
diff --git a/chapter04/groff.xml b/chapter04/groff.xml
index faa1ba6c5..dbc4b1c8c 100644
--- a/chapter04/groff.xml
+++ b/chapter04/groff.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/groff-&groff-version;.tar.bz2"/>
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
index 1b79ca635..dec097f31 100644
--- a/chapter04/gzip.xml
+++ b/chapter04/gzip.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/gzip-&gzip-version;.tar.bz2"/>
diff --git a/chapter04/kbd-patch.xml b/chapter04/kbd-patch.xml
index b83f6b50f..c42e97d1f 100644
--- a/chapter04/kbd-patch.xml
+++ b/chapter04/kbd-patch.xml
@@ -1,4 +1,3 @@
 Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
-<ulink url="&ftp;/kbd-&kbd-patch-version;.patch.bz2">&ftp;/kbd-&kbd-patch-version;.patch.bz2</ulink>
-<ulink url="&http;/kbd-&kbd-patch-version;.patch.bz2">&http;/kbd-&kbd-patch-version;.patch.bz2</ulink>
-
+<ulink url="&ftp;/kbd-&kbd-patch-version;.patch.bz2"/>
+<ulink url="&http;/kbd-&kbd-patch-version;.patch.bz2"/>
diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml
index 2784baa0b..0a765625c 100644
--- a/chapter04/kbd.xml
+++ b/chapter04/kbd.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/kbd-&kbd-version;.tar.bz2"/>
diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml
index aa3887ca9..fd2f5fa2e 100644
--- a/chapter04/kernel.xml
+++ b/chapter04/kernel.xml
@@ -1,4 +1,3 @@
 Linux (&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"/>
+<ulink url="&http;/linux-&kernel-version;.tar.bz2"/>
diff --git a/chapter04/less.xml b/chapter04/less.xml
index 0d923f4cf..8db2423c1 100644
--- a/chapter04/less.xml
+++ b/chapter04/less.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/less-&less-version;.tar.bz2"/>
diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml
index c6cce7251..adda828c8 100644
--- a/chapter04/libtool.xml
+++ b/chapter04/libtool.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/libtool-&libtool-version;.tar.bz2"/>
diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml
index a8a0be3ec..5d2304e91 100644
--- a/chapter04/lilo.xml
+++ b/chapter04/lilo.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/lilo-&lilo-version;.tar.bz2"/>
diff --git a/chapter04/m4.xml b/chapter04/m4.xml
index 53ffdebb0..d40233380 100644
--- a/chapter04/m4.xml
+++ b/chapter04/m4.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/m4-&m4-version;.tar.bz2"/>
diff --git a/chapter04/make.xml b/chapter04/make.xml
index 99c2d0a4a..ce2dbf263 100644
--- a/chapter04/make.xml
+++ b/chapter04/make.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/make-&make-version;.tar.bz2"/>
diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml
index 3742d7c61..a93d25d1e 100644
--- a/chapter04/makedev.xml
+++ b/chapter04/makedev.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/MAKEDEV-&makedev-version;.bz2"/>
diff --git a/chapter04/man.xml b/chapter04/man.xml
index a719276d0..3b0c9319d 100644
--- a/chapter04/man.xml
+++ b/chapter04/man.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/man-&man-version;.tar.bz2"/>
diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml
index 31d33ed3b..96fb5ed74 100644
--- a/chapter04/manpages.xml
+++ b/chapter04/manpages.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2"/>
diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml
index 8e17a38c8..d7d062951 100644
--- a/chapter04/modutils.xml
+++ b/chapter04/modutils.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/modutils-&modutils-version;.tar.bz2"/>
diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml
index e1d2cf382..f1a1556f9 100644
--- a/chapter04/ncurses.xml
+++ b/chapter04/ncurses.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2"/>
diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml
index 01cbf64d8..d93bc30fb 100644
--- a/chapter04/netkitbase.xml
+++ b/chapter04/netkitbase.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2"/>
diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml
index 9adda8efd..2063c8668 100644
--- a/chapter04/nettools.xml
+++ b/chapter04/nettools.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2"/>
diff --git a/chapter04/patch.xml b/chapter04/patch.xml
index 6c4611b55..148cd407d 100644
--- a/chapter04/patch.xml
+++ b/chapter04/patch.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/patch-&patch-version;.tar.bz2"/>
diff --git a/chapter04/perl.xml b/chapter04/perl.xml
index 47569e100..a7f4525fb 100644
--- a/chapter04/perl.xml
+++ b/chapter04/perl.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/perl-&perl-version;.tar.bz2"/>
diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml
index b7d1e6074..af0374ed0 100644
--- a/chapter04/procinfo.xml
+++ b/chapter04/procinfo.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2"/>
diff --git a/chapter04/procps.xml b/chapter04/procps.xml
index bbd22dc57..81e3f787a 100644
--- a/chapter04/procps.xml
+++ b/chapter04/procps.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/procps-&procps-version;.tar.bz2"/>
diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml
index e1d95f5b1..d943ec766 100644
--- a/chapter04/psmisc.xml
+++ b/chapter04/psmisc.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2"/>
diff --git a/chapter04/reiserfs.xml b/chapter04/reiserfs.xml
index bb30c89f2..01d9f2579 100644
--- a/chapter04/reiserfs.xml
+++ b/chapter04/reiserfs.xml
@@ -1,4 +1,3 @@
 Reiserfsprogs (&reiserfs-version;) - &reiserfs-size;:
-<ulink url="&ftp;/reiserfsprogs-&reiserfs-version;.tar.bz2">&ftp;/reiserfsprogs-&reiserfs-version;.tar.bz2</ulink>
-<ulink url="&http;/reiserfsprogs-&reiserfs-version;.tar.bz2">&http;/reiserfsprogs-&reiserfs-version;.tar.bz2</ulink>
-
+<ulink url="&ftp;/reiserfsprogs-&reiserfs-version;.tar.bz2"/>
+<ulink url="&http;/reiserfsprogs-&reiserfs-version;.tar.bz2"/>
diff --git a/chapter04/sed.xml b/chapter04/sed.xml
index 49ac970aa..514221434 100644
--- a/chapter04/sed.xml
+++ b/chapter04/sed.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/sed-&sed-version;.tar.bz2"/>
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
index 821cf75cb..d217942dc 100644
--- a/chapter04/shadowpwd.xml
+++ b/chapter04/shadowpwd.xml
@@ -1,4 +1,3 @@
 Shadow (&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"/>
+<ulink url="&http;/shadow-&shadow-version;.tar.bz2"/>
diff --git a/chapter04/shellutils.xml b/chapter04/shellutils.xml
index bd138cf64..f89fe72a7 100644
--- a/chapter04/shellutils.xml
+++ b/chapter04/shellutils.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2"/>
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
index 9b6847f54..cccce6d1e 100644
--- a/chapter04/sysklogd.xml
+++ b/chapter04/sysklogd.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2"/>
diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml
index 73d5d99c4..60152e804 100644
--- a/chapter04/sysvinit.xml
+++ b/chapter04/sysvinit.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2"/>
diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml
index a83a0decf..04a534696 100644
--- a/chapter04/tar-patch.xml
+++ b/chapter04/tar-patch.xml
@@ -1,4 +1,4 @@
 Tar Patch (&tar-version;) - &tar-patch-size;:
-<ulink url="&ftp;/tar-1.13.patch.bz2">&ftp;/tar-1.13.patch.bz2</ulink>
-<ulink url="&http;/tar-1.13.patch.bz2">&http;/tar-1.13.patch.bz2</ulink>
+<ulink url="&ftp;/tar-1.13.patch.bz2"/>
+<ulink url="&http;/tar-1.13.patch.bz2"/>
 
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
index 901ba24d9..fc35aca43 100644
--- a/chapter04/tar.xml
+++ b/chapter04/tar.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/tar-&tar-version;.tar.bz2"/>
diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml
index 0725c64a3..fe7c47602 100644
--- a/chapter04/texinfo.xml
+++ b/chapter04/texinfo.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2"/>
diff --git a/chapter04/textutils.xml b/chapter04/textutils.xml
index 177b64a7b..52524af54 100644
--- a/chapter04/textutils.xml
+++ b/chapter04/textutils.xml
@@ -1,4 +1,3 @@
 Textutils (&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"/>
+<ulink url="&http;/textutils-&textutils-version;.tar.bz2"/>
diff --git a/chapter04/toplevel.xml b/chapter04/toplevel.xml
index ec26bbd8c..59016dc33 100644
--- a/chapter04/toplevel.xml
+++ b/chapter04/toplevel.xml
@@ -1,6 +1,6 @@
 Browse FTP: 
-<ulink url="&ftp-root;/">&ftp-root;/</ulink>
+<ulink url="&ftp-root;/"/>
 
 Browse HTTP:
-<ulink url="&http-root;/">&http-root;/</ulink>
+<ulink url="&http-root;/"/>
 
diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml
index 463ff5140..4d92018a3 100644
--- a/chapter04/utillinux.xml
+++ b/chapter04/utillinux.xml
@@ -1,4 +1,3 @@
 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"/>
+<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2"/>
diff --git a/chapter04/vim.xml b/chapter04/vim.xml
index b1c9fd561..5f8aeaba7 100644
--- a/chapter04/vim.xml
+++ b/chapter04/vim.xml
@@ -1,4 +1,3 @@
 Vim (&vim-version;) - &vim-size;:
-<ulink url="&ftp;/vim-&vim-version;.tar.bz2">&ftp;/vim-&vim-version;.tar.bz2</ulink>
-<ulink url="&http;/vim-&vim-version;.tar.bz2">&http;/vim-&vim-version;.tar.bz2</ulink>
-
+<ulink url="&ftp;/vim-&vim-version;.tar.bz2"/>
+<ulink url="&http;/vim-&vim-version;.tar.bz2"/>