20 files changed, 26 insertions, 22 deletions
diff --git a/appendixa/bzip2-down.xml b/appendixa/bzip2-down.xml
index 5355291b2..37e9b1d51 100644
--- a/appendixa/bzip2-down.xml
+++ b/appendixa/bzip2-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for Bzip2 (&bzip2-version;): 
-<ulink url="http://sources.redhat.com/bzip2/"/></literallayout>
+<ulink url="ftp://sources.redhat.com/pub/bzip2/"/></literallayout>
diff --git a/appendixa/e2fsprogs-down.xml b/appendixa/e2fsprogs-down.xml
index a012db35e..d946fca0a 100644
--- a/appendixa/e2fsprogs-down.xml
+++ b/appendixa/e2fsprogs-down.xml
@@ -1,3 +1,2 @@
-<literallayout>Official download locations for E2fsprogs (&e2fsprogs-version;):
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/"/>
+<literallayout>Official download location for E2fsprogs (&e2fsprogs-version;):
 <ulink url="http://download.sourceforge.net/e2fsprogs/"/></literallayout>
diff --git a/appendixa/file-down.xml b/appendixa/file-down.xml
index c45be10b5..d7a62e0db 100644
--- a/appendixa/file-down.xml
+++ b/appendixa/file-down.xml
@@ -1,5 +1,5 @@
 <literallayout>Official download location for File (&file-version;): 
