Equalizing the use of URL entities.

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

11 files changed, 35 insertions, 39 deletions

diff --git a/INSTALL b/INSTALL
index 96d7825a8..ea824ffed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ read (e.g. HTML, TXT, PS or PDF).  If you are interested in this, then keep
 reading.  If you are only interested in editing the XML source for re- 
 submission to the lfs-book or lfs-dev mailing lists, then you do not need this 
 document.  Instead, you need to read the LFS Editor's Manual.  See the LFS 
-website at http://linuxfromscratch.org for more information.
+website at http://www.linuxfromscratch.org for more information.
 
 -------------------------------------------------------------------------------
 If all you want to do is convert XML to HTML perform the following:
diff --git a/appendixa/bootscripts-down.xml b/appendixa/bootscripts-down.xml
index 7fbe951c2..798838964 100644
--- a/appendixa/bootscripts-down.xml
+++ b/appendixa/bootscripts-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for LFS-Bootscripts (&bootscripts-version;): 
-<ulink url="&http;/"/></literallayout>
+<ulink url="&http-down;"/></literallayout>
diff --git a/appendixa/lfs-utils-down.xml b/appendixa/lfs-utils-down.xml
index ea0341a0d..9639047cd 100644
--- a/appendixa/lfs-utils-down.xml
+++ b/appendixa/lfs-utils-down.xml
@@ -1,3 +1,3 @@
 <literallayout>Official download location for Lfs-Utils (&lfs-utils-version;):
-<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/></literallayout>
+<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/></literallayout>
 
diff --git a/appendixa/makedev-down.xml b/appendixa/makedev-down.xml
index 8766db7a2..1e0e6a63c 100644
--- a/appendixa/makedev-down.xml
+++ b/appendixa/makedev-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for MAKEDEV (&makedev-version;):
-<ulink url="&http;/"/></literallayout>
+<ulink url="&http-down;"/></literallayout>
diff --git a/chapter01/contactinfo.xml b/chapter01/contactinfo.xml
index f22935a61..02b05acac 100644
--- a/chapter01/contactinfo.xml
+++ b/chapter01/contactinfo.xml
@@ -9,7 +9,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
-<ulink url="http://www.linuxfromscratch.org/faq/"/>.</para>
+<ulink url="&faq-root;"/>.</para>
 
 </sect2>
 
@@ -36,7 +36,7 @@ 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 <ulink
-url="http://www.linuxfromscratch.org/mail.html"/>.</para>
+url="&lfs-root;mail.html"/>.</para>
 
 </sect2>
 
@@ -79,8 +79,8 @@ 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 <ulink url="http://www.linuxfromscratch.org/"/> for
-a list of current mirrors.</para>
+Please visit the website at <ulink url="&lfs-root;"/> for a list of current
+mirrors.</para>
 
 </sect2>
 
diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml
index d453e557a..924cc7288 100644
--- a/chapter01/conventions.xml
+++ b/chapter01/conventions.xml
@@ -25,7 +25,7 @@ show filenames, such as <filename>/etc/ld.so.conf</filename>.</para></blockquote
 book, mainly to emphasize important points, and to give examples of
 what to type.</para></blockquote>
 
-<para><ulink url="http://www.linuxfromscratch.org/"/></para>
+<para><ulink url="&lfs-root;"/></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
diff --git a/chapter01/versions.xml b/chapter01/versions.xml
index b8fd3d26e..162dcb140 100644
--- a/chapter01/versions.xml
+++ b/chapter01/versions.xml
@@ -5,7 +5,7 @@
 <para>This is version &version; of the Linux From Scratch book, dated
 &releasedate;. If this book is more than three months old, a newer and better
 version is probably already available. To find out, check one of the mirrors
-listed on <ulink url="http://www.linuxfromscratch.org/"/>.</para>
+listed on <ulink url="&lfs-root;"/>.</para>
 
 </sect1>
 
diff --git a/chapter02/aboutsbus.xml b/chapter02/aboutsbus.xml
index ab700d3ff..646788f89 100644
--- a/chapter02/aboutsbus.xml
+++ b/chapter02/aboutsbus.xml
@@ -33,7 +33,7 @@ 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
-<ulink url="http://www.linuxfromscratch.org/~bdubbs/"/>.</para>
+<ulink url="&lfs-root;~bdubbs/"/>.</para>
 
 </sect1>
 
diff --git a/chapter02/askforhelp.xml b/chapter02/askforhelp.xml
index c3c865576..f0a4ff732 100644
--- a/chapter02/askforhelp.xml
+++ b/chapter02/askforhelp.xml
@@ -2,15 +2,13 @@
 <title>How to ask for help</title>
 <?dbhtml filename="askforhelp.html" dir="chapter02"?>
 
