Index: chapter01/administrativa.xml
===================================================================
--- chapter01/administrativa.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter01/administrativa.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -17,5 +17,5 @@
 have any questions, or think you found a typo in the book, then please first
 consult the FAQ (Frequently Asked Questions) at
-<uri xlink:href="&faq-root;">&faq-root;</uri>.</para>
+<link xlink:href="&faq-root;">&faq-root;</link>.</para>
 
 </section>
@@ -43,5 +43,5 @@
 
 <para>For information on which lists are available, how to subscribe to them,
-their archive locations, and so on, visit <uri xlink:href="&lfs-root;mail.html">&lfs-root;mail.html</uri>.</para>
+their archive locations, and so on, visit <link xlink:href="&lfs-root;mail.html">&lfs-root;mail.html</link>.</para>
 
 </section>
@@ -65,5 +65,5 @@
 
 <para>For more information on a package, updated versions, tweaks, personal
-experiences, and so on, see the LFS Wiki at <uri xlink:href="&wiki-root;">&wiki-root;</uri>. You can add information there yourself too, to help others.</para>
+experiences, and so on, see the LFS Wiki at <link xlink:href="&wiki-root;">&wiki-root;</link>. You can add information there yourself too, to help others.</para>
 
 </section>
@@ -75,5 +75,5 @@
 <para>If you need still more detailed information on the packages,
 you will find useful pointers on this page:
-<uri xlink:href="http://www.109bean.org.uk/LFS-references.html">http://www.109bean.org.uk/LFS-references.html</uri>.</para>
+<link xlink:href="http://www.109bean.org.uk/LFS-references.html">http://www.109bean.org.uk/LFS-references.html</link>.</para>
 
 </section>
@@ -85,5 +85,5 @@
 <para>The LFS project has a number of mirrors set up world-wide to make
 accessing the website and downloading the required packages more convenient.
-Please visit the website at <uri xlink:href="&lfs-root;">&lfs-root;</uri> for a list of current mirrors.</para>
+Please visit the website at <link xlink:href="&lfs-root;">&lfs-root;</link> for a list of current mirrors.</para>
 
 </section>
Index: chapter01/askforhelp.xml
===================================================================
--- chapter01/askforhelp.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter01/askforhelp.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -11,8 +11,8 @@
 
 <para>If you run into a problem while working through this book, you should
-first check the FAQ at <uri xlink:href="&faq-root;"/> -- often your question
+first check the FAQ at <link xlink:href="&faq-root;"/> -- often your question
 is already answered there. If it is not, you should try to find the source of
 the problem. The following hint might give you some ideas for your
-troubleshooting: <uri xlink:href="&hints-root;errors.txt">&hints-root;errors.txt</uri>.</para>
+troubleshooting: <link xlink:href="&hints-root;errors.txt">&hints-root;errors.txt</link>.</para>
 
 <para>If all that fails, you will find that most people on IRC and the mailing
@@ -91,5 +91,5 @@
 <para>An excellent article on asking for help on the Internet in general
 has been written by Eric S. Raymond. It is available online at 
-<uri xlink:href="http://catb.org/~esr/faqs/smart-questions.html">http://catb.org/~esr/faqs/smart-questions.html"</uri>.
+<link xlink:href="http://catb.org/~esr/faqs/smart-questions.html">http://catb.org/~esr/faqs/smart-questions.html"</link>.
 Read and follow the hints in that document and you are much more likely
 to get a response to start with and also to get the help you actually
@@ -104,5 +104,5 @@
 of the package, we may encourage you to run. Sometimes packages will
 generate false or expected failures. If you encounter these, you can check
-the LFS Wiki page at <uri xlink:href="&wiki-root;">&wiki-root;</uri> to see
+the LFS Wiki page at <link xlink:href="&wiki-root;">&wiki-root;</link> to see
 whether we have already noted and investigated them. If we already know about
 them, then usually there is no need to be concerned.</para>
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter01/changelog.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -14,5 +14,5 @@
 &releasedate;. If this book is more than two months old, a newer and better
 version is probably already available. To find out, please check one of the
-mirrors via <uri xlink:href="&lfs-root;">&lfs-root;</uri>.</para>
+mirrors via <link xlink:href="&lfs-root;">&lfs-root;</link>.</para>
 
 <para>Below is a list of changes made since the previous release of the book,
Index: chapter02/creatingfilesystem.xml
===================================================================
--- chapter02/creatingfilesystem.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter02/creatingfilesystem.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -15,5 +15,5 @@
 systems are becoming increasingly popular. Here we will create an ext2 file
 system, but build instructions for other file systems can be found at 
-<uri xlink:href="&blfs-root;view/stable/postlfs/filesystems.html">&blfs-root;view/stable/postlfs/filesystems.html</uri>.</para>
+<link xlink:href="&blfs-root;view/stable/postlfs/filesystems.html">&blfs-root;view/stable/postlfs/filesystems.html</link>.</para>
 
 <para>To create an ext2 file system on the LFS partition run the following:</para>
Index: chapter02/creatingpartition.xml
===================================================================
--- chapter02/creatingpartition.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter02/creatingpartition.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -16,5 +16,5 @@
 This procedure is not recommended for your first LFS install, but if you
 are short on disk space, and you feel brave, take a look at the hint at
