Index: general.ent
===================================================================
--- general.ent	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ general.ent	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -33,5 +33,5 @@
 <!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&clfs-root;wiki/faq">
+<!ENTITY faq-root "&clfs-wiki;wiki/faq">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
Index: introduction/common/askforhelp.xml
===================================================================
--- introduction/common/askforhelp.xml	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ introduction/common/askforhelp.xml	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -69,5 +69,5 @@
       mean that we will not help you. After all, the CLFS project is
       about personal preference. Be upfront about any changes to
-      the established procedure, this helps us evaluate and determine
+      the established procedure&mdash;this helps us evaluate and determine
       possible causes of your problem.</para>
     </note>
Index: materials/common/introduction.xml
===================================================================
--- materials/common/introduction.xml	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ materials/common/introduction.xml	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -25,5 +25,5 @@
   most packages. If this search is unsuccessful, try one of the
   alternative means of downloading discussed at <ulink
-  url="http://cross-lfs.org/files/packages/&major-version;.&minor-version;.&extra-version;"/>.</para>
+  url="&packages-root;"/>.</para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
@@ -42,9 +42,9 @@
 <screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
 
-  <para>Make this directory writable and sticky. <quote>Sticky</quote>
-  means that even if multiple users have write permission on a
-  directory, only the owner of a file can delete the file within a
-  sticky directory. The following command will enable the write and
-  sticky modes:</para>
+  <para>Make this directory writable and sticky. When a directory is
+  marked <quote>sticky</quote>, that means that even if multiple users have
+  write permission on that directory, any file within that directory can only be
+  deleted or modified by its owner. The following command will enable the
+  write and sticky modes:</para>
 
 <screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ materials/common/patches.xml	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -15,5 +15,5 @@
   fixed by the maintainer. The patches also make small modifications to
   make the packages easier to work with. The following patches will be
-  needed to build an CLFS system:</para>
+  needed to build a CLFS system:</para>
 
   <variablelist role="materials">
Index: packages.ent
===================================================================
--- packages.ent	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ packages.ent	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY packages-root "http://cross-lfs.org/files/packages/&generic-version;/">
+<!ENTITY packages-root "&clfs-root;files/packages/&generic-version;/">
 
 <!-- Note: For empty *-home entities use " " not "" -->
Index: patches.ent
===================================================================
--- patches.ent	(revision 5c05e8fa86ab8959faa05d754dedd684fb04d961)
+++ patches.ent	(revision 82a8dbfc3d224e284ff96b7d55849dfa67487855)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY patches-root "http://cross-lfs.org/files/patches/&generic-version;/">
+<!ENTITY patches-root "&clfs-root;files/patches/&generic-version;/">
 
 <!-- Start of Common Patches -->