-<ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/>
+<ulink url="ftp://ftp.astron.com/pub/file/"/>
 
 Alternate Download Location:
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/"/></literallayout>
diff --git a/appendixa/flex-down.xml b/appendixa/flex-down.xml
index 410eed464..9daff0d33 100644
--- a/appendixa/flex-down.xml
+++ b/appendixa/flex-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for Flex (&flex-version;): 
-<ulink url="ftp://ftp.gnu.org/non-gnu/flex/"/></literallayout>
+<ulink url="ftp://ftp.gnu.org/gnu/non-gnu/flex/"/></literallayout>
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 191d679ee..9da28d287 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for Gawk (&gawk-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout>
+<ulink url="ftp://ftp.gnu.org/gnu/gawk/"/></literallayout>
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index ae724474a..459694178 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -1,5 +1,5 @@
 <literallayout>Official download location for GCC (&gcc-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
+<ulink url="ftp://ftp.gnu.org/gnu/gcc/"/>
 And for the GCC No-Fixincludes Patch:
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/>
 And for the GCC Specs Patch:
diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml
index 7b28b7763..331a9ecda 100644
--- a/appendixa/grub-down.xml
+++ b/appendixa/grub-down.xml
@@ -1,2 +1,2 @@
 <literallayout>Official download location for Grub (&grub-version;):
-<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/></literallayout>
+<ulink url="ftp://alpha.gnu.org/gnu/grub/"/></literallayout>
diff --git a/appendixa/inetutils-down.xml b/appendixa/inetutils-down.xml
index 73a734529..346978108 100644
--- a/appendixa/inetutils-down.xml
+++ b/appendixa/inetutils-down.xml
@@ -1,5 +1,5 @@
 <literallayout>Official download location for Inetutils (&inetutils-version;):
-<ulink url="http://freshmeat.net/projects/inetutils/"/>
+<ulink url="ftp://ftp.gnu.org/gnu/inetutils/"/>
 And for the Inetutils No-Server-Man-Pages Patch:
 <ulink url="&patches-root;&inetutils-no-server-man-pages-patch;"/></literallayout>
 
diff --git a/appendixa/manpages-down.xml b/appendixa/manpages-down.xml
index e6829ab17..98df8c1e5 100644
--- a/appendixa/manpages-down.xml
+++ b/appendixa/manpages-down.xml
@@ -1,3 +1,3 @@
 <literallayout>Official download location for Man-pages (&man-pages-version;): 
-<ulink url="ftp://ftp.kernel.org/pub/linux/docs/manpages/"/></literallayout>
+<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/manpages/"/></literallayout>
 
diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml
index eecd67534..0814f738f 100644
--- a/appendixa/perl-down.xml
+++ b/appendixa/perl-down.xml
@@ -1,4 +1,4 @@
 <literallayout>Official download location for Perl (&perl-version;):
-<ulink url="http://www.perl.com/"/>
+<ulink url="http://www.cpan.org/src/"/>
 And for the Perl Libc Patch:
 <ulink url="&patches-root;&perl-libc-patch;"/></literallayout>
diff --git a/appendixa/psmisc-down.xml b/appendixa/psmisc-down.xml
index dc469fab8..555d59297 100644
--- a/appendixa/psmisc-down.xml
+++ b/appendixa/psmisc-down.xml
@@ -1,3 +1,2 @@
-<literallayout>Official download locations for Psmisc (&psmisc-version;):
-<ulink url="http://download.sourceforge.net/psmisc/"/>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/psmisc/"/></literallayout>
+<literallayout>Official download location for Psmisc (&psmisc-version;):
+<ulink url="http://download.sourceforge.net/psmisc/"/></literallayout>
diff --git a/appendixa/sysklogd-down.xml b/appendixa/sysklogd-down.xml
index 4ac2d3e9c..7160e2343 100644
--- a/appendixa/sysklogd-down.xml
+++ b/appendixa/sysklogd-down.xml
@@ -1,3 +1,3 @@
 <literallayout>Official download location for Sysklogd (&sysklogd-version;):
-<ulink url="http://www.infodrom.org/projects/sysklogd/"/></literallayout>
+<ulink url="http://www.infodrom.org/projects/sysklogd/download/"/></literallayout>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 114cfa457..02b3b65c1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -60,6 +60,12 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>February 1st, 2004 [gerard]: Applied Anderson's patch
+fixing: wrong official download location for file, fix TCLs tcl-package
+entity, remove redundant download locations for e2fsprogs and psmisc, and
+fix incorrect extensions for gcc, groff, kbd, libtool, man and man-pages.
+Closed bugs #750, #751 and #754.</para></listitem>
+
 <listitem><para>February 1st, 2004 [matt]: Upgraded to
 expect-5.40.0</para></listitem>
 
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 333d625f3..8aecd6cff 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -9,7 +9,7 @@
 <!ENTITY gcc-2953-depversion "2.95.3">
 <!ENTITY gcc-2953-contversion "2.95.3">
 <!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">
-<!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
+<!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.gz">
 <!ENTITY gcc-2953-size "9,618 KB">
 
 <!ENTITY gcc-2953-patch "gcc-&gcc-2953-version;-2.patch">
diff --git a/entities/groff.ent b/entities/groff.ent
index 985144f45..1468af865 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -9,7 +9,7 @@
 <!ENTITY groff-depversion "1.17.2">
 <!ENTITY groff-contversion "1.19">
 <!ENTITY groff-dir "groff-&groff-version;">
-<!ENTITY groff-package "groff-&groff-version;.tar.bz2">
+<!ENTITY groff-package "groff-&groff-version;.tar.gz">
 <!ENTITY groff-size "2,360 KB">
 
 <!ENTITY groff-compsize "43 MB">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index b241147ab..3d0783d6d 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -9,7 +9,7 @@
 <!ENTITY kbd-depversion "1.12">
 <!ENTITY kbd-contversion "1.12">
 <!ENTITY kbd-dir "kbd-&kbd-version;">
-<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
+<!ENTITY kbd-package "kbd-&kbd-version;.tar.gz">
 <!ENTITY kbd-size "617 KB">
 
 <!ENTITY kbd-patch "kbd-&kbd-version;-more-programs-1.patch">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index cb00b1322..f5a4dd618 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -9,7 +9,7 @@
 <!ENTITY libtool-depversion "1.4.2">
 <!ENTITY libtool-contversion "1.5">
 <!ENTITY libtool-dir "libtool-&libtool-version;">
-<!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
+<!ENTITY libtool-package "libtool-&libtool-version;.tar.gz">
 <!ENTITY libtool-size "2,591 KB">
 
 <!ENTITY libtool-compsize "20 MB">
diff --git a/entities/man.ent b/entities/man.ent
index 9f2b87679..54c664ae4 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -9,7 +9,7 @@
 <!ENTITY man-depversion "1.5i">
 <!ENTITY man-contversion "1.5m2">
 <!ENTITY man-dir "man-&man-version;">
-<!ENTITY man-package "man-&man-version;.tar.bz2">
+<!ENTITY man-package "man-&man-version;.tar.gz">
 <!ENTITY man-size "196 KB">
 
 <!ENTITY man-80cols-patch "man-&man-version;-80cols.patch">
diff --git a/entities/manpages.ent b/entities/manpages.ent
index d6c9e4e63..593ab3ddd 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -9,7 +9,7 @@
 <!ENTITY man-pages-depversion "1.65">
 <!ENTITY man-pages-contversion "1.65">
 <!ENTITY man-pages-dir "man-pages-&man-pages-version;">
-<!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
+<!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.gz">
 <!ENTITY man-pages-size "1,752 KB">
 
 <!ENTITY man-pages-compsize "15 MB">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 48ef6b654..3bcdbb3e7 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -9,7 +9,7 @@
 <!ENTITY tcl-depversion "8.4.5">
 <!ENTITY tcl-contversion "8.4.5">
 <!ENTITY tcl-dir "tcl-&tcl-version;">
-<!ENTITY tcl-package "tcl-&tcl-version;.tar.gz">
+<!ENTITY tcl-package "tcl&tcl-version;-src.tar.gz">
 <!ENTITY tcl-size "3,363 KB">
 
 <!ENTITY tcl-compsize-tools "23 MB">