4 files changed, 11 insertions, 18 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index 90d5123e2..ec2a88b12 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -13,7 +13,11 @@
 <!ENTITY url-debian-home "http://&www-debian-org;/">
 
 <!ENTITY ftp-debian-org "ftp.debian.org">
+<!-- The entity below is deprecated -->
 <!ENTITY url-debian-ftp "ftp://&ftp-debian-org;/">
+<!-- Use http.us.debian.org as ftp.debian.org does not have all arches -->
+<!ENTITY archive-mirror "http.us.debian.org">
+<!ENTITY url-archive "http://&archive-mirror;/">
 
 <!ENTITY url-d-i "http://&www-debian-org;/devel/debian-installer/">
 
@@ -39,11 +43,11 @@
 <!ENTITY email-debian-boot-list "debian-boot@lists.debian.org">
 
 <!-- base for the current distribution -->
-<!ENTITY disturlftp "ftp://&ftp-debian-org;/debian/dists/&releasename;/">
-<!ENTITY disturl    "http://http.us.debian.org/debian/dists/&releasename;/">
+<!ENTITY disturlftp "&url-debian-ftp;debian/dists/&releasename;/">
+<!ENTITY disturl    "&url-archive;debian/dists/&releasename;/">
 
 <!-- base for unstable -->
-<!ENTITY url-dist-unstable "ftp://ftp.debian.org/debian/dists/unstable/">
+<!ENTITY url-dist-unstable "&url-archive;debian/dists/unstable/">
 
 <!-- where to get the current debian-installer -->
 <!ENTITY url-debian-installer "&disturl;main/installer-&architecture;/current/">
@@ -205,13 +209,6 @@
 <!ENTITY url-scsi-faq
   "http://www.cis.ohio-state.edu/hypertext/faq/usenet/scsi-faq/top.html">
 
-<!ENTITY url-removed-packages
-  "http://ftp-master.debian.org/removals.txt">
-
-<!ENTITY url-removed-nonus
-  "http://non-us.debian.org/~troup/removals.txt">
-
-
 <!ENTITY url-linux-org-help "http://www.linux.org/help/">
 
 <!-- possibly useful
@@ -266,11 +263,6 @@
      http://metalab.unc.edu/LDP/HOWTO/Multiboot-with-LILO.html
   -->     
 
-<!ENTITY url-xfree86 "http://www.xfree86.org/">
-<!ENTITY url-xfree "&url-xfree86;">
-
-<!ENTITY url-xfree86-cardlist "&url-xfree86;cardlist.html">
-
 <!ENTITY url-xorg "http://xorg.freedesktop.org/">
 
 <!ENTITY url-simtel "ftp://ftp.simtel.net/pub/simtelnet/msdos/">
diff --git a/debian/changelog b/debian/changelog
index 4b203db55..9626be9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 installation-guide (2007xxxx) UNRELEASED; urgency=low
 
+  * Cleaned up definitions of some entities and removed unused ones.
   * appendix/files: update information about mouse configuration, based on a
     patch from Peter Samuelson (for which thanks). Closes: #406290.
 
- -- Frans Pop <fjp@debian.org>  Mon, 22 Jan 2007 17:56:37 +0100
+ -- Frans Pop <fjp@debian.org>  Mon, 22 Jan 2007 20:20:41 +0100
 
 installation-guide (20070122) unstable; urgency=low
 
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 8ab3e6bfd..98b5232a4 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -145,7 +145,7 @@ the files.
 
 <command>debootstrap</command> can download the needed files directly
 from the archive when you run it. You can substitute any Debian
-archive mirror for <userinput>http.us.debian.org/debian</userinput> in
+archive mirror for <userinput>&archive-mirror;/debian</userinput> in
 the command example below, preferably a mirror close to you
 network-wise. Mirrors are listed at
 <ulink url="http://www.debian.org/misc/README.mirrors"></ulink>.
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 3f7f45067..4be5fed17 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -830,7 +830,7 @@ same as <classname>mirror/suite</classname>.
 
 <informalexample role="example"><screen>
 d-i mirror/country string enter information manually
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string