-<uri xlink:href="&hints-root;lfs_next_to_existing_systems.txt">&hints-root;lfs_next_to_existing_systems.txt</uri>.</para>
+<link xlink:href="&hints-root;lfs_next_to_existing_systems.txt">&hints-root;lfs_next_to_existing_systems.txt</link>.</para>
 
 <para>For a minimal system you will need a partition of around 1.3 GB.
Index: chapter03/introduction.xml
===================================================================
--- chapter03/introduction.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter03/introduction.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -20,5 +20,5 @@
 
 <para>All the URLs, when possible, refer to the project's page at
-<uri xlink:href="http://www.freshmeat.net/">http://www.freshmeat.net/</uri>.
+<link xlink:href="http://www.freshmeat.net/">http://www.freshmeat.net/</link>.
 The Freshmeat pages will give you easy access to the official download sites as
 well as project websites, mailing lists, FAQs, changelogs and more.</para>
@@ -28,5 +28,5 @@
 try to google for the package. Should you remain unsuccessful with this, 
 try one of the alternative means of downloading listed on
-<uri xlink:href="&lfs-root;lfs/packages.html">&lfs-root;lfs/packages.html</uri>.</para>
+<link xlink:href="&lfs-root;lfs/packages.html">&lfs-root;lfs/packages.html</link>.</para>
 
 <para>You'll need to store all the downloaded packages and patches somewhere
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter03/packages.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -18,5 +18,5 @@
 <term>Autoconf (&autoconf-version;) - 903 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/autoconf/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/autoconf/"/></para>
 </listitem>
 </varlistentry>
@@ -25,5 +25,5 @@
 <term>Automake (&automake-version;) - 644 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/automake/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/automake/"/></para>
 </listitem>
 </varlistentry>
@@ -32,5 +32,5 @@
 <term>Bash (&bash-version;) - 1,910 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/bash/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/bash/"/></para>
 </listitem>
 </varlistentry>
@@ -39,5 +39,5 @@
 <term>Binutils (&binutils-version;) - 10,666 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.kernel.org/pub/linux/devel/binutils/"/></para>
+<para><link xlink:href="http://www.kernel.org/pub/linux/devel/binutils/"/></para>
 </listitem>
 </varlistentry>
@@ -46,5 +46,5 @@
 <term>Bison (&bison-version;) - 796 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.tuniv.szczecin.pl/pub/Linux/alpha-gnu/bison/"/></para>
+<para><link xlink:href="http://ftp.tuniv.szczecin.pl/pub/Linux/alpha-gnu/bison/"/></para>
 </listitem>
 </varlistentry>
@@ -53,5 +53,5 @@
 <term>Bzip2 (&bzip2-version;) - 650 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://sources.redhat.com/pub/bzip2/v102/"/></para>
+<para><link xlink:href="ftp://sources.redhat.com/pub/bzip2/v102/"/></para>
 </listitem>
 </varlistentry>
@@ -60,5 +60,5 @@
 <term>Coreutils (&coreutils-version;) - 3,860 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/coreutils/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/coreutils/"/></para>
 </listitem>
 </varlistentry>
@@ -67,5 +67,5 @@
 <term>DejaGNU (&dejagnu-version;) - 1,055 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/dejagnu/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/dejagnu/"/></para>
 </listitem>
 </varlistentry>
@@ -74,5 +74,5 @@
 <term>Diffutils (&diffutils-version;) - 762 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/diffutils/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/diffutils/"/></para>
 </listitem>
 </varlistentry>
@@ -81,5 +81,5 @@
 <term>E2fsprogs (&e2fsprogs-version;) - 3,003 KB:</term>
 <listitem>
-<para><uri xlink:href="http://prdownloads.sourceforge.net/e2fsprogs/"/></para>
+<para><link xlink:href="http://prdownloads.sourceforge.net/e2fsprogs/"/></para>
 </listitem>
 </varlistentry>
@@ -88,5 +88,5 @@
 <term>Expect (&expect-version;) - 510 KB:</term>
 <listitem>
-<para><uri xlink:href="http://expect.nist.gov/src/"/></para>
+<para><link xlink:href="http://expect.nist.gov/src/"/></para>
 </listitem>
 </varlistentry>
@@ -95,5 +95,5 @@
 <term>File (&file-version;) - 356 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
+<para><link xlink:href="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
 </listitem>
 </varlistentry>
@@ -102,5 +102,5 @@
 <term>Findutils (&findutils-version;) - 760 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://alpha.gnu.org/gnu/findutils/"/></para>
+<para><link xlink:href="ftp://alpha.gnu.org/gnu/findutils/"/></para>
 </listitem>
 </varlistentry>
@@ -109,5 +109,5 @@
 <term>Flex (&flex-version;) - 372 KB:</term>
 <listitem>
-<para><uri xlink:href="http://sourceforge.net/projects/lex/"/></para>
+<para><link xlink:href="http://sourceforge.net/projects/lex/"/></para>
 </listitem>
 </varlistentry>
@@ -116,5 +116,5 @@
 <term>Gawk (&gawk-version;) - 1,596 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/gawk/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/gawk/"/></para>
 </listitem>
 </varlistentry>
