Author: dnicholson
Date: 2007-08-27 15:52:47 -0600 (Mon, 27 Aug 2007)
New Revision: 8339

Modified:
   branches/6.3/BOOK/appendices/acknowledgments.xml
   branches/6.3/BOOK/chapter01/changelog.xml
   branches/6.3/BOOK/chapter03/packages.xml
   branches/6.3/BOOK/general.ent
   branches/6.3/BOOK/packages.ent
Log:
Merge r8337 and r8338 from trunk


Modified: branches/6.3/BOOK/appendices/acknowledgments.xml
===================================================================
--- branches/6.3/BOOK/appendices/acknowledgments.xml    2007-08-27 21:45:49 UTC 
(rev 8338)
+++ branches/6.3/BOOK/appendices/acknowledgments.xml    2007-08-27 21:52:47 UTC 
(rev 8339)
@@ -55,7 +55,7 @@
     <listitem>
       <para><ulink url="mailto:[EMAIL PROTECTED]">Jeremy
       Huntwork</ulink> &lt;[EMAIL PROTECTED]&gt; &ndash; LFS
-      Technical Writer, LFS LiveCD Maintainer, ALFS Project Leader</para>
+      Technical Writer, LFS LiveCD Maintainer</para>
     </listitem>
 
     <listitem>
@@ -71,6 +71,11 @@
     </listitem>
 
     <listitem>
+      <para><ulink url="mailto:[EMAIL PROTECTED]">Ken Moffat</ulink>
+      &lt;[EMAIL PROTECTED]&gt; &ndash; LFS and CLFS Editor</para>
+    </listitem>
+
+    <listitem>
       <para><ulink url="mailto:[EMAIL PROTECTED]">Ryan
       Oliver</ulink> &lt;[EMAIL PROTECTED]&gt; &ndash; CLFS Project
       Co-Leader</para>

Modified: branches/6.3/BOOK/chapter01/changelog.xml
===================================================================
--- branches/6.3/BOOK/chapter01/changelog.xml   2007-08-27 21:45:49 UTC (rev 
8338)
+++ branches/6.3/BOOK/chapter01/changelog.xml   2007-08-27 21:52:47 UTC (rev 
8339)
@@ -40,6 +40,13 @@
       <para>2007-08-27</para>
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Changed the Shadow download URL to a more
+          stable location.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Updated the acknowledgements page again.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Upgrade to Linux-2.6.22.5. Fixes 
           <ulink url="&lfs-ticket-root;2064">#2065</ulink>.</para>
         </listitem>

Modified: branches/6.3/BOOK/chapter03/packages.xml
===================================================================
--- branches/6.3/BOOK/chapter03/packages.xml    2007-08-27 21:45:49 UTC (rev 
8338)
+++ branches/6.3/BOOK/chapter03/packages.xml    2007-08-27 21:52:47 UTC (rev 
8339)
@@ -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>
 

Modified: branches/6.3/BOOK/general.ent
===================================================================
--- branches/6.3/BOOK/general.ent       2007-08-27 21:45:49 UTC (rev 8338)
+++ branches/6.3/BOOK/general.ent       2007-08-27 21:52:47 UTC (rev 8339)
@@ -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;/">

Modified: branches/6.3/BOOK/packages.ent
===================================================================
--- branches/6.3/BOOK/packages.ent      2007-08-27 21:45:49 UTC (rev 8338)
+++ branches/6.3/BOOK/packages.ent      2007-08-27 21:52:47 UTC (rev 8339)
@@ -432,7 +432,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">

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to