diff options
| author | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-08-27 21:52:47 +0000 |
|---|---|---|
| committer | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-08-27 21:52:47 +0000 |
| commit | fdb8449467e8647a9796fa857bd25d5e63ba0172 (patch) | |
| tree | 1c8a943d2edbe73703e6352824ae8e5fcf6087b0 | |
| parent | 77e165032e4e99a0fd4399427dbda6c2fddffa1c (diff) | |
Merge r8337 and r8338 from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK@8339 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | appendices/acknowledgments.xml | 7 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 7 | ||||
| -rw-r--r-- | chapter03/packages.xml | 2 | ||||
| -rw-r--r-- | general.ent | 1 | ||||
| -rw-r--r-- | packages.ent | 3 |
5 files changed, 19 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 a6d372bc7..deace3dc2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 899b8ca73..1516e6ed5 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 3ed1ca430..7f5cbbf6a 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 567f7b100..2fc9d7822 100644 --- a/packages.ent +++ b/packages.ent @@ -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"> |