@@ -123,5 +123,5 @@
 <term>GCC (&gcc-version;) - ~27,000KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/"/></para>
 </listitem>
 </varlistentry>
@@ -130,5 +130,5 @@
 <term>Gettext (&gettext-version;) - 6,397 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/gettext/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/gettext/"/></para>
 </listitem>
 </varlistentry>
@@ -137,5 +137,5 @@
 <term>Glibc (&glibc-version;) - 13,800 KB: -- <emphasis>(see Note 1 below)</emphasis></term>
 <listitem>
-<para><uri xlink:href="ftp://sources.redhat.com/pub/glibc/snapshots/"/></para>
+<para><link xlink:href="ftp://sources.redhat.com/pub/glibc/snapshots/"/></para>
 </listitem>
 </varlistentry>
@@ -144,5 +144,5 @@
 <term>Grep (&grep-version;) - 545 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/grep/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/grep/"/></para>
 </listitem>
 </varlistentry>
@@ -151,5 +151,5 @@
 <term>Groff (&groff-version;) - 2,360 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/groff/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/groff/"/></para>
 </listitem>
 </varlistentry>
@@ -158,5 +158,5 @@
 <term>Grub (&grub-version;) - 902 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://alpha.gnu.org/pub/gnu/grub/"/></para>
+<para><link xlink:href="ftp://alpha.gnu.org/pub/gnu/grub/"/></para>
 </listitem>
 </varlistentry>
@@ -165,5 +165,5 @@
 <term>Gzip (&gzip-version;) - 324 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://alpha.gnu.org/gnu/gzip/"/></para>
+<para><link xlink:href="ftp://alpha.gnu.org/gnu/gzip/"/></para>
 </listitem>
 </varlistentry>
@@ -172,5 +172,5 @@
 <term>Hotplug (&hotplug-version;) - 34 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><link xlink:href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
 </listitem>
 </varlistentry>
@@ -179,5 +179,5 @@
 <term>Iana-Etc (&iana-etc-version;) - 161 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.sethwklein.net/projects/iana-etc/downloads/"/></para>
+<para><link xlink:href="http://www.sethwklein.net/projects/iana-etc/downloads/"/></para>
 </listitem>
 </varlistentry>
@@ -186,5 +186,5 @@
 <term>Inetutils (&inetutils-version;) - 1,019 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/inetutils/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/inetutils/"/></para>
 </listitem>
 </varlistentry>
@@ -193,5 +193,5 @@
 <term>IPRoute2 (&iproute2-version;) - 230 KB:</term>
 <listitem>
-<para><uri xlink:href="http://developer.osdl.org/dev/iproute2/download/"/></para>
+<para><link xlink:href="http://developer.osdl.org/dev/iproute2/download/"/></para>
 </listitem>
 </varlistentry>
@@ -200,5 +200,5 @@
 <term>Kbd (&kbd-version;) - 617 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.kernel.org/pub/linux/utils/kbd/"/></para>
+<para><link xlink:href="http://ftp.kernel.org/pub/linux/utils/kbd/"/></para>
 </listitem>
 </varlistentry>
@@ -207,5 +207,5 @@
 <term>Less (&less-version;) - 259 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/less/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/less/"/></para>
 </listitem>
 </varlistentry>
@@ -214,5 +214,5 @@
 <term>LFS-Bootscripts (&bootscripts-version;) - 14 KB:</term>
 <listitem>
-<para><uri xlink:href="http://downloads.linuxfromscratch.org/"/></para>
+<para><link xlink:href="http://downloads.linuxfromscratch.org/"/></para>
 </listitem>
 </varlistentry>
@@ -221,5 +221,5 @@
 <term>Libol (&libol-version;) - 336 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.balabit.com/downloads/syslog-ng/libol/0.3/"/></para>
+<para><link xlink:href="http://www.balabit.com/downloads/syslog-ng/libol/0.3/"/></para>
 </listitem>
 </varlistentry>
@@ -228,5 +228,5 @@
 <term>Libtool (&libtool-version;) - 2,602 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/libtool/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/libtool/"/></para>
 </listitem>
 </varlistentry>
@@ -235,5 +235,5 @@
 <term>Linux (&linux-version;) - 30,051 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.kernel.org/pub/linux/kernel/v2.6"/></para>
+<para><link xlink:href="http://www.kernel.org/pub/linux/kernel/v2.6"/></para>
 </listitem>
 </varlistentry>
@@ -242,5 +242,5 @@
 <term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,381 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"/></para>
+<para><link xlink:href="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"/></para>
 </listitem>
 </varlistentry>
@@ -249,5 +249,5 @@
 <term>M4 (&m4-version;) - 310 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/m4/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/m4/"/></para>
 </listitem>
 </varlistentry>
@@ -256,5 +256,5 @@
 <term>Make (&make-version;) - 899 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/make/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/make/"/></para>
 </listitem>
 </varlistentry>
@@ -263,5 +263,5 @@
 <term>Man (&man-version;) - 196 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></para>
+<para><link xlink:href="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></para>
 </listitem>
 </varlistentry>
@@ -270,5 +270,5 @@
 <term>Man-pages (&man-pages-version;) - 1,586 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.kernel.org/pub/linux/docs/manpages/"/></para>
+<para><link xlink:href="http://ftp.kernel.org/pub/linux/docs/manpages/"/></para>
 </listitem>
 </varlistentry>
@@ -277,5 +277,5 @@
 <term>Mktemp (&mktemp-version;) - 69 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.cs.colorado.edu:/pub/mktemp/"/></para>
+<para><link xlink:href="ftp://ftp.cs.colorado.edu:/pub/mktemp/"/></para>
 </listitem>
 </varlistentry>
@@ -284,5 +284,5 @@
 <term>Module-Init-Tools (&module-init-tools-version;) - 118 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/"/></para>
+<para><link xlink:href="ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/"/></para>
 </listitem>
 </varlistentry>
@@ -291,5 +291,5 @@
 <term>Ncurses (&ncurses-version;) - 2,019 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/ncurses/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/ncurses/"/></para>
 </listitem>
 </varlistentry>
@@ -298,5 +298,5 @@
 <term>Patch (&patch-version;) - 182 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/patch/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/patch/"/></para>
 </listitem>
 </varlistentry>
@@ -305,5 +305,5 @@
 <term>Perl (&perl-version;) - 9,373 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.cpan.org/src/"/></para>
+<para><link xlink:href="http://www.cpan.org/src/"/></para>
 </listitem>
 </varlistentry>
@@ -312,5 +312,5 @@
 <term>Procps (&procps-version;) - 256 KB:</term>
 <listitem>
-<para><uri xlink:href="http://procps.sourceforge.net/"/></para>
+<para><link xlink:href="http://procps.sourceforge.net/"/></para>
 </listitem>
 </varlistentry>
@@ -319,5 +319,5 @@
 <term>Psmisc (&psmisc-version;) - 375 KB:</term>
 <listitem>
-<para><uri xlink:href="http://prdownloads.sourceforge.net/psmisc/"/></para>
+<para><link xlink:href="http://prdownloads.sourceforge.net/psmisc/"/></para>
 </listitem>
 </varlistentry>
@@ -326,5 +326,5 @@
 <term>Readline (&readline-version;) - 940 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/readline/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/readline/"/></para>
 </listitem>
 </varlistentry>
@@ -333,5 +333,5 @@
 <term>Sed (&sed-version;) - 753 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/sed/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/sed/"/></para>
 </listitem>
 </varlistentry>
@@ -340,5 +340,5 @@
 <term>Shadow (&shadow-version;) - 795 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.pld.org.pl/software/shadow/"/></para>
+<para><link xlink:href="ftp://ftp.pld.org.pl/software/shadow/"/></para>
 </listitem>
 </varlistentry>
@@ -347,5 +347,5 @@
 <term>Syslog-ng (&syslogng-version;) - 388 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.balabit.com/downloads/syslog-ng/1.6/src/"/></para>
+<para><link xlink:href="http://www.balabit.com/downloads/syslog-ng/1.6/src/"/></para>
 </listitem>
 </varlistentry>
@@ -354,5 +354,5 @@
 <term>Sysvinit (&sysvinit-version;) - 91 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></para>
+<para><link xlink:href="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></para>
 </listitem>
 </varlistentry>
@@ -361,5 +361,5 @@
 <term>Tar (&tar-version;) - 1,025 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/tar/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/tar/"/></para>
 </listitem>
 </varlistentry>
@@ -368,5 +368,5 @@
 <term>Tcl (&tcl-version;) - 3,363 KB:</term>
 <listitem>
-<para><uri xlink:href="http://prdownloads.sourceforge.net/tcl/"/></para>
+<para><link xlink:href="http://prdownloads.sourceforge.net/tcl/"/></para>
 </listitem>
 </varlistentry>
@@ -375,5 +375,5 @@
 <term>Texinfo (&texinfo-version;) - 1,385 KB:</term>
 <listitem>
-<para><uri xlink:href="http://ftp.gnu.org/gnu/texinfo/"/></para>
+<para><link xlink:href="http://ftp.gnu.org/gnu/texinfo/"/></para>
 </listitem>
 </varlistentry>
@@ -382,5 +382,5 @@
 <term>Udev (&udev-version;) - 374 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><link xlink:href="ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
 </listitem>
 </varlistentry>
@@ -389,5 +389,5 @@
 <term>Udev Permissions Configuration - 2 KB:</term>
 <listitem>
-<para><uri xlink:href="http://downloads.linuxfromscratch.org/udev-config-2.permissions"/></para>
+<para><link xlink:href="http://downloads.linuxfromscratch.org/udev-config-2.permissions"/></para>
 </listitem>
 </varlistentry>
@@ -396,5 +396,5 @@
 <term>Udev Rules Configuration - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="http://downloads.linuxfromscratch.org/udev-config-1.rules"/></para>
+<para><link xlink:href="http://downloads.linuxfromscratch.org/udev-config-1.rules"/></para>
 </listitem>
 </varlistentry>
@@ -403,5 +403,5 @@
 <term>Util-linux (&util-linux-version;) - 1,814 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/"/></para>
