XML changes

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

68 files changed, 92 insertions, 185 deletions

diff --git a/Attic/appendixb/books.xml b/Attic/appendixb/books.xml
index 615495859..b5d9cfeea 100644
--- a/Attic/appendixb/books.xml
+++ b/Attic/appendixb/books.xml
@@ -3,14 +3,11 @@
 
 <itemizedlist>
 
-<listitem><para>
-        Linux Network Administrator's Guide published by O'Reilly. ISBN:
-        1-56502-087-2
-</para></listitem>
+<listitem><para>Linux Network Administrator's Guide published by
+O'Reilly. ISBN: 1-56502-087-2</para></listitem>
 
-<listitem><para>
-        Running Linux published by O'Reilly. ISBN: 1-56592-151-8
-</para></listitem>
+<listitem><para>Running Linux published by O'Reilly. 
+ISBN: 1-56592-151-8</para></listitem>
 
 </itemizedlist>
 
diff --git a/Attic/appendixb/howtoguides.xml b/Attic/appendixb/howtoguides.xml
index 273213700..d25df49a8 100644
--- a/Attic/appendixb/howtoguides.xml
+++ b/Attic/appendixb/howtoguides.xml
@@ -1,21 +1,15 @@
 <sect1 id="ab-howtoguides">
 <title>HOWTOs and Guides</title>
 
-<para>
-All of the following HOWTOs can be downloaded from the Linux
+<para>All of the following HOWTOs can be downloaded from the Linux
 Documentation Project site at <ulink url="http://www.linuxdoc.org">
-http://www.linuxdoc.org</ulink>
-</para>
+http://www.linuxdoc.org</ulink></para>
 
 <itemizedlist>
 
-<listitem><para>
-        Linux Network Administrator's Guide
-</para></listitem>
+<listitem><para>Linux Network Administrator's Guide</para></listitem>
 
-<listitem><para>
-        Powerup2Bash-HOWTO
-</para></listitem>
+<listitem><para>Powerup2Bash-HOWTO</para></listitem>
 
 </itemizedlist>
 
diff --git a/Attic/appendixb/introduction.xml b/Attic/appendixb/introduction.xml
index 1eced9af8..add3fcc4b 100644
--- a/Attic/appendixb/introduction.xml
+++ b/Attic/appendixb/introduction.xml
@@ -1,13 +1,11 @@
 <sect1 id="ab-introduction">
 <title>Introduction</title>
 
-<para>
-A list of books, HOWTOs and other documents that might be useful to
+<para>A list of books, HOWTOs and other documents that might be useful to
 download or buy follows. This list is just a small list to start with.
 We
 hope to be able to expand this list in time as we come across more
-useful documents or books.
-</para>
+useful documents or books.</para>
 
 </sect1>
 
diff --git a/Attic/appendixb/other.xml b/Attic/appendixb/other.xml
index 3b40bf3e4..5ad193fcc 100644
--- a/Attic/appendixb/other.xml
+++ b/Attic/appendixb/other.xml
@@ -3,9 +3,8 @@
 
 <itemizedlist>
 
-<listitem><para>
-        The various man and info pages that come with the packages
-</para></listitem>
+<listitem><para>The various man and info pages that 
+come with the packages</para></listitem>
 
 </itemizedlist>
 
