Merge r8337 and r8337 to jh branch

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

appendices/acknowledgments.xml

@@ -55,7 +55,7 @@
     <listitem>
       <para><ulink url="mailto:jhuntwork@linuxfromscratch.org">Jeremy
       Huntwork</ulink> &lt;jhuntwork@linuxfromscratch.org&gt; &ndash; LFS
-      Technical Writer, LFS LiveCD Maintainer, ALFS Project Leader</para>
+      Technical Writer, LFS LiveCD Maintainer</para>
     </listitem>
 
     <listitem>
@@ -70,6 +70,11 @@
       BLFS Editor</para>
     </listitem>
 
+    <listitem>
+      <para><ulink url="mailto:ken@linuxfromscratch.org">Ken Moffat</ulink>
+      &lt;ken@linuxfromscratch.org&gt; &ndash; LFS and CLFS Editor</para>
+    </listitem>
+
     <listitem>
       <para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan
       Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; &ndash; CLFS Project

chapter01/changelog.xml

@@ -57,6 +57,9 @@
           <para>[dnicholson] - Changed the Shadow download URL to a more
           stable location.</para>
         </listitem>
+        <listitem>
+          <para>[dnicholson] - Updated the acknowledgements page again.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

chapter03/packages.xml

@@ -467,6 +467,7 @@
         <para>Download: <ulink url="&shadow-url;"/></para>
         <para>MD5 sum: <literal>&shadow-md5;</literal></para>
 
+        <!-- Using anduin for now since this site is dead
         <note>
           <para>Shadow (&shadow-version;) may no longer be available at the
           listed location. The site administrators of the master download
@@ -474,6 +475,7 @@
           url="ftp://ftp.pld.org.pl/software/shadow/old/"/> when new ones are
           released.</para>
         </note>
+        -->
       </listitem>
     </varlistentry>
 

general.ent

@@ -12,6 +12,7 @@
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
 <!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
+<!ENTITY anduin-sources "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/&generic-version;/">
 <!ENTITY livecd-root "&lfs-root;livecd/">
 <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">

packages.ent

@@ -428,7 +428,10 @@
 
 <!ENTITY shadow-version "4.0.18.1">
 <!ENTITY shadow-size "1,481 KB">
+<!-- This site is dead. Use anduin instead.
 <!ENTITY shadow-url "ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2">
+-->
+<!ENTITY shadow-url "&anduin-sources;shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-md5 "e7751d46ecf219c07ae0b028ab3335c6">
 <!ENTITY shadow-home " ">
 <!ENTITY shadow-ch6-du "20.7 MB">