+<para><link xlink:href="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/"/></para>
 </listitem>
 </varlistentry>
@@ -410,5 +410,5 @@
 <term>Vim (&vim-version;) - 3,612 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.vim.org/pub/vim/unix/"/></para>
+<para><link xlink:href="ftp://ftp.vim.org/pub/vim/unix/"/></para>
 </listitem>
 </varlistentry>
@@ -417,5 +417,5 @@
 <term>Vim (&vim-version;) language files (optional) - 1,033 KB:</term>
 <listitem>
-<para><uri xlink:href="ftp://ftp.vim.org/pub/vim/unix/"/></para>
+<para><link xlink:href="ftp://ftp.vim.org/pub/vim/unix/"/></para>
 </listitem>
 </varlistentry>
@@ -424,5 +424,5 @@
 <term>Zlib (&zlib-version;) - 277 KB:</term>
 <listitem>
-<para><uri xlink:href="http://www.zlib.net/"/></para>
+<para><link xlink:href="http://www.zlib.net/"/></para>
 </listitem>
 </varlistentry>
@@ -443,5 +443,5 @@
 <para>Alternatively, we've made our own tarball available which you can download
 from any of the FTP mirrors listed on the
-<uri xlink:href="&lfs-root;lfs/packages.html#http">LFS Website</uri>.  It can be
+<link xlink:href="&lfs-root;lfs/packages.html#http">LFS Website</link>.  It can be
 found under the
 <filename>/pub/lfs/packages/conglomeration/glibc</filename> directory.
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter03/patches.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -21,5 +21,5 @@
 <term>Bash Various Fixes - 21 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;bash-&bash-version;-fixes-1.patch"/></para>
+<para><link xlink:href="&patches-root;bash-&bash-version;-fixes-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -28,5 +28,5 @@
 <term>Bash Avoid Wcontinued Patch - 1KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;bash-&bash-version;-avoid_WCONTINUED-1.patch"/></para>
+<para><link xlink:href="&patches-root;bash-&bash-version;-avoid_WCONTINUED-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -35,5 +35,5 @@
 <term>Coreutils Suppress Uptime, Kill, Su Patch - 16 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para>
+<para><link xlink:href="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -42,5 +42,5 @@
 <term>Coreutils Uname Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;coreutils-&coreutils-version;-uname-2.patch"/></para>
+<para><link xlink:href="&patches-root;coreutils-&coreutils-version;-uname-2.patch"/></para>
 </listitem>
 </varlistentry>
@@ -49,5 +49,5 @@
 <term>Expect Spawn Patch - 6 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;expect-&expect-version;-spawn-1.patch"/></para>
+<para><link xlink:href="&patches-root;expect-&expect-version;-spawn-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -56,5 +56,5 @@
 <term>Flex Brokenness Patch - 8 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;flex-&flex-version;-debian_fixes-2.patch"/></para>
+<para><link xlink:href="&patches-root;flex-&flex-version;-debian_fixes-2.patch"/></para>
 </listitem>
 </varlistentry>
@@ -63,5 +63,5 @@
 <term> GCC Linkonce Patch - 12KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;gcc-&gcc-version;-linkonce-1.patch"/></para>
+<para><link xlink:href="&patches-root;gcc-&gcc-version;-linkonce-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -70,5 +70,5 @@
 <term>GCC No-Fixincludes Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/></para>
+<para><link xlink:href="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -77,5 +77,5 @@
 <term>GCC Specs Patch - 11 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;gcc-&gcc-version;-specs-2.patch"/></para>
+<para><link xlink:href="&patches-root;gcc-&gcc-version;-specs-2.patch"/></para>
 </listitem>
 </varlistentry>
@@ -84,5 +84,5 @@
 <term>Inetutils Kernel Headers Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
+<para><link xlink:href="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -91,5 +91,5 @@
 <term>Inetutils No-Server-Man-Pages Patch - 4 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para>
+<para><link xlink:href="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -98,5 +98,5 @@
 <term>IPRoute2 Disable DB Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;iproute2-&iproute2-patch-version;-remove_db-1.patch"/></para>
+<para><link xlink:href="&patches-root;iproute2-&iproute2-patch-version;-remove_db-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -105,5 +105,5 @@
 <term>Man 80-Columns Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;man-&man-version;-80cols-1.patch"/></para>
+<para><link xlink:href="&patches-root;man-&man-version;-80cols-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -112,5 +112,5 @@
 <term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
+<para><link xlink:href="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -119,5 +119,5 @@
 <term>Perl Libc Patch - 1 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;perl-&perl-version;-libc-1.patch"/></para>
+<para><link xlink:href="&patches-root;perl-&perl-version;-libc-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -126,5 +126,5 @@
 <term>Readline Various Fixes - 7 KB:</term>
 <listitem>
-<para><uri xlink:href="&patches-root;readline-&readline-version;-fixes-1.patch" /></para>
+<para><link xlink:href="&patches-root;readline-&readline-version;-fixes-1.patch" /></para>
 </listitem>
 </varlistentry>
@@ -132,5 +132,5 @@
 <varlistentry>
 <term>Sysvinit /proc Title Length Patch - 1 KB:</term> <listitem>