diff --git a/Attic/appendixc/autoconf.xml b/Attic/appendixc/autoconf.xml
index bd7563a2f..c7054de31 100644
--- a/Attic/appendixc/autoconf.xml
+++ b/Attic/appendixc/autoconf.xml
@@ -1,4 +1,3 @@
 Autoconf (&autoconf-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/autoconf/">
-ftp://ftp.gnu.org/gnu/autoconf/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/autoconf/">ftp://ftp.gnu.org/gnu/autoconf/</ulink>
 
diff --git a/Attic/appendixc/automake.xml b/Attic/appendixc/automake.xml
index ed829b08a..08ffc2ba6 100644
--- a/Attic/appendixc/automake.xml
+++ b/Attic/appendixc/automake.xml
@@ -1,4 +1,2 @@
 Automake (&automake-version;):
-<ulink  url="ftp://ftp.gnu.org/gnu/automake/">
-ftp://ftp.gnu.org/gnu/automake/</ulink>
-
+<ulink  url="ftp://ftp.gnu.org/gnu/automake/">ftp://ftp.gnu.org/gnu/automake/</ulink>
diff --git a/Attic/appendixc/bash.xml b/Attic/appendixc/bash.xml
index 72eac6202..2d791a83d 100644
--- a/Attic/appendixc/bash.xml
+++ b/Attic/appendixc/bash.xml
@@ -1,4 +1,3 @@
 Bash (&bash-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/bash/">
-ftp://ftp.gnu.org/gnu/bash/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/bash/">ftp://ftp.gnu.org/gnu/bash/</ulink>
 
diff --git a/Attic/appendixc/bin86.xml b/Attic/appendixc/bin86.xml
index e22be3dd9..4873bab8e 100644
--- a/Attic/appendixc/bin86.xml
+++ b/Attic/appendixc/bin86.xml
@@ -1,4 +1,3 @@
 Bin86 (&bin86-version;):
-<ulink url="http://www.cix.co.uk/~mayday/">
-http://www.cix.co.uk/~mayday/</ulink>
+<ulink url="http://www.cix.co.uk/~mayday/">http://www.cix.co.uk/~mayday/</ulink>
 
diff --git a/Attic/appendixc/binutils.xml b/Attic/appendixc/binutils.xml
index 152efacf1..e271c91fe 100644
--- a/Attic/appendixc/binutils.xml
+++ b/Attic/appendixc/binutils.xml
@@ -1,4 +1,3 @@
 Binutils (&binutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/binutils/">
-ftp://ftp.gnu.org/gnu/binutils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/binutils/">ftp://ftp.gnu.org/gnu/binutils/</ulink>
 
diff --git a/Attic/appendixc/bison.xml b/Attic/appendixc/bison.xml
index 9565847ca..f5c6be988 100644
--- a/Attic/appendixc/bison.xml
+++ b/Attic/appendixc/bison.xml
@@ -1,4 +1,3 @@
 Bison (&bison-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/bison/">
-ftp://ftp.gnu.org/gnu/bison/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/bison/">ftp://ftp.gnu.org/gnu/bison/</ulink>
 
diff --git a/Attic/appendixc/bzip2.xml b/Attic/appendixc/bzip2.xml
index 74d74897e..ea50865ad 100644
--- a/Attic/appendixc/bzip2.xml
+++ b/Attic/appendixc/bzip2.xml
@@ -1,4 +1,3 @@
 Bzip2 (&bzip2-version;):
-<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/">
-ftp://sourceware.cygnus.com/pub/bzip2/</ulink>
+<ulink url="ftp://sourceware.cygnus.com/pub/bzip2/">ftp://sourceware.cygnus.com/pub/bzip2/</ulink>
 
diff --git a/Attic/appendixc/diffutils.xml b/Attic/appendixc/diffutils.xml
index 8b89bc508..d6d28e3df 100644
--- a/Attic/appendixc/diffutils.xml
+++ b/Attic/appendixc/diffutils.xml
@@ -1,4 +1,3 @@
 Diff Utils (&diffutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">
-ftp://ftp.gnu.org/gnu/diffutils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/diffutils/">ftp://ftp.gnu.org/gnu/diffutils/</ulink>
 
diff --git a/Attic/appendixc/e2fsprogs.xml b/Attic/appendixc/e2fsprogs.xml
index 63baded7c..bb3c2e2d9 100644
--- a/Attic/appendixc/e2fsprogs.xml
+++ b/Attic/appendixc/e2fsprogs.xml
@@ -1,6 +1,4 @@
 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>
+<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>
 
diff --git a/Attic/appendixc/ed.xml b/Attic/appendixc/ed.xml
index dbad3e9c7..b02168359 100644
--- a/Attic/appendixc/ed.xml
+++ b/Attic/appendixc/ed.xml
@@ -1,4 +1,3 @@
 Ed (&ed-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/ed/">
-ftp://ftp.gnu.org/gnu/ed/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/ed/">ftp://ftp.gnu.org/gnu/ed/</ulink>
 
diff --git a/Attic/appendixc/file.xml b/Attic/appendixc/file.xml
index d8d8285b0..44d3c51aa 100644
--- a/Attic/appendixc/file.xml
+++ b/Attic/appendixc/file.xml
@@ -1,4 +1,3 @@
 File (&file-version;):
-<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/">
-ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink>
+<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/">ftp://ftp.gw.com/mirrors/pub/unix/file/</ulink>
 
diff --git a/Attic/appendixc/fileutils.xml b/Attic/appendixc/fileutils.xml
index f99586faf..86626918b 100644
--- a/Attic/appendixc/fileutils.xml
+++ b/Attic/appendixc/fileutils.xml
@@ -1,4 +1,3 @@
 File Utils (&fileutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/fileutils/">
-ftp://ftp.gnu.org/gnu/fileutils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/fileutils/">ftp://ftp.gnu.org/gnu/fileutils/</ulink>
 
diff --git a/Attic/appendixc/findutils-patch.xml b/Attic/appendixc/findutils-patch.xml
index df2798bed..afa8ed5a5 100644
--- a/Attic/appendixc/findutils-patch.xml
+++ b/Attic/appendixc/findutils-patch.xml
@@ -1,6 +1,4 @@
 Find Utils Patch (&findutils-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/findutils.xml b/Attic/appendixc/findutils.xml
index 40b017767..29ecf2b11 100644
--- a/Attic/appendixc/findutils.xml
+++ b/Attic/appendixc/findutils.xml
@@ -1,4 +1,3 @@
 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/">ftp://ftp.gnu.org/gnu/findutils/</ulink>
 
diff --git a/Attic/appendixc/flex.xml b/Attic/appendixc/flex.xml
index 6d9469578..aa9c091bc 100644
--- a/Attic/appendixc/flex.xml
+++ b/Attic/appendixc/flex.xml
@@ -1,4 +1,3 @@
 Flex (&flex-version;):
-<ulink url="ftp://ftp.gnu.org/non-gnu/flex/">
-ftp://ftp.gnu.org/non-gnu/flex/</ulink>
+<ulink url="ftp://ftp.gnu.org/non-gnu/flex/">ftp://ftp.gnu.org/non-gnu/flex/</ulink>
 
diff --git a/Attic/appendixc/gcc-patch.xml b/Attic/appendixc/gcc-patch.xml
index 958da3f41..538806381 100644
--- a/Attic/appendixc/gcc-patch.xml
+++ b/Attic/appendixc/gcc-patch.xml
@@ -1,6 +1,4 @@
 GCC Patch (&gcc-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/gcc.xml b/Attic/appendixc/gcc.xml
index 91e4a8b01..89a59a337 100644
--- a/Attic/appendixc/gcc.xml
+++ b/Attic/appendixc/gcc.xml
@@ -1,4 +1,3 @@
 GCC (&gcc-version;):
-<ulink url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/">
-ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/</ulink>
+<ulink url="ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/">ftp://ftp.freesoftware.com/pub/sourceware/gcc/releases/</ulink>
 
diff --git a/Attic/appendixc/gettext.xml b/Attic/appendixc/gettext.xml
index e8ebdbfeb..ef42a47e0 100644
--- a/Attic/appendixc/gettext.xml
+++ b/Attic/appendixc/gettext.xml
@@ -1,4 +1,3 @@
 Gettext (&gettext-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/gettext/">
-ftp://ftp.gnu.org/gnu/gettext/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/gettext/">ftp://ftp.gnu.org/gnu/gettext/</ulink>
 
diff --git a/Attic/appendixc/glibc-threads.xml b/Attic/appendixc/glibc-threads.xml
index 69ec47b12..dbead6651 100644
--- a/Attic/appendixc/glibc-threads.xml
+++ b/Attic/appendixc/glibc-threads.xml
@@ -1,4 +1,3 @@
 Glibc-linuxthreads (&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/">ftp://ftp.gnu.org/gnu/glibc/</ulink>
 
diff --git a/Attic/appendixc/glibc.xml b/Attic/appendixc/glibc.xml
index 4e8b72ab9..8e7cf9a23 100644
--- a/Attic/appendixc/glibc.xml
+++ b/Attic/appendixc/glibc.xml
@@ -1,4 +1,3 @@
 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/">ftp://ftp.gnu.org/gnu/glibc/</ulink>
 
diff --git a/Attic/appendixc/grep.xml b/Attic/appendixc/grep.xml
index 6c26dd732..66ec272e4 100644
--- a/Attic/appendixc/grep.xml
+++ b/Attic/appendixc/grep.xml
@@ -1,4 +1,3 @@
 Grep (&grep-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/grep/">
-ftp://ftp.gnu.org/gnu/grep/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/grep/">ftp://ftp.gnu.org/gnu/grep/</ulink>
 
diff --git a/Attic/appendixc/groff.xml b/Attic/appendixc/groff.xml
index bdd504928..087396cc3 100644
--- a/Attic/appendixc/groff.xml
+++ b/Attic/appendixc/groff.xml
@@ -1,4 +1,3 @@
 Groff (&groff-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/groff/">
-ftp://ftp.gnu.org/gnu/groff/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/groff/">ftp://ftp.gnu.org/gnu/groff/</ulink>
 
diff --git a/Attic/appendixc/gzip-patch.xml b/Attic/appendixc/gzip-patch.xml
index e88fb75e1..5ad72ffa7 100644
--- a/Attic/appendixc/gzip-patch.xml
+++ b/Attic/appendixc/gzip-patch.xml
@@ -1,6 +1,4 @@
 Gzip Patch (&gzip-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/gzip.xml b/Attic/appendixc/gzip.xml
index 9b22b835d..03aa9aef5 100644
--- a/Attic/appendixc/gzip.xml
+++ b/Attic/appendixc/gzip.xml
@@ -1,4 +1,3 @@
 Gzip (&gzip-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/gzip/">
-ftp://ftp.gnu.org/gnu/gzip/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink>
 
diff --git a/Attic/appendixc/kbd.xml b/Attic/appendixc/kbd.xml
index fb0039080..cecb9ec30 100644
--- a/Attic/appendixc/kbd.xml
+++ b/Attic/appendixc/kbd.xml
@@ -1,4 +1,3 @@
 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/">ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</ulink>
 
diff --git a/Attic/appendixc/kernel.xml b/Attic/appendixc/kernel.xml
index e84383e42..014415b75 100644
--- a/Attic/appendixc/kernel.xml
+++ b/Attic/appendixc/kernel.xml
@@ -1,4 +1,3 @@
 Linux Kernel (&kernel-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/">
-ftp://ftp.kernel.org/pub/linux/kernel/</ulink>
+<ulink url="ftp://ftp.kernel.org/pub/linux/kernel/">ftp://ftp.kernel.org/pub/linux/kernel/</ulink>
 
diff --git a/Attic/appendixc/less.xml b/Attic/appendixc/less.xml
index ef356d6db..3a8b92c36 100644
--- a/Attic/appendixc/less.xml
+++ b/Attic/appendixc/less.xml
@@ -1,4 +1,3 @@
 Less (&less-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/less/">
-ftp://ftp.gnu.org/gnu/less/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/less/">ftp://ftp.gnu.org/gnu/less/</ulink>
 
diff --git a/Attic/appendixc/libtool.xml b/Attic/appendixc/libtool.xml
index 00929f236..c20a48988 100644
--- a/Attic/appendixc/libtool.xml
+++ b/Attic/appendixc/libtool.xml
@@ -1,4 +1,3 @@
 Libtool (&libtool-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/libtool/">
-ftp://ftp.gnu.org/gnu/libtool/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/libtool/">ftp://ftp.gnu.org/gnu/libtool/</ulink>
 
diff --git a/Attic/appendixc/lilo.xml b/Attic/appendixc/lilo.xml
index c2889de1e..1973966ad 100644
--- a/Attic/appendixc/lilo.xml
+++ b/Attic/appendixc/lilo.xml
@@ -1,4 +1,3 @@
 Lilo (&lilo-version;):
-<ulink url="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo">
-ftp://metalab.unc.edu/pub/Linux/system/boot/lilo</ulink>
+<ulink url="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo">ftp://metalab.unc.edu/pub/Linux/system/boot/lilo</ulink>
 
diff --git a/Attic/appendixc/m4.xml b/Attic/appendixc/m4.xml
index 810f00e9e..b790075ef 100644
--- a/Attic/appendixc/m4.xml
+++ b/Attic/appendixc/m4.xml
@@ -1,4 +1,3 @@
 M4 (&m4-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/m4/">
-ftp://ftp.gnu.org/gnu/m4/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/m4/">ftp://ftp.gnu.org/gnu/m4/</ulink>
 
diff --git a/Attic/appendixc/make.xml b/Attic/appendixc/make.xml
index b29801a8e..548a9183d 100644
--- a/Attic/appendixc/make.xml
+++ b/Attic/appendixc/make.xml
@@ -1,4 +1,3 @@
 Make (&make-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/make/">
-ftp://ftp.gnu.org/gnu/make/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/make/">ftp://ftp.gnu.org/gnu/make/</ulink>
 
diff --git a/Attic/appendixc/makedev.xml b/Attic/appendixc/makedev.xml
index ad209807a..1203b9b8b 100644
--- a/Attic/appendixc/makedev.xml
+++ b/Attic/appendixc/makedev.xml
@@ -1,6 +1,4 @@
 MAKEDEV:
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/man-patch.xml b/Attic/appendixc/man-patch.xml
index 1bebeb494..3a75d3a99 100644
--- a/Attic/appendixc/man-patch.xml
+++ b/Attic/appendixc/man-patch.xml
@@ -1,6 +1,4 @@
 Man Patch (&man-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/man.xml b/Attic/appendixc/man.xml
index 4e58848e3..e342b42af 100644
--- a/Attic/appendixc/man.xml
+++ b/Attic/appendixc/man.xml
@@ -1,4 +1,3 @@
 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>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/">ftp://ftp.win.tue.nl/pub/linux-local/utils/man/</ulink>
 
diff --git a/Attic/appendixc/manpages-patch.xml b/Attic/appendixc/manpages-patch.xml
index 3c32cd6dd..d54c5b2b7 100644
--- a/Attic/appendixc/manpages-patch.xml
+++ b/Attic/appendixc/manpages-patch.xml
@@ -1,6 +1,4 @@
 Man-pages Patch (&man-pages-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/manpages.xml b/Attic/appendixc/manpages.xml
index 9a7302b1d..ae973d3cb 100644
--- a/Attic/appendixc/manpages.xml
+++ b/Attic/appendixc/manpages.xml
@@ -1,4 +1,3 @@
 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>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/">ftp://ftp.win.tue.nl/pub/linux-local/manpages/</ulink>
 
diff --git a/Attic/appendixc/mawk.xml b/Attic/appendixc/mawk.xml
index 249cb4946..440fd229a 100644
--- a/Attic/appendixc/mawk.xml
+++ b/Attic/appendixc/mawk.xml
@@ -1,4 +1,3 @@
 Mawk (&mawk-version;):
-<ulink url="ftp://ftp.whidbey.net/pub/brennan/">
-ftp://ftp.whidbey.net/pub/brennan/</ulink>
+<ulink url="ftp://ftp.whidbey.net/pub/brennan/">ftp://ftp.whidbey.net/pub/brennan/</ulink>
 
diff --git a/Attic/appendixc/modutils.xml b/Attic/appendixc/modutils.xml
index 1c1e56428..b5181666d 100644
--- a/Attic/appendixc/modutils.xml
+++ b/Attic/appendixc/modutils.xml
@@ -1,4 +1,3 @@
 Modutils (&modutils-version;):
-<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils">
-ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils</ulink>
+<ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils">ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils</ulink>
 
diff --git a/Attic/appendixc/ncurses-patch.xml b/Attic/appendixc/ncurses-patch.xml
index 8d80b80ad..38aa67518 100644
--- a/Attic/appendixc/ncurses-patch.xml
+++ b/Attic/appendixc/ncurses-patch.xml
@@ -1,6 +1,4 @@
 Ncurses Patch (&ncurses-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/ncurses.xml b/Attic/appendixc/ncurses.xml
index bb94bb949..9874e392e 100644
--- a/Attic/appendixc/ncurses.xml
+++ b/Attic/appendixc/ncurses.xml
@@ -1,4 +1,3 @@
 Ncurses (&ncurses-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/ncurses/">
-ftp://ftp.gnu.org/gnu/ncurses/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/ncurses/">ftp://ftp.gnu.org/gnu/ncurses/</ulink>
 
diff --git a/Attic/appendixc/netkitbase.xml b/Attic/appendixc/netkitbase.xml
index bf2f6dbc1..e2c1edaf6 100644
--- a/Attic/appendixc/netkitbase.xml
+++ b/Attic/appendixc/netkitbase.xml
@@ -1,4 +1,3 @@
 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>
+<ulink url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/">ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/</ulink>
 
diff --git a/Attic/appendixc/nettools.xml b/Attic/appendixc/nettools.xml
index b24bddd78..15a61dcb0 100644
--- a/Attic/appendixc/nettools.xml
+++ b/Attic/appendixc/nettools.xml
@@ -1,4 +1,3 @@
 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>
+<ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/">http://www.tazenda.demon.co.uk/phil/net-tools/</ulink>
 
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index b81aa4266..aecea646a 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -1,11 +1,9 @@
 <sect1 id="ac-packages">
 <title>Official download locations</title>
 
-<para>
-Below is the list with packages from chapter 3 with their original
+<para>Below is the list with packages from chapter 3 with their original
 download locations. This might help to find a newer version of a
-package quicker.
-</para>
+package quicker.</para>
 
 <literallayout>
 &ac-bash;
diff --git a/Attic/appendixc/patch.xml b/Attic/appendixc/patch.xml
index 9a4bee7a5..19af249fa 100644
--- a/Attic/appendixc/patch.xml
+++ b/Attic/appendixc/patch.xml
@@ -1,4 +1,3 @@
 Patch (&patch-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/patch/">
-ftp://ftp.gnu.org/gnu/patch/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/patch/">ftp://ftp.gnu.org/gnu/patch/</ulink>
 
diff --git a/Attic/appendixc/perl.xml b/Attic/appendixc/perl.xml
index 7eaf708ae..9cf1b196d 100644
--- a/Attic/appendixc/perl.xml
+++ b/Attic/appendixc/perl.xml
@@ -1,4 +1,3 @@
 Perl (&perl-version;):
-<ulink url="http://www.perl.com">
-http://www.perl.com</ulink>
+<ulink url="http://www.perl.com">http://www.perl.com</ulink>
 
diff --git a/Attic/appendixc/procinfo.xml b/Attic/appendixc/procinfo.xml
index 193ba80e0..2f1109ece 100644
--- a/Attic/appendixc/procinfo.xml
+++ b/Attic/appendixc/procinfo.xml
@@ -1,4 +1,3 @@
 Procinfo (&procinfo-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/svm/">
-ftp://ftp.cistron.nl/pub/people/svm/</ulink>
+<ulink url="ftp://ftp.cistron.nl/pub/people/svm/">ftp://ftp.cistron.nl/pub/people/svm/</ulink>
 
diff --git a/Attic/appendixc/procps.xml b/Attic/appendixc/procps.xml
index 02f485c0e..a8ca507dd 100644
--- a/Attic/appendixc/procps.xml
+++ b/Attic/appendixc/procps.xml
@@ -1,4 +1,3 @@
 Procps (&procps-version;):
-<ulink url="ftp://people.redhat.com/johnsonm/procps/">
-ftp://people.redhat.com/johnsonm/procps/</ulink>
+<ulink url="ftp://people.redhat.com/johnsonm/procps/">ftp://people.redhat.com/johnsonm/procps/</ulink>
 
diff --git a/Attic/appendixc/psmisc.xml b/Attic/appendixc/psmisc.xml
index 43f5cf2e2..ca84b6a61 100644
--- a/Attic/appendixc/psmisc.xml
+++ b/Attic/appendixc/psmisc.xml
@@ -1,6 +1,4 @@
 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>
+<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>
 
diff --git a/Attic/appendixc/sed.xml b/Attic/appendixc/sed.xml
index 8af300721..a35fcfb38 100644
--- a/Attic/appendixc/sed.xml
+++ b/Attic/appendixc/sed.xml
@@ -1,4 +1,3 @@
 Sed (&sed-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sed/">
-ftp://ftp.gnu.org/gnu/sed/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/sed/">ftp://ftp.gnu.org/gnu/sed/</ulink>
 
diff --git a/Attic/appendixc/shadowpwd-patch.xml b/Attic/appendixc/shadowpwd-patch.xml
index bdf42b642..53081833e 100644
--- a/Attic/appendixc/shadowpwd-patch.xml
+++ b/Attic/appendixc/shadowpwd-patch.xml
@@ -1,6 +1,4 @@
 Shadow Password Suite Patch (&shadow-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/shadowpwd.xml b/Attic/appendixc/shadowpwd.xml
index d28b90dad..cef68188e 100644
--- a/Attic/appendixc/shadowpwd.xml
+++ b/Attic/appendixc/shadowpwd.xml
@@ -1,4 +1,3 @@
 Shadow Password Suite (&shadow-version;):
-<ulink url="ftp://ftp.pld.org.pl/software/shadow/">
-ftp://ftp.pld.org.pl/software/shadow/</ulink>
+<ulink url="ftp://ftp.pld.org.pl/software/shadow/">ftp://ftp.pld.org.pl/software/shadow/</ulink>
 
diff --git a/Attic/appendixc/shellutils-patch.xml b/Attic/appendixc/shellutils-patch.xml
index 9e71f4871..c67fa6460 100644
--- a/Attic/appendixc/shellutils-patch.xml
+++ b/Attic/appendixc/shellutils-patch.xml
@@ -1,6 +1,4 @@
 Sh-utils Patch (&sh-utils-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/shellutils.xml b/Attic/appendixc/shellutils.xml
index 4880ae923..14c8e55af 100644
--- a/Attic/appendixc/shellutils.xml
+++ b/Attic/appendixc/shellutils.xml
@@ -1,4 +1,3 @@
 Sh-utils (&sh-utils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">
-ftp://ftp.gnu.org/gnu/sh-utils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink>
 
diff --git a/Attic/appendixc/sysklogd.xml b/Attic/appendixc/sysklogd.xml
index b18be0328..26981340f 100644
--- a/Attic/appendixc/sysklogd.xml
+++ b/Attic/appendixc/sysklogd.xml
@@ -1,4 +1,3 @@
 Sysklogd (&sysklogd-version;):
-<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/">
-ftp://ftp.ibiblio.org/pub/Linux/system/daemons/</ulink>
+<ulink url="ftp://ftp.ibiblio.org/pub/Linux/system/daemons/">ftp://ftp.ibiblio.org/pub/Linux/system/daemons/</ulink>
 
diff --git a/Attic/appendixc/sysvinit-patch.xml b/Attic/appendixc/sysvinit-patch.xml
index 83dcb1701..7824920e6 100644
--- a/Attic/appendixc/sysvinit-patch.xml
+++ b/Attic/appendixc/sysvinit-patch.xml
@@ -1,6 +1,4 @@
 Sysvinit Patch (&sysvinit-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/sysvinit.xml b/Attic/appendixc/sysvinit.xml
index cf854f882..0aa688742 100644
--- a/Attic/appendixc/sysvinit.xml
+++ b/Attic/appendixc/sysvinit.xml
@@ -1,4 +1,3 @@
 Sysvinit (&sysvinit-version;):
-<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">
-ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink>
+<ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/">ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/</ulink>
 
diff --git a/Attic/appendixc/tar-patch.xml b/Attic/appendixc/tar-patch.xml
index 9ea6a6a51..76ebd7e53 100644
--- a/Attic/appendixc/tar-patch.xml
+++ b/Attic/appendixc/tar-patch.xml
@@ -1,4 +1,3 @@
 Tar Patch (&tar-version;):
-<ulink url="http://sourceware.cygnus.com/bzip2/">
-http://sourceware.cygnus.com/bzip2/</ulink>
+<ulink url="http://sourceware.cygnus.com/bzip2/">http://sourceware.cygnus.com/bzip2/</ulink>
 
diff --git a/Attic/appendixc/tar.xml b/Attic/appendixc/tar.xml
index 77dd9763e..02c3dbadc 100644
--- a/Attic/appendixc/tar.xml
+++ b/Attic/appendixc/tar.xml
@@ -1,4 +1,3 @@
 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/">ftp://ftp.gnu.org/gnu/tar/</ulink>
 
diff --git a/Attic/appendixc/texinfo-patch.xml b/Attic/appendixc/texinfo-patch.xml
index f19d2bc89..c2a3ff62b 100644
--- a/Attic/appendixc/texinfo-patch.xml
+++ b/Attic/appendixc/texinfo-patch.xml
@@ -1,6 +1,4 @@
 Texinfo Patch (&texinfo-version;):
-<ulink url="&ftp;/">
-&ftp;/</ulink>
-<ulink url="&http;/">
-&http;/</ulink>
+<ulink url="&ftp;/">&ftp;/</ulink>
+<ulink url="&http;/">&http;/</ulink>
 
diff --git a/Attic/appendixc/texinfo.xml b/Attic/appendixc/texinfo.xml
index b9c81c7eb..4044cdebf 100644
--- a/Attic/appendixc/texinfo.xml
+++ b/Attic/appendixc/texinfo.xml
@@ -1,4 +1,3 @@
 Texinfo (&texinfo-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/texinfo/">
-ftp://ftp.gnu.org/gnu/texinfo/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/texinfo/">ftp://ftp.gnu.org/gnu/texinfo/</ulink>
 
diff --git a/Attic/appendixc/textutils.xml b/Attic/appendixc/textutils.xml
index 4e2881b52..bf0331361 100644
--- a/Attic/appendixc/textutils.xml
+++ b/Attic/appendixc/textutils.xml
@@ -1,4 +1,3 @@
 Text Utils (&textutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/textutils/">
-ftp://ftp.gnu.org/gnu/textutils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/textutils/">ftp://ftp.gnu.org/gnu/textutils/</ulink>
 
diff --git a/Attic/appendixc/toplevel.xml b/Attic/appendixc/toplevel.xml
index 0574f82cb..1a358eafb 100644
--- a/Attic/appendixc/toplevel.xml
+++ b/Attic/appendixc/toplevel.xml
@@ -1,8 +1,6 @@
 Browse FTP: 
-<ulink url="ftp-root;/">
-&ftp-root;/</ulink>
+<ulink url="ftp-root;/">&ftp-root;/</ulink>
 
 Browse HTTP:
-<ulink url="&http-root;/">
-&http-root;/</ulink>
+<ulink url="&http-root;/">&http-root;/</ulink>
 
diff --git a/Attic/appendixc/utillinux.xml b/Attic/appendixc/utillinux.xml
index 7a9e42eac..0e7f01113 100644
--- a/Attic/appendixc/utillinux.xml
+++ b/Attic/appendixc/utillinux.xml
@@ -1,4 +1,3 @@
 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>
+<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>
 
diff --git a/Attic/appendixc/vim.xml b/Attic/appendixc/vim.xml
index 1a1d30c47..dcabb757a 100644
--- a/Attic/appendixc/vim.xml
+++ b/Attic/appendixc/vim.xml
@@ -1,8 +1,6 @@
 Vim-rt (&vim-version;):
-<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">
-ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>
 
 Vim-src (&vim-version;):
-<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">
-ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>
+<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink>