Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ basicnet/mailnews/slrn.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -143,5 +143,5 @@
       command:</para>
 
-<screen><userinput>NNTPSERVER=<replaceable>&lt;news.linuxfromscratch.org&gt;</replaceable> \
+<screen><userinput>NNTPSERVER=<replaceable>&lt;news.&lfs-domainname;&gt;</replaceable> \
     slrn -f ~/.jnewsrc --create</userinput></screen>
 
Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ book/preface.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -42,5 +42,5 @@
     <para>Finally, we encourage you to become involved in the community; ask
     questions on the mailing list or news gateway and join in the fun on #lfs at
-    irc.linuxfromscratch.org. You can find more details about all of these in the
+    irc.&lfs-domainname;. You can find more details about all of these in the
     <xref linkend="introduction"/> section of the book.</para>
 
@@ -49,5 +49,5 @@
     <blockquote>
 <literallayout>Mark Hymers
-markh &lt;at&gt; linuxfromscratch.org
+markh &lt;at&gt; &lfs-domainname;
 BLFS Editor (July 2001&ndash;March 2003)</literallayout>
     </blockquote>
@@ -70,5 +70,5 @@
     <blockquote>
 <literallayout>Larry Lawrence
-larry &lt;at&gt; linuxfromscratch.org
+larry &lt;at&gt; &lfs-domainname;
 BLFS Editor (March 2003&ndash;June 2004)</literallayout>
     </blockquote>
@@ -92,5 +92,5 @@
     <blockquote>
 <literallayout>Bruce Dubbs
-bdubbs &lt;at&gt; linuxfromscratch.org
+bdubbs &lt;at&gt; &lfs-domainname;
 BLFS Editor (June 2004&ndash;Present)</literallayout>
     </blockquote>
@@ -156,5 +156,5 @@
       to date.  We appreciate any feedback in helping us to make the book as
       accurate as possible.  The best place to provide comments is via the
-      mailing list at <ulink url="mailto:blfs-dev@linuxfromscratch.org"/>.</para>
+      mailing list at <ulink url="mailto:blfs-dev@&lfs-domainname;"/>.</para>
 
       <para>Enjoy!</para>
Index: general.ent
===================================================================
--- general.ent	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ general.ent	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -1,3 +1,3 @@
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
@@ -9,19 +9,21 @@
 <!ENTITY last-commit  "$Date$"> <!-- Automatic update -->
 
-<!ENTITY maintainer-fullname  "Bruce Dubbs">
-<!ENTITY maintainer-firstname "Bruce">
-<!ENTITY maintainer-address   "bdubbs@linuxfromscratch.org">
-
-<!ENTITY downloads-root "http://www.linuxfromscratch.org/blfs/downloads/svn">
-<!ENTITY downloads-project "http://downloads.linuxfromscratch.org">
-<!ENTITY sources-anduin-http "http://anduin.linuxfromscratch.org/sources/BLFS/svn">
-<!ENTITY sources-anduin-ftp  "ftp://anduin.linuxfromscratch.org/BLFS/svn">
-<!ENTITY files-anduin   "http://anduin.linuxfromscratch.org/files/BLFS">
-<!ENTITY hints-root     "http://www.linuxfromscratch.org/hints">
-<!ENTITY patch-root     "http://www.linuxfromscratch.org/patches/blfs/svn">
-<!ENTITY errata         "http://www.linuxfromscratch.org/blfs/errata/&blfs-version;/">
-<!-- <!ENTITY lfs-root       "http://www.linuxfromscratch.org/lfs/view/&lfs-version;"> -->
-<!ENTITY lfs-root       "../../../../lfs/view/&lfs-version;">
-<!ENTITY publisher      "Unknown">
+<!ENTITY lfs-domainname       "linuxfromscratch.org">
+
+<!ENTITY maintainer-fullname  "Randy McMurchy">
+<!ENTITY maintainer-firstname "Randy">
+<!ENTITY maintainer-address   "randy@&lfs-domainname;">
+
+<!ENTITY downloads-root       "http://www.&lfs-domainname;/blfs/downloads/svn">
+<!ENTITY downloads-project    "http://downloads.&lfs-domainname;">
+<!ENTITY sources-anduin-http  "http://anduin.&lfs-domainname;/sources/BLFS/svn">
+<!ENTITY sources-anduin-ftp   "ftp://anduin.&lfs-domainname;/BLFS/svn">
+<!ENTITY files-anduin         "http://anduin.&lfs-domainname;/files/BLFS">
+<!ENTITY hints-root           "http://www.&lfs-domainname;/hints">
+<!ENTITY patch-root           "http://www.&lfs-domainname;/patches/blfs/svn">
+<!ENTITY errata               "http://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
+<!-- <!ENTITY lfs-root             "http://www.&lfs-domainname;/lfs/view/&lfs-version;"> -->
+<!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
+<!ENTITY publisher            "Unknown">
 
 <!-- These entities are used to identify versions of LFS