-<para><uri xlink:href="&patches-root;sysvinit-&sysvinit-version;-proclen-1.patch"/></para>
+<para><link xlink:href="&patches-root;sysvinit-&sysvinit-version;-proclen-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -138,5 +138,5 @@
 <varlistentry>
 <term>Texinfo Seg-Fault Patch - 1 KB:</term> <listitem>
-<para><uri xlink:href="&patches-root;texinfo-&texinfo-version;-segfault-1.patch"/></para>
+<para><link xlink:href="&patches-root;texinfo-&texinfo-version;-segfault-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -147,5 +147,5 @@
 optional ones created by the LFS community. Most of these solve slight
 problems, or enable some functionality that's not enabled by default.
-Feel free to examine the patches database, located at <uri xlink:href="&lfs-root;patches/"/>, 
+Feel free to examine the patches database, located at <link xlink:href="&lfs-root;patches/"/>, 
 and pick any additional patches you wish to use.</para>
 
Index: chapter04/aboutsbus.xml
===================================================================
--- chapter04/aboutsbus.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter04/aboutsbus.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -42,5 +42,5 @@
 
 <para>If you wish to see actual timings for specific machines, have a look at
-<uri xlink:href="&lfs-root;~bdubbs/"/>.</para>
+<link xlink:href="&lfs-root;~bdubbs/"/>.</para>
 
 </section>
Index: chapter04/abouttestsuites.xml
===================================================================
--- chapter04/abouttestsuites.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter04/abouttestsuites.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -41,5 +41,5 @@
 
 <para>Sometimes package test suites will give false failures. You can
-consult the LFS Wiki at <uri xlink:href="&wiki-root;"/> to verify that these
+consult the LFS Wiki at <link xlink:href="&wiki-root;"/> to verify that these
 failures are normal. This applies to all tests throughout the book.</para>
 
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter05/gcc-pass2.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -45,5 +45,5 @@
 properly. In this case there is no point in running the test suites for GCC
 and Binutils until you are able to resolve the issue. You can consult the LFS
-Wiki at <uri xlink:href="&wiki-root;"/> for more information on how to get PTYs
+Wiki at <link xlink:href="&wiki-root;"/> for more information on how to get PTYs
 working.</para>
 
@@ -167,5 +167,5 @@
 mailing list for similar configurations to your own. For an example of how
 current GCC-&gcc-version; should look on i686-pc-linux-gnu, see
-<uri xlink:href="http://gcc.gnu.org/ml/gcc-testresults/2004-09/msg00261.html"/>.</para>
+<link xlink:href="http://gcc.gnu.org/ml/gcc-testresults/2004-09/msg00261.html"/>.</para>
 
 <para>Having a few unexpected failures often cannot be avoided. The GCC
Index: chapter06/aboutdebug.xml
===================================================================
--- chapter06/aboutdebug.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/aboutdebug.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -45,5 +45,5 @@
 your convenience, the next section shows how to strip all debugging symbols
 from all programs and libraries. Information on other ways of optimizing your
-system can be found in the hint at <uri xlink:href="&hints-root;optimization.txt"/>.</para>
+system can be found in the hint at <link xlink:href="&hints-root;optimization.txt"/>.</para>
 
 </section>
Index: chapter06/creatingdirs.xml
===================================================================
--- chapter06/creatingdirs.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/creatingdirs.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -53,5 +53,5 @@
 
 <para>We have based our directory tree on the FHS standard (available at
-<uri xlink:href="http://www.pathname.com/fhs/"/>). Besides the above created
+<link xlink:href="http://www.pathname.com/fhs/"/>). Besides the above created
 tree this standard stipulates the existence of
 <filename class="directory">/usr/local/games</filename> and
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/e2fsprogs.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -71,5 +71,5 @@
 internal interfaces and EVMS is not installed as part of a base LFS system, so
 the plugin is not required.  See the
-<uri xlink:href="http://evms.sourceforge.net/">EVMS homepage</uri> for more
+<link xlink:href="http://evms.sourceforge.net/">EVMS homepage</link> for more
 information regarding EVMS itself.</para></listitem>
 </varlistentry>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/gcc.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -42,5 +42,5 @@
 GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
-<uri xlink:href="&blfs-root;view/stable/general/gcc.html"/>.</para>
+<link xlink:href="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
Index: chapter06/inetutils.xml
===================================================================
--- chapter06/inetutils.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/inetutils.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -81,5 +81,5 @@
 are insecure by nature and are only considered safe on trusted networks. More
 information can be found at
-<uri xlink:href="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
+<link xlink:href="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
 replacements are available for many of these servers.</para></listitem>
 </varlistentry>
Index: chapter06/introduction.xml
===================================================================
--- chapter06/introduction.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/introduction.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -30,5 +30,5 @@
 
 <para>If you plan to use compiler optimizations in this chapter, take a look at
-the optimization hint at <uri xlink:href="&hints-root;optimization.txt"/>.
+the optimization hint at <link xlink:href="&hints-root;optimization.txt"/>.
 Compiler optimizations can make a program run slightly faster, but they may also
 cause compilation difficulties and even problems when running the program. If a
@@ -62,7 +62,7 @@
 <para>If you wish to keep track of which package installs what files, you may
 want to use a package manager. For a general overview of package managers have