-<para>If you encounter a problem while using this book, and your problem 
-is not listed in the FAQ (<ulink
-url="http://www.linuxfromscratch.org/faq"/>), you will find that most 
-of the people on Internet Relay Chat (IRC) and 
-on the mailing lists are willing to help you. An 
-overview of the LFS mailing lists can be found in 
-<xref linkend="ch01-maillists"/>. To assist us in diagnosing and solving
-your problem, include as much relevant information as possible in your
-request for help.</para>
+<para>If you encounter a problem while using this book, and your problem
+is not listed in the FAQ (<ulink url="&faq-root;"/>), you will find that
+most of the people on Internet Relay Chat (IRC) and on the mailing lists
+are willing to help you. An overview of the LFS mailing lists can be
+found via <xref linkend="ch01-maillists"/>. To assist us in diagnosing
+and solving your problem, include as much relevant information as
+possible in your request for help.</para>
 
 <sect2>
 <title>Things to mention</title>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 9890a587c..1181d67aa 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -24,10 +24,9 @@ project websites, mailing lists, FAQs, changelogs and more.</para>
 <para>We can't guarantee that these download locations are always available.
 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, you
-can consult the book's errata page at
-<ulink url="http://linuxfromscratch.org/lfs/print/"/> or, better yet, try one
-of the alternative means of downloading listed on
-<ulink url="http://linuxfromscratch.org/lfs/packages.html"/>.</para>
+can consult the book's errata page at <ulink url="&lfs-root;/lfs/print/"/>
+or, better yet, try one of the alternative means of downloading listed on
+<ulink url="&lfs-root;/lfs/packages.html"/>.</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
@@ -153,10 +152,10 @@ Less (&less-version;) - &less-size;:
 <ulink url="http://freshmeat.net/projects/less/"/>
 
 LFS-Bootscripts (&bootscripts-version;) - &bootscripts-size;:
-<ulink url="&http;/lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
+<ulink url="&http-down;lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
 
 Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;:
-<ulink url="http://www.linuxfromscratch.org/~winkie/downloads/lfs-utils/"/>
+<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/>
 
 Libtool (&libtool-version;) - &libtool-size;:
 <ulink url="http://freshmeat.net/projects/libtool/"/>
@@ -171,7 +170,7 @@ Make (&make-version;) - &make-size;:
 <ulink url="http://freshmeat.net/projects/gnumake"/>
 
 MAKEDEV (&makedev-version;) - &makedev-size;:
-<ulink url="&http;/MAKEDEV-&makedev-version;.bz2"/>
+<ulink url="&http-down;MAKEDEV-&makedev-version;.bz2"/>
 
 Man (&man-version;) - &man-size;:
 <ulink url="http://freshmeat.net/projects/man/"/>
@@ -326,10 +325,10 @@ Perl Libc Patch - &perl-libc-patch-size;:
 
 <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
-<ulink url="http://www.linuxfromscratch.org/patches/"/>, and pick any
-additional patches you wish to use.</para>
+problems, or enable some functionality that's not enabled by default.
+Feel free to examine the patches database, located at <ulink
+url="&lfs-root;patches/"/>, and pick any additional patches you wish to
+use.</para>
 
 </sect1>
 
diff --git a/index.xml b/index.xml
index d922d3590..58070a14b 100644
--- a/index.xml
+++ b/index.xml
@@ -7,15 +7,14 @@
 <!ENTITY milestone "5.1">
 <!ENTITY nbsp " ">
 
-<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
-<!ENTITY http-root "http://ftp.linuxfromscratch.org">
-<!ENTITY ftp "ftp://ftp.linuxfromscratch.org/lfs-packages/cvs">
-<!ENTITY http "http://downloads.linuxfromscratch.org">
-<!ENTITY hints-root "http://www.linuxfromscratch.org/hints/downloads/files/">
-<!ENTITY hints-index "http://www.linuxfromscratch.org/hints/list.html">
-<!ENTITY blfs-root "http://www.linuxfromscratch.org/blfs/">
-<!ENTITY patches-root "http://www.linuxfromscratch.org/patches/lfs/cvs/">
+<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
+<!ENTITY blfs-root "&lfs-root;blfs/">
+<!ENTITY faq-root "&lfs-root;faq/">
+<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
+<!ENTITY hints-index "&lfs-root;hints/list.html">
+<!ENTITY patches-root "&lfs-root;patches/lfs/cvs/">
 <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
+<!ENTITY http-down "http://downloads.linuxfromscratch.org/">
 <!ENTITY tldp-root "http://www.tldp.org/">
 
 <!ENTITY all-size-version "cvs-2003-10-06">