@@ -41,5 +43,5 @@
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
-<!ENTITY blfs-wiki                    "http://wiki.linuxfromscratch.org/blfs/wiki">
+<!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
 
 <!-- Part II -->
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ general/prog/gcc.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -65,5 +65,5 @@
       <para>Instructions to install the 3.4.6 version of the Fortran compiler
       can be found in <xref linkend='gcc3'/> and on the
-      <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">BLFS
+      <ulink url="&blfs-wiki;/gcc3">BLFS
       Wiki</ulink>.</para>
     </note>
Index: general/prog/gcc3.xml
===================================================================
--- general/prog/gcc3.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ general/prog/gcc3.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY gcc3-download-http "http://ftp.gnu.org/gnu/gcc/gcc-&gcc3-version;/gcc-&gcc3-version;.tar.bz2">
@@ -62,5 +50,5 @@
     building the <application>GCC</application>-3.4.x Fortran compiler can be
     found on the
-    <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">BLFS
+    <ulink url="&blfs-wiki;/gcc3">BLFS
     Wiki</ulink>.</para>
 
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ general/prog/pdl.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -106,5 +106,5 @@
     <application>GCC</application>-3.4.6. You can find specific instructions
     to install a <application>GCC</application>-3.4.6 compiler on the
-    <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">BLFS
+    <ulink url="&blfs-wiki;/gcc3">BLFS
     Wiki</ulink>. Alternatively, if you have a need to install
     <xref linkend="gcc3"/>, you can add the Fortran compiler to the list of
@@ -196,5 +196,5 @@
               <listitem>
                 <para><ulink
-                url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a Fortran
+                url="&blfs-wiki;/gcc3">a Fortran
                 compiler</ulink></para>
               </listitem>
@@ -209,5 +209,5 @@
                 <xref linkend="lesstif"/>,
                 <xref linkend="tk"/>, and <ulink
-                url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a Fortran
+                url="&blfs-wiki;/gcc3">a Fortran
                 compiler</ulink></para>
               </listitem>
