aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Attic/appendixb/howtoguides.xml2
-rw-r--r--appendixa/autoconf-down.xml2
-rw-r--r--appendixa/automake-down.xml2
-rw-r--r--appendixa/bash-down.xml2
-rw-r--r--appendixa/bin86-down.xml2
-rw-r--r--appendixa/binutils-down.xml2
-rw-r--r--appendixa/bison-down.xml2
-rw-r--r--appendixa/bootscripts-down.xml4
-rw-r--r--appendixa/bzip2-down.xml2
-rw-r--r--appendixa/diffutils-down.xml2
-rw-r--r--appendixa/e2fsprogs-down.xml4
-rw-r--r--appendixa/ed-down.xml2
-rw-r--r--appendixa/file-down.xml2
-rw-r--r--appendixa/fileutils-down.xml2
-rw-r--r--appendixa/findutils-down.xml6
-rw-r--r--appendixa/flex-down.xml2
-rw-r--r--appendixa/gawk-down.xml3
-rw-r--r--appendixa/gcc-down.xml6
-rw-r--r--appendixa/gettext-down.xml2
-rw-r--r--appendixa/glibc-down.xml4
-rw-r--r--appendixa/grep-down.xml2
-rw-r--r--appendixa/groff-down.xml2
-rw-r--r--appendixa/gzip-down.xml2
-rw-r--r--appendixa/kbd-down.xml6
-rw-r--r--appendixa/kernel-down.xml2
-rw-r--r--appendixa/less-down.xml2
-rw-r--r--appendixa/libtool-down.xml2
-rw-r--r--appendixa/lilo-down.xml5
-rw-r--r--appendixa/m4-down.xml2
-rw-r--r--appendixa/make-down.xml2
-rw-r--r--appendixa/makedev-down.xml4
-rw-r--r--appendixa/man-down.xml2
-rw-r--r--appendixa/manpages-down.xml2
-rw-r--r--appendixa/modutils-down.xml2
-rw-r--r--appendixa/ncurses-down.xml2
-rw-r--r--appendixa/netkitbase-down.xml2
-rw-r--r--appendixa/nettools-down.xml2
-rw-r--r--appendixa/patch-down.xml2
-rw-r--r--appendixa/perl-down.xml2
-rw-r--r--appendixa/procinfo-down.xml2
-rw-r--r--appendixa/procps-down.xml2
-rw-r--r--appendixa/psmisc-down.xml4
-rw-r--r--appendixa/reiserfs-down.xml2
-rw-r--r--appendixa/sed-down.xml2
-rw-r--r--appendixa/shadowpwd-down.xml2
-rw-r--r--appendixa/shellutils-down.xml2
-rw-r--r--appendixa/sysklogd-down.xml2
-rw-r--r--appendixa/sysvinit-down.xml2
-rw-r--r--appendixa/tar-down.xml6
-rw-r--r--appendixa/texinfo-down.xml2
-rw-r--r--appendixa/textutils-down.xml2
-rw-r--r--appendixa/utillinux-down.xml2
-rw-r--r--appendixa/vim-down.xml2
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter01/conventions.xml2
-rw-r--r--chapter01/faq.xml6
-rw-r--r--chapter01/mailarchive.xml7
-rw-r--r--chapter01/mirrors.xml52
-rw-r--r--chapter02/askforhelp.xml2
-rw-r--r--chapter03/creatingpart.xml2
-rw-r--r--chapter04/all.xml4
-rw-r--r--chapter04/autoconf.xml4
-rw-r--r--chapter04/automake.xml5
-rw-r--r--chapter04/bash.xml4
-rw-r--r--chapter04/bin86.xml5
-rw-r--r--chapter04/binutils.xml5
-rw-r--r--chapter04/bison.xml5
-rw-r--r--chapter04/bootscripts.xml5
-rw-r--r--chapter04/bzip2.xml5
-rw-r--r--chapter04/diffutils.xml5
-rw-r--r--chapter04/e2fsprogs.xml5
-rw-r--r--chapter04/ed.xml5
-rw-r--r--chapter04/file.xml5
-rw-r--r--chapter04/fileutils.xml5
-rw-r--r--chapter04/findutils-patch.xml5
-rw-r--r--chapter04/findutils.xml5
-rw-r--r--chapter04/flex.xml5
-rw-r--r--chapter04/gawk.xml5
-rw-r--r--chapter04/gcc-patch.xml5
-rw-r--r--chapter04/gcc.xml5
-rw-r--r--chapter04/gettext.xml5
-rw-r--r--chapter04/glibc-threads.xml5
-rw-r--r--chapter04/glibc.xml5
-rw-r--r--chapter04/grep.xml5
-rw-r--r--chapter04/groff.xml5
-rw-r--r--chapter04/gzip.xml5
-rw-r--r--chapter04/kbd-patch.xml5
-rw-r--r--chapter04/kbd.xml5
-rw-r--r--chapter04/kernel.xml5
-rw-r--r--chapter04/less.xml5
-rw-r--r--chapter04/libtool.xml5
-rw-r--r--chapter04/lilo.xml5
-rw-r--r--chapter04/m4.xml5
-rw-r--r--chapter04/make.xml5
-rw-r--r--chapter04/makedev.xml5
-rw-r--r--chapter04/man.xml5
-rw-r--r--chapter04/manpages.xml5
-rw-r--r--chapter04/modutils.xml5
-rw-r--r--chapter04/ncurses.xml5
-rw-r--r--chapter04/netkitbase.xml5
-rw-r--r--chapter04/nettools.xml5
-rw-r--r--chapter04/patch.xml5
-rw-r--r--chapter04/perl.xml5
-rw-r--r--chapter04/procinfo.xml5
-rw-r--r--chapter04/procps.xml5
-rw-r--r--chapter04/psmisc.xml5
-rw-r--r--chapter04/reiserfs.xml5
-rw-r--r--chapter04/sed.xml5
-rw-r--r--chapter04/shadowpwd.xml5
-rw-r--r--chapter04/shellutils.xml5
-rw-r--r--chapter04/sysklogd.xml5
-rw-r--r--chapter04/sysvinit.xml5
-rw-r--r--chapter04/tar-patch.xml4
-rw-r--r--chapter04/tar.xml5
-rw-r--r--chapter04/texinfo.xml5
-rw-r--r--chapter04/textutils.xml5
-rw-r--r--chapter04/toplevel.xml4
-rw-r--r--chapter04/utillinux.xml5
-rw-r--r--chapter04/vim.xml5
-rw-r--r--chapter05/creatingdirs.xml2
-rw-r--r--chapter06/aboutdebug.xml4
-rw-r--r--chapter06/bootscripts-inst.xml3
-rw-r--r--chapter06/chroot.xml1
-rw-r--r--chapter06/introduction.xml6
-rw-r--r--chapter06/lilo-inst.xml9
-rw-r--r--chapter06/man-inst.xml6
-rw-r--r--chapter06/shadowpwd-inst.xml6
-rw-r--r--chapter06/vim-inst.xml2
-rw-r--r--chapter07/setclock.xml3
-rw-r--r--chapter09/getcounted.xml9
-rw-r--r--chapter09/reboot.xml9
-rw-r--r--index.xml4
-rw-r--r--preface/whonotread.xml2
133 files changed, 254 insertions, 320 deletions
diff --git a/Attic/appendixb/howtoguides.xml b/Attic/appendixb/howtoguides.xml
index d03410656..111158b16 100644
--- a/Attic/appendixb/howtoguides.xml
+++ b/Attic/appendixb/howtoguides.xml
@@ -3,7 +3,7 @@
<?dbhtml filename="howtoguides.html" dir="appendixb"?>
<para>All of the following HOWTOs can be downloaded from the Linux
-Documentation Project site at <ulink url="http://www.tldp.org">http://www.tldp.org</ulink></para>
+Documentation Project site at <ulink url="http://www.tldp.org"/></para>
<itemizedlist>
diff --git a/appendixa/autoconf-down.xml b/appendixa/autoconf-down.xml
index e984f8c37..92e57b577 100644
--- a/appendixa/autoconf-down.xml
+++ b/appendixa/autoconf-down.xml
@@ -3,6 +3,6 @@
<title>Official Download Location</title>
<para><literallayout>Autoconf (&autoconf-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/autoconf/">ftp://ftp.gnu.org/gnu/autoconf/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/autoconf/"/></literallayout></para>
</sect2>
diff --git a/appendixa/automake-down.xml b/appendixa/automake-down.xml
index 6d2004a30..bf4e70c82 100644
--- a/appendixa/automake-down.xml
+++ b/appendixa/automake-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Automake (&automake-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/automake/">ftp://ftp.gnu.org/gnu/automake/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/automake/"/></literallayout></para>
</sect2>
diff --git a/appendixa/bash-down.xml b/appendixa/bash-down.xml
index 21d9f8ea6..9191e9cd0 100644
--- a/appendixa/bash-down.xml
+++ b/appendixa/bash-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Bash (&bash-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/bash/">ftp://ftp.gnu.org/gnu/bash/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/bash/"/></literallayout></para>
</sect2>
diff --git a/appendixa/bin86-down.xml b/appendixa/bin86-down.xml
index 0bb8f54d6..eb0d392f2 100644
--- a/appendixa/bin86-down.xml
+++ b/appendixa/bin86-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Bin86 (&bin86-version;):
-<ulink url="http://www.cix.co.uk/~mayday/">http://www.cix.co.uk/~mayday/</ulink></literallayout></para>
+<ulink url="http://www.cix.co.uk/~mayday/"/></literallayout></para>
</sect2>
diff --git a/appendixa/binutils-down.xml b/appendixa/binutils-down.xml
index 0b964d349..69bba3527 100644
--- a/appendixa/binutils-down.xml
+++ b/appendixa/binutils-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Binutils (&binutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/binutils/">ftp://ftp.gnu.org/gnu/binutils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/binutils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/bison-down.xml b/appendixa/bison-down.xml
index cd3b56fca..f541096d0 100644
--- a/appendixa/bison-down.xml
+++ b/appendixa/bison-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Bison (&bison-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/bison/">ftp://ftp.gnu.org/gnu/bison/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/bison/"/></literallayout></para>
</sect2>
diff --git a/appendixa/bootscripts-down.xml b/appendixa/bootscripts-down.xml
index 0dd9e00b0..be2caae8d 100644
--- a/appendixa/bootscripts-down.xml
+++ b/appendixa/bootscripts-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>LFS-Bootscripts (&bootscripts-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/bzip2-down.xml b/appendixa/bzip2-down.xml
index 5f7935d06..230793e08 100644
--- a/appendixa/bzip2-down.xml
+++ b/appendixa/bzip2-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Bzip2 (&bzip2-version;):
-<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/">ftp://sourceware.cygnus.com/pub/bzip2/</ulink></literallayout></para>
+<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/"/></literallayout></para>
</sect2>
diff --git a/appendixa/diffutils-down.xml b/appendixa/diffutils-down.xml
index 2d171b19c..e586bf0a6 100644
--- a/appendixa/diffutils-down.xml
+++ b/appendixa/diffutils-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Diff Utils (&diffutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">ftp://ftp.gnu.org/gnu/diffutils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/diffutils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/e2fsprogs-down.xml b/appendixa/e2fsprogs-down.xml
index 28837d2dc..e9315b1a5 100644
--- a/appendixa/e2fsprogs-down.xml
+++ b/appendixa/e2fsprogs-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>E2fsprogs (&e2fsprogs-version;):
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/">ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/</ulink>
-<ulink url="http://download.sourceforge.net/e2fsprogs/">http://download.sourceforge.net/e2fsprogs/</ulink></literallayout></para>
+<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/"/>
+<ulink url="http://download.sourceforge.net/e2fsprogs/"/></literallayout></para>
</sect2>
diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml
index 18bf43600..4ac875b20 100644
--- a/appendixa/ed-down.xml
+++ b/appendixa/ed-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Ed (&ed-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/ed/">ftp://ftp.gnu.org/gnu/ed/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/ed/"/></literallayout></para>
</sect2>
diff --git a/appendixa/file-down.xml b/appendixa/file-down.xml
index 2d027ac9d..a36020fd6 100644
--- a/appendixa/file-down.xml
+++ b/appendixa/file-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>File (&file-version;):
-<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/">ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></literallayout></para>
</sect2>
diff --git a/appendixa/fileutils-down.xml b/appendixa/fileutils-down.xml
index f4a3817ae..b2313584b 100644
--- a/appendixa/fileutils-down.xml
+++ b/appendixa/fileutils-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>File Utils (&fileutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/fileutils/">ftp://ftp.gnu.org/gnu/fileutils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/fileutils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/findutils-down.xml b/appendixa/findutils-down.xml
index f19e4b264..3dfb4b0b2 100644
--- a/appendixa/findutils-down.xml
+++ b/appendixa/findutils-down.xml
@@ -2,9 +2,9 @@
<title>Official Download Location</title>
<para><literallayout>Find Utils (&findutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/findutils/">ftp://ftp.gnu.org/gnu/findutils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/findutils/"/>
Find Utils Patch (&findutils-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/flex-down.xml b/appendixa/flex-down.xml
index 960c26288..8c01714b3 100644
--- a/appendixa/flex-down.xml
+++ b/appendixa/flex-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Flex (&flex-version;):
-<ulink url="ftp://ftp.gnu.org/non-gnu/flex/">ftp://ftp.gnu.org/non-gnu/flex/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/non-gnu/flex/"/></literallayout></para>
</sect2>
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 7c28160b5..58f3401dd 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -2,6 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Gawk (&gawk-version;):
-<ulink
-url="ftp://ftp.gnu.org/pub/gnu/gawk/">ftp://ftp.gnu.org/pub/gnu/gawk/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout></para>
</sect2>
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index 5c2694b49..345a7d929 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -2,9 +2,9 @@
<title>Official Download Location</title>
<para><literallayout>GCC (&gcc-version;):
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/">ftp://ftp.gnu.org/pub/gnu/gcc/</ulink>
+<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
GCC Patch (&gcc-patch-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/gettext-down.xml b/appendixa/gettext-down.xml
index 09c433583..480be8250 100644
--- a/appendixa/gettext-down.xml
+++ b/appendixa/gettext-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Gettext (&gettext-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/gettext/">ftp://ftp.gnu.org/gnu/gettext/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/gettext/"/></literallayout></para>
</sect2>
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index c1231f5f8..115e3980e 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -2,8 +2,8 @@
<title>Official Download Location</title>
<para><literallayout>Glibc (&glibc-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
Glibc-linuxthreads (&glibc-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/glibc/"/></literallayout></para>
</sect2>
diff --git a/appendixa/grep-down.xml b/appendixa/grep-down.xml
index 349b109af..1bcb60c73 100644
--- a/appendixa/grep-down.xml
+++ b/appendixa/grep-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Grep (&grep-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/grep/">ftp://ftp.gnu.org/gnu/grep/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/grep/"/></literallayout></para>
</sect2>
diff --git a/appendixa/groff-down.xml b/appendixa/groff-down.xml
index f16760e11..9fd8de534 100644
--- a/appendixa/groff-down.xml
+++ b/appendixa/groff-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Groff (&groff-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/groff/">ftp://ftp.gnu.org/gnu/groff/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/groff/"/></literallayout></para>
</sect2>
diff --git a/appendixa/gzip-down.xml b/appendixa/gzip-down.xml
index d3f9c7e0c..60ff0e276 100644
--- a/appendixa/gzip-down.xml
+++ b/appendixa/gzip-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Gzip (&gzip-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/gzip/"/></literallayout></para>
</sect2>
diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml
index b406bd110..2c327091b 100644
--- a/appendixa/kbd-down.xml
+++ b/appendixa/kbd-down.xml
@@ -2,9 +2,9 @@
<title>Official Download Location</title>
<para><literallayout>Kbd (&kbd-version;):
-<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/">ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</ulink>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"/>
Kbd Patch (&kbd-patch-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/kernel-down.xml b/appendixa/kernel-down.xml
index e517ca351..594319daf 100644
--- a/appendixa/kernel-down.xml
+++ b/appendixa/kernel-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Linux Kernel (&kernel-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/">ftp://ftp.kernel.org/pub/linux/kernel/</ulink></literallayout></para>
+<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/"/></literallayout></para>
</sect2>
diff --git a/appendixa/less-down.xml b/appendixa/less-down.xml
index 165965583..a642d6785 100644
--- a/appendixa/less-down.xml
+++ b/appendixa/less-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Less (&less-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/less/">ftp://ftp.gnu.org/gnu/less/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/less/"/></literallayout></para>
</sect2>
diff --git a/appendixa/libtool-down.xml b/appendixa/libtool-down.xml
index f8d1bc098..5eae295c3 100644
--- a/appendixa/libtool-down.xml
+++ b/appendixa/libtool-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Libtool (&libtool-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/libtool/">ftp://ftp.gnu.org/gnu/libtool/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/libtool/"/></literallayout></para>
</sect2>
diff --git a/appendixa/lilo-down.xml b/appendixa/lilo-down.xml
index c7352e91b..8160108fa 100644
--- a/appendixa/lilo-down.xml
+++ b/appendixa/lilo-down.xml
@@ -2,7 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Lilo (&lilo-version;):
-<ulink url="ftp://ibiblio.org/pub/Linux/system/boot/lilo/">ftp://ibiblio.org/pub/Linux/system/boot/lilo/</ulink>
-<ulink
-url="http://ibiblio.org/pub/Linux/system/boot/lilo/">http://ibiblio.org/pub/Linux/system/boot/lilo/</ulink></literallayout></para>
+<ulink url="ftp://ibiblio.org/pub/Linux/system/boot/lilo/"/>
+<ulink url="http://ibiblio.org/pub/Linux/system/boot/lilo/"/></literallayout></para>
</sect2>
diff --git a/appendixa/m4-down.xml b/appendixa/m4-down.xml
index 4e6f5396d..caf51c8ba 100644
--- a/appendixa/m4-down.xml
+++ b/appendixa/m4-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>M4 (&m4-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/m4/">ftp://ftp.gnu.org/gnu/m4/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/m4/"/></literallayout></para>
</sect2>
diff --git a/appendixa/make-down.xml b/appendixa/make-down.xml
index e229a5a3c..d8c7b90a0 100644
--- a/appendixa/make-down.xml
+++ b/appendixa/make-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Make (&make-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/make/"/></literallayout></para>
</sect2>
diff --git a/appendixa/makedev-down.xml b/appendixa/makedev-down.xml
index b2fa010a8..67752ee13 100644
--- a/appendixa/makedev-down.xml
+++ b/appendixa/makedev-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>MAKEDEV (&makedev-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml
index 93fc43246..091d0b142 100644
--- a/appendixa/man-down.xml
+++ b/appendixa/man-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Man (&man-version;):
-<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/">ftp://ftp.win.tue.nl/pub/linux-local/utils/man/</ulink></literallayout></para>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></literallayout></para>
</sect2>
diff --git a/appendixa/manpages-down.xml b/appendixa/manpages-down.xml
index 83084be83..e9d836c25 100644
--- a/appendixa/manpages-down.xml
+++ b/appendixa/manpages-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Man-pages (&man-pages-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/docs/manpages/">ftp://ftp.kernel.org/pub/linux/docs/manpages/</ulink></literallayout></para>
+<ulink url="ftp://ftp.kernel.org/pub/linux/docs/manpages/"/></literallayout></para>
</sect2>
diff --git a/appendixa/modutils-down.xml b/appendixa/modutils-down.xml
index 33d2fe6b5..5fa964cfb 100644
--- a/appendixa/modutils-down.xml
+++ b/appendixa/modutils-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Modutils (&modutils-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/">ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml
index 3b3674098..c7b5705a5 100644
--- a/appendixa/ncurses-down.xml
+++ b/appendixa/ncurses-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Ncurses (&ncurses-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/ncurses/">ftp://ftp.gnu.org/gnu/ncurses/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/></literallayout></para>
</sect2>
diff --git a/appendixa/netkitbase-down.xml b/appendixa/netkitbase-down.xml
index 69e184534..eed9b76d9 100644
--- a/appendixa/netkitbase-down.xml
+++ b/appendixa/netkitbase-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Netkit-base (&netkit-base-version;):
-<ulink url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/">ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/</ulink></literallayout></para>
+<ulink url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"/></literallayout></para>
</sect2>
diff --git a/appendixa/nettools-down.xml b/appendixa/nettools-down.xml
index 3724eafb3..bda7e576f 100644
--- a/appendixa/nettools-down.xml
+++ b/appendixa/nettools-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Net-tools (&net-tools-version;):
-<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/">http://www.tazenda.demon.co.uk/phil/net-tools/</ulink></literallayout></para>
+<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/"/></literallayout></para>
</sect2>
diff --git a/appendixa/patch-down.xml b/appendixa/patch-down.xml
index 81d30d0ad..279c36346 100644
--- a/appendixa/patch-down.xml
+++ b/appendixa/patch-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Patch (&patch-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/patch/">ftp://ftp.gnu.org/gnu/patch/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/patch/"/></literallayout></para>
</sect2>
diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml
index 8503b2332..ede165d48 100644
--- a/appendixa/perl-down.xml
+++ b/appendixa/perl-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Perl (&perl-version;):
-<ulink url="http://www.perl.com/">http://www.perl.com/</ulink></literallayout></para>
+<ulink url="http://www.perl.com/"/></literallayout></para>
</sect2>
diff --git a/appendixa/procinfo-down.xml b/appendixa/procinfo-down.xml
index 2d13d72a7..9324cb2c7 100644
--- a/appendixa/procinfo-down.xml
+++ b/appendixa/procinfo-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Procinfo (&procinfo-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/svm/">ftp://ftp.cistron.nl/pub/people/svm/</ulink></literallayout></para>
+<ulink url="ftp://ftp.cistron.nl/pub/people/svm/"/></literallayout></para>
</sect2>
diff --git a/appendixa/procps-down.xml b/appendixa/procps-down.xml
index 2905982b7..1ba13da92 100644
--- a/appendixa/procps-down.xml
+++ b/appendixa/procps-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Procps (&procps-version;):
-<ulink url="ftp://people.redhat.com/johnsonm/procps/">ftp://people.redhat.com/johnsonm/procps/</ulink></literallayout></para>
+<ulink url="ftp://people.redhat.com/johnsonm/procps/"/></literallayout></para>
</sect2>
diff --git a/appendixa/psmisc-down.xml b/appendixa/psmisc-down.xml
index d413f06e7..5681d5b10 100644
--- a/appendixa/psmisc-down.xml
+++ b/appendixa/psmisc-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Psmisc (&psmisc-version;):
-<ulink url="http://download.sourceforge.net/psmisc/">http://download.sourceforge.net/psmisc/</ulink>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/">ftp://download.sourceforge.net/pub/sourceforge/psmisc/</ulink></literallayout></para>
+<ulink url="http://download.sourceforge.net/psmisc/"/>
+<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/"/></literallayout></para>
</sect2>
diff --git a/appendixa/reiserfs-down.xml b/appendixa/reiserfs-down.xml
index 7d0132a1f..22b602868 100644
--- a/appendixa/reiserfs-down.xml
+++ b/appendixa/reiserfs-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Reiserfs (&reiserfs-version;):
-<ulink url="ftp://ftp.namesys.com/pub/reiserfsprogs/">ftp://ftp.namesys.com/pub/reiserfsprogs/</ulink></literallayout></para>
+<ulink url="ftp://ftp.namesys.com/pub/reiserfsprogs/"/></literallayout></para>
</sect2>
diff --git a/appendixa/sed-down.xml b/appendixa/sed-down.xml
index 940654832..48bbd589a 100644
--- a/appendixa/sed-down.xml
+++ b/appendixa/sed-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Sed (&sed-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sed/">ftp://ftp.gnu.org/gnu/sed/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/sed/"/></literallayout></para>
</sect2>
diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadowpwd-down.xml
index f40d73373..ca134cbf1 100644
--- a/appendixa/shadowpwd-down.xml
+++ b/appendixa/shadowpwd-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Shadow Password Suite (&shadow-version;):
-<ulink url="ftp://ftp.pld.org.pl/software/shadow/">ftp://ftp.pld.org.pl/software/shadow/</ulink></literallayout></para>
+<ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></literallayout></para>
</sect2>
diff --git a/appendixa/shellutils-down.xml b/appendixa/shellutils-down.xml
index 06fa679f7..7fec9f7a1 100644
--- a/appendixa/shellutils-down.xml
+++ b/appendixa/shellutils-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Sh-utils (&sh-utils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/sysklogd-down.xml b/appendixa/sysklogd-down.xml
index 5ec27c592..e3cfb6c59 100644
--- a/appendixa/sysklogd-down.xml
+++ b/appendixa/sysklogd-down.xml
@@ -2,6 +2,6 @@
<title>Official Download Location</title>
<para><literallayout>Sysklogd (&sysklogd-version;):
-<ulink url="http://www.infodrom.org/projects/sysklogd/">http://www.infodrom.org/projects/sysklogd/</ulink></literallayout></para>
+<ulink url="http://www.infodrom.org/projects/sysklogd/"/></literallayout></para>
</sect2>
diff --git a/appendixa/sysvinit-down.xml b/appendixa/sysvinit-down.xml
index 540d7f5ad..3eb8191a1 100644
--- a/appendixa/sysvinit-down.xml
+++ b/appendixa/sysvinit-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Sysvinit (&sysvinit-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink></literallayout></para>
+<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></literallayout></para>
</sect2>
diff --git a/appendixa/tar-down.xml b/appendixa/tar-down.xml
index 13b3b4a20..d1fc90fd1 100644
--- a/appendixa/tar-down.xml
+++ b/appendixa/tar-down.xml
@@ -2,9 +2,9 @@
<title>Official Download Location</title>
<para><literallayout>Tar (&tar-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/tar/">ftp://ftp.gnu.org/gnu/tar/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/tar/"/>
Tar Patch (&tar-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
+<ulink url="&ftp;/"/>
+<ulink url="&http;/"/></literallayout></para>
</sect2>
diff --git a/appendixa/texinfo-down.xml b/appendixa/texinfo-down.xml
index 4f49eb2a1..fde8c69a1 100644
--- a/appendixa/texinfo-down.xml
+++ b/appendixa/texinfo-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Texinfo (&texinfo-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/texinfo/">ftp://ftp.gnu.org/gnu/texinfo/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/texinfo/"/></literallayout></para>
</sect2>
diff --git a/appendixa/textutils-down.xml b/appendixa/textutils-down.xml
index 2fe4767e6..4173f1b53 100644
--- a/appendixa/textutils-down.xml
+++ b/appendixa/textutils-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Text Utils (&textutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/textutils/">ftp://ftp.gnu.org/gnu/textutils/</ulink></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/textutils/"/></literallayout></para>
</sect2>
diff --git a/appendixa/utillinux-down.xml b/appendixa/utillinux-down.xml
index d9a926493..abe1f86b1 100644
--- a/appendixa/utillinux-down.xml
+++ b/appendixa/utillinux-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Util Linux (&util-linux-version;):
-<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/">ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/</ulink></literallayout></para>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/"/></literallayout></para>
</sect2>
diff --git a/appendixa/vim-down.xml b/appendixa/vim-down.xml
index 878ea2596..6d3ae1c52 100644
--- a/appendixa/vim-down.xml
+++ b/appendixa/vim-down.xml
@@ -2,5 +2,5 @@
<title>Official Download Location</title>
<para><literallayout>Vim (&vim-version;):
-<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink></literallayout></para>
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"/></literallayout></para>
</sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b5cd2bd78..031ecd0ae 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,10 @@
</para></listitem>
+<listitem><para>May 11th, 2002 [markh]: Various XML
+fixups; mainly altering &lt;ulink&gt; tags to remove erroneous &amp;#13;
+in the HTML output.</para></listitem>
+
<listitem><para>May 9th, 2002 [gerard]: Appendix A - Glibc: Filled in the
missing descriptions.</para></listitem>
@@ -197,7 +201,7 @@ files. On some systems overwriting the existing files doesn't work due to
hardlinks being used.</para></listitem>
<listitem><para>March 21st, 2002 [gerard]: Appendix A - Sysklogd: Updated
-the download location to <ulink url="http://www.infodrom.org/projects/sysklogd/">http://www.infodrom.org/projects/sysklogd/</ulink></para></listitem>
+the download location to <ulink url="http://www.infodrom.org/projects/sysklogd/"/></para></listitem>
<listitem><para>March 20th, 2002 [gerard]: Chapter 06 - Configure Dynamic
Loader: Removed the <filename class="directory">/lib</filename> and
@@ -650,7 +654,7 @@ util-linux-2.11l.</para></listitem>
--datadir option, kbd's default is set properly already.</para></listitem>
<listitem><para>October 7th, 2001 [gerard]: Chapter 6 - Shadow: Mentioned
-the <ulink url="http://hints.linuxfromscratch.org/hints/shadowpasswd_plus.txt">http://hints.linuxfromscratch.org/hints/shadowpasswd_plus.txt</ulink>
+the <ulink url="http://hints.linuxfromscratch.org/hints/shadowpasswd_plus.txt"/>
lfs-hint</para></listitem>
<listitem><para>October 7th, 2001 [gerard]: Chapter 6 - Vim: Changed the
@@ -665,8 +669,7 @@ util-linux-2.11l and vim-6.0</para></listitem>
<listitem><para>October 2nd, 2001 [gerard]: Chapter 9 - The End: Added the
reference to the LFS Counter at
-<ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi">
-http://linuxfromscratch.org/cgi-bin/lfscounter.cgi</ulink></para></listitem>
+<ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi"/></para></listitem>
<listitem><para>September 26th, 2001 [gerard]: Chapter 1 - News server:
Added reference to the news server</para></listitem>
diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml
index 7f34326f5..b944d0596 100644
--- a/chapter01/conventions.xml
+++ b/chapter01/conventions.xml
@@ -25,7 +25,7 @@ show filenames such as <filename>/etc/lilo.conf</filename></para></blockquote>
book but mainly to emphasize important points or to give examples as to
what to type.</para></blockquote>
-<para><ulink url="http://www.linuxfromscratch.org/">http://www.linuxfromscratch.org/</ulink></para>
+<para><ulink url="http://www.linuxfromscratch.org/"/></para>
<blockquote><para>This form of text is used for hyperlinks, both within the
book and to external pages such as HowTo's, download locations,
diff --git a/chapter01/faq.xml b/chapter01/faq.xml
index 2d02f1fbf..9762b3f8b 100644
--- a/chapter01/faq.xml
+++ b/chapter01/faq.xml
@@ -3,10 +3,8 @@
<?dbhtml filename="faq.html" dir="chapter01"?>
<para>If you encounter any problems building an LFS system, you should
-check out <ulink
-url="http://www.linuxfromscratch.org/faq/">
-http://www.linuxfromscratch.org/faq/</ulink> to see if your question is
-already answered in the FAQ.</para>
+check out <ulink url="http://www.linuxfromscratch.org/faq/"/> to see if
+your question is already answered in the FAQ.</para>
</sect1>
diff --git a/chapter01/mailarchive.xml b/chapter01/mailarchive.xml
index a62922ec1..341921548 100644
--- a/chapter01/mailarchive.xml
+++ b/chapter01/mailarchive.xml
@@ -2,10 +2,9 @@
<title>Mail archives</title>
<para>All these lists are archived and can be viewed online at
-<ulink url="http://archive.linuxfromscratch.org/mail-archives">http://archive.linuxfromscratch.org/mail-archives</ulink> or downloaded
-from <ulink url="&http-root;/mail-archives">&http-root;/mail-archives</ulink>
-or
-<ulink url="&ftp-root;/mail-archives">&ftp-root;/mail-archives</ulink>.</para>
+<ulink url="http://archive.linuxfromscratch.org/mail-archives"/> or downloaded
+from <ulink url="&http-root;/mail-archives"/>
+or <ulink url="&ftp-root;/mail-archives"/>.</para>
</sect2>
diff --git a/chapter01/mirrors.xml b/chapter01/mirrors.xml
index 4efbeaff4..bb3c9bfb8 100644
--- a/chapter01/mirrors.xml
+++ b/chapter01/mirrors.xml
@@ -5,7 +5,7 @@
<para>Below is a list of our current HTTP and FTP mirror sites as
of April 10th, 2002. This list might not be accurate anymore.
The latest info can be found on our website at
-<ulink url="http://www.linuxfromscratch.org">http://www.linuxfromscratch.org</ulink>.</para>
+<ulink url="http://www.linuxfromscratch.org"/>.</para>
<sect2>
<title>HTTP Mirrors</title>
@@ -16,13 +16,13 @@ The latest info can be found on our website at
<itemizedlist>
<listitem><para>Fremont, California, USA [8 Mbit] - <ulink
-url="http://www.linuxfromscratch.org/lfs/intro.shtml">http://www.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Lufkin, Texas, USA [6 Mbit] - <ulink
-url="http://linuxfromscratch.idge.net/lfs/intro.shtml">http://linuxfromscratch.idge.net/lfs/intro.shtml</ulink></para></listitem>
+url="http://linuxfromscratch.idge.net/lfs/intro.shtml"/></para></listitem>
<listitem><para>Columbus, Ohio, United States [1 Mbit] - <ulink
-url="http://www.us.linuxfromscratch.org/lfs/intro.shtml">http://www.us.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.us.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
</itemizedlist>
@@ -34,28 +34,28 @@ url="http://www.us.linuxfromscratch.org/lfs/intro.shtml">http://www.us.linuxfrom
<itemizedlist>
<listitem><para>Mainz, Germany [100 Mbit] - <ulink
-url="http://lfs.linux-provider.net/lfs/intro.shtml">http://lfs.linux-provider.net/lfs/intro.shtml</ulink></para></listitem>
+url="http://lfs.linux-provider.net/lfs/intro.shtml"/></para></listitem>
<listitem><para>Amsterdam, The Netherlands [100 Mbit] - <ulink
-url="http://www.nl.linuxfromscratch.org/lfs/intro.shtml">http://www.nl.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.nl.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Oslo, Norway [100 Mbit] - <ulink
-url="http://www.no.linuxfromscratch.org/lfs/intro.shtml">http://www.no.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.no.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Lancaster, United Kingdom [100 Mbit] - <ulink
-url="http://linuxfromscratch.mirror.ac.uk/lfs/intro.shtml">http://linuxfromscratch.mirror.ac.uk/lfs/intro.shtml</ulink></para></listitem>
+url="http://linuxfromscratch.mirror.ac.uk/lfs/intro.shtml"/></para></listitem>
<listitem><para>Vienna Univ. of Technology, Austria [64 Mbit] - <ulink
-url="http://www.at.linuxfromscratch.org/lfs/intro.shtml">http://www.at.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.at.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Karlskrona, Sweden [10 Mbit] - <ulink
-url="http://www.se.linuxfromscratch.org/lfs/intro.shtml">http://www.se.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.se.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Freising, Germany [4 Mbit] - <ulink
-url="http://www.de.linuxfromscratch.org/lfs/intro.shtml">http://www.de.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.de.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
<listitem><para>Teeside, United Kingdom [256 Kbit] - <ulink
-url="http://www.linuxfromscratch.co.uk/lfs/intro.shtml">http://www.linuxfromscratch.co.uk/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.linuxfromscratch.co.uk/lfs/intro.shtml"/></para></listitem>
</itemizedlist>
@@ -67,7 +67,7 @@ url="http://www.linuxfromscratch.co.uk/lfs/intro.shtml">http://www.linuxfromscra
<itemizedlist>
<listitem><para>Brisbane, Australia [155 Mbit] - <ulink
-url="http://www.au.linuxfromscratch.org/lfs/intro.shtml">http://www.au.linuxfromscratch.org/lfs/intro.shtml</ulink></para></listitem>
+url="http://www.au.linuxfromscratch.org/lfs/intro.shtml"/></para></listitem>
</itemizedlist>
@@ -84,13 +84,13 @@ url="http://www.au.linuxfromscratch.org/lfs/intro.shtml">http://www.au.linuxfrom
<itemizedlist>
<listitem><para>Fremont, California, USA [FTP] [8 Mbit] - <ulink
-url="&ftp-root;">&ftp-root;</ulink></para></listitem>
+url="&ftp-root;"/></para></listitem>
<listitem><para>Fremont, California, USA [HTTP] [8 Mbit] - <ulink
-url="&http-root;">&http-root;</ulink></para></listitem>
+url="&http-root;"/></para></listitem>
<listitem><para>Lufkin, Texas, USA [FTP] [6 Mbit] - <ulink
-url="ftp://linuxfromscratch.idge.net/linuxfromscratch">ftp://linuxfromscratch.idge.net/linuxfromscratch</ulink></para></listitem>
+url="ftp://linuxfromscratch.idge.net/linuxfromscratch"/></para></listitem>
</itemizedlist>
@@ -102,31 +102,31 @@ url="ftp://linuxfromscratch.idge.net/linuxfromscratch">ftp://linuxfromscratch.id
<itemizedlist>
<listitem><para>Univ. of Twente, The Netherlands [HTTP] [100 Mbit] - <ulink
-url="http://ftp.snt.utwente.nl/linux/lfs">http://ftp.snt.utwente.nl/linux/lfs</ulink></para></listitem>
+url="http://ftp.snt.utwente.nl/linux/lfs/"/></para></listitem>
<listitem><para>Univ. of Twente, The Netherlands [FTP] [100 Mbit] - <ulink
-url="ftp://ftp.snt.utwente.nl/pub/linux/lfs">ftp:/ftp.snt.utwente.nl/pub/linux/lfs</ulink></para></listitem>
+url="ftp://ftp.snt.utwente.nl/pub/linux/lfs/"/></para></listitem>
<listitem><para>Oslo, Norway [FTP] [100 Mbit] - <ulink
-url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/">ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/</ulink></para></listitem>
+url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/"/></para></listitem>
<listitem><para>Lancaster, United Kingdom [HTTP] [100 Mbit] - <ulink
-url="http://www.mirror.ac.uk/sites/ftp.linuxfromscratch.org">http://www.mirror.ac.uk/sites/ftp.linuxfromscratch.org</ulink></para></listitem>
+url="http://www.mirror.ac.uk/sites/ftp.linuxfromscratch.org/"/></para></listitem>
<listitem><para>Vienna Univ. of Tech., Austria [FTP] [64 Mbit] - <ulink
-url="ftp://ftp.at.linuxfromscratch.org/pub/lfs">ftp://ftp.at.linuxfromscratch.org/pub/lfs</ulink></para></listitem>
+url="ftp://ftp.at.linuxfromscratch.org/pub/lfs/"/></para></listitem>
<listitem><para>Vienna Univ. of Tech., Austria [HTTP] [64 Mbit] - <ulink
-url="http://ftp.at.linuxfromscratch.org/pub/lfs">http://ftp.at.linuxfromscratch.org/pub/lfs</ulink></para></listitem>
+url="http://ftp.at.linuxfromscratch.org/pub/lfs"/></para></listitem>
<listitem><para>Karlskrona, Sweden [FTP] [10 Mbit] - <ulink
-url="ftp://ftp.se.linuxfromscratch.org/lfs">ftp://ftp.se.linuxfromscratch.org/lfs</ulink></para></listitem>
+url="ftp://ftp.se.linuxfromscratch.org/lfs"/></para></listitem>
<listitem><para>Freising, Germany [HTTP] [4 Mbit] - <ulink
-url="http://ftp.de.linuxfromscratch.org">http://ftp.de.linuxfromscratch.org</ulink></para></listitem>
+url="http://ftp.de.linuxfromscratch.org/"/></para></listitem>
<listitem><para>Freising, Germany [FTP] [4 Mbit] - <ulink
-url="ftp://ftp.de.[..]/mirrors/ftp.linuxfromscratch.org">ftp://ftp.de.[..]/mirrors/ftp.linuxfromscratch.org</ulink></para></listitem>
+url="ftp://ftp.de.[..]/mirrors/ftp.linuxfromscratch.org/"/></para></listitem>
</itemizedlist>
@@ -138,7 +138,7 @@ url="ftp://ftp.de.[..]/mirrors/ftp.linuxfromscratch.org">ftp://ftp.de.[..]/mirro
<itemizedlist>
<listitem><para>Brisbane, Australia [FTP] [155 Mbit] - <ulink
-url="ftp://ftp.planetmirror.com/pub/lfs/">ftp://ftp.planetmirror.com/pub/lfs/</ulink></para></listitem>
+url="ftp://ftp.planetmirror.com/pub/lfs/"/></para></listitem>
</itemizedlist>
diff --git a/chapter02/askforhelp.xml b/chapter02/askforhelp.xml
index 86dbef18b..feba21a79 100644
--- a/chapter02/askforhelp.xml
+++ b/chapter02/askforhelp.xml
@@ -77,7 +77,7 @@ message(s).</para>
<para>An excellent article on asking for help on the Internet in general
has been written by Eric S. Raymond. It is available online at <ulink
-url="http://www.tuxedo.org/~esr/faqs/smart-questions.html">http://www.tuxedo.org/~esr/faqs/smart-questions.html</ulink>.
+url="http://www.tuxedo.org/~esr/faqs/smart-questions.html"/>.
Read and follow the hints in this document and you are much more likely
to get a response to start with and also to get the help you actually
need.</para>
diff --git a/chapter03/creatingpart.xml b/chapter03/creatingpart.xml
index 5d31115a7..5144298d4 100644
--- a/chapter03/creatingpart.xml
+++ b/chapter03/creatingpart.xml
@@ -8,7 +8,7 @@ installed. This is not recommended if it is the first time you try LFS,
but may be useful if you are short on disk space. If you feel brave, take
a look at the <emphasis>Install LFS next to existing systems on the same
partition</emphasis> hint at <ulink
-url="&hints-root;lfs_next_to_existing_systems.txt">&hints-root;lfs_next_to_existing_systems.txt</ulink></para>
+url="&hints-root;lfs_next_to_existing_systems.txt"/></para>
<para>Before we can build our new Linux system, we need to have an empty Linux
partition on which we can build our new system. We recommend a partition size
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"/>
diff --git a/chapter05/creatingdirs.xml b/chapter05/creatingdirs.xml
index 9ebdd1884..45f717a54 100644
--- a/chapter05/creatingdirs.xml
+++ b/chapter05/creatingdirs.xml
@@ -4,7 +4,7 @@
<para>Let's now create the directory tree on the LFS partition based on
the FHS standard, which can be found at
-<ulink url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/</ulink>.
+<ulink url="http://www.pathname.com/fhs/"/>.
Issuing the following commands will create a default directory layout:</para>
<para><screen><userinput>cd $LFS &amp;&amp;
diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index 6655aaeec..dbc03bea4 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -46,9 +46,7 @@ all debugging symbols from all programs and libraries on your
system.</para>
<para>You might find additional information in the optimization hint which can
-be found at <ulink
-url="&hints-root;optimization.txt">&hints-root;optimization.txt</ulink>
-.</para>
+be found at <ulink url="&hints-root;optimization.txt"/>.</para>
</sect1>
diff --git a/chapter06/bootscripts-inst.xml b/chapter06/bootscripts-inst.xml
index f59b966a8..a582f2cb7 100644
--- a/chapter06/bootscripts-inst.xml
+++ b/chapter06/bootscripts-inst.xml
@@ -4,8 +4,7 @@
<para>We will be using SysV style init scripts. We have chosen this style
because it is widely used and we feel comfortable with it. If you want to
try something else, someone has written an LFS-Hint on BSD style init
-scripts at <ulink
-url="&hints-root;bsd-init.txt">&hints-root;bsd-init.txt</ulink>.</para>
+scripts at <ulink url="&hints-root;bsd-init.txt"/>.</para>
<para>If you decide to use BSD style, or some other style scripts, you can
skip chapter 7 when you arrive at it and move on to chapter 8.</para>
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index daf324588..1bf864b03 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -31,4 +31,3 @@ book.</para>
normal because Glibc hasn't been installed yet.</para>
</sect1>
-
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index d45efcc33..fc8f68e3b 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -10,9 +10,9 @@ method. Although I agree on that, I choose to give the
full instructions for each and every package. This is simply to avoid any
possible confusion and errors.</para>
-<para>Now would be a good time to take a look at the optimization hint at <ulink
-url="&hints-root;optimization.txt">&hints-root;optimization.txt</ulink>
-if you plan on using compiler optimization for the packages
+<para>Now would be a good time to take a look at the optimization hint
+at <ulink url="&hints-root;optimization.txt"/> if you plan on using
+compiler optimization for the packages
installed in the following chapter. Compiler optimization can make a program run
faster, but may also cause some compilation problems. If you run into problems
after having used optimization, always try it without optimizing to see if
diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml
index 46994267e..c86208ea1 100644
--- a/chapter06/lilo-inst.xml
+++ b/chapter06/lilo-inst.xml
@@ -3,9 +3,8 @@
<para>We have chosen Lilo because we feel comfortable with it, but you
may wish to take a look elsewhere. Someone has written a hint on
-GRUB at <ulink
-url="&hints-root;grub-howto.txt">&hints-root;grub-howto.txt</ulink>,
- an alternative boot loader.</para>
+GRUB at <ulink url="&hints-root;grub-howto.txt"/>, an alternative
+boot loader.</para>
<para>Install Lilo by running the following commands:</para>
@@ -24,9 +23,7 @@ yet. We will complete the installation of lilo in chapter 8.</para>
<para>Maybe you'll be interested to know that someone wrote a hint on
how to get a logo instead the the standard LILO prompt or menu. Take
-a look at it at <ulink
-url="&hints-root;bootlogo.txt">&hints-root;bootlogo.txt</ulink>
-.</para>
+a look at it at <ulink url="&hints-root;bootlogo.txt"/>.</para>
</sect2>
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 1250be4b9..ac945c018 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -8,8 +8,8 @@ make &amp;&amp;
make install &amp;&amp;
mv /usr/share/misc/man.conf /etc</userinput></screen></para>
-<para>You may want to take a look at the man hint at <ulink
-url="&hints-root;man.txt">&hints-root;man.txt</ulink>
-which deals with formatting and compression issues for man pages.</para>
+<para>You may want to take a look at the man hint
+at <ulink url="&hints-root;man.txt"/> which deals with formatting
+and compression issues for man pages.</para>
</sect2>
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 3da3581de..26419b876 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -1,9 +1,9 @@
<sect2>
<title>Installation of Shadow Password Suite</title>
-<para>Before you install this package, you may want to have a look at the
-<ulink url="http://hints.linuxfromscratch.org/hints/shadowpasswd_plus.txt">http://hints.linuxfromscratch.org/hints/shadowpasswd_plus.txt</ulink>
-lfs hint. It discusses how you can make your system more secure regarding
+<para>Before you install this package, you may want to have a look at
+the <ulink url="&hints-root;shadowpasswd_plus.txt"/> lfs hint. It
+discusses how you can make your system more secure regarding
passwords and how to get the most out of this Shadow package.</para>
<para>Install the Shadow Password Suite by running the
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index 3b3909050..e7e46a57a 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -4,7 +4,7 @@
<para>If you don't like vim to be installed as an editor on the LFS system,
you may want to download an alternative and install an editor you
prefer. There are a few hints how to install different editors
-available at <ulink url="&hints-root;">&hints-root;</ulink>. The hints
+available at <ulink url="&hints-root;"/>. The hints
which are currently available are for Emacs, Joe and nano.</para>
<para>Install Vim by running the following commands:</para>
diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml
index 432d0790f..7e59a57c6 100644
--- a/chapter07/setclock.xml
+++ b/chapter07/setclock.xml
@@ -25,8 +25,7 @@ UTC=1
<userinput>EOF</userinput></screen></para>
<para>Now, you may want to take a look at a very good hint explaining how we
-deal with time on LFS at <ulink
-url="&hints-root;time.txt">&hints-root;time.txt</ulink>.
+deal with time on LFS at <ulink url="&hints-root;time.txt"/>.
It explains issues such as timezones, UTC, and the TZ environment
variable.</para>
diff --git a/chapter09/getcounted.xml b/chapter09/getcounted.xml
index 4b9dcf602..aae3cfa0c 100644
--- a/chapter09/getcounted.xml
+++ b/chapter09/getcounted.xml
@@ -3,11 +3,10 @@
<?dbhtml filename="getcounted.html" dir="chapter09"?>
<para>Want to be counted as an LFS user now that you have finished the
-book? Head over to
-<ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi">
-http://linuxfromscratch.org/cgi-bin/lfscounter.cgi</ulink> and register as
-an LFS user by entering your name and the first LFS version you have
-used.</para>
+book? Head over
+to <ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi"/> and
+register as an LFS user by entering your name and the first LFS version
+you have used.</para>
<para>Let's reboot into LFS now...</para>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 828e6e418..c0763cd26 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -33,11 +33,10 @@ on LFS active:</para>
<para>If you are wondering: "Well, where to go now?" you'll be glad to
hear that someone has written an LFS hint on the subject at <ulink
-url="&hints-root;afterlfs.txt">&hints-root;afterlfs.txt</ulink>.
-On a same note, if you are not only newbie to LFS, but also
-newbie to Linux in general, you may find the newbie hint at <ulink
-url="&hints-root;newbie.txt">&hints-root;newbie.txt</ulink>
- very interesting.</para>
+url="&hints-root;afterlfs.txt"/>. On a similar note, if you are not
+only a newbie to LFS, but also to Linux in general, you may
+find the newbie hint at <ulink url="&hints-root;newbie.txt"/> very
+interesting.</para>
<para>Don't forget there are several LFS mailinglists you can subscribe
to if you are in need of help, advice, etc. See
diff --git a/index.xml b/index.xml
index 0d4780fd9..ada3395f3 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
<!ENTITY book SYSTEM "book/book.xml">
-<!ENTITY version "20020509">
-<!ENTITY releasedate "May 9th, 2002">
+<!ENTITY version "20020511">
+<!ENTITY releasedate "May 11th, 2002">
<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
<!ENTITY http-root "http://ftp.linuxfromscratch.org">
diff --git a/preface/whonotread.xml b/preface/whonotread.xml
index ccef0df69..46c493998 100644
--- a/preface/whonotread.xml
+++ b/preface/whonotread.xml
@@ -21,7 +21,7 @@ the basics, then the From-PowerUp-To-Bash-Prompt-HOWTO is probably
better material to read.</para>
<para>The <quote>From-PowerUp-To-Bash-Prompt-HOWTO</quote> is located at
-<ulink url="http://www.netspace.net.au/~gok/power2bash/">http://www.netspace.net.au/~gok/power2bash/</ulink></para>
+<ulink url="http://www.netspace.net.au/~gok/power2bash/"/>.</para>
</sect1>