Author: jhuntwork
Date: 2007-08-30 11:54:42 -0600 (Thu, 30 Aug 2007)
New Revision: 8352
Modified:
branches/jh/BOOK/appendices/acknowledgments.xml
branches/jh/BOOK/chapter01/changelog.xml
branches/jh/BOOK/chapter03/packages.xml
branches/jh/BOOK/general.ent
branches/jh/BOOK/packages.ent
Log:
Merge r8337 and r8337 to jh branch
Modified: branches/jh/BOOK/appendices/acknowledgments.xml
===================================================================
--- branches/jh/BOOK/appendices/acknowledgments.xml 2007-08-30 17:51:33 UTC
(rev 8351)
+++ branches/jh/BOOK/appendices/acknowledgments.xml 2007-08-30 17:54:42 UTC
(rev 8352)
@@ -55,7 +55,7 @@
<listitem>
<para><ulink url="mailto:[EMAIL PROTECTED]">Jeremy
Huntwork</ulink> <[EMAIL PROTECTED]> – 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>
+ <[EMAIL PROTECTED]> – LFS and CLFS Editor</para>
+ </listitem>
+
+ <listitem>
<para><ulink url="mailto:[EMAIL PROTECTED]">Ryan
Oliver</ulink> <[EMAIL PROTECTED]> – CLFS Project
Co-Leader</para>
Modified: branches/jh/BOOK/chapter01/changelog.xml
===================================================================
--- branches/jh/BOOK/chapter01/changelog.xml 2007-08-30 17:51:33 UTC (rev
8351)
+++ branches/jh/BOOK/chapter01/changelog.xml 2007-08-30 17:54:42 UTC (rev
8352)
@@ -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>
Modified: branches/jh/BOOK/chapter03/packages.xml
===================================================================
--- branches/jh/BOOK/chapter03/packages.xml 2007-08-30 17:51:33 UTC (rev
8351)
+++ branches/jh/BOOK/chapter03/packages.xml 2007-08-30 17:54:42 UTC (rev
8352)
@@ -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/jh/BOOK/general.ent
===================================================================
--- branches/jh/BOOK/general.ent 2007-08-30 17:51:33 UTC (rev 8351)
+++ branches/jh/BOOK/general.ent 2007-08-30 17:54:42 UTC (rev 8352)
@@ -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/jh/BOOK/packages.ent
===================================================================
--- branches/jh/BOOK/packages.ent 2007-08-30 17:51:33 UTC (rev 8351)
+++ branches/jh/BOOK/packages.ent 2007-08-30 17:54:42 UTC (rev 8352)
@@ -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">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
