Package versions in dedicated entities

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

63 files changed, 152 insertions, 454 deletions

diff --git a/Attic/appendixc/autoconf.xml b/Attic/appendixc/autoconf.xml
index b80a85e37..bd7563a2f 100644
--- a/Attic/appendixc/autoconf.xml
+++ b/Attic/appendixc/autoconf.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Autoconf (2.13):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/autoconf/">
+Autoconf (&autoconf-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/autoconf/">
 ftp://ftp.gnu.org/gnu/autoconf/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/automake.xml b/Attic/appendixc/automake.xml
index c31cb4239..ed829b08a 100644
--- a/Attic/appendixc/automake.xml
+++ b/Attic/appendixc/automake.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Automake (1.4):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/automake/">
+Automake (&automake-version;):
+<ulink  url="ftp://ftp.gnu.org/gnu/automake/">
 ftp://ftp.gnu.org/gnu/automake/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/bash.xml b/Attic/appendixc/bash.xml
index ef046430e..72eac6202 100644
--- a/Attic/appendixc/bash.xml
+++ b/Attic/appendixc/bash.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Bash (2.04):
-	<ulink
-url="ftp://ftp.gnu.org/gnu/bash/">
+Bash (&bash-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/bash/">
 ftp://ftp.gnu.org/gnu/bash/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/bin86.xml b/Attic/appendixc/bin86.xml
index 1dfc52c5c..e22be3dd9 100644
--- a/Attic/appendixc/bin86.xml
+++ b/Attic/appendixc/bin86.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Bin86 (0.15.4):
-	<ulink 
-url="http://www.cix.co.uk/~mayday/">
+Bin86 (&bin86-version;):
+<ulink url="http://www.cix.co.uk/~mayday/">
 http://www.cix.co.uk/~mayday/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/binutils.xml b/Attic/appendixc/binutils.xml
index f07f8c9d1..152efacf1 100644
--- a/Attic/appendixc/binutils.xml
+++ b/Attic/appendixc/binutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Binutils (2.10.1):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/binutils/">
+Binutils (&binutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/binutils/">
 ftp://ftp.gnu.org/gnu/binutils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/bison.xml b/Attic/appendixc/bison.xml
index bf368be74..9565847ca 100644
--- a/Attic/appendixc/bison.xml
+++ b/Attic/appendixc/bison.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Bison (1.28):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/bison/">
+Bison (&bison-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/bison/">
 ftp://ftp.gnu.org/gnu/bison/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/bzip2.xml b/Attic/appendixc/bzip2.xml
index 551d61b92..74d74897e 100644
--- a/Attic/appendixc/bzip2.xml
+++ b/Attic/appendixc/bzip2.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Bzip2 (1.0.1):
-	<ulink 
-url="ftp://sourceware.cygnus.com/pub/bzip2/">
+Bzip2 (&bzip2-version;):
+<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/">
 ftp://sourceware.cygnus.com/pub/bzip2/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/consoledata.xml b/Attic/appendixc/consoledata.xml
index 9e6825cbb..c52c2e069 100644
--- a/Attic/appendixc/consoledata.xml
+++ b/Attic/appendixc/consoledata.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Console-data (1999.08.29):
-	<ulink
-url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
+Console-data (&console-data-version;):
+<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
 ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/consoletools-patch.xml b/Attic/appendixc/consoletools-patch.xml
index 7f38a5254..cdd7573ba 100644
--- a/Attic/appendixc/consoletools-patch.xml
+++ b/Attic/appendixc/consoletools-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Console-tools Patch (0.2.3):
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages">
-ftp://packages.linuxfromscratch.org/common-packages</ulink>
-
-</para></listitem>
+Console-tools Patch (&console-tools-version;):
+<ulink url="&ftp-common;/">
+&ftp-common;/</ulink>
+<ulink url="&http-common;/">
+&http-common;/</ulink>
 
diff --git a/Attic/appendixc/consoletools.xml b/Attic/appendixc/consoletools.xml
index e6afbe85b..ff6ed99b4 100644
--- a/Attic/appendixc/consoletools.xml
+++ b/Attic/appendixc/consoletools.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Console-tools (0.2.3):
-	<ulink 
-url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
+Console-tools (&console-tools-version;):
+<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/">
 ftp://ftp.ibiblio.org/pub/Linux/system/keyboards/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/diffutils.xml b/Attic/appendixc/diffutils.xml
index 611fa7416..8b89bc508 100644
--- a/Attic/appendixc/diffutils.xml
+++ b/Attic/appendixc/diffutils.xml
@@ -1,8 +1,4 @@
-<listitem><para>
-
-Diff Utils (2.7):
-	<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">
+Diff Utils (&diffutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">
 ftp://ftp.gnu.org/gnu/diffutils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/e2fsprogs.xml b/Attic/appendixc/e2fsprogs.xml
index 45abb0b86..613b16bbf 100644
--- a/Attic/appendixc/e2fsprogs.xml
+++ b/Attic/appendixc/e2fsprogs.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-E2fsprogs (1.19):
-	<ulink
-url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/">
+E2fsprogs (&e2fsprogs-version;):
+<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/">
 ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/ed.xml b/Attic/appendixc/ed.xml
index 5859e93b4..dbad3e9c7 100644
--- a/Attic/appendixc/ed.xml
+++ b/Attic/appendixc/ed.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Ed (0.2):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/ed/">
+Ed (&ed-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/ed/">
 ftp://ftp.gnu.org/gnu/ed/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/file.xml b/Attic/appendixc/file.xml
index d5a77c336..d8d8285b0 100644
--- a/Attic/appendixc/file.xml
+++ b/Attic/appendixc/file.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-File (3.33):
-	<ulink 
-url="ftp://ftp.gw.com/mirrors/pub/unix/file/">
+File (&file-version;):
+<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/">
 ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/fileutils-patch.xml b/Attic/appendixc/fileutils-patch.xml
index 46a62036e..c4a0cebc3 100644
--- a/Attic/appendixc/fileutils-patch.xml
+++ b/Attic/appendixc/fileutils-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-File Utils Patch (4.0):
-	<ulink
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2">
-ftp://packages.linuxfromscratch.org/new-in-cvs/fileutils-4.0.patch.bz2</ulink>
-
-</para></listitem>
+File Utils Patch (&fileutils-version;):
+<ulink url="&ftp-cvs;/">
+&ftp-cvs;/</ulink>
+<ulink url="&http-cvs;/">
+&http-cvs;/</ulink>
 
diff --git a/Attic/appendixc/fileutils.xml b/Attic/appendixc/fileutils.xml
index b1b36a651..f99586faf 100644
--- a/Attic/appendixc/fileutils.xml
+++ b/Attic/appendixc/fileutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-File Utils (4.0):
-	<ulink
-url="ftp://ftp.gnu.org/gnu/fileutils/">
+File Utils (&fileutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/fileutils/">
 ftp://ftp.gnu.org/gnu/fileutils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/findutils-patch.xml b/Attic/appendixc/findutils-patch.xml
index b51c6592f..b5205bb68 100644
--- a/Attic/appendixc/findutils-patch.xml
+++ b/Attic/appendixc/findutils-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Find Utils Patch (4.1):
-	<ulink 
-url="ftp://packages.linuxfromscratch.org/common-packages">
-ftp://packages.linuxfromscratch.org/common-packages</ulink>
-
-</para></listitem>
+Find Utils Patch (&findutils-version;):
+<ulink url="&ftp-common;/">
+&ftp-common;/</ulink>
+<ulink url="&http-common;/">
+&http-common;/</ulink>
 
diff --git a/Attic/appendixc/findutils.xml b/Attic/appendixc/findutils.xml
index 02db1bf05..40b017767 100644
--- a/Attic/appendixc/findutils.xml
+++ b/Attic/appendixc/findutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Find Utils (4.1):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/findutils/">
+Find Utils (&findutils-version;):
+<ulink  url="ftp://ftp.gnu.org/gnu/findutils/">
 ftp://ftp.gnu.org/gnu/findutils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/flex.xml b/Attic/appendixc/flex.xml
index 2a46caecb..6d9469578 100644
--- a/Attic/appendixc/flex.xml
+++ b/Attic/appendixc/flex.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Flex (2.5.4a):
-	<ulink 
-url="ftp://ftp.gnu.org/non-gnu/flex/">
+Flex (&flex-version;):
+<ulink url="ftp://ftp.gnu.org/non-gnu/flex/">
 ftp://ftp.gnu.org/non-gnu/flex/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/gcc.xml b/Attic/appendixc/gcc.xml
index 8b03352cd..91e4a8b01 100644
--- a/Attic/appendixc/gcc.xml
+++ b/Attic/appendixc/gcc.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-GCC (2.95.2.1):
-	<ulink 
-url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/">
+GCC (&gcc-version;):
+<ulink url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/">
 ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/gettext.xml b/Attic/appendixc/gettext.xml
index 65895193f..e8ebdbfeb 100644
--- a/Attic/appendixc/gettext.xml
+++ b/Attic/appendixc/gettext.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Gettext (0.10.35):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/gettext/">
+Gettext (&gettext-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/gettext/">
 ftp://ftp.gnu.org/gnu/gettext/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/glibc-threads.xml b/Attic/appendixc/glibc-threads.xml
index 532ec5fe8..69ec47b12 100644
--- a/Attic/appendixc/glibc-threads.xml
+++ b/Attic/appendixc/glibc-threads.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Glibc-linuxthreads (2.2.1):
-	<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>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/glibc.xml b/Attic/appendixc/glibc.xml
index 3f1fd5263..4e8b72ab9 100644
--- a/Attic/appendixc/glibc.xml
+++ b/Attic/appendixc/glibc.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Glibc (2.2.1):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/glibc/">
+Glibc (&glibc-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/glibc/">
 ftp://ftp.gnu.org/gnu/glibc/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/grep.xml b/Attic/appendixc/grep.xml
index f56484223..6c26dd732 100644
--- a/Attic/appendixc/grep.xml
+++ b/Attic/appendixc/grep.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Grep (2.4.2):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/grep/">
+Grep (&grep-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/grep/">
 ftp://ftp.gnu.org/gnu/grep/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/groff.xml b/Attic/appendixc/groff.xml
index 5aa189164..bdd504928 100644
--- a/Attic/appendixc/groff.xml
+++ b/Attic/appendixc/groff.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Groff (1.16.1):
-	<ulink
-url="ftp://ftp.gnu.org/gnu/groff/">
+Groff (&groff-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/groff/">
 ftp://ftp.gnu.org/gnu/groff/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/gzip-patch.xml b/Attic/appendixc/gzip-patch.xml
index efe134922..f6f724d80 100644
--- a/Attic/appendixc/gzip-patch.xml
+++ b/Attic/appendixc/gzip-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Gzip Patch (1.2.4a):
-	<ulink
-url="ftp://packages.linuxfromscratch.org/common-packages">
-ftp://packages.linuxfromscratch.org/common-packages</ulink>
-
-</para></listitem>
+Gzip Patch (&gzip-version;):
+<ulink url="&ftp-common;/">
+&ftp-common;/</ulink>
+<ulink url="&http-common;/">
+&http-common;/</ulink>
 
diff --git a/Attic/appendixc/gzip.xml b/Attic/appendixc/gzip.xml
index 784490f90..9b22b835d 100644
--- a/Attic/appendixc/gzip.xml
+++ b/Attic/appendixc/gzip.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Gzip (1.2.4a):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/gzip/">
+Gzip (&gzip-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/gzip/">
 ftp://ftp.gnu.org/gnu/gzip/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/kernel.xml b/Attic/appendixc/kernel.xml
index 7cb2004d1..e84383e42 100644
--- a/Attic/appendixc/kernel.xml
+++ b/Attic/appendixc/kernel.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Linux Kernel (2.4.1):
-	<ulink 
-url="ftp://ftp.kernel.org/pub/linux/kernel/">
+Linux Kernel (&kernel-version;):
+<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/">
 ftp://ftp.kernel.org/pub/linux/kernel/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/ldso.xml b/Attic/appendixc/ldso.xml
index b58c629da..e482df013 100644
--- a/Attic/appendixc/ldso.xml
+++ b/Attic/appendixc/ldso.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Ld.so (1.9.9):
-	<ulink 
-url="ftp://ftp.ods.com/pub/linux/">
-	ftp://ftp.ods.com/pub/linux/</ulink>
-
-</para></listitem>
+Ld.so (&ld.so-version;):
+<ulink url="ftp://ftp.ods.com/pub/linux/">
+ftp://ftp.ods.com/pub/linux/</ulink>
 
diff --git a/Attic/appendixc/less.xml b/Attic/appendixc/less.xml
index 875bfc4ce..ef356d6db 100644
--- a/Attic/appendixc/less.xml
+++ b/Attic/appendixc/less.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Less (358):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/less/">
+Less (&less-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/less/">
 ftp://ftp.gnu.org/gnu/less/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/libtool.xml b/Attic/appendixc/libtool.xml
index b946713b9..00929f236 100644
--- a/Attic/appendixc/libtool.xml
+++ b/Attic/appendixc/libtool.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Libtool (1.3.5):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/libtool/">
+Libtool (&libtool-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/libtool/">
 ftp://ftp.gnu.org/gnu/libtool/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/lilo.xml b/Attic/appendixc/lilo.xml
index 1cae5df79..eacbbfd45 100644
--- a/Attic/appendixc/lilo.xml
+++ b/Attic/appendixc/lilo.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Lilo (21.6):
-	<ulink
-url="ftp://brun.dyndns.org/pub/linux/lilo">
+Lilo (&lilo-version;):
+<ulink url="ftp://brun.dyndns.org/pub/linux/lilo">
 ftp://brun.dyndns.org/pub/linux/lilo</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/m4.xml b/Attic/appendixc/m4.xml
index 3a1db8ec0..810f00e9e 100644
--- a/Attic/appendixc/m4.xml
+++ b/Attic/appendixc/m4.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-M4 (1.4):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/m4/">
+M4 (&m4-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/m4/">
 ftp://ftp.gnu.org/gnu/m4/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/make.xml b/Attic/appendixc/make.xml
index 104b9095e..b29801a8e 100644
--- a/Attic/appendixc/make.xml
+++ b/Attic/appendixc/make.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Make (3.79.1):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/make/">
+Make (&make-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/make/">
 ftp://ftp.gnu.org/gnu/make/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/makedev-patch.xml b/Attic/appendixc/makedev-patch.xml
index 8abb9a673..0c2ad2bc0 100644
--- a/Attic/appendixc/makedev-patch.xml
+++ b/Attic/appendixc/makedev-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-MAKEDEV Patch (2.5):
-	<ulink 
-url="ftp://packages.linuxfromscratch.org/new-in-cvs/">
-ftp://packages.linuxfromscratch.org/new-in-cvs/</ulink>
-
-</para></listitem>
+MAKEDEV Patch (&makedev-version;):
+<ulink url="&ftp-cvs;/">
+&ftp-cvs;/</ulink>
+<ulink url="&http-cvs;/">
+&http-cvs;/</ulink>
 
diff --git a/Attic/appendixc/makedev.xml b/Attic/appendixc/makedev.xml
index 25bd6534c..4db900984 100644
--- a/Attic/appendixc/makedev.xml
+++ b/Attic/appendixc/makedev.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-MAKEDEV (2.5):
-	<ulink 
-url="ftp://ftp.ihg.uni-duisburg.de/Linux/system/">
+MAKEDEV (&makedev-version;):
+<ulink url="ftp://ftp.ihg.uni-duisburg.de/Linux/system/">
 ftp://ftp.ihg.uni-duisburg.de/Linux/system/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/man.xml b/Attic/appendixc/man.xml
index 38d5bc14e..4e58848e3 100644
--- a/Attic/appendixc/man.xml
+++ b/Attic/appendixc/man.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Man (1.5h1):
-	<ulink 
-url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/">
+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>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/manpages.xml b/Attic/appendixc/manpages.xml
index 28a922bb4..9a7302b1d 100644
--- a/Attic/appendixc/manpages.xml
+++ b/Attic/appendixc/manpages.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Man-pages (1.33):
-	<ulink 
-url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/">
+Man-pages (&man-pages-version;):
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/">
 ftp://ftp.win.tue.nl/pub/linux-local/manpages/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/mawk.xml b/Attic/appendixc/mawk.xml
index f87166c73..249cb4946 100644
--- a/Attic/appendixc/mawk.xml
+++ b/Attic/appendixc/mawk.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Mawk (1.3.3):
-	<ulink 
-url="ftp://ftp.whidbey.net/pub/brennan/">
+Mawk (&mawk-version;):
+<ulink url="ftp://ftp.whidbey.net/pub/brennan/">
 ftp://ftp.whidbey.net/pub/brennan/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/modutils.xml b/Attic/appendixc/modutils.xml
index 081831e97..1c1e56428 100644
--- a/Attic/appendixc/modutils.xml
+++ b/Attic/appendixc/modutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Modutils (2.4.0):
-	<ulink 
-url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils">
+Modutils (&modutils-version;):
+<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils">
 ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/ncurses.xml b/Attic/appendixc/ncurses.xml
index b30b198d1..bb94bb949 100644
--- a/Attic/appendixc/ncurses.xml
+++ b/Attic/appendixc/ncurses.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Ncurses (5.2):
-	<ulink
-url="ftp://ftp.gnu.org/gnu/ncurses/">
+Ncurses (&ncurses-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/ncurses/">
 ftp://ftp.gnu.org/gnu/ncurses/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/netkitbase.xml b/Attic/appendixc/netkitbase.xml
index 8b2542d19..bf2f6dbc1 100644
--- a/Attic/appendixc/netkitbase.xml
+++ b/Attic/appendixc/netkitbase.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Netkit-base (0.17):
-	<ulink
-url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/">
+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>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/nettools.xml b/Attic/appendixc/nettools.xml
index aa00c2cf7..b24bddd78 100644
--- a/Attic/appendixc/nettools.xml
+++ b/Attic/appendixc/nettools.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Net-tools (1.57):
-	<ulink 
-url="http://www.tazenda.demon.co.uk/phil/net-tools/">
+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>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index 4b72cc383..e268f41bb 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -7,7 +7,7 @@ download locations. This might help you to find a newer version of a
 package quicker.
 </para>
 
-<itemizedlist>
+<literallayout>
 
 &ac-bash;
 &ac-binutils;
@@ -71,7 +71,7 @@ package quicker.
 &ac-netkitbase;
 &ac-nettools;
 
-</itemizedlist>
+</literallayout>
 
 </sect1>
 
diff --git a/Attic/appendixc/patch.xml b/Attic/appendixc/patch.xml
index ee13d8d92..9a4bee7a5 100644
--- a/Attic/appendixc/patch.xml
+++ b/Attic/appendixc/patch.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Patch (2.5.4):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/patch/">
+Patch (&patch-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/patch/">
 ftp://ftp.gnu.org/gnu/patch/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/perl.xml b/Attic/appendixc/perl.xml
index 42cabfc4e..7eaf708ae 100644
--- a/Attic/appendixc/perl.xml
+++ b/Attic/appendixc/perl.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Perl (5.6.0):
-	<ulink 
-url="http://www.perl.com">
+Perl (&perl-version;):
+<ulink url="http://www.perl.com">
 http://www.perl.com</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/procinfo.xml b/Attic/appendixc/procinfo.xml
index ce1188a4e..193ba80e0 100644
--- a/Attic/appendixc/procinfo.xml
+++ b/Attic/appendixc/procinfo.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Procinfo (17):
-	<ulink 
-url="ftp://ftp.cistron.nl/pub/people/svm/">
+Procinfo (&procinfo-version;):
+<ulink url="ftp://ftp.cistron.nl/pub/people/svm/">
 ftp://ftp.cistron.nl/pub/people/svm/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/procps.xml b/Attic/appendixc/procps.xml
index 58b526bee..02f485c0e 100644
--- a/Attic/appendixc/procps.xml
+++ b/Attic/appendixc/procps.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Procps (2.0.7):
-	<ulink 
-url="ftp://people.redhat.com/johnsonm/procps/">
+Procps (&procps-version;):
+<ulink url="ftp://people.redhat.com/johnsonm/procps/">
 ftp://people.redhat.com/johnsonm/procps/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/psmisc.xml b/Attic/appendixc/psmisc.xml
index a2e1a6b55..3616b692d 100644
--- a/Attic/appendixc/psmisc.xml
+++ b/Attic/appendixc/psmisc.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Psmisc (19):
-	<ulink 
-url="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/">
+Psmisc (&psmisc-version;):
+<ulink url="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/">
 ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/sed.xml b/Attic/appendixc/sed.xml
index cc6e14f99..8af300721 100644
--- a/Attic/appendixc/sed.xml
+++ b/Attic/appendixc/sed.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Sed (3.02):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/sed/">
+Sed (&sed-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/sed/">
 ftp://ftp.gnu.org/gnu/sed/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/shadowpwd.xml b/Attic/appendixc/shadowpwd.xml
index 30aaa8e7e..d28b90dad 100644
--- a/Attic/appendixc/shadowpwd.xml
+++ b/Attic/appendixc/shadowpwd.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Shadow Password Suite (20000902):
-	<ulink 
-url="ftp://ftp.pld.org.pl/software/shadow/">
+Shadow Password Suite (&shadow-version;):
+<ulink url="ftp://ftp.pld.org.pl/software/shadow/">
 ftp://ftp.pld.org.pl/software/shadow/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/shellutils.xml b/Attic/appendixc/shellutils.xml
index d2f1c8617..4880ae923 100644
--- a/Attic/appendixc/shellutils.xml
+++ b/Attic/appendixc/shellutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Sh-utils (2.0):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/sh-utils/">
+Sh-utils (&sh-utils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">
 ftp://ftp.gnu.org/gnu/sh-utils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/sysklogd-patch.xml b/Attic/appendixc/sysklogd-patch.xml
index e84be0012..272fa1678 100644
--- a/Attic/appendixc/sysklogd-patch.xml
+++ b/Attic/appendixc/sysklogd-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Sysklogd Patch (1.4):
-	<ulink 
-url="ftp://packages.linuxfromscratch.org/common-packages/">
-ftp://packages.linuxfromscratch.org/common-packages/</ulink>
-
-</para></listitem>
+Sysklogd Patch (&sysklogd-version;):
+<ulink url="&ftp-common;/">
+&ftp-common;/</ulink>
+<ulink url="&http-common;/">
+&http-common;/</ulink>
 
diff --git a/Attic/appendixc/sysklogd.xml b/Attic/appendixc/sysklogd.xml
index 6e6141a71..b18be0328 100644
--- a/Attic/appendixc/sysklogd.xml
+++ b/Attic/appendixc/sysklogd.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Sysklogd (1.4):
-	<ulink 
-url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/">
+Sysklogd (&sysklogd-version;):
+<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/">
 ftp://ftp.ibiblio.org/pub/Linux/system/daemons/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/sysvinit-patch.xml b/Attic/appendixc/sysvinit-patch.xml
index 1f2c391ff..2a6e4b705 100644
--- a/Attic/appendixc/sysvinit-patch.xml
+++ b/Attic/appendixc/sysvinit-patch.xml
@@ -1,9 +1,6 @@
-<listitem><para>
-
-Sysvinit Patch (2.78):
-	<ulink 
-url="ftp://packages.linuxfromscratch.org/common-packages/">
-ftp://packages.linuxfromscratch.org/common-packages/</ulink>
-
-</para></listitem>
+Sysvinit Patch (&sysvinit-version;):
+<ulink url="&ftp-common;/">
+&ftp-common;/</ulink>
+<ulink url="&http-common;/">
+&http-common;/</ulink>
 
diff --git a/Attic/appendixc/sysvinit.xml b/Attic/appendixc/sysvinit.xml
index 479e96817..cf854f882 100644
--- a/Attic/appendixc/sysvinit.xml
+++ b/Attic/appendixc/sysvinit.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Sysvinit (2.78):
-	<ulink 
-url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">
+Sysvinit (&sysvinit-version;):
+<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">
 ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/tar-patch.xml b/Attic/appendixc/tar-patch.xml
index 45bed7974..9ea6a6a51 100644
--- a/Attic/appendixc/tar-patch.xml
+++ b/Attic/appendixc/tar-patch.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Tar Patch (1.13):
-	<ulink
-url="http://sourceware.cygnus.com/bzip2/">
+Tar Patch (&tar-version;):
+<ulink url="http://sourceware.cygnus.com/bzip2/">
 http://sourceware.cygnus.com/bzip2/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/tar.xml b/Attic/appendixc/tar.xml
index e2ac336ab..77dd9763e 100644
--- a/Attic/appendixc/tar.xml
+++ b/Attic/appendixc/tar.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Tar (1.13):
-	<ulink
-url="ftp://ftp.gnu.org/gnu/tar/">
+Tar (&tar-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/tar/">
 ftp://ftp.gnu.org/gnu/tar/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/texinfo.xml b/Attic/appendixc/texinfo.xml
index 8e09e80c8..b9c81c7eb 100644
--- a/Attic/appendixc/texinfo.xml
+++ b/Attic/appendixc/texinfo.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Texinfo (4.0):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/texinfo/">
+Texinfo (&texinfo-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/texinfo/">
 ftp://ftp.gnu.org/gnu/texinfo/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/textutils.xml b/Attic/appendixc/textutils.xml
index ab6a19c1c..4e2881b52 100644
--- a/Attic/appendixc/textutils.xml
+++ b/Attic/appendixc/textutils.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Text Utils (2.0):
-	<ulink 
-url="ftp://ftp.gnu.org/gnu/textutils/">
+Text Utils (&textutils-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/textutils/">
 ftp://ftp.gnu.org/gnu/textutils/</ulink>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/toplevel.xml b/Attic/appendixc/toplevel.xml
index fd03dbf4e..0574f82cb 100644
--- a/Attic/appendixc/toplevel.xml
+++ b/Attic/appendixc/toplevel.xml
@@ -1,16 +1,8 @@
-<listitem><para>
-
 Browse FTP: 
-	<ulink
-url="ftp://ftp.linuxfromscratch.org/">ftp://ftp.linuxfromscratch.org</ulink>
-
-</para></listitem>
-
-<listitem><para>
+<ulink url="ftp-root;/">
+&ftp-root;/</ulink>
 
 Browse HTTP:
-	<ulink
-url="http://ftp.linuxfromscratch.org/">http://ftp.linuxfromscratch.org</ulink>
-
-</para></listitem>
+<ulink url="&http-root;/">
+&http-root;/</ulink>
 
diff --git a/Attic/appendixc/utillinux.xml b/Attic/appendixc/utillinux.xml
index ddc020ed2..7a9e42eac 100644
--- a/Attic/appendixc/utillinux.xml
+++ b/Attic/appendixc/utillinux.xml
@@ -1,9 +1,4 @@
-<listitem><para>
-
-Util Linux (2.10r):
-	<ulink 
-url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/">
+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>
 
-</para></listitem>
-
diff --git a/Attic/appendixc/vim.xml b/Attic/appendixc/vim.xml
index 39b6e446d..1a1d30c47 100644
--- a/Attic/appendixc/vim.xml
+++ b/Attic/appendixc/vim.xml
@@ -1,17 +1,8 @@
-<listitem><para>
-
-Vim-rt (5.7) 1,073 KB:
-	<ulink 
-url="ftp://ftp.vim.org/pub/editors/vim/unix/">
+Vim-rt (&vim-version;):
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">
 ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>
 
-</para></listitem>
-
-<listitem><para>
-
-Vim-src (5.7) 1,202 KB:
-	<ulink 
-url="ftp://ftp.vim.org/pub/editors/vim/unix/">
+Vim-src (&vim-version;):
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">
 ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>
 
-</para></listitem>