In DocBook-NG the replacement for <ulink> is a new definition of <link>.

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

32 files changed, 127 insertions, 127 deletions

diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index 01e937707..c30f7533d 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -16,7 +16,7 @@
 <para>If during the building of your LFS system you encounter any errors, or
 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>
 
@@ -42,7 +42,7 @@ of mailing lists used for the development of the LFS project. These lists
 include, among others, the main development and support lists.</para>
 
 <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>
 
@@ -64,7 +64,7 @@ are copied to the corresponding newsgroup, and vice versa.</para>
 <title>Wiki</title>
 
 <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>
 
@@ -74,7 +74,7 @@ experiences, and so on, see the LFS Wiki at <uri xlink:href="&wiki-root;">&wiki-
 
 <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>
 
@@ -84,7 +84,7 @@ you will find useful pointers on this page:
 
 <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>
 
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index 0b83ef912..5bd01a599 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -10,10 +10,10 @@
 <?dbhtml filename="askforhelp.html"?>
 
 <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
 lists (see <xref linkend="ch-scatter-administrativa"/>) are willing to help
@@ -90,7 +90,7 @@ command that was executed and the command's error message(s).</para>
 
 <para>An excellent article on asking for help on the Internet in general
 has been written by Eric S. Raymond. It is available online at 
-<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
 need.</para>
@@ -103,7 +103,7 @@ need.</para>
 <para>Many packages provide a test suite which, depending on the importance
 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>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ee0378696..46a67ae6e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -13,7 +13,7 @@
 <para>This is version &version; of the Linux From Scratch book, dated
 &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,
 first a summary, then a detailed log.</para>
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index 897aa2c39..84cae02bc 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -14,7 +14,7 @@ Most widely used in the Linux world is the second extended file system (ext2),
 but with the high-capacity hard disks of today the so-called journaling file
 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>
 
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 208576331..88d58491f 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -15,7 +15,7 @@ on any of your hard disks to make one, then you could build LFS on the
 same partition as the one on which your current distribution is installed.
 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.
 This is enough to store all the source tarballs and compile all the packages.
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index abf03e00f..fc37f4205 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -19,7 +19,7 @@ reason for not using the latest version due to known problems that haven't
 been worked around yet.</para>
 
 <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>
 
@@ -27,7 +27,7 @@ well as project websites, mailing lists, FAQs, changelogs and more.</para>
 In case a download location has changed since this book was published, please
 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
 that is conveniently available throughout the entire build. You'll also need a
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 959bf212e..b649f9294 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -17,413 +17,413 @@
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
@@ -442,7 +442,7 @@ tar jcvf glibc-2.3.4-20040828.tar.bz2 glibc-2.3.4-20040828</userinput></screen>
 
 <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.
 </para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index fb6c382e1..d0084ab6a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -20,124 +20,124 @@ following:</para>
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <varlistentry>
 <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>
 
 <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>
 
 <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>
 
@@ -146,7 +146,7 @@ following:</para>
 <para>In addition to the above required patches, there exist a number of
 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>
 
 </section>
diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml
index 5fbdd770b..09cab5a71 100644
--- a/chapter04/aboutsbus.xml
+++ b/chapter04/aboutsbus.xml
@@ -41,6 +41,6 @@ so lucky as to have multiple processors, chances are that your system is so fast
 that you won't mind.</para>
 
 <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>
diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml
index 926d40d07..ac60ee933 100644
--- a/chapter04/abouttestsuites.xml
+++ b/chapter04/abouttestsuites.xml
@@ -40,7 +40,7 @@ likely cause is that the host system doesn't have the
 more detail later on in <xref linkend="chapter-temporary-tools"/>.</para>
 
 <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>
 
 </section>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 2d2911861..c0437e40f 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -44,7 +44,7 @@ system is set up correctly in this regard by performing a simple test:</para>
 <para>If you receive the above message, your host doesn't have its PTYs set up
 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>
 
 <para>This time we will build both the C and the C++ compilers, so you'll have
@@ -166,7 +166,7 @@ a summary of the test suite results, run this:</para>
 <para>You can compare your results to those posted to the gcc-testresults
 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
 developers are usually aware of these, but haven't yet gotten around to fixing
diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index 156b16524..0771f380d 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -44,6 +44,6 @@ difference will generally be a factor between 2 and 5.</para>
 software, a lot of disk space can be regained by removing these symbols. For
 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>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 3047e8b26..f8212131b 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -52,7 +52,7 @@ mask.</para>
 <title>FHS compliance note</title>
 
 <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
 <filename class="directory">/usr/share/games</filename>, but we don't
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index d065d0af3..d75964e5a 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -70,7 +70,7 @@ the shared libraries which some programs in this package use.</para></listitem>
 System (EVMS) plugin.  This plugin is not up-to-date with the latest EVMS
 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>
 </variablelist>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 63c12d7b8..06bd77610 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -41,7 +41,7 @@ or modifying them when building GCC.</para>
 will unfold into the same directory. You should likewise extract the
 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>
 the Specs patch) also used in the previous chapter:</para>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 43598dbc5..bdf11c7b5 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -80,7 +80,7 @@ installation of the various network servers included as part of the Inetutils
 package. These servers are deemed not appropriate in a basic LFS system. Some
 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>
 </variablelist>
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 300da6313..9454a7866 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -29,7 +29,7 @@ given followed by concise descriptions of each program and library it
 installed.</para>
 
 <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
 package refuses to compile when using optimization, try to compile it without