@@ -239,5 +239,5 @@
             <xref linkend="python"/> (with
             <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
-            <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a
+            <ulink url="&blfs-wiki;/gcc3">a
             Fortran compiler</ulink>,
             <ulink url="http://www.swig.org/">SWIG</ulink>, and
@@ -336,5 +336,5 @@
           <listitem>
             <para><ulink
-            url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a Fortran
+            url="&blfs-wiki;/gcc3">a Fortran
             compiler</ulink></para>
           </listitem>
@@ -422,5 +422,5 @@
                           <listitem>
                             <para><ulink
-                            url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a
+                            url="&blfs-wiki;/gcc3">a
                             Fortran compiler</ulink></para>
                           </listitem>
@@ -449,5 +449,5 @@
                       <listitem>
                         <para><ulink
-                        url="http://wiki.linuxfromscratch.org/blfs/wiki/gcc3">a
+                        url="&blfs-wiki;/gcc3">a
                         Fortran compiler</ulink></para>
                       </listitem>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ general/prog/php.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -177,5 +177,5 @@
       a <command>configure</command> command that utilizes many of the most
       common dependencies can be found at <ulink
-      url="http://anduin.linuxfromscratch.org/files/BLFS/php_configure.txt"/>.
+      url="&files-anduin;/php_configure.txt"/>.
       </para>
 
Index: introduction/important/beyond.xml
===================================================================
--- introduction/important/beyond.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/important/beyond.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -113,5 +113,5 @@
       <para>If you are having a problem compiling the package, try
       searching the LFS archives at
-      <ulink url="http://search.linuxfromscratch.org/"/> for the error or if
+      <ulink url="http://search.&lfs-domainname;/"/> for the error or if
       that fails, try searching Google. If everything else fails,
       try the blfs-support mailing-list.</para>
Index: introduction/important/patches.xml
===================================================================
--- introduction/important/patches.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/important/patches.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -35,5 +35,5 @@
   <para>In short, the book only includes patches that are either required or
   recommended. There is a
-  <ulink url="http://www.linuxfromscratch.org/patches">Patches subproject</ulink>
+  <ulink url="http://www.&lfs-domainname;/patches">Patches subproject</ulink>
   which hosts various patches (including the patches referenced in the books)
   to enable you to configure your LFS the way you like it.</para>
Index: introduction/welcome/acknowledgments.xml
===================================================================
--- introduction/welcome/acknowledgments.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/acknowledgments.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -27,15 +27,15 @@
     <listitem>
       <para><ulink url="mailto:strider@linux.com">Mark Stone</ulink>
-      &lt;mstone &lt;at&gt; linux.com&gt; for donating the linuxfromscratch.org
+      &lt;mstone &lt;at&gt; linux.com&gt; for donating the &lfs-domainname;
       servers.</para>
     </listitem>
     <listitem>
-      <para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
-      Beekmans</ulink> &lt;gerard &lt;at&gt; linuxfromscratch.org&gt; for starting and
+      <para><ulink url="mailto:gerard@&lfs-domainname;">Gerard
+      Beekmans</ulink> &lt;gerard &lt;at&gt; &lfs-domainname;&gt; for starting and
       writing the vast majority of the LFS project.</para>
     </listitem>
     <listitem>
-      <para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
-      Tie-Ten-Quee</ulink> &lt;higho &lt;at&gt; @linuxfromscratch.org&gt; for answering
+      <para><ulink url="mailto:highos@&lfs-domainname;">Jesse
+      Tie-Ten-Quee</ulink> &lt;higho &lt;at&gt; @&lfs-domainname;&gt; for answering
       many questions on IRC, having a great deal of patience and for not killing
       the former editor for the joke in the original BLFS announcement!</para>
@@ -47,5 +47,5 @@
     </listitem>
     <listitem>
-      <para>Robert Briggs for donating the linuxfromscratch.org and
+      <para>Robert Briggs for donating the &lfs-domainname; and
       linuxfromscratch.com domain names.</para>
     </listitem>
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/askhelp.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -17,5 +17,5 @@
 
   <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"/>),
+  is not listed in the FAQ (<ulink url="http://www.&lfs-domainname;/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
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/conventions.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -44,5 +44,5 @@
   </blockquote>
 
-  <para><ulink url="http://www.linuxfromscratch.org/"/></para>
+  <para><ulink url="http://www.&lfs-domainname;/"/></para>
 
   <blockquote>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/credits.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -30,9 +30,9 @@
     <itemizedlist>
       <listitem>
-        <para><emphasis>Editor:</emphasis> Bruce Dubbs <ulink
+        <para><emphasis>Editor:</emphasis> Randy McMurchy <ulink
         url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para>
       </listitem>
       <listitem>
-        <para><emphasis>Co-Editors:</emphasis> Randy McMurchy,
+        <para><emphasis>Co-Editors:</emphasis> Bruce Dubbs,
         Larry Lawrence, Igor Zivkovic, DJ Lucas, Tushar Teredesai,
         David Jensen, Archaic, Manuel Canales Esparcia, Dan Nicholson,
Index: introduction/welcome/maillists.xml
===================================================================
--- introduction/welcome/maillists.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/maillists.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -16,5 +16,5 @@
   <title>Mailing Lists</title>
 
-  <para>The linuxfromscratch.org server is hosting a number of mailing
+  <para>The &lfs-domainname; server is hosting a number of mailing
   lists that are used for the development of the BLFS book. These lists include,
   among others, the main development and support lists.</para>
@@ -22,5 +22,5 @@
   <para>For more information regarding which lists are available, how to
   subscribe to them, archive locations, etc., visit
-  <ulink url="http://www.linuxfromscratch.org/mail.html"/>.</para>
+  <ulink url="http://www.&lfs-domainname;/mail.html"/>.</para>
 
 </sect1>
Index: introduction/welcome/mirrors.xml
===================================================================
--- introduction/welcome/mirrors.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/mirrors.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -18,5 +18,5 @@
   <para>The BLFS project has a number of mirrors set up world-wide to make it
   easier and more convenient for you to access the website. Please visit the
-  <ulink url="http://www.linuxfromscratch.org/mirrors.html"/> website for the
+  <ulink url="http://www.&lfs-domainname;/mirrors.html"/> website for the
   list of current mirrors.</para>
 
Index: introduction/welcome/newsserver.xml
===================================================================
--- introduction/welcome/newsserver.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/newsserver.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -16,5 +16,5 @@
   <title>News Server</title>
 
-  <para>All the mailing lists hosted at linuxfromscratch.org are also
+  <para>All the mailing lists hosted at &lfs-domainname; are also
   accessible via the NNTP server. All messages posted to a mailing
   list will be copied to its correspondent newsgroup. Note, however,
@@ -24,5 +24,5 @@
 
   <para>The news server can be reached at <ulink
-  url="news:news.linuxfromscratch.org">news.linuxfromscratch.org</ulink>.</para>
+  url="news:news.&lfs-domainname;">news.&lfs-domainname;</ulink>.</para>
 
 </sect1>
Index: introduction/welcome/packages.xml
===================================================================
--- introduction/welcome/packages.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/packages.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -25,5 +25,5 @@
   <para>To overcome this problem, the BLFS Team, with the assistance of <ulink
   url='http://www.serverbeach.com'>Server Beach</ulink>, has made an HTTP/FTP
-  site available at <emphasis>anduin.linuxfromscratch.org</emphasis>.  This site
+  site available at <emphasis>anduin.&lfs-domainname;</emphasis>.  This site
   has all the sources of the exact versions of the packages used in BLFS.  If
   you can't find the BLFS package you need, get it there.</para>
Index: introduction/welcome/version.xml
===================================================================
--- introduction/welcome/version.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/version.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -19,5 +19,5 @@
   If this version is older than a month, a newer version is probably already
   available for download. Check one of the mirror sites at
-  <ulink url="http://www.linuxfromscratch.org/mirrors.html"/> for updated
+  <ulink url="http://www.&lfs-domainname;/mirrors.html"/> for updated
   versions.</para>
 
Index: introduction/welcome/wiki.xml
===================================================================
--- introduction/welcome/wiki.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ introduction/welcome/wiki.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -17,5 +17,5 @@
 
   <para>The BLFS Project has created a Wiki for users to comment on pages
-  and instructions at <ulink url='http://wiki.linuxfromscratch.org/blfs/'/>.
+  and instructions at <ulink url='&blfs-wiki;'/>.
   Comments are welcome from all users.</para>
 
@@ -33,10 +33,10 @@
         <para>Questions with your specific installation problems should be made
         by subscribing and mailing to the BLFS Support Mailing List at <ulink
-        url='mailto:blfs-support@linuxfromscratch.org'/>.</para>
+        url='mailto:blfs-support@&lfs-domainname;'/>.</para>
       </listitem>
       <listitem>
         <para>Discussions of build instructions should be made by subscribing
         and mailing to the BLFS Development List at <ulink
-        url='mailto:blfs-dev@linuxfromscratch.org'/>.</para>
+        url='mailto:blfs-dev@&lfs-domainname;'/>.</para>
       </listitem>
       <listitem>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ multimedia/audioutils/mpg123.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -6,5 +6,5 @@
 
   <!ENTITY mpg123-download-http "http://downloads.sourceforge.net/mpg123/mpg123-&mpg123-version;.tar.bz2">
-  <!ENTITY mpg123-download-ftp  "">
+  <!ENTITY mpg123-download-ftp  " ">
   <!ENTITY mpg123-md5sum        "14fa52ba192104a990e206493d9d771b">
   <!ENTITY mpg123-size          "589 KB">
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ postlfs/config/bootdisk.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -62,5 +62,5 @@
 
     <para>Also, the LFS Community has developed its own LiveCD available at
-    <ulink url='http://www.linuxfromscratch.org/livecd/'/>.  This LiveCD, in
+    <ulink url='http://www.&lfs-domainname;/livecd/'/>.  This LiveCD, in
     addition to having boot and rescue capabilities, is capable of building an
     entire LFS/BLFS system.  A copy of this CD-ROM is available with the
@@ -70,5 +70,5 @@
     <para>A hint that describes the instructions for creating this ISO image
     is available at <ulink
-    url='http://www.linuxfromscratch.org/hints/downloads/files/livecd.txt'/>.
+    url='&hints-root;/downloads/files/livecd.txt'/>.
     </para>
 
Index: postlfs/config/compressdoc.xml
===================================================================
--- postlfs/config/compressdoc.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ postlfs/config/compressdoc.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -39,5 +39,5 @@
 #
 # Modified to be able to gzip or bzip2 files as an option and to deal
-# with all symlinks properly by Mark Hymers &lt;markh @ linuxfromscratch.org&gt;
+# with all symlinks properly by Mark Hymers &lt;markh @ &lfs-domainname;&gt;
 #
 # Modified 20030930 by Yann E. Morin &lt;yann.morin.1998 @ anciens.enib.fr&gt;
@@ -135,5 +135,5 @@
   See the original post from Mickael A. Peters, titled
   "Bootable Utility CD", dated 20030409.1816(+0200), and subsequent posts:
-  http://linuxfromscratch.org/pipermail/blfs-support/2003-April/038817.html
+  http://&lfs-domainname;/pipermail/blfs-support/2003-April/038817.html
 
   On my system (x86, ext3), man pages were 35564KB before compression.
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ postlfs/config/profile.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -418,5 +418,5 @@
 # Written for Beyond Linux From Scratch
 # by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@linuxfromscratch.org&gt;
+# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
 
 # Make sure that the terminal is set up properly for each shell
@@ -470,5 +470,5 @@
 # Written for Beyond Linux From Scratch
 # by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@linuxfromscratch.org&gt;
+# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
 
 # Personal environment variables and startup programs.
Index: postlfs/security/firewalling.xml
===================================================================
--- postlfs/security/firewalling.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ postlfs/security/firewalling.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -298,5 +298,5 @@
 echo "You can find additional information"
 echo "about firewalls in Chapter 4 of the BLFS book."
-echo "http://www.linuxfromscratch.org/blfs"
+echo "http://www.&lfs-domainname;/blfs"
 echo
 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ server/mail/courier.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -518,5 +518,5 @@
 
 <screen><userinput>INSERT INTO users VALUES (
-'blfsuser@linuxfromscratch.org',
+'blfsuser@&lfs-domainname;',
 '',
 'password',
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ server/major/bind.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -433,6 +433,6 @@
       <command>dig</command> command twice on the same address:</para>
 
-<screen><userinput>dig www.linuxfromscratch.org &amp;&amp;
-dig www.linuxfromscratch.org</userinput></screen>
+<screen><userinput>dig www.&lfs-domainname; &amp;&amp;
+dig www.&lfs-domainname;</userinput></screen>
 
       <para>You can see almost instantaneous results with the named caching
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7app.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  " ">
-  <!ENTITY x7apps-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7apps-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7apps-size          "9.1 MB">
   <!ENTITY x7apps-buildsize     "30.7 MB">
@@ -99,8 +99,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/app-7.1.wget &amp;&amp;
 mkdir app &amp;&amp;
 cd app &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/app/ \
+     -i ../app-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7data.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7data-download-http "http://xorg.freedesktop.org/releases/individual/data/">
   <!ENTITY x7data-download-ftp  " ">
-  <!ENTITY x7data-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7data-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7data-size          "2.5 MB">
   <!ENTITY x7data-buildsize     "19.5 MB">
@@ -73,8 +73,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/data-7.1.wget &amp;&amp;
 mkdir data &amp;&amp;
 cd data &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/data/ \
+     -i ../data-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7driver.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7drivers-download-http "http://xorg.freedesktop.org/releases/individual/driver/">
   <!ENTITY x7drivers-download-ftp  " ">
-  <!ENTITY x7drivers-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7drivers-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7drivers-size          "18.7 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
@@ -74,5 +74,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/driver-7.1.wget &amp;&amp;
 mkdir driver &amp;&amp;
 cd driver &amp;&amp;
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7font.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
   <!ENTITY x7fonts-download-ftp  " ">
-  <!ENTITY x7fonts-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7fonts-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7fonts-size          "13.3 MB">
   <!ENTITY x7fonts-buildsize     "100 MB">
@@ -70,8 +70,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/font-7.1.wget &amp;&amp;
 mkdir font &amp;&amp;
 cd font &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/font/ \
+     -i ../font-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7lib.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
   <!ENTITY x7libs-download-ftp  " ">
-  <!ENTITY x7libs-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7libs-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7libs-size          "12 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
@@ -96,8 +96,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/lib-7.1.wget &amp;&amp;
 mkdir lib &amp;&amp;
 cd lib &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/lib/ \
+     -i ../lib-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7proto.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7proto-download-http "http://xorg.freedesktop.org/releases/individual/proto/">
   <!ENTITY x7proto-download-ftp  " ">
-  <!ENTITY x7proto-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7proto-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7proto-size          "1.5 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
@@ -73,8 +73,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/proto-7.1.wget &amp;&amp;
 mkdir proto &amp;&amp;
 cd proto &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/proto/ \
+     -i ../proto-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/x7util.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -7,5 +7,5 @@
   <!ENTITY x7utils-download-http "http://xorg.freedesktop.org/releases/individual/util/">
   <!ENTITY x7utils-download-ftp  " ">
-  <!ENTITY x7utils-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7utils-md5sum        "&sources-anduin-http;/x/files/md5sums">
   <!ENTITY x7utils-size          "664 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
@@ -75,8 +75,9 @@
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util-7.1.wget &amp;&amp;
+<screen><userinput>wget &sources-anduin-ftp;/x/wget/util-7.1.wget &amp;&amp;
 mkdir util &amp;&amp;
 cd util &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util-7.1.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/util/ \
+     -i ../util-7.1.wget</userinput></screen>
 
   </sect2>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/installing/xorg7.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -63,5 +63,5 @@
     options for the individual <application>Xorg</application> packages.
     The instructions assume that all packages have been built.  A
-    <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">wiki</ulink>
+    <ulink url="&blfs-wiki;/Xorg-&xorg7-version;">wiki</ulink>
     page containing dependency information is under development.  You are
     encouraged to add to these pages if you discover additional information
Index: x/lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision 864b24de82a4c5bac80c81a041dd951925baeb99)
+++ x/lib/mesalib.xml	(revision 4e886136ffe428231f574c3c4342f9b0961e7080)
@@ -107,5 +107,6 @@
 <screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
 sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c &amp;&amp;
-sed -i 's@lib/modules@lib/X11/modules@' src/mesa/drivers/dri/Makefile.template</userinput></screen>
+sed -i 's@lib/modules@lib/X11/modules@' \
+    src/mesa/drivers/dri/Makefile.template</userinput></screen>
 
     <para>Fix an error with output redirection if <command>/bin/sh</command>