-a look at <uri xlink:href="&blfs-root;view/cvs/introduction/pkgmgt.html"/>. And
+a look at <link xlink:href="&blfs-root;view/cvs/introduction/pkgmgt.html"/>. And
 for a package management method specifically geared towards LFS see
-<uri xlink:href="&hints-root;more_control_and_pkg_man.txt"/>.</para>
+<link xlink:href="&hints-root;more_control_and_pkg_man.txt"/>.</para>
 
 </section>
Index: chapter06/iproute2.xml
===================================================================
--- chapter06/iproute2.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/iproute2.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -39,6 +39,6 @@
           Berkeley DB by applying the patch using the command below.  If you
           need the <command>arpd</command> binary, then instructions for
-          compiling Berkeley DB can be found in the <uri
-xlink:href="http://www.linuxfromscratch.org/blfs/view/cvs/content/databases.html#db">BLFS book</uri>.
+          compiling Berkeley DB can be found in the <link
+xlink:href="http://www.linuxfromscratch.org/blfs/view/cvs/content/databases.html#db">BLFS book</link>.
     </para>
 
Index: chapter06/man.xml
===================================================================
--- chapter06/man.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/man.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -108,5 +108,5 @@
 
 <para>You may want to also take a look at the BLFS page at
-<uri xlink:href="&blfs-root;view/cvs/postlfs/compressdoc.html"/> which deals with
+<link xlink:href="&blfs-root;view/cvs/postlfs/compressdoc.html"/> which deals with
 formatting and compression issues for man pages.</para>
 
Index: chapter06/pwdgroup.xml
===================================================================
--- chapter06/pwdgroup.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/pwdgroup.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -55,6 +55,6 @@
 <para>The created groups aren't part of any standard -- they are some of the
 groups that the Udev configuration we will be using in the next section
-uses. The LSB (<uri xlink:href="http://www.linuxbase.org/">Linux Standard
-Base</uri>) recommends only that, beside the group <quote>root</quote> with a
+uses. The LSB (<link xlink:href="http://www.linuxbase.org/">Linux Standard
+Base</link>) recommends only that, beside the group <quote>root</quote> with a
 GID of 0, a group <quote>bin</quote> with a GID of 1 be present. All other group
 names and GIDs can be chosen freely by the system administrator, since
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/revisedchroot.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -33,5 +33,5 @@
 the prefix from <filename class="directory">/tools</filename> to <filename class="directory">/usr</filename>. The
 BLFS book discusses a slightly different approach to installing Tcl, see 
-<uri xlink:href="&blfs-root;"/>.</para></note>
+<link xlink:href="&blfs-root;"/>.</para></note>
 
 <para>You may also want to move the packages and patches stored in <filename 
Index: chapter06/vim.xml
===================================================================
--- chapter06/vim.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter06/vim.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -30,5 +30,5 @@
 <title>Alternatives to Vim</title>
 <para>If you prefer another editor -- like Emacs, Joe, or Nano -- to Vim,
-have a look at <uri xlink:href="&blfs-root;view/stable/postlfs/editors.html"/> for
+have a look at <link xlink:href="&blfs-root;view/stable/postlfs/editors.html"/> for
 suggested installation instructions.</para>
 </tip>
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter07/introduction.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -18,5 +18,5 @@
 are widely used and we feel comfortable with them. If you would prefer to try
 something else: Marc Heerdink has written a hint about BSD style init scripts,
-to be found at <uri xlink:href="&hints-root;bsd-init.txt"/>. And if you'd like
+to be found at <link xlink:href="&hints-root;bsd-init.txt"/>. And if you'd like
 something more radical, search the LFS mailing lists for <quote>depinit</quote>.
 </para>
Index: chapter07/setclock.xml
===================================================================
--- chapter07/setclock.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter07/setclock.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -37,5 +37,5 @@
 
 <para>Now, you may want to take a look at a very good hint explaining how we
-deal with time on LFS at <uri xlink:href="&hints-root;time.txt"/>. 
+deal with time on LFS at <link xlink:href="&hints-root;time.txt"/>. 
 It explains issues such as time zones, UTC, and the TZ environment
 variable.</para>
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter08/grub.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -121,5 +121,5 @@
 <para>If <command>info grub</command> doesn't tell you all you want to
 know, you can find more information regarding Grub on its website, located at:
-<uri xlink:href="http://www.gnu.org/software/grub/"/>.</para>
+<link xlink:href="http://www.gnu.org/software/grub/"/>.</para>
 
 <para>The FHS stipulates that Grub's menu.lst file should be symlinked to
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter08/kernel.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -127,5 +127,5 @@
 consider stripping and compressing the modules. For most people such compression
 isn't worth the trouble, but if you're really pressed for space, then have a look at
-<uri xlink:href="http://www.linux-mips.org/archives/linux-mips/2002-04/msg00031.html"/>.</para>
+<link xlink:href="http://www.linux-mips.org/archives/linux-mips/2002-04/msg00031.html"/>.</para>
 
 <para>Kernel compilation has finished but more steps are required to complete
