aboutsummaryrefslogtreecommitdiffstats
path: root/chapter04
diff options
context:
space:
mode:
Diffstat (limited to 'chapter04')
-rw-r--r--chapter04/all.xml10
-rw-r--r--chapter04/autoconf.xml8
-rw-r--r--chapter04/automake.xml8
-rw-r--r--chapter04/bash.xml8
-rw-r--r--chapter04/bin86.xml8
-rw-r--r--chapter04/binutils.xml8
-rw-r--r--chapter04/bison.xml8
-rw-r--r--chapter04/bzip2.xml8
-rw-r--r--chapter04/diffutils.xml8
-rw-r--r--chapter04/e2fsprogs.xml8
-rw-r--r--chapter04/ed.xml8
-rw-r--r--chapter04/file.xml10
-rw-r--r--chapter04/fileutils-patch.xml8
-rw-r--r--chapter04/fileutils.xml8
-rw-r--r--chapter04/findutils-patch.xml8
-rw-r--r--chapter04/findutils.xml8
-rw-r--r--chapter04/flex.xml8
-rw-r--r--chapter04/gcc.xml8
-rw-r--r--chapter04/gettext.xml8
-rw-r--r--chapter04/glibc-threads.xml8
-rw-r--r--chapter04/glibc.xml8
-rw-r--r--chapter04/grep.xml8
-rw-r--r--chapter04/groff.xml8
-rw-r--r--chapter04/gzip-patch.xml8
-rw-r--r--chapter04/gzip.xml8
-rw-r--r--chapter04/kbd.xml8
-rw-r--r--chapter04/kernel.xml8
-rw-r--r--chapter04/ldso.xml8
-rw-r--r--chapter04/less.xml8
-rw-r--r--chapter04/libtool.xml8
-rw-r--r--chapter04/lilo.xml8
-rw-r--r--chapter04/m4.xml8
-rw-r--r--chapter04/make.xml8
-rw-r--r--chapter04/makedev.xml8
-rw-r--r--chapter04/man.xml8
-rw-r--r--chapter04/manpages.xml8
-rw-r--r--chapter04/mawk.xml8
-rw-r--r--chapter04/modutils.xml8
-rw-r--r--chapter04/ncurses.xml8
-rw-r--r--chapter04/netkitbase.xml8
-rw-r--r--chapter04/nettools.xml8
-rw-r--r--chapter04/packages.xml2
-rw-r--r--chapter04/patch.xml8
-rw-r--r--chapter04/perl.xml8
-rw-r--r--chapter04/procinfo.xml8
-rw-r--r--chapter04/procps.xml8
-rw-r--r--chapter04/psmisc.xml8
-rw-r--r--chapter04/sed.xml8
-rw-r--r--chapter04/shadowpwd-patch.xml8
-rw-r--r--chapter04/shadowpwd.xml8
-rw-r--r--chapter04/shellutils.xml8
-rw-r--r--chapter04/sysklogd.xml8
-rw-r--r--chapter04/sysvinit-patch.xml8
-rw-r--r--chapter04/sysvinit.xml8
-rw-r--r--chapter04/tar-patch.xml8
-rw-r--r--chapter04/tar.xml8
-rw-r--r--chapter04/texinfo.xml8
-rw-r--r--chapter04/textutils.xml8
-rw-r--r--chapter04/toplevel.xml8
-rw-r--r--chapter04/utillinux.xml8
-rw-r--r--chapter04/vim.xml16
61 files changed, 247 insertions, 247 deletions
diff --git a/chapter04/all.xml b/chapter04/all.xml
index d09e18770..1ac1d3141 100644
--- a/chapter04/all.xml
+++ b/chapter04/all.xml
@@ -1,6 +1,6 @@
-All LFS Packages - 70,160 KB:
-<ulink url="&ftp-intel;/lfs-packages-intel-3.0-pre2.tar">
-&ftp-intel;/lfs-packages-intel-3.0-pre2.tar</ulink>
-<ulink url="&http-intel;/lfs-packages-intel-3.0-pre2.tar">
-&http-intel;/lfs-packages-intel-3.0-pre2.tar</ulink>
+All LFS Packages - 70,290 KB:
+<ulink url="&ftp;/lfs-packages-intel-3.0-pre2.tar">
+&ftp;/lfs-packages-intel-3.0-pre2.tar</ulink>
+<ulink url="&http;/lfs-packages-intel-3.0-pre2.tar">
+&http;/lfs-packages-intel-3.0-pre2.tar</ulink>
diff --git a/chapter04/autoconf.xml b/chapter04/autoconf.xml
index 1876cd75d..f44985545 100644
--- a/chapter04/autoconf.xml
+++ b/chapter04/autoconf.xml
@@ -1,6 +1,6 @@
Autoconf (&autoconf-version;) - 333 KB:
-<ulink url="&ftp-common;/autoconf-&autoconf-version;.tar.bz2">
-&ftp-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
-<ulink url="&http-common;/autoconf-&autoconf-version;.tar.bz2">
-&http-common;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&ftp;/autoconf-&autoconf-version;.tar.bz2">
+&ftp;/autoconf-&autoconf-version;.tar.bz2</ulink>
+<ulink url="&http;/autoconf-&autoconf-version;.tar.bz2">
+&http;/autoconf-&autoconf-version;.tar.bz2</ulink>
diff --git a/chapter04/automake.xml b/chapter04/automake.xml
index c0e8c0469..ac16d3ced 100644
--- a/chapter04/automake.xml
+++ b/chapter04/automake.xml
@@ -1,6 +1,6 @@
Automake (&automake-version;) - 277 KB:
-<ulink url="&ftp-common;/automake-&automake-version;.tar.bz2">
-&ftp-common;/automake-&automake-version;.tar.bz2</ulink>
-<ulink url="&http-common;/automake-&automake-version;.tar.bz2">
-&http-common;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&ftp;/automake-&automake-version;.tar.bz2">
+&ftp;/automake-&automake-version;.tar.bz2</ulink>
+<ulink url="&http;/automake-&automake-version;.tar.bz2">
+&http;/automake-&automake-version;.tar.bz2</ulink>
diff --git a/chapter04/bash.xml b/chapter04/bash.xml
index 7af90622f..3df97bc9e 100644
--- a/chapter04/bash.xml
+++ b/chapter04/bash.xml
@@ -1,6 +1,6 @@
Bash (&bash-version;) - 1,308 KB:
-<ulink url="&ftp-common;/bash-&bash-version;.tar.bz2">
-&ftp-common;/bash-&bash-version;.tar.bz2</ulink>
-<ulink url="&http-common;/bash-&bash-version;.tar.bz2">
-&http-common;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bash-&bash-version;.tar.bz2">
+&ftp;/bash-&bash-version;.tar.bz2</ulink>
+<ulink url="&http;/bash-&bash-version;.tar.bz2">
+&http;/bash-&bash-version;.tar.bz2</ulink>
diff --git a/chapter04/bin86.xml b/chapter04/bin86.xml
index b5cc14ed9..12ad7b25d 100644
--- a/chapter04/bin86.xml
+++ b/chapter04/bin86.xml
@@ -1,6 +1,6 @@
Bin86 (&bin86-version;) - 112 KB:
-<ulink url="&ftp-common;/bin86-&bin86-version;.tar.bz2">
-&ftp-common;/bin86-&bin86-version;.tar.bz2</ulink>
-<ulink url="&http-common;/bin86-&bin86-version;.tar.bz2">
-&http-common;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bin86-&bin86-version;.tar.bz2">
+&ftp;/bin86-&bin86-version;.tar.bz2</ulink>
+<ulink url="&http;/bin86-&bin86-version;.tar.bz2">
+&http;/bin86-&bin86-version;.tar.bz2</ulink>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index f4f0f3e18..26c10a6a3 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,6 +1,6 @@
Binutils (&binutils-version;) - 5,524 KB:
-<ulink url="&ftp-common;/binutils-&binutils-version;.tar.bz2">
-&ftp-common;/binutils-&binutils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/binutils-&binutils-version;.tar.bz2">
-&http-common;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/binutils-&binutils-version;.tar.bz2">
+&ftp;/binutils-&binutils-version;.tar.bz2</ulink>
+<ulink url="&http;/binutils-&binutils-version;.tar.bz2">
+&http;/binutils-&binutils-version;.tar.bz2</ulink>
diff --git a/chapter04/bison.xml b/chapter04/bison.xml
index d6be0993c..1859f5777 100644
--- a/chapter04/bison.xml
+++ b/chapter04/bison.xml
@@ -1,6 +1,6 @@
Bison (&bison-version;) - 321 KB:
-<ulink url="&ftp-common;/bison-&bison-version;.tar.bz2">
-&ftp-common;/bison-&bison-version;.tar.bz2</ulink>
-<ulink url="&http-common;/bison-&bison-version;.tar.bz2">
-&http-common;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bison-&bison-version;.tar.bz2">
+&ftp;/bison-&bison-version;.tar.bz2</ulink>
+<ulink url="&http;/bison-&bison-version;.tar.bz2">
+&http;/bison-&bison-version;.tar.bz2</ulink>
diff --git a/chapter04/bzip2.xml b/chapter04/bzip2.xml
index de5b8c83a..98652dd67 100644
--- a/chapter04/bzip2.xml
+++ b/chapter04/bzip2.xml
@@ -1,6 +1,6 @@
Bzip2 (&bzip2-version;) - 410 KB:
-<ulink url="&ftp-common;/bzip2-&bzip2-version;.tar.bz2">
-&ftp-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
-<ulink url="&http-common;/bzip2-&bzip2-version;.tar.bz2">
-&http-common;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&ftp;/bzip2-&bzip2-version;.tar.bz2">
+&ftp;/bzip2-&bzip2-version;.tar.bz2</ulink>
+<ulink url="&http;/bzip2-&bzip2-version;.tar.bz2">
+&http;/bzip2-&bzip2-version;.tar.bz2</ulink>
diff --git a/chapter04/diffutils.xml b/chapter04/diffutils.xml
index 366707a72..830cd94e9 100644
--- a/chapter04/diffutils.xml
+++ b/chapter04/diffutils.xml
@@ -1,6 +1,6 @@
Diff Utils (&diffutils-version;) - 247 KB:
-<ulink url="&ftp-common;/diffutils-&diffutils-version;.tar.bz2">
-&ftp-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/diffutils-&diffutils-version;.tar.bz2">
-&http-common;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/diffutils-&diffutils-version;.tar.bz2">
+&ftp;/diffutils-&diffutils-version;.tar.bz2</ulink>
+<ulink url="&http;/diffutils-&diffutils-version;.tar.bz2">
+&http;/diffutils-&diffutils-version;.tar.bz2</ulink>
diff --git a/chapter04/e2fsprogs.xml b/chapter04/e2fsprogs.xml
index 896551466..5795d436c 100644
--- a/chapter04/e2fsprogs.xml
+++ b/chapter04/e2fsprogs.xml
@@ -1,6 +1,6 @@
E2fsprogs (&e2fsprogs-version;) - 808 KB:
-<ulink url="&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
-&ftp-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
-<ulink url="&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
-&http-common;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&ftp;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
+<ulink url="&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2">
+&http;/e2fsprogs-&e2fsprogs-version;.tar.bz2</ulink>
diff --git a/chapter04/ed.xml b/chapter04/ed.xml
index 75c29af07..37bc9c595 100644
--- a/chapter04/ed.xml
+++ b/chapter04/ed.xml
@@ -1,6 +1,6 @@
Ed (&ed-version;) - 158 KB:
-<ulink url="&ftp-common;/ed-&ed-version;.tar.bz2">
-&ftp-common;/ed-&ed-version;.tar.bz2</ulink>
-<ulink url="&http-common;/ed-&ed-version;.tar.bz2">
-&http-common;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&ftp;/ed-&ed-version;.tar.bz2">
+&ftp;/ed-&ed-version;.tar.bz2</ulink>
+<ulink url="&http;/ed-&ed-version;.tar.bz2">
+&http;/ed-&ed-version;.tar.bz2</ulink>
diff --git a/chapter04/file.xml b/chapter04/file.xml
index 865207eb3..f5652b3c7 100644
--- a/chapter04/file.xml
+++ b/chapter04/file.xml
@@ -1,7 +1,7 @@
-File (&file-version;) - 126 KB:
-<ulink url="&ftp-cvs;/file-&file-version;.tar.bz2">
-&ftp-cvs;/file-&file-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/file-&file-version;.tar.bz2">
-&http-cvs;/file-&file-version;.tar.bz2</ulink>
+File (&file-version;) - 130 KB:
+<ulink url="&ftp;/file-&file-version;.tar.bz2">
+&ftp;/file-&file-version;.tar.bz2</ulink>
+<ulink url="&http;/file-&file-version;.tar.bz2">
+&http;/file-&file-version;.tar.bz2</ulink>
diff --git a/chapter04/fileutils-patch.xml b/chapter04/fileutils-patch.xml
index f353fe2fa..b0b9df71a 100644
--- a/chapter04/fileutils-patch.xml
+++ b/chapter04/fileutils-patch.xml
@@ -1,6 +1,6 @@
File Utils Patch (&fileutils-version;) - 1 KB:
-<ulink url="&ftp-cvs;/fileutils-&fileutils-version;.patch.bz2">
-&ftp-cvs;/fileutils-&fileutils-version;.patch.bz2</ulink>
-<ulink url="&http-cvs;/fileutils-&fileutils-version;.patch.bz2">
-&http-cvs;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&ftp;/fileutils-&fileutils-version;.patch.bz2">
+&ftp;/fileutils-&fileutils-version;.patch.bz2</ulink>
+<ulink url="&http;/fileutils-&fileutils-version;.patch.bz2">
+&http;/fileutils-&fileutils-version;.patch.bz2</ulink>
diff --git a/chapter04/fileutils.xml b/chapter04/fileutils.xml
index e51779425..d19e151a7 100644
--- a/chapter04/fileutils.xml
+++ b/chapter04/fileutils.xml
@@ -1,6 +1,6 @@
File Utils (&fileutils-version;) 801 KB:
-<ulink url="&ftp-common;/fileutils-&fileutils-version;.tar.bz2">
-&ftp-common;/fileutils-&fileutils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/fileutils-&fileutils-version;.tar.bz2">
-&http-common;/fileutils-&fileutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/fileutils-&fileutils-version;.tar.bz2">
+&ftp;/fileutils-&fileutils-version;.tar.bz2</ulink>
+<ulink url="&http;/fileutils-&fileutils-version;.tar.bz2">
+&http;/fileutils-&fileutils-version;.tar.bz2</ulink>
diff --git a/chapter04/findutils-patch.xml b/chapter04/findutils-patch.xml
index e2e5cfcad..62c9c1b9e 100644
--- a/chapter04/findutils-patch.xml
+++ b/chapter04/findutils-patch.xml
@@ -1,6 +1,6 @@
Find Utils Patch (&findutils-version;) 1 KB:
-<ulink url="&ftp-common;/findutils-&findutils-version;.patch.bz2">
-&ftp-common;/findutils-&findutils-version;.patch.bz2</ulink>
-<ulink url="&http-common;/findutils-&findutils-version;.patch.bz2">
-&http-common;/findutils-&findutils-version;.patch.bz2</ulink>
+<ulink url="&ftp;/findutils-&findutils-version;.patch.bz2">
+&ftp;/findutils-&findutils-version;.patch.bz2</ulink>
+<ulink url="&http;/findutils-&findutils-version;.patch.bz2">
+&http;/findutils-&findutils-version;.patch.bz2</ulink>
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
index 598ce2e77..49db1c9ba 100644
--- a/chapter04/findutils.xml
+++ b/chapter04/findutils.xml
@@ -1,6 +1,6 @@
Find Utils (&findutils-version;) 226 KB:
-<ulink url="&ftp-common;/findutils-&findutils-version;.tar.bz2">
-&ftp-common;/findutils-&findutils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/findutils-&findutils-version;.tar.bz2">
-&http-common;/findutils-&findutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/findutils-&findutils-version;.tar.bz2">
+&ftp;/findutils-&findutils-version;.tar.bz2</ulink>
+<ulink url="&http;/findutils-&findutils-version;.tar.bz2">
+&http;/findutils-&findutils-version;.tar.bz2</ulink>
diff --git a/chapter04/flex.xml b/chapter04/flex.xml
index ea4dc3c5d..a540dac12 100644
--- a/chapter04/flex.xml
+++ b/chapter04/flex.xml
@@ -1,6 +1,6 @@
Flex (&flex-version;) 278 KB:
-<ulink url="&ftp-common;/flex-&flex-version;.tar.bz2">
-&ftp-common;/flex-&flex-version;.tar.bz2</ulink>
-<ulink url="&http-common;/flex-&flex-version;.tar.bz2">
-&http-common;/flex-&flex-version;.tar.bz2</ulink>
+<ulink url="&ftp;/flex-&flex-version;.tar.bz2">
+&ftp;/flex-&flex-version;.tar.bz2</ulink>
+<ulink url="&http;/flex-&flex-version;.tar.bz2">
+&http;/flex-&flex-version;.tar.bz2</ulink>
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index eb629aff7..e29299a5a 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -1,6 +1,6 @@
GCC (&gcc-version;) 9,551 KB:
-<ulink url="&ftp-cvs;/gcc-&gcc-version;.tar.bz2">
-&ftp-cvs;/gcc-&gcc-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/gcc-&gcc-version;.tar.bz2">
-&http-cvs;/gcc-&gcc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2">
+&ftp;/gcc-&gcc-version;.tar.bz2</ulink>
+<ulink url="&http;/gcc-&gcc-version;.tar.bz2">
+&http;/gcc-&gcc-version;.tar.bz2</ulink>
diff --git a/chapter04/gettext.xml b/chapter04/gettext.xml
index 653e48354..51805094b 100644
--- a/chapter04/gettext.xml
+++ b/chapter04/gettext.xml
@@ -1,6 +1,6 @@
Gettext (&gettext-version;) 705 KB:
-<ulink url="&ftp-cvs;/gettext-&gettext-version;.tar.bz2">
-&ftp-cvs;/gettext-&gettext-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/gettext-&gettext-version;.tar.bz2">
-&http-cvs;/gettext-&gettext-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gettext-&gettext-version;.tar.bz2">
+&ftp;/gettext-&gettext-version;.tar.bz2</ulink>
+<ulink url="&http;/gettext-&gettext-version;.tar.bz2">
+&http;/gettext-&gettext-version;.tar.bz2</ulink>
diff --git a/chapter04/glibc-threads.xml b/chapter04/glibc-threads.xml
index 8428add3d..1c482df47 100644
--- a/chapter04/glibc-threads.xml
+++ b/chapter04/glibc-threads.xml
@@ -1,6 +1,6 @@
Glibc-linuxthreads (&glibc-version;) 149 KB:
-<ulink url="&ftp-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2">
-&ftp-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2">
-&http-cvs;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2">
+&ftp;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http;/glibc-linuxthreads-&glibc-version;.tar.bz2">
+&http;/glibc-linuxthreads-&glibc-version;.tar.bz2</ulink>
diff --git a/chapter04/glibc.xml b/chapter04/glibc.xml
index c1b00804f..0fb115afe 100644
--- a/chapter04/glibc.xml
+++ b/chapter04/glibc.xml
@@ -1,6 +1,6 @@
Glibc (&glibc-version;) 10,137 KB:
-<ulink url="&ftp-cvs;/glibc-&glibc-version;.tar.bz2">
-&ftp-cvs;/glibc-&glibc-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/glibc-&glibc-version;.tar.bz2">
-&http-cvs;/glibc-&glibc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/glibc-&glibc-version;.tar.bz2">
+&ftp;/glibc-&glibc-version;.tar.bz2</ulink>
+<ulink url="&http;/glibc-&glibc-version;.tar.bz2">
+&http;/glibc-&glibc-version;.tar.bz2</ulink>
diff --git a/chapter04/grep.xml b/chapter04/grep.xml
index 96e04560f..1752cfca6 100644
--- a/chapter04/grep.xml
+++ b/chapter04/grep.xml
@@ -1,6 +1,6 @@
Grep (&grep-version;) 382 KB:
-<ulink url="&ftp-common;/grep-&grep-version;.tar.bz2">
-&ftp-common;/grep-&grep-version;.tar.bz2</ulink>
-<ulink url="&http-common;/grep-&grep-version;.tar.bz2">
-&http-common;/grep-&grep-version;.tar.bz2</ulink>
+<ulink url="&ftp;/grep-&grep-version;.tar.bz2">
+&ftp;/grep-&grep-version;.tar.bz2</ulink>
+<ulink url="&http;/grep-&grep-version;.tar.bz2">
+&http;/grep-&grep-version;.tar.bz2</ulink>
diff --git a/chapter04/groff.xml b/chapter04/groff.xml
index 9f8e7ad0b..06b7511ff 100644
--- a/chapter04/groff.xml
+++ b/chapter04/groff.xml
@@ -1,6 +1,6 @@
Groff (&groff-version;) 1,174 KB:
-<ulink url="&ftp-common;/groff-&groff-version;.tar.bz2">
-&ftp-common;/groff-&groff-version;.tar.bz2</ulink>
-<ulink url="&http-common;/groff-&groff-version;.tar.bz2">
-&http-common;/groff-&groff-version;.tar.bz2</ulink>
+<ulink url="&ftp;/groff-&groff-version;.tar.bz2">
+&ftp;/groff-&groff-version;.tar.bz2</ulink>
+<ulink url="&http;/groff-&groff-version;.tar.bz2">
+&http;/groff-&groff-version;.tar.bz2</ulink>
diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml
index 6eadc9c0b..f1c17c2cf 100644
--- a/chapter04/gzip-patch.xml
+++ b/chapter04/gzip-patch.xml
@@ -1,6 +1,6 @@
Gzip Patch (&gzip-version;) 1 KB:
-<ulink url="&ftp-common;/gzip-&gzip-version;.patch.bz2">
-&ftp-common;/gzip-&gzip-version;.patch.bz2</ulink>
-<ulink url="&http-common;/gzip-&gzip-version;.patch.bz2">
-&http-common;/gzip-&gzip-version;.patch.bz2</ulink>
+<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2">
+&ftp;/gzip-&gzip-version;.patch.bz2</ulink>
+<ulink url="&http;/gzip-&gzip-version;.patch.bz2">
+&http;/gzip-&gzip-version;.patch.bz2</ulink>
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
index 1d958bc6b..1a2358349 100644
--- a/chapter04/gzip.xml
+++ b/chapter04/gzip.xml
@@ -1,6 +1,6 @@
Gzip (&gzip-version;) 178 KB:
-<ulink url="&ftp-common;/gzip-&gzip-version;.tar.bz2">
-&ftp-common;/gzip-&gzip-version;.tar.bz2</ulink>
-<ulink url="&http-common;/gzip-&gzip-version;.tar.bz2">
-&http-common;/gzip-&gzip-version;.tar.bz2</ulink>
+<ulink url="&ftp;/gzip-&gzip-version;.tar.bz2">
+&ftp;/gzip-&gzip-version;.tar.bz2</ulink>
+<ulink url="&http;/gzip-&gzip-version;.tar.bz2">
+&http;/gzip-&gzip-version;.tar.bz2</ulink>
diff --git a/chapter04/kbd.xml b/chapter04/kbd.xml
index d81ee0b49..5927cbda6 100644
--- a/chapter04/kbd.xml
+++ b/chapter04/kbd.xml
@@ -1,6 +1,6 @@
Kbd (&kbd-version;) 585 KB:
-<ulink url="&ftp-cvs;/kbd-&kbd-version;.tar.bz2">
-&ftp-cvs;/kbd-&kbd-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/kbd-&kbd-version;.tar.bz2">
-&http-cvs;/kbd-&kbd-version;.tar.bz2</ulink>
+<ulink url="&ftp;/kbd-&kbd-version;.tar.bz2">
+&ftp;/kbd-&kbd-version;.tar.bz2</ulink>
+<ulink url="&http;/kbd-&kbd-version;.tar.bz2">
+&http;/kbd-&kbd-version;.tar.bz2</ulink>
diff --git a/chapter04/kernel.xml b/chapter04/kernel.xml
index def2194db..60161a5d5 100644
--- a/chapter04/kernel.xml
+++ b/chapter04/kernel.xml
@@ -1,6 +1,6 @@
Linux Kernel (&kernel-version;) 20,019 KB:
-<ulink url="&ftp-cvs;/linux-&kernel-version;.tar.bz2">
-&ftp-cvs;/linux-&kernel-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/linux-&kernel-version;.tar.bz2">
-&http-cvs;/linux-&kernel-version;.tar.bz2</ulink>
+<ulink url="&ftp;/linux-&kernel-version;.tar.bz2">
+&ftp;/linux-&kernel-version;.tar.bz2</ulink>
+<ulink url="&http;/linux-&kernel-version;.tar.bz2">
+&http;/linux-&kernel-version;.tar.bz2</ulink>
diff --git a/chapter04/ldso.xml b/chapter04/ldso.xml
index 311d35415..b460b2045 100644
--- a/chapter04/ldso.xml
+++ b/chapter04/ldso.xml
@@ -1,6 +1,6 @@
Ld.so (&ld.so-version;) 280 KB:
-<ulink url="&ftp-common;/ld.so-&ld.so-version;.tar.bz2">
-&ftp-common;/ld.so-&ld.so-version;.tar.bz2</ulink>
-<ulink url="&http-common;/ld.so-&ld.so-version;.tar.bz2">
-&http-common;/ld.so-&ld.so-version;.tar.bz2</ulink>
+<ulink url="&ftp;/ld.so-&ld.so-version;.tar.bz2">
+&ftp;/ld.so-&ld.so-version;.tar.bz2</ulink>
+<ulink url="&http;/ld.so-&ld.so-version;.tar.bz2">
+&http;/ld.so-&ld.so-version;.tar.bz2</ulink>
diff --git a/chapter04/less.xml b/chapter04/less.xml
index 992a1ad21..c974aae2d 100644
--- a/chapter04/less.xml
+++ b/chapter04/less.xml
@@ -1,6 +1,6 @@
Less (&less-version;) 178 KB:
-<ulink url="&ftp-common;/less-&less-version;.tar.bz2">
-&ftp-common;/less-&less-version;.tar.bz2</ulink>
-<ulink url="&http-common;/less-&less-version;.tar.bz2">
-&http-common;/less-&less-version;.tar.bz2</ulink>
+<ulink url="&ftp;/less-&less-version;.tar.bz2">
+&ftp;/less-&less-version;.tar.bz2</ulink>
+<ulink url="&http;/less-&less-version;.tar.bz2">
+&http;/less-&less-version;.tar.bz2</ulink>
diff --git a/chapter04/libtool.xml b/chapter04/libtool.xml
index dc54dcf99..844d365b8 100644
--- a/chapter04/libtool.xml
+++ b/chapter04/libtool.xml
@@ -1,6 +1,6 @@
Libtool (&libtool-version;) 361 KB:
-<ulink url="&ftp-common;/libtool-&libtool-version;.tar.bz2">
-&ftp-common;/libtool-&libtool-version;.tar.bz2</ulink>
-<ulink url="&http-common;/libtool-&libtool-version;.tar.bz2">
-&http-common;/libtool-&libtool-version;.tar.bz2</ulink>
+<ulink url="&ftp;/libtool-&libtool-version;.tar.bz2">
+&ftp;/libtool-&libtool-version;.tar.bz2</ulink>
+<ulink url="&http;/libtool-&libtool-version;.tar.bz2">
+&http;/libtool-&libtool-version;.tar.bz2</ulink>
diff --git a/chapter04/lilo.xml b/chapter04/lilo.xml
index fe66d66cd..b4f1c5379 100644
--- a/chapter04/lilo.xml
+++ b/chapter04/lilo.xml
@@ -1,6 +1,6 @@
Lilo (&lilo-version;) 174 KB:
-<ulink url="&ftp-cvs;/lilo-&lilo-version;.tar.bz2">
-&ftp-cvs;/lilo-&lilo-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/lilo-&lilo-version;.tar.bz2">
-&http-cvs;/lilo-&lilo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/lilo-&lilo-version;.tar.bz2">
+&ftp;/lilo-&lilo-version;.tar.bz2</ulink>
+<ulink url="&http;/lilo-&lilo-version;.tar.bz2">
+&http;/lilo-&lilo-version;.tar.bz2</ulink>
diff --git a/chapter04/m4.xml b/chapter04/m4.xml
index 8a4e257aa..ab49f69b1 100644
--- a/chapter04/m4.xml
+++ b/chapter04/m4.xml
@@ -1,6 +1,6 @@
M4 (&m4-version;) 249 KB:
-<ulink url="&ftp-common;/m4-&m4-version;.tar.bz2">
-&ftp-common;/m4-&m4-version;.tar.bz2</ulink>
-<ulink url="&http-common;/m4-&m4-version;.tar.bz2">
-&http-common;/m4-&m4-version;.tar.bz2</ulink>
+<ulink url="&ftp;/m4-&m4-version;.tar.bz2">
+&ftp;/m4-&m4-version;.tar.bz2</ulink>
+<ulink url="&http;/m4-&m4-version;.tar.bz2">
+&http;/m4-&m4-version;.tar.bz2</ulink>
diff --git a/chapter04/make.xml b/chapter04/make.xml
index b81314e5b..da2a4b99f 100644
--- a/chapter04/make.xml
+++ b/chapter04/make.xml
@@ -1,6 +1,6 @@
Make (&make-version;) 794 KB:
-<ulink url="&ftp-common;/make-&make-version;.tar.bz2">
-&ftp-common;/make-&make-version;.tar.bz2</ulink>
-<ulink url="&http-common;/make-&make-version;.tar.bz2">
-&http-common;/make-&make-version;.tar.bz2</ulink>
+<ulink url="&ftp;/make-&make-version;.tar.bz2">
+&ftp;/make-&make-version;.tar.bz2</ulink>
+<ulink url="&http;/make-&make-version;.tar.bz2">
+&http;/make-&make-version;.tar.bz2</ulink>
diff --git a/chapter04/makedev.xml b/chapter04/makedev.xml
index 220726411..45763e649 100644
--- a/chapter04/makedev.xml
+++ b/chapter04/makedev.xml
@@ -1,6 +1,6 @@
MAKEDEV - 7 KB:
-<ulink url="&ftp-cvs;/MAKEDEV.bz2">
-&ftp-cvs;/MAKEDEV.bz2</ulink>
-<ulink url="&http-cvs;/MAKEDEV.bz2">
-&http-cvs;/MAKEDEV.bz2</ulink>
+<ulink url="&ftp;/MAKEDEV.bz2">
+&ftp;/MAKEDEV.bz2</ulink>
+<ulink url="&http;/MAKEDEV.bz2">
+&http;/MAKEDEV.bz2</ulink>
diff --git a/chapter04/man.xml b/chapter04/man.xml
index 77d2d74d2..24da1acc0 100644
--- a/chapter04/man.xml
+++ b/chapter04/man.xml
@@ -1,6 +1,6 @@
Man (&man-version;) 158 KB:
-<ulink url="&ftp-cvs;/man-&man-version;.tar.bz2">
-&ftp-cvs;/man-&man-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/man-&man-version;.tar.bz2">
-&http-cvs;/man-&man-version;.tar.bz2</ulink>
+<ulink url="&ftp;/man-&man-version;.tar.bz2">
+&ftp;/man-&man-version;.tar.bz2</ulink>
+<ulink url="&http;/man-&man-version;.tar.bz2">
+&http;/man-&man-version;.tar.bz2</ulink>
diff --git a/chapter04/manpages.xml b/chapter04/manpages.xml
index 45cbd580b..4851ccdcc 100644
--- a/chapter04/manpages.xml
+++ b/chapter04/manpages.xml
@@ -1,6 +1,6 @@
Man-pages (&man-pages-version;) 478 KB:
-<ulink url="&ftp-cvs;/man-pages-&man-pages-version;.tar.bz2">
-&ftp-cvs;/man-pages-&man-pages-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/man-pages-&man-pages-version;.tar.bz2">
-&http-cvs;/man-pages-&man-pages-version;.tar.bz2</ulink>
+<ulink url="&ftp;/man-pages-&man-pages-version;.tar.bz2">
+&ftp;/man-pages-&man-pages-version;.tar.bz2</ulink>
+<ulink url="&http;/man-pages-&man-pages-version;.tar.bz2">
+&http;/man-pages-&man-pages-version;.tar.bz2</ulink>
diff --git a/chapter04/mawk.xml b/chapter04/mawk.xml
index 5564fd35e..eb2410a0b 100644
--- a/chapter04/mawk.xml
+++ b/chapter04/mawk.xml
@@ -1,6 +1,6 @@
Mawk (&mawk-version;) 168 KB:
-<ulink url="&ftp-common;/mawk&mawk-version;.tar.bz2">
-&ftp-common;/mawk&mawk-version;.tar.bz2</ulink>
-<ulink url="&http-common;/mawk&mawk-version;.tar.bz2">
-&http-common;/mawk&mawk-version;.tar.bz2</ulink>
+<ulink url="&ftp;/mawk&mawk-version;.tar.bz2">
+&ftp;/mawk&mawk-version;.tar.bz2</ulink>
+<ulink url="&http;/mawk&mawk-version;.tar.bz2">
+&http;/mawk&mawk-version;.tar.bz2</ulink>
diff --git a/chapter04/modutils.xml b/chapter04/modutils.xml
index fc75c86a0..150fd5200 100644
--- a/chapter04/modutils.xml
+++ b/chapter04/modutils.xml
@@ -1,6 +1,6 @@
Modutils (&modutils-version;) 200 KB:
-<ulink url="&ftp-cvs;/modutils-&modutils-version;.tar.bz2">
-&ftp-cvs;/modutils-&modutils-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/modutils-&modutils-version;.tar.bz2">
-&http-cvs;/modutils-&modutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/modutils-&modutils-version;.tar.bz2">
+&ftp;/modutils-&modutils-version;.tar.bz2</ulink>
+<ulink url="&http;/modutils-&modutils-version;.tar.bz2">
+&http;/modutils-&modutils-version;.tar.bz2</ulink>
diff --git a/chapter04/ncurses.xml b/chapter04/ncurses.xml
index d5eed370c..cb107038e 100644
--- a/chapter04/ncurses.xml
+++ b/chapter04/ncurses.xml
@@ -1,6 +1,6 @@
Ncurses (&ncurses-version;) 1,308 KB:
-<ulink url="&ftp-intel;/ncurses-&ncurses-version;.tar.bz2">
-&ftp-intel;/ncurses-&ncurses-version;.tar.bz2</ulink>
-<ulink url="&http-intel;/ncurses-&ncurses-version;.tar.bz2">
-&http-intel;/ncurses-&ncurses-version;.tar.bz2</ulink>
+<ulink url="&ftp;/ncurses-&ncurses-version;.tar.bz2">
+&ftp;/ncurses-&ncurses-version;.tar.bz2</ulink>
+<ulink url="&http;/ncurses-&ncurses-version;.tar.bz2">
+&http;/ncurses-&ncurses-version;.tar.bz2</ulink>
diff --git a/chapter04/netkitbase.xml b/chapter04/netkitbase.xml
index 0edd7802a..bb78f78d8 100644
--- a/chapter04/netkitbase.xml
+++ b/chapter04/netkitbase.xml
@@ -1,6 +1,6 @@
Netkit-base (&netkit-base-version;) 49 KB:
-<ulink url="&ftp-common;/netkit-base-&netkit-base-version;.tar.bz2">
-&ftp-common;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
-<ulink url="&http-common;/netkit-base-&netkit-base-version;.tar.bz2">
-&http-common;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
+<ulink url="&ftp;/netkit-base-&netkit-base-version;.tar.bz2">
+&ftp;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
+<ulink url="&http;/netkit-base-&netkit-base-version;.tar.bz2">
+&http;/netkit-base-&netkit-base-version;.tar.bz2</ulink>
diff --git a/chapter04/nettools.xml b/chapter04/nettools.xml
index 3ff36dbfb..b405d6770 100644
--- a/chapter04/nettools.xml
+++ b/chapter04/nettools.xml
@@ -1,6 +1,6 @@
Net-tools (&net-tools-version;) 193 KB:
-<ulink url="&ftp-cvs;/net-tools-&net-tools-version;.tar.bz2">
-&ftp-cvs;/net-tools-&net-tools-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/net-tools-&net-tools-version;.tar.bz2">
-&http-cvs;/net-tools-&net-tools-version;.tar.bz2</ulink>
+<ulink url="&ftp;/net-tools-&net-tools-version;.tar.bz2">
+&ftp;/net-tools-&net-tools-version;.tar.bz2</ulink>
+<ulink url="&http;/net-tools-&net-tools-version;.tar.bz2">
+&http;/net-tools-&net-tools-version;.tar.bz2</ulink>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index e93dd8f6a..1ea8a1260 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -64,7 +64,7 @@
&c3-netkitbase;
&c3-nettools;
-Total size of all intel-packages: 70,236 KB (68,59 MB)
+Total size of all intel-packages: 70,240 KB (68,60 MB)
</literallayout>
diff --git a/chapter04/patch.xml b/chapter04/patch.xml
index 4a62ac490..bbc72ab95 100644
--- a/chapter04/patch.xml
+++ b/chapter04/patch.xml
@@ -1,6 +1,6 @@
Patch (&patch-version;) 149 KB:
-<ulink url="&ftp-common;/patch-&patch-version;.tar.bz2">
-&ftp-common;/patch-&patch-version;.tar.bz2</ulink>
-<ulink url="&http-common;/patch-&patch-version;.tar.bz2">
-&http-common;/patch-&patch-version;.tar.bz2</ulink>
+<ulink url="&ftp;/patch-&patch-version;.tar.bz2">
+&ftp;/patch-&patch-version;.tar.bz2</ulink>
+<ulink url="&http;/patch-&patch-version;.tar.bz2">
+&http;/patch-&patch-version;.tar.bz2</ulink>
diff --git a/chapter04/perl.xml b/chapter04/perl.xml
index 28f1b95e6..c979926f7 100644
--- a/chapter04/perl.xml
+++ b/chapter04/perl.xml
@@ -1,6 +1,6 @@
Perl (&perl-version;) 4,327 KB:
-<ulink url="&ftp-common;/perl-&perl-version;.tar.bz2">
-&ftp-common;/perl-&perl-version;.tar.bz2</ulink>
-<ulink url="&http-common;/perl-&perl-version;.tar.bz2">
-&http-common;/perl-&perl-version;.tar.bz2</ulink>
+<ulink url="&ftp;/perl-&perl-version;.tar.bz2">
+&ftp;/perl-&perl-version;.tar.bz2</ulink>
+<ulink url="&http;/perl-&perl-version;.tar.bz2">
+&http;/perl-&perl-version;.tar.bz2</ulink>
diff --git a/chapter04/procinfo.xml b/chapter04/procinfo.xml
index 2393f5835..90026d7a1 100644
--- a/chapter04/procinfo.xml
+++ b/chapter04/procinfo.xml
@@ -1,6 +1,6 @@
Procinfo (&procinfo-version;) 22 KB:
-<ulink url="&ftp-cvs;/procinfo-&procinfo-version;.tar.bz2">
-&ftp-cvs;/procinfo-&procinfo-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/procinfo-&procinfo-version;.tar.bz2">
-&http-cvs;/procinfo-&procinfo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/procinfo-&procinfo-version;.tar.bz2">
+&ftp;/procinfo-&procinfo-version;.tar.bz2</ulink>
+<ulink url="&http;/procinfo-&procinfo-version;.tar.bz2">
+&http;/procinfo-&procinfo-version;.tar.bz2</ulink>
diff --git a/chapter04/procps.xml b/chapter04/procps.xml
index 1581662f0..e3425cebd 100644
--- a/chapter04/procps.xml
+++ b/chapter04/procps.xml
@@ -1,6 +1,6 @@
Procps (&procps-version;) 153 KB:
-<ulink url="&ftp-common;/procps-&procps-version;.tar.bz2">
-&ftp-common;/procps-&procps-version;.tar.bz2</ulink>
-<ulink url="&http-common;/procps-&procps-version;.tar.bz2">
-&http-common;/procps-&procps-version;.tar.bz2</ulink>
+<ulink url="&ftp;/procps-&procps-version;.tar.bz2">
+&ftp;/procps-&procps-version;.tar.bz2</ulink>
+<ulink url="&http;/procps-&procps-version;.tar.bz2">
+&http;/procps-&procps-version;.tar.bz2</ulink>
diff --git a/chapter04/psmisc.xml b/chapter04/psmisc.xml
index 7490325cb..42d8e45ea 100644
--- a/chapter04/psmisc.xml
+++ b/chapter04/psmisc.xml
@@ -1,6 +1,6 @@
Psmisc (&psmisc-version;) 51 KB:
-<ulink url="&ftp-cvs;/psmisc-&psmisc-version;.tar.bz2">
-&ftp-cvs;/psmisc-&psmisc-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/psmisc-&psmisc-version;.tar.bz2">
-&http-cvs;/psmisc-&psmisc-version;.tar.bz2</ulink>
+<ulink url="&ftp;/psmisc-&psmisc-version;.tar.bz2">
+&ftp;/psmisc-&psmisc-version;.tar.bz2</ulink>
+<ulink url="&http;/psmisc-&psmisc-version;.tar.bz2">
+&http;/psmisc-&psmisc-version;.tar.bz2</ulink>
diff --git a/chapter04/sed.xml b/chapter04/sed.xml
index f933bc969..b5ebf4be4 100644
--- a/chapter04/sed.xml
+++ b/chapter04/sed.xml
@@ -1,6 +1,6 @@
Sed (&sed-version;) 221 KB:
-<ulink url="&ftp-common;/sed-&sed-version;.tar.bz2">
-&ftp-common;/sed-&sed-version;.tar.bz2</ulink>
-<ulink url="&http-common;/sed-&sed-version;.tar.bz2">
-&http-common;/sed-&sed-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sed-&sed-version;.tar.bz2">
+&ftp;/sed-&sed-version;.tar.bz2</ulink>
+<ulink url="&http;/sed-&sed-version;.tar.bz2">
+&http;/sed-&sed-version;.tar.bz2</ulink>
diff --git a/chapter04/shadowpwd-patch.xml b/chapter04/shadowpwd-patch.xml
index cca9ade5e..e9467c9ea 100644
--- a/chapter04/shadowpwd-patch.xml
+++ b/chapter04/shadowpwd-patch.xml
@@ -1,6 +1,6 @@
Shadow Password Suite Patch (&shadow-version;) 1 KB:
-<ulink url="&ftp-cvs;/shadow-&shadow-version;.patch.bz2">
-&ftp-cvs;/shadow-&shadow-version;.patch.bz2</ulink>
-<ulink url="&http-cvs;/shadow-&shadow-version;.patch.bz2">
-&http-cvs;/shadow-&shadow-version;.patch.bz2</ulink>
+<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2">
+&ftp;/shadow-&shadow-version;.patch.bz2</ulink>
+<ulink url="&http;/shadow-&shadow-version;.patch.bz2">
+&http;/shadow-&shadow-version;.patch.bz2</ulink>
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
index 60576e5e7..1bf1f38e1 100644
--- a/chapter04/shadowpwd.xml
+++ b/chapter04/shadowpwd.xml
@@ -1,6 +1,6 @@
Shadow Password Suite (&shadow-version;) 551 KB:
-<ulink url="&ftp-cvs;/shadow-&shadow-version;.tar.bz2">
-&ftp-cvs;/shadow-&shadow-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/shadow-&shadow-version;.tar.bz2">
-&http-cvs;/shadow-&shadow-version;.tar.bz2</ulink>
+<ulink url="&ftp;/shadow-&shadow-version;.tar.bz2">
+&ftp;/shadow-&shadow-version;.tar.bz2</ulink>
+<ulink url="&http;/shadow-&shadow-version;.tar.bz2">
+&http;/shadow-&shadow-version;.tar.bz2</ulink>
diff --git a/chapter04/shellutils.xml b/chapter04/shellutils.xml
index 0614641b3..1ad7ffa81 100644
--- a/chapter04/shellutils.xml
+++ b/chapter04/shellutils.xml
@@ -1,6 +1,6 @@
Sh-utils (&sh-utils-version;) 824 KB:
-<ulink url="&ftp-common;/sh-utils-&sh-utils-version;.tar.bz2">
-&ftp-common;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/sh-utils-&sh-utils-version;.tar.bz2">
-&http-common;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sh-utils-&sh-utils-version;.tar.bz2">
+&ftp;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
+<ulink url="&http;/sh-utils-&sh-utils-version;.tar.bz2">
+&http;/sh-utils-&sh-utils-version;.tar.bz2</ulink>
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
index abbc6fd4f..358c3b92b 100644
--- a/chapter04/sysklogd.xml
+++ b/chapter04/sysklogd.xml
@@ -1,6 +1,6 @@
Sysklogd (&sysklogd-version;) 67 KB:
-<ulink url="&ftp-cvs;/sysklogd-&sysklogd-version;.tar.bz2">
-&ftp-cvs;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/sysklogd-&sysklogd-version;.tar.bz2">
-&http-cvs;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sysklogd-&sysklogd-version;.tar.bz2">
+&ftp;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
+<ulink url="&http;/sysklogd-&sysklogd-version;.tar.bz2">
+&http;/sysklogd-&sysklogd-version;.tar.bz2</ulink>
diff --git a/chapter04/sysvinit-patch.xml b/chapter04/sysvinit-patch.xml
index 05eeedbad..f8a0b743f 100644
--- a/chapter04/sysvinit-patch.xml
+++ b/chapter04/sysvinit-patch.xml
@@ -1,6 +1,6 @@
Sysvinit Patch (&sysvinit-version;) 1 KB:
-<ulink url="&ftp-common;/sysvinit-&sysvinit-version;.patch.bz2">
-&ftp-common;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
-<ulink url="&http-common;/sysvinit-&sysvinit-version;.patch.bz2">
-&http-common;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
+<ulink url="&ftp;/sysvinit-&sysvinit-version;.patch.bz2">
+&ftp;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
+<ulink url="&http;/sysvinit-&sysvinit-version;.patch.bz2">
+&http;/sysvinit-&sysvinit-version;.patch.bz2</ulink>
diff --git a/chapter04/sysvinit.xml b/chapter04/sysvinit.xml
index c494e06ce..c04a75689 100644
--- a/chapter04/sysvinit.xml
+++ b/chapter04/sysvinit.xml
@@ -1,6 +1,6 @@
Sysvinit (&sysvinit-version;) 90 KB:
-<ulink url="&ftp-common;/sysvinit-&sysvinit-version;.tar.bz2">
-&ftp-common;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
-<ulink url="&http-common;/sysvinit-&sysvinit-version;.tar.bz2">
-&http-common;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
+<ulink url="&ftp;/sysvinit-&sysvinit-version;.tar.bz2">
+&ftp;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
+<ulink url="&http;/sysvinit-&sysvinit-version;.tar.bz2">
+&http;/sysvinit-&sysvinit-version;.tar.bz2</ulink>
diff --git a/chapter04/tar-patch.xml b/chapter04/tar-patch.xml
index d4f28a689..f82c92566 100644
--- a/chapter04/tar-patch.xml
+++ b/chapter04/tar-patch.xml
@@ -1,6 +1,6 @@
Tar Patch (&tar-version;) 1 KB:
-<ulink url="&ftp-common;/gnutarpatch.txt.bz2">
-&ftp-common;/gnutarpatch.txt.bz2</ulink>
-<ulink url="&http-common;/gnutarpatch.txt.bz2">
-&http-common;/gnutarpatch.txt.bz2</ulink>
+<ulink url="&ftp;/gnutarpatch.txt.bz2">
+&ftp;/gnutarpatch.txt.bz2</ulink>
+<ulink url="&http;/gnutarpatch.txt.bz2">
+&http;/gnutarpatch.txt.bz2</ulink>
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
index 418bfbd87..754b571e5 100644
--- a/chapter04/tar.xml
+++ b/chapter04/tar.xml
@@ -1,6 +1,6 @@
Tar (&tar-version;) 730 KB:
-<ulink url="&ftp-common;/tar-&tar-version;.tar.bz2">
-&ftp-common;/tar-&tar-version;.tar.bz2</ulink>
-<ulink url="&http-common;/tar-&tar-version;.tar.bz2">
-&http-common;/tar-&tar-version;.tar.bz2</ulink>
+<ulink url="&ftp;/tar-&tar-version;.tar.bz2">
+&ftp;/tar-&tar-version;.tar.bz2</ulink>
+<ulink url="&http;/tar-&tar-version;.tar.bz2">
+&http;/tar-&tar-version;.tar.bz2</ulink>
diff --git a/chapter04/texinfo.xml b/chapter04/texinfo.xml
index 4ae56bc4b..67c033d09 100644
--- a/chapter04/texinfo.xml
+++ b/chapter04/texinfo.xml
@@ -1,6 +1,6 @@
Texinfo (&texinfo-version;) 812 KB:
-<ulink url="&ftp-common;/texinfo-&texinfo-version;.tar.bz2">
-&ftp-common;/texinfo-&texinfo-version;.tar.bz2</ulink>
-<ulink url="&http-common;/texinfo-&texinfo-version;.tar.bz2">
-&http-common;/texinfo-&texinfo-version;.tar.bz2</ulink>
+<ulink url="&ftp;/texinfo-&texinfo-version;.tar.bz2">
+&ftp;/texinfo-&texinfo-version;.tar.bz2</ulink>
+<ulink url="&http;/texinfo-&texinfo-version;.tar.bz2">
+&http;/texinfo-&texinfo-version;.tar.bz2</ulink>
diff --git a/chapter04/textutils.xml b/chapter04/textutils.xml
index 624a7e5ca..a4bf20d25 100644
--- a/chapter04/textutils.xml
+++ b/chapter04/textutils.xml
@@ -1,6 +1,6 @@
Text Utils (&textutils-version;) 1,040 KB:
-<ulink url="&ftp-common;/textutils-&textutils-version;.tar.bz2">
-&ftp-common;/textutils-&textutils-version;.tar.bz2</ulink>
-<ulink url="&http-common;/textutils-&textutils-version;.tar.bz2">
-&http-common;/textutils-&textutils-version;.tar.bz2</ulink>
+<ulink url="&ftp;/textutils-&textutils-version;.tar.bz2">
+&ftp;/textutils-&textutils-version;.tar.bz2</ulink>
+<ulink url="&http;/textutils-&textutils-version;.tar.bz2">
+&http;/textutils-&textutils-version;.tar.bz2</ulink>
diff --git a/chapter04/toplevel.xml b/chapter04/toplevel.xml
index f1edb0942..761955676 100644
--- a/chapter04/toplevel.xml
+++ b/chapter04/toplevel.xml
@@ -1,8 +1,8 @@
Browse FTP:
-<ulink url="&ftp-root;">
-&ftp-root;</ulink>
+<ulink url="&ftp-root;/">
+&ftp-root;/</ulink>
Browse HTTP:
-<ulink url="&http-root;">
-&http-root;</ulink>
+<ulink url="&http-root;/">
+&http-root;/</ulink>
diff --git a/chapter04/utillinux.xml b/chapter04/utillinux.xml
index 7229c6c67..73c8a24d7 100644
--- a/chapter04/utillinux.xml
+++ b/chapter04/utillinux.xml
@@ -1,6 +1,6 @@
Util Linux (&util-linux-version;) 919 KB:
-<ulink url="&ftp-cvs;/util-linux-&util-linux-version;.tar.bz2">
-&ftp-cvs;/util-linux-&util-linux-version;.tar.bz2</ulink>
-<ulink url="&http-cvs;/util-linux-&util-linux-version;.tar.bz2">
-&http-cvs;/util-linux-&util-linux-version;.tar.bz2</ulink>
+<ulink url="&ftp;/util-linux-&util-linux-version;.tar.bz2">
+&ftp;/util-linux-&util-linux-version;.tar.bz2</ulink>
+<ulink url="&http;/util-linux-&util-linux-version;.tar.bz2">
+&http;/util-linux-&util-linux-version;.tar.bz2</ulink>
diff --git a/chapter04/vim.xml b/chapter04/vim.xml
index e7cb9f40d..158efbf8a 100644
--- a/chapter04/vim.xml
+++ b/chapter04/vim.xml
@@ -1,12 +1,12 @@
Vim-rt (&vim-version;) 905 KB:
-<ulink url="&ftp-common;/vim-&vim-version;-rt.tar.bz2">
-&ftp-common;/vim-&vim-version;-rt.tar.bz2</ulink>
-<ulink url="&http-common;/vim-&vim-version;-rt.tar.bz2">
-&http-common;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2">
+&ftp;/vim-&vim-version;-rt.tar.bz2</ulink>
+<ulink url="&http;/vim-&vim-version;-rt.tar.bz2">
+&http;/vim-&vim-version;-rt.tar.bz2</ulink>
Vim-src (&vim-version;) 963 KB:
-<ulink url="&ftp-common;/vim-&vim-version;-src.tar.bz2">
-&ftp-common;/vim-&vim-version;-src.tar.bz2</ulink>
-<ulink url="&http-common;/vim-&vim-version;-src.tar.bz2">
-&http-common;/vim-&vim-version;-src.tar.bz2</ulink>
+<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2">
+&ftp;/vim-&vim-version;-src.tar.bz2</ulink>
+<ulink url="&http;/vim-&vim-version;-src.tar.bz2">
+&http;/vim-&vim-version;-src.tar.bz2</ulink>