diff options
| author | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2007-08-30 17:54:42 +0000 |
|---|---|---|
| committer | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2007-08-30 17:54:42 +0000 |
| commit | 3a8acaefedc7e65b2a1913e04a3b6533b99475cf (patch) | |
| tree | 3116dad905158a9ed0fff2cfb7c372a0e8a33fb2 | |
| parent | edd90b4fae7ebdf826f3871a436681033ce27fd7 (diff) | |
Merge r8337 and r8337 to jh branch
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8352 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | appendices/acknowledgments.xml | 7 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter03/packages.xml | 2 | ||||
| -rw-r--r-- | general.ent | 1 | ||||
| -rw-r--r-- | packages.ent | 3 |
5 files changed, 15 insertions, 1 deletions
diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml index edc4e4b49..a7a4287f1 100644 --- a/appendices/acknowledgments.xml +++ b/appendices/acknowledgments.xml @@ -55,7 +55,7 @@ <listitem> <para><ulink url="mailto:jhuntwork@linuxfromscratch.org">Jeremy Huntwork</ulink> <jhuntwork@linuxfromscratch.org> – 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:ken@linuxfromscratch.org">Ken Moffat</ulink> + <ken@linuxfromscratch.org> – LFS and CLFS Editor</para> + </listitem> + + <listitem> <para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan Oliver</ulink> <ryan@linuxfromscratch.org> – CLFS Project Co-Leader</para> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3060c9793..7049c970f 100644 --- a/chapter01/changelog.xml +++ b/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> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 53fa1b4cb..41fcdfce1 100644 --- a/chapter03/packages.xml +++ b/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> diff --git a/general.ent b/general.ent index d9b5b5fcd..bba529743 100644 --- a/general.ent +++ b/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;/"> diff --git a/packages.ent b/packages.ent index 582176a1b..7d2c42573 100644 --- a/packages.ent +++ b/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"> |