Index: chapter09/getcounted.xml
===================================================================
--- chapter09/getcounted.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter09/getcounted.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -12,5 +12,5 @@
 <para>Want to be counted as an LFS user now that you have finished the
 book? Head over 
-to <uri xlink:href="&lfs-root;cgi-bin/lfscounter.cgi"/> and 
+to <link xlink:href="&lfs-root;cgi-bin/lfscounter.cgi"/> and 
 register as an LFS user by entering your name and the first LFS version 
 you have used.</para>
Index: chapter09/whatnow.xml
===================================================================
--- chapter09/whatnow.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ chapter09/whatnow.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -22,5 +22,5 @@
 <para>The Beyond Linux From Scratch book covers installation procedures
 for a wide range of software beyond the scope of the LFS Book. The BLFS
-project can be found at <uri xlink:href="&blfs-root;"/>.</para></listitem>
+project can be found at <link xlink:href="&blfs-root;"/>.</para></listitem>
 
 <listitem><para>LFS Hints</para>
@@ -28,5 +28,5 @@
 <para>The LFS Hints are a collection of small, educational documents
 submitted by volunteers in the LFS community. The Hints are available at
-<uri xlink:href="&hints-index;"/>.</para></listitem>
+<link xlink:href="&hints-index;"/>.</para></listitem>
 
 <listitem><para>Mailing lists</para>
@@ -41,5 +41,5 @@
 all of the issues of Linux documentation. The LDP features a large collection
 of HOWTOs, Guides and man pages; it may be found at
-<uri xlink:href="http://www.tldp.org/"/>.</para></listitem>
+<link xlink:href="http://www.tldp.org/"/>.</para></listitem>
 
 </itemizedlist>
Index: prologue/acknowledgments.xml
===================================================================
--- prologue/acknowledgments.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ prologue/acknowledgments.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -379,5 +379,5 @@
 <listitem><para><link xlink:href="mailto:bkenoah@oswd.org">Frank Skettino</link>
 &lt;bkenoah@oswd.org&gt; for the initial design of the old website -- have a
-look at <uri xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.oswd.org/">http://www.oswd.org/</uri>.</para></listitem>
+look at <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.oswd.org/">http://www.oswd.org/</link>.</para></listitem>
 
 <listitem><para><link xlink:href="mailto:highos@linuxfromscratch.org">Jesse
Index: prologue/audience.xml
===================================================================
--- prologue/audience.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ prologue/audience.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -89,7 +89,7 @@
 
 <para>The <quote>From Power Up To Bash Prompt</quote> HOWTO is located at 
-<uri xlink:href="http://axiom.anu.edu.au/~okeefe/p2b/">http://axiom.anu.edu.au/~okeefe/p2b/</uri> or on The Linux 
+<link xlink:href="http://axiom.anu.edu.au/~okeefe/p2b/">http://axiom.anu.edu.au/~okeefe/p2b/</link> or on The Linux 
 Documentation Project's website at
-<uri xlink:href="http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html">http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html</uri>.</para>
+<link xlink:href="http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html">http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html</link>.</para>
 
 </section>
Index: prologue/prerequisites.xml
===================================================================
--- prologue/prerequisites.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ prologue/prerequisites.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -19,5 +19,5 @@
 <para>This is a comprehensive guide to building and installing
 <quote>generic</quote> Unix software distributions under Linux. This HOWTO is
-available at <uri xlink:href="http://www.tldp.org/HOWTO/Software-Building-HOWTO.html">http://www.tldp.org/HOWTO/Software-Building-HOWTO.html</uri>.</para>
+available at <link xlink:href="http://www.tldp.org/HOWTO/Software-Building-HOWTO.html">http://www.tldp.org/HOWTO/Software-Building-HOWTO.html</link>.</para>
 </listitem>
 
@@ -25,5 +25,5 @@
 
 <para>This guide covers the usage of assorted Linux software and is available at
-<uri xlink:href="http://espc22.murdoch.edu.au/~stewart/guide/guide.html">http://espc22.murdoch.edu.au/~stewart/guide/guide.html</uri>.</para>
+<link xlink:href="http://espc22.murdoch.edu.au/~stewart/guide/guide.html">http://espc22.murdoch.edu.au/~stewart/guide/guide.html</link>.</para>
 </listitem>
 
@@ -35,5 +35,5 @@
 understanding of many of the topics in this hint. It is available at
 
-<uri xlink:href="&hints-root;essential_prereading.txt">&hints-root;essential_prereading.txt</uri></para></listitem>
+<link xlink:href="&hints-root;essential_prereading.txt">&hints-root;essential_prereading.txt</link></para></listitem>
 
 </itemizedlist>
Index: prologue/typography.xml
===================================================================
--- prologue/typography.xml	(revision 5156910bdbbcde9be049830d92aca490124ec756)
+++ prologue/typography.xml	(revision dc6acb5b86f73b5040f24f6d7e28c4901ccc9f90)
@@ -31,5 +31,5 @@
 book, mainly to emphasize important points or items.</para></blockquote>
 
-<para><uri xlink:href="&lfs-root;">&lfs-root;</uri></para>
+<para><link xlink:href="&lfs-root;">&lfs-root;</link></para>
 
 <blockquote><para>This form of text is used for hyperlinks, both within the 