@@ -61,8 +61,8 @@ with a series of short descriptions of these.</para>
 
 <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>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index c1742c2c5..b19a466ee 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -38,8 +38,8 @@
           common requirement on a base Linux system we remove the dependency on
           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>
 
     <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 4f8cf2a96..68f2f4a83 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -107,7 +107,7 @@ multibyte character sets properly anyway. You may want to look at
 internationalization related hints, though.</para>
 
 <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>
 
 </section>
diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml
index 1be248aca..ed35a77f6 100644
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@@ -54,8 +54,8 @@ EOF</userinput></screen>
 
 <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
 well-written packages don't depend on GID numbers but use the group's name.
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 12c363247..759a185a9 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -32,7 +32,7 @@ will need to recompile and re-install them. The installation instructions are
 the same as in <xref linkend="chapter-temporary-tools"/>, apart from changing
 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 
 class="directory">/sources</filename> to a more usual location, such as
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 3a6545ea7..335bc4d55 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -29,7 +29,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 <tip>
 <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>
 </section>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 7c0448fa8..3453b3053 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -17,7 +17,7 @@ dependent information.</para>
 <para>We have chosen to use System-V style init scripts simply because they
 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>
 
diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml
index 8819b9c7c..aa9ed9d65 100644
--- a/chapter07/setclock.xml
+++ b/chapter07/setclock.xml
@@ -36,7 +36,7 @@ UTC=1
 EOF</userinput></screen>
 
 <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>
 
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 39e2eeae4..5a7580c6d 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -120,7 +120,7 @@ EOF</userinput></screen>
 
 <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
 /etc/grub/menu.lst.  To satisfy this requirement, issue the following
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 676f41df5..f8819316e 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -126,7 +126,7 @@ configuration, especially if this is the first time you use Udev.</para>
 <para>If you have a lot of modules and very little space, you may want to
 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
 the installation. Some files need to be copied to the <filename class="directory">/boot</filename>
diff --git a/chapter09/getcounted.xml b/chapter09/getcounted.xml
index 84bc2223f..6c71bc1fa 100644
--- a/chapter09/getcounted.xml
+++ b/chapter09/getcounted.xml
@@ -11,7 +11,7 @@
 
 <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>
 
diff --git a/chapter09/whatnow.xml b/chapter09/whatnow.xml
index 0767c5e6d..09d3ced5c 100644
--- a/chapter09/whatnow.xml
+++ b/chapter09/whatnow.xml
@@ -21,13 +21,13 @@ composed a list of resources for you.</para>
 
 <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>
 
 <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>
 
@@ -40,7 +40,7 @@ information.</para></listitem>
 <para>The goal of the Linux Documentation Project is to collaborate in
 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>
 
diff --git a/prologue/acknowledgments.xml b/prologue/acknowledgments.xml
index 2c73df994..d7a0c7bce 100644
--- a/prologue/acknowledgments.xml
+++ b/prologue/acknowledgments.xml
@@ -378,7 +378,7 @@ LFS banner by Garrett LeSage.</para></listitem>
 
 <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
 Tie-Ten-Quee</link> &lt;highos@linuxfromscratch.org&gt; for temporarily
diff --git a/prologue/audience.xml b/prologue/audience.xml
index bb0d2a6a2..bcd861378 100644
--- a/prologue/audience.xml
+++ b/prologue/audience.xml
@@ -88,9 +88,9 @@ you do not have any plans for your finished system, then the
 <quote>From Power Up To Bash Prompt</quote> HOWTO is probably a better choice.</para>
 
 <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>
 
diff --git a/prologue/prerequisites.xml b/prologue/prerequisites.xml
index ae61326ab..5eaa409bc 100644
--- a/prologue/prerequisites.xml
+++ b/prologue/prerequisites.xml
@@ -18,13 +18,13 @@ system, you should read the following HOWTOs:</para>
 
 <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>
 
 <listitem><para>The Linux Users' Guide</para>
 
 <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>
 
 <listitem><para>The Essential Pre-Reading Hint</para>
@@ -34,7 +34,7 @@ mostly a list of links to excellent sources of information on a wide range of
 topics. Any person attempting to install LFS, should at least have an
 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>
 
diff --git a/prologue/typography.xml b/prologue/typography.xml
index 229767872..02a8450f2 100644
--- a/prologue/typography.xml
+++ b/prologue/typography.xml
@@ -30,7 +30,7 @@ show filenames, such as <filename>/etc/ld.so.conf</filename>.</para></blockquote
 <blockquote><para>This form of text is used for several purposes in the 
 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 
 book and to external pages such as HOWTOs, download locations and