remove all unneeded info from obsolete release

13 files changed, 30 insertions, 1058 deletions

diff --git a/english/releases/etch/Makefile b/english/releases/etch/Makefile
index da1d53046f6..2667c63948b 100644
--- a/english/releases/etch/Makefile
+++ b/english/releases/etch/Makefile
@@ -3,23 +3,13 @@
 
 WMLBASE=../..
 CUR_DIR=releases/etch
-SUBS=debian-installer
+SUBS=
 
 include $(WMLBASE)/Make.lang
 
 index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml
+  $(TEMPLDIR)/release_info.wml
 
 releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \
+  $(TEMPLDIR)/release_info.wml \
   $(sort $(wildcard $(HTMLDIR)/*/release-notes*))
-
-installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \
-  $(sort $(wildcard $(HTMLDIR)/*/install*))
-
-etchnhalf.$(LANGUAGE).html: etchnhalf.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/etch/release.data
-
-$(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/installer.wml
-	touch $@
diff --git a/english/releases/etch/credits.wml b/english/releases/etch/credits.wml
deleted file mode 100644
index 163bf4e1aa5..00000000000
--- a/english/releases/etch/credits.wml
+++ /dev/null
@@ -1,10 +0,0 @@
-#use wml::debian::template title="Debian GNU/Linux 4.0 -- Credits (or Blame)" BARETITLE=true
-
-<h2>Release management</h2>
-
-<p>This release of Debian was managed by Steve Langasek and Andreas Barth.</p>
-
-<h2>The rest of Debian</h2>
-
-<p>The developers and everyone else
-who contributed.</p>
diff --git a/english/releases/etch/debian-installer/Makefile b/english/releases/etch/debian-installer/Makefile
deleted file mode 100644
index 7312bae6877..00000000000
--- a/english/releases/etch/debian-installer/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# If this makefile is not generic enough to support a translation,
-# please contact debian-www.
-
-WMLBASE=../../..
-CUR_DIR=releases/etch/debian-installer
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-index.$(LANGUAGE).html:: $(ENGLISHDIR)/releases/etch/release.data \
-	$(TEMPLDIR)/release_info.wml \
-	$(TEMPLDIR)/installer.wml
-
-etchnhalf.$(LANGUAGE).html:: $(ENGLISHDIR)/releases/etch/release.data \
-	$(ENGLISHDIR)/releases/etch/debian-installer/etchnhalf-images.data \
-	$(TEMPLDIR)/release_info.wml \
-	$(TEMPLDIR)/installer.wml
diff --git a/english/releases/etch/debian-installer/etchnhalf-images.data b/english/releases/etch/debian-installer/etchnhalf-images.data
deleted file mode 100644
index d152dea55d6..00000000000
--- a/english/releases/etch/debian-installer/etchnhalf-images.data
+++ /dev/null
@@ -1,21 +0,0 @@
-#include wml::debian::installer
-
-<define-tag etchnhalf-images-url>https://cdimage.debian.org/cdimage/archive/4.0_r8</define-tag>
-<define-tag lenny-images-url>https://cdimage.debian.org/debian-cd/5.0.1</define-tag>
-
-<define-tag etchnhalf-netinst-images>
-<images-list url="<etchnhalf-images-url/>/@ARCH@/iso-cd/debian-40r8-etchnhalf-@ARCH@-netinst.iso" arch="amd64 i386" />
-</define-tag>
-
-<define-tag etchnhalf-businesscard-images>
-<images-list url="<lenny-images-url/>/@ARCH@/iso-cd/debian-501-@ARCH@-businesscard.iso" arch="<strip-arches "<etch-images-arches />" "s390 source" />" />
-</define-tag>
-
-# this needs to link a debian/ mirror rather than cdimage.d.o
-# no idea why ftp.nl.d.o is picked -joy, 2007-11-10
-# it's a reliable mirror that has all arches and good connectivity -fjp, 2008-02-08
-<define-tag lenny-otherimages-url>http://ftp.nl.debian.org/debian/dists/lenny/main/installer-@ARCH@/current/images/</define-tag>
-
-<define-tag etchnhalf-other-images>
-<images-list url="<lenny-otherimages-url/>" arch="<strip-arches "<stable-images-arches />" "source" />" />
-</define-tag>
diff --git a/english/releases/etch/debian-installer/etchnhalf.wml b/english/releases/etch/debian-installer/etchnhalf.wml
deleted file mode 100644
index cbc3ee592e6..00000000000
--- a/english/releases/etch/debian-installer/etchnhalf.wml
+++ /dev/null
@@ -1,195 +0,0 @@
-#use wml::debian::template title="Debian &ldquo;etchnhalf&rdquo; Installation Information" NOHEADER="true"
-#include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/etch/release.data"
-#include "$(ENGLISHDIR)/releases/etch/debian-installer/etchnhalf-images.data"
-
-
-<p><strong>Debian GNU/Linux 4.0 has been superseded by
-<a href="../../lenny/">Debian GNU/Linux 5.0 (<q>lenny</q>)</a>. Some of these
-installation images may no longer be available, or may no longer work, and
-you are recommended to install <q>lenny</q> instead.
-</strong></p>
-
-<h1>Installing Debian GNU/Linux <q>etch-and-a-half</q></h1>
-
-<h2>Overview</h2>
-
-<p>
-The <q>etch-and-a-half</q> release is essentially just the most recent
-point release for etch, but with a more recent kernel (version 2.6.24).
-The main purpose of this release is to allow installation of <q>etch</q>
-on systems not supported by the 2.6.18 kernel that is used in regular
-<q>etch</q> installs.
-</p>
-
-<p>
-For further details about scope, purpose and limitations of the
-<q>etch-and-a-half</q> release, see the
-<a href="../etchnhalf">Release Notes</a>.
-</p>
-
-<h2>Installing</h2>
-
-<p>
-For new installations of <q>etch-and-a-half</q> the current release of
-<em>Debian Installer for <strong>lenny</strong></em> is used, with minor
-changes for compatibility with <q>etch</q>.
-</p>
-
-<p>
-Please read the notes below carefully before installing <q>etch-and-a-half</q>.
-</p>
-
-<ul>
-	<li>Because the current <q>lenny</q> installer is an RC release, it
-	    may have some errata you would not expect in a stable release.
-	    See the <a href="#errata">errata section</a> at the bottom of this
-	    page for details.</li>
-	<li>The <q>lenny</q> installer includes a number of changes from the
-	    <q>etch</q> installer. See the release announcements for the
-	    <a href="$(HOME)/devel/debian-installer/News/2008/20080317">beta1</a>,
-	    <a href="$(HOME)/devel/debian-installer/News/2008/20080609">beta2</a>, 
-	    <a href="$(HOME)/devel/debian-installer/News/2008/20081112">RC1</a> and
-	    <a href="$(HOME)/devel/debian-installer/News/2009/20090131">RC2</a>
-	    releases of the installer for an overview of changes.</li>
-	<li>This includes changes that affect preseeding (automated
-	    installations). See the appendix on preseeding in the Installation
-	    Guide for <q>lenny</q> (linked below) for correct preseeding options.</li>
-</ul>
-
-<p>
-The following installation options are available to install Debian GNU/Linux
-<q>etch-and-a-half</q>.
-</p>
-
-<div class="line">
-<div class="item col50">
-
-<strong>netinst CD image</strong> (generally 135-175 MB)
-	<ul>
-	<li>Only available for selected architectures.</li>
-	<li>Will automatically install <q>etch-and-a-half</q>.</li>
-	<li>Will automatically install the 2.6.24 kernel.</li>
-	<li>Can optionally be used in combination with images from the
-	    <a href="index">current full CD/DVD set for <q>etch</q></a>.
-	    After the installation of the base system, the installer will ask
-	    if additional CDs should be scanned; at that point insert CD1 or
-	    DVD1, or the KDE or Xfce CDs.</li>
-	</ul>
-<etchnhalf-netinst-images />
-</div>
-
-<div class="item col50 lastcol">
-
-<strong>businesscard CD image</strong> (generally 20-50 MB)
-	<ul>
-	<li>Available for all architectures.</li>
-	<li>Needs to be booted with the option '<tt>suite=etch</tt>' to
-	    install <q>etch-and-a-half</q>.</li>
-	<li>Will automatically install the 2.6.24 kernel.</li>
-	</ul>
-<etchnhalf-businesscard-images />
-</div>
-</div>
-
-<div class="line">
-<div class="item col50">
-
-<strong>netboot images</strong>
-	<ul>
-	<li>Available for all architectures.</li>
-	<li>Needs to be booted with the option '<tt>suite=etch</tt>' to
-	    install <q>etch-and-a-half</q>.</li>
-	<li>Will automatically install the 2.6.24 kernel.</li>
-	<li>Other images than netboot (usb stick, floppy) may be usable,
-	    but have not been tested.</li>
-	<li>Images for subarchitectures that will be supported in <q>lenny</q>
-	    but are not supported in <q>etch</q>, may not be usable.</li>
-	</ul>
-<etchnhalf-other-images />
-</div>
-</div>
-
-<p>
-<strong>Additional notes</strong>
-</p>
-<ul>
-    <li>
-	The current <q>etch-and-a-half</q> installation images based on
-	Debian Installer Lenny RC1 use a newer kernel (2.6.26) than the
-	version that was included in the <q>etch-and-a-half</q> release
-	and is installed for the target system (2.6.24). In some cases this
-	can mean that hardware which is supported during the installation
-	does not work after the reboot into the installed system because
-	support for it was added after the 2.6.24 version.
-    </li><li>
-	If any of the hardware in your system requires firmware to be loaded
-	with the device driver, the installer may ask if it should load the
-	firmware from a removable medium, such as a floppy disk or USB stick.
-	General information about loading firmware during an installation can
-	be found in the Installation Guide (see	Documentation below).
-    </li><li>
-	For the installation images, verification files (<tt>SHA256SUMS</tt>,
-	<tt>SHA512SUMS</tt> and other) are available from the same directory as the
-	images.
-    </li><li>
-	There are two reasons the netinst image is only available for selected
-	architectures. First, a lot of architectures don't really have new
-	hardware that is not supported by the 2.6.18 kernel. Second, some
-	architectures are most commonly installed using netboot, making the CD
-	image unnecessary.
-    </li>
-</ul>
-
-
-<h2>Documentation</h2>
-
-<p>
-<strong>If you read only one document</strong> before installing, read our
-<a href="../../lenny/i386/apa">Installation Howto</a>, a quick
-walkthrough of the installation process. Other useful documentation includes:
-</p>
-
-<ul>
-<li><a href="../../lenny/installmanual">Lenny Installation Guide</a><br />
-detailed installation instructions</li>
-<li><a href="https://wiki.debian.org/DebianInstaller/FAQ">Debian-Installer FAQ</a>
-and <a href="$(HOME)/CD/faq/">Debian-CD FAQ</a><br />
-common questions and answers</li>
-<li><a href="https://wiki.debian.org/DebianInstaller">Debian-Installer Wiki</a><br />
-community maintained documentation</li>
-</ul>
-
-<h2 id="errata">Errata</h2>
-
-<p>
-This is a list of known problems in the installer shipped with 
-Debian GNU/Linux <q>etch-and-a-half</q>. If you have experienced a problem
-installing Debian and do not see your problem listed here, please send us an 
-<a href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">installation report</a>
-describing the problem or 
-<a href="https://wiki.debian.org/DebianInstaller/BrokenThings">check the wiki</a>
-for other known problems.
-</p>
-
-<p>
-Most issues can be found in the <a href="../etchnhalf">Release Notes for
-<q>etch-and-a-half</q></a> or in the
-<a href="$(HOME)/devel/debian-installer/errata">errata for the current
-Debian Installer release for lenny</a>, on which the installer for
-<q>etch-and-a-half</q> is based.
-</p>
-
-<p>
-In addition, the errata listed below are specific to the <q>etch-and-a-half</q>
-release.
-</p>
-
-<h3 id="errata-r0">Errata specific to <q>etch-and-a-half</q></h3>
-
-<ul>
-<li>
-The <q>etch-and-a-half</q> 4.0r5 netinst images for both i386 and amd64 had some
-minor problems with the isolinux boot menu. This was fixed in the 4.0r5a images.
-</li>
-</ul>
diff --git a/english/releases/etch/debian-installer/index.wml b/english/releases/etch/debian-installer/index.wml
deleted file mode 100644
index f866f28112f..00000000000
--- a/english/releases/etch/debian-installer/index.wml
+++ /dev/null
@@ -1,382 +0,0 @@
-#use wml::debian::template title="Debian &ldquo;etch&rdquo; Installation Information" NOHEADER="true"
-#include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/etch/release.data"
-
-<h1>Installing Debian GNU/Linux <current_release_etch></h1>
-
-<p><strong>Debian GNU/Linux 4.0 has been superseded by
-<a href="../../lenny/">Debian GNU/Linux 5.0 (<q>lenny</q>)</a>. Some of these
-installation images may no longer be available, or may no longer work, and
-you are recommended to install lenny instead.
-</strong></p>
-
-
-<p>
-<strong>To install Debian GNU/Linux</strong> <current_release_etch>
-(<em>etch</em>), download any of the following images:
-</p>
-
-<div class="line">
-<div class="item col50">
-        <p><strong>netinst CD image (generally 135-175 MB)</strong></p>
-                <netinst-images />
-</div>
-
-<div class="item col50 lastcol">
-        <p><strong>businesscard CD image (generally 20-50 MB)</strong></p>
-                <businesscard-images />
-</div>
-</div>
-
-<div class="line">
-<div class="item col50">
-        <p><strong>full CD sets</strong></p>
-                <full-cd-images />
-</div>
-
-<div class="item col50 lastcol">
-        <p><strong>full DVD sets</strong></p>
-                <full-dvd-images />
-</div>
-</div>
-
-<div class="line">
-<div class="item col50">
-<p><strong>CD (via <a
-href="$(HOME)/CD/torrent-cd">bittorrent)</a></strong></p>
-<full-cd-torrent />
-</div>
-
-<div class="item col50 lastcol">
-<p><strong>DVD (via <a href="$(HOME)/CD/torrent-cd">bittorrent)</a></strong></p>
-<full-dvd-torrent />
-</div>
-</div>
-
-<div class="line">
-<div class="item col50">
-<p><strong>CD (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
-<full-cd-jigdo />
-</div>
-
-<div class="item col50 lastcol">
-<p><strong>DVD (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
-<full-dvd-jigdo />
-</div>
-</div>
-
-<div class="line">
-<div class="item col50">
-<p><strong>other images (netboot, usb stick, etc.)</strong></p>
-<other-images />
-</div>
-</div>
-
-
-<p>
-<strong>Notes</strong>
-</p>
-<ul>
-    <if-etchnhalf-released released="yes"><li>
-	Information about <strong>installing Debian GNU/Linux
-	<q>etch-and-a-half</q></strong> (using an updated 2.6.24 kernel) is
-	available from a <a href="etchnhalf">separate page</a>.
-    </li></if-etchnhalf-released>
-    <li>
-	The multi-arch <em>CD</em> images support i386/amd64/powerpc and
-	alpha/hppa/ia64 respectively; the installation is similar to installing
-	from a single architecture netinst image.
-    </li><li>
-	The multi-arch <em>DVD</em> image supports i386/amd64/powerpc; the
-	installation is similar to installing from a single architecture full
-	CD image; the DVD also includes the source for all included packages.
-    </li><li>
-	For the installation images, verification files (<tt>SHA256SUMS</tt>,
-	<tt>SHA512SUMS</tt> and other) are available from the same directory as the
-	images.
-    </li>
-</ul>
-
-
-<h1>Documentation</h1>
-
-<p>
-<strong>If you read only one document</strong> before installing, read our
-<a href="../i386/apa">Installation Howto</a>, a quick
-walkthrough of the installation process. Other useful documentation includes:
-</p>
-
-<ul>
-<li><a href="../installmanual">Etch Installation Guide</a><br />
-detailed installation instructions</li>
-<li><a href="https://wiki.debian.org/DebianInstaller/FAQ">Debian-Installer FAQ</a>
-and <a href="$(HOME)/CD/faq/">Debian-CD FAQ</a><br />
-common questions and answers</li>
-<li><a href="https://wiki.debian.org/DebianInstaller">Debian-Installer Wiki</a><br />
-community maintained documentation</li>
-</ul>
-
-<h1 id="errata">Errata</h1>
-
-<p>
-This is a list of known problems in the installer shipped with 
-Debian GNU/Linux <current_release_etch>. If you have experienced a problem
-installing Debian and do not see your problem listed here, please send us an 
-<a href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">installation report</a>
-describing the problem or 
-<a href="https://wiki.debian.org/DebianInstaller/BrokenThings">check the wiki</a>
-for other known problems.
-</p>
-
-<h3 id="errata-r3">Errata for release 4.0r3</h3>
-
-<p>This release fixes the two issues listed below for 4.0r2.</p>
-
-<h3 id="errata-r2">Errata for release 4.0r2</h3>
-
-<p>This release fixes the <q>serial console setup with GRUB</q> issue listed
-below for the 4.0r0 release.</p>
-
-<p>Due to an oversight, the installer does not use the kernel version released
-with 4.0r2, but a slightly older one (2.6.18.dfsg.1-13). Modules loaded later
-in the installation may be from a later version (2.6.18.dfsg.1-16), but as
-these two versions are ABI compatible, this should not cause any problems.</p>
-
-<p>For the same reason, the added support for Nevada SGI O2 machines mentioned in
-the <a href="$(HOME)/News/2007/20071227">release announcement</a> is
-not actually included in this release.</p>
-
-<p>These two issues will be corrected with the next point release for Etch.</p>
-
-<h3 id="errata-r1">Errata for release 4.0r1</h3>
-
-<p>This new release fixes a few problems present in the original 4.0r0 release.
-More USB CD drives will be detected and <tt>gksu</tt> will be correctly
-configured when installed with the root account disabled (<tt>sudo</tt>
-mode). The creation of <tt>ext2</tt> filesystems on amd64 is now possible.</p>
-
-<p>The mirror list has also been updated, along with Catalan and Romanian
-translations of the partitioner.</p>
-
-<p>With the update of the kernel for this release, some of the installer
-images originally released with etch 4.0r0 (netboot and floppies) will no
-longer work due to a kernel version mismatch.  CD-based installations are
-<strong>not</strong> affected.</p>
-
-<h3 id="errata-r0">Errata for release 4.0r0</h3>
-
-<dl class="gloss">
-	<dt>Disk devices may change on reboot</dt>
-	<dd>
-	On systems with multiple disk controllers, the kernel/udev may assign
-	a different device node on reboot of the system than was used during
-	installation due to difference in load order of drivers.<br />
-	This can lead to failure to boot the system. In most cases this can be
-	corrected by changing the bootloader configuration and /etc/fstab,
-	possibly using the rescue mode of the installer.<br />
-	Note however that this problem may occur again on subsequent boots.
-	Fixing this issue has priority for the next release of Debian installer.
-	</dd>
-
-	<dt>Resizing of existing ext3 partitions may fail</dt>
-	<dd>
-	The installer is currently not able to resize ext3 partitions that have
-	the <tt>dir_index</tt> and/or <tt>resize_inode</tt> features enabled.
-	This includes ext3 partitions created with the Etch installer.<br />
-	You can however manually resize an ext3 partition during installation.
-	Proceed until the partitioning step, use the &lt;Go Back&gt; button to
-	exit to the main menu, start a shell, and resize the file system and
-	partition using the commands available in the shell (<tt>fsck.ext3</tt>,
-	<tt>resize2fs</tt> and e.g. <tt>fdisk</tt> or <tt>parted</tt>). If you
-	start partman again after completing the resize operation, it should
-	show the new size of the partition.
-	</dd>
-
-	<dt>Error using loop-aes encryption during hd-media install</dt>
-	<dd>
-	If loop-aes encryption is used during an installation using the
-	hd-media images (e.g. from USB stick), this may fail with the
-	following (or similar) error message in the syslog
-	(<a href="https://bugs.debian.org/434027">#434027</a>):<br />
-	<tt>partman-crypto: ioctl: LOOP_SET_STATUS: Invalid argument, requested
-	cipher or key length (256 bits) not supported by kernel.</tt><br />
-	Cause of this issue is that early in the installation the CD image
-	will have been loop-mounted using the regular loop module, which
-	prevents the loop-aes module from being loaded later.<br />
-	It is possible to work around this issue by manually unmounting the
-	CD image, unloading the loop module, loading the loop-aes module, and
-	remounting the CD image.
-	</dd>
-
-	<dt>Incomplete installation of Desktop task from full CD</dt>
-	<dd>
-	The full CD image is too small to contain all packages needed to
-	install the complete Desktop task. This means that if you only use the
-	CD as a source, only part of the Desktop task will be installed.<br />
-	You can resolve this either <em>during the installation</em> by choosing
-	to use a network mirror as a source to install packages in addition to the
-	CD (not recommended if you don't have a decent internet connection), or
-	<em>after you have rebooted</em> into the installed system by using
-	<tt>apt-cdrom</tt> to load additional CDs and then selecting the Desktop
-	task again in <tt>aptitude</tt>.
-	</dd>
-
-	<dt>Buggy routers may cause network problems</dt>
-	<dd>
-	If you experience network problems during the installation, this may be
-	caused by a router somewhere between you and the Debian mirror that
-	doesn't correctly handle window scaling.
-	See <a href="https://bugs.debian.org/401435">#401435</a> and this
-	<a href="http://kerneltrap.org/node/6723">kerneltrap article</a> for
-	details.<br />
-	You can work around this issue by disabling TCP window scaling. Activate
-	a shell and enter the following command:<br />
-	<tt>echo 0 &gt; /proc/sys/net/ipv4/tcp_window_scaling</tt><br />
-	For the installed system you should probably not completely disable TCP
-	window scaling. The following command will set ranges for reading and
-	writing that should work with almost any router:<br />
-	<tt>echo 4096 65536 65536 &gt;/proc/sys/net/ipv4/tcp_rmem</tt><br />
-	<tt>echo 4096 65536 65536 &gt;/proc/sys/net/ipv4/tcp_wmem</tt>
-	</dd>
-
-	<dt>General issues after reboot because of UTF-8 default</dt>
-	<dd>
-	The installed system is now set to UTF-8 by default. However, not all
-	applications properly support UTF-8 yet, which may result in minor or
-	major problems when using them.<br />
-	Please check if such problems have been reported yet and, if not, file
-	a bug report against the relevant package (not the installer).
-	</dd>
-
-	<dt>Limited localization of installed system</dt>
-	<dd>
-	For the Sarge version of the installer the package localization-config was
-	responsible for part of the localization of the installed system. This
-	package ran as part of base-config, which has been dropped in the release.
-	Adapting localization-config to run before the reboot is on our TODO list,
-	but meanwhile some localization may not be done automatically when
-	installing in languages other than English.
-	</dd>
-
-	<dt>Installation of Sarge not supported</dt>
-	<dd>
-	As a result of some structural changes in the installer, installation of
-	Sarge (oldstable) is not supported.
-	</dd>
-
-	<dt>Graphical installer</dt>
-	<dd>
-	The graphical installer still has some known issues (see also the
-	Installation Guide):
-	<ul>
-		<li>some non-US keymaps are not fully supported (deadkeys and
-		    combining characters do not work)</li>
-		<li>touchpads should work, but support may not be optimal; if you
-		    experience problems, you should use an external mouse instead</li>
-		<li>limited support for creating encrypted partitions</li>
-		<li>should work on almost all PowerPC systems that have an ATI
-		    graphics card, but is unlikely to work on other PowerPC
-		    systems</li>
-	</ul>
-	</dd>
-
-	<dt>False warning about missing swap when installing the <em>laptop</em> task</dt>
-	<dd>
-	When the <em>laptop</em> task is installed, a incorrect warning will be
-	issued by the <tt>uswsusp</tt> package saying <q>No swap partition
-	found; userspace software suspend will not work</q>. This is only a
-	<strong>incorrect</strong> warning and software suspend should work
-	correctly. See also bug
-	<a href="https://bugs.debian.org/427104">#427104</a>.
-	</dd>
-
-	<dt>Network driver sky2 known to be broken</dt>
-	<dd>
-	The sky2 network driver is known to be broken in the kernel
-	(2.6.18.dfsg.1-11) used in the installer and may cause kernel panics. See
-	for example <a href="https://bugs.debian.org/404107">#404107</a>.
-	<a href="https://bugs.debian.org/411115">#411115</a> contains a series of
-	patches that may fix the issues.
-	</dd>
-
-<!-- leaving this in for possible future use...
-	<dt>i386: more than 32 mb of memory is needed to install</dt>
-	<dd>
-	The minimum amount of memory needed to successfully install on i386
-	is 48 mb, instead of the previous 32 mb. We hope to reduce the
-	requirements back to 32 mb later. Memory requirements may have
-	also changed for other architectures.
-	</dd>
--->
-
-	<dt>i386/amd64: serial console setup with GRUB</dt>
-	<dd>
-	There are some issues with the way the installer tries to setup GRUB
-	to use a serial console. Full details can be found in the bug report
-	<a href="https://bugs.debian.org/416310">#416310</a>.
-	Briefly, these issues can be resolved by ensuring that the parity and
-	bits options are also passed in the <q><tt>console=</tt></q> definition.<br />
-	For most people	this will mean that instead of booting the installer
-	with <q><tt>console=ttyS0,9600</tt></q> you should use
-	<q><tt>console=ttyS0,9600n8</tt></q>.
-	</dd>
-
-	<dt>i386: booting the installer may fail on some older systems</dt>
-	<dd>
-	Due to a regression in the syslinux bootloader used for most installer
-	images, some older systems may fail to boot the installer. If the boot
-	halts after displaying <q><tt>Loading initrd.gz....</tt></q>, you
-	should try one of the
-	<a href="https://d-i.alioth.debian.org/pub/etch/syslinux/">alternative
-	images</a> that use an older version of syslinux. See also bug report
-	<a href="https://bugs.debian.org/415992">#415992</a>.
-	</dd>
-
-	<dt>amd64: formatting an ext2 file system is not possible (fixed in 4.0r1)</dt>
-	<dd>
-	Because the ext2 kernel module is not available, it is not possible
-	to create an ext2 file system. This will be fixed with the next update
-	of the installer for Etch.
-	</dd>
-
-	<dt>powerpc: various issues</dt>
-	<dd>
-	The PowerPC port has several issues in this release:
-	<ul>
-		<li>installation from floppy on OldWorld PowerMac is broken
-		    because no device node is created for the swim3 module
-		    and as miboot is not included</li>
-		<li>the snd-powermac module is no longer loaded by default as
-		    it will lock up some systems; you will need to add it to
-		    <tt>/etc/modules</tt> manually</li>
-	</ul>
-	</dd>
-
-	<dt>sparc: CD installs for sparc32 may fail</dt>
-	<dd>
-	The esp kernel driver module is broken which means that installation from
-	CD-ROM is broken for most sparc32 systems. We suggest you use the <q>netboot</q>
-	installation method instead.
-	</dd>
-
-	<dt>sparc: installer appears to hang during boot</dt>
-	<dd>
-	There are two situations where the installer may appear to hang during
-	boot after displaying <q><tt>Booting Linux...</tt></q>. The first is when
-	there are two graphics controllers present (this is also described in the
-	<a href="$(HOME)/releases/etch/sparc/ch05s03#sparc-boot-problems">installation guide</a>).
-	The second is due to a bug in the kernel's ATI framebuffer driver and
-	affects only certain ATI graphics cards.<br />
-	In both cases the issue can be worked around by adding the parameter
-	<tt>video=atyfb:off</tt> when booting the installer.
-	</dd>
-
-	<dt>s390: unsupported features</dt>
-	<dd>
-	<ul>
-		<li>support for the DASD DIAG discipline is currently not
-		    available</li>
-		<li>support for LCS network interfaces is no longer available</li>
-	</ul>
-	</dd>
-</dl>
diff --git a/english/releases/etch/errata.wml b/english/releases/etch/errata.wml
index f054761b40e..fefaa49c1d9 100644
--- a/english/releases/etch/errata.wml
+++ b/english/releases/etch/errata.wml
@@ -83,5 +83,5 @@ the proposed updates by adding the following line to
 
 <p>
 For information about errata and updates for the installation system, see
-the <a href="debian-installer/">installation information</a> page.
+the installation information page.
 </p>
diff --git a/english/releases/etch/etchnhalf.wml b/english/releases/etch/etchnhalf.wml
deleted file mode 100644
index 866ac76a17e..00000000000
--- a/english/releases/etch/etchnhalf.wml
+++ /dev/null
@@ -1,170 +0,0 @@
-#use wml::debian::template title="Debian GNU/Linux 4.0 -- Etch-And-A-Half Release Notes" BARETITLE=true
-#include "$(ENGLISHDIR)/releases/etch/release.data"
-
-<if-etchnhalf-released released="no">
-<h1>Placeholder page</h1>
-
-<p>
-Content will be revealed when Debian GNU/Linux <q>etch-and-a-half</q>
-is released.
-</p>
-</if-etchnhalf-released>
-
-<if-etchnhalf-released released="yes">
-
-<h2>Overview</h2>
-
-<p>
-Additional packages have been added in the Debian 4.0r4 point release to
-increase the set of hardware supported by Debian 4.0 (<q>etch</q>). This
-includes packages based upon the Linux 2.6.24 kernel and additional drivers
-for the X window system. Installation of these additional packages is not
-required and will not occur by default. This update represents no change
-to the support of previously available packages.
-</p>
-
-<p>
-The existing 2.6.18-based kernel will continue to be the default kernel for
-the etch release.
-</p>
-
-<h2>Newly available packages</h2>
-
-<ul>
-  <li><a href="https://packages.debian.org/src:linux-2.6.24">linux-2.6.24</a><br />
-  New linux-image and supporting packages have been added to take advantage
-  of many new and updated device drivers. See the <q>Limitations</q> section
-  of this document for more information.</li>
-  <li><a href="https://packages.debian.org/etch/xserver-xorg-video-intel">xserver-xorg-video-intel</a><br />
-  A new X driver has been included to add support for the 965GM, 965GME, G33,
-  Q35, Q33 and GM45 (PCI ids 0x2A02, 0x2A12, 0x29B2, 0x29C2, 0x29D2 and
-  0x2A42) devices. Some cards that were previously supported by the
-  xserver-xorg-video-i810 driver may perform better with the
-  xserver-xorg-video-intel driver. This includes the 945GM, 946GZ, 965G and
-  965Q devices.</li>
-</ul>
-
-<h2>Updated <q>etch</q> packages</h2>
-
-<p>
-Some existing etch packages have been updated to add support for new hardware
-and for compatibility with the 2.6.24 kernel:
-</p>
-
-<ul>
- <li><a href="https://packages.debian.org/etch/aboot">aboot</a><br />
- Support for booting recent kernels.</li>
- <li><a href="https://packages.debian.org/etch/sysvinit">sysvinit</a><br />
- Updated shutdown command to properly shutdown disks.</li>
- <li><a href="https://packages.debian.org/etch/wireless-tools">wireless-tools</a><br />
- Inaccurate incompatibility warning removed.</li>
- <li><a href="https://packages.debian.org/source/etch/firmware-nonfree">firmware-nonfree</a><br />
- Firmware blobs for use with 2.6.24 kernel added.</li>
-  <li><a href="https://packages.debian.org/etch/xserver-xorg-video-nv">xserver-xorg-video-nv</a><br />
-  An updated X driver has been included to add support for previously
-  unsupported NVIDIA graphics adapters (notably the GeFORCE 8 series).
-  The updated xserver-xorg-video-nv package provides support for NVIDIA Riva,
-  TNT, GeFORCE and Quadro cards.</li>
-</ul> 
-
-<h2>Installing the <q>Etch-And-A-Half</q> release</h2>
-
-<p>
-Starting from this release, there are now two methods for installing the
-4.0 (<q>etch</q>) release of Debian.</p>
-
-<ol>
-  <li><strong>Install using Debian 4.0 (<q>etch</q>) installer</strong><br />
-  If your hardware is sufficiently supported by the standard etch installer
-  you may choose to use standard etch install media to initially install
-  your system and then later migrate to the <q>etch-and-a-half</q> kernel.
-  This option is best for users who already have a system installed with
-  etch or do not wish to obtain new installation media but would like to
-  add additional hardware that is only supported by the <q>etch-and-a-half</q>
-  kernel.<br />
-  Information on obtaining and using the Debian 4.0 (<q>etch</q>) installer is
-  available <a href="debian-installer/">here</a>.</li>
-  <li><strong>Install using current Debian <q>lenny</q> installer</strong><br />
-  Beginning with Beta 2, the lenny installer features an install kernel
-  that is very similar to the <q>etch-and-a-half</q> kernel and has a
-  compatibility mode for installing the etch release. This option is best
-  for users with hardware that is supported by the <q>etch-and-a-half</q>
-  kernel but is not supported by the default etch installer. Information
-  on obtaining and using a <q>lenny</q>-based installer to install
-  <q>etch-and-a-half</q> is available
-  <a href="debian-installer/etchnhalf">here</a>.</li>
-</ol>
-
-<h2>Limitations</h2>
-
-<ul>
-  <li>Debian does not guarantee that all hardware that is supported by the
-  default etch 2.6.18 kernel is also supported by the 2.6.24 kernel, nor
-  that all software included in etch will work correctly with the newer
-  kernel.</li>
-  <li>Migrating from the 2.6.18 etch kernel to the 2.6.24 <q>etch-and-a-half</q>
-  kernel will work in many cases, but is not guaranteed to succeed. Upgrades
-  from both the 2.6.18 and 2.6.24 kernels to the kernel provided by the next
-  stable release (<q>lenny</q>) will be supported.</li>
-  <li>Not all features of the etch 2.6.18 kernel are available in the 2.6.24
-  images, this includes the Xen and linux virtual server flavors.</li>
-  <li>Out-of-tree kernel module source packages that were provided in etch
-  are not guaranteed to function properly with the 2.6.24 kernel.</li>
-</ul>
-
-<h2>Hardware-specific Notes</h2>
-<ul>
-  <li><strong>Broadcom NetXtreme II network controllers</strong><br />
-  The bnx2 driver for Broadcom NetXtreme II network controllers has been
-  modified to load firmware files from the filesystem. These firmware files
-  are provided in the
-  <a href="https://packages.debian.org/etch/firmware-bnx2">firmware-bnx2</a>
-  package in the non-free section of the archive. Systems that require the
-  bnx2 driver must have the firmware-bnx2 package installed to function with
-  the 2.6.24 <q>etch-and-a-half</q> kernel. These devices will not be
-  available at installtime when using a Debian <q>lenny</q>-based installer.</li>
-  <li><strong>Intel 3945/4965 wireless network adapters</strong><br />
-  Systems that use an Intel 3945 or 4965 based wireless network adapter must
-  have the corresponding firmware files installed for these adapters to
-  function with the 2.6.24 <q>etch-and-a-half</q> kernel. These firmware
-  files are provided in the
-  <a href="https://packages.debian.org/etch/firmware-iwlwifi">firmware-iwlwifi</a>
-  package in the non-free section of the archive. For information about
-  migrating from the ipw3945 driver to the iwl3945 driver you should review the
-  <a href="https://wiki.debian.org/iwlwifi">transition information</a>.</li>
-  <li><strong>Cirrus Logic <q>Sound Fusion</q> sound devices</strong><br />
-  The snd-cs46xx driver is no longer available in the <q>etch-and-a-half</q>
-  kernel due to legal issues.</li>
-  <li><strong>ARM ip32x (Thecus N2100, IO-Data GLAN Tank)</strong>
-  <ul>
-    <li>A problem in the r8169 network driver has been fixed that would
-    cause NFS problems on the Thecus N2100 (see bug
-    <a href="https://bugs.debian.org/452069">#452069</a>).</li>
-    <li>The Thecus N2100 now correctly powers off.</li>
-    <li>Support for the sensor chip to control the fan is now included
-    thanks to Riku Voipio.</li>
-  </ul>
-  </li>
-  <li><strong>ARM ixp4xx (Linksys NSLU2)</strong>
-    <ul>
-      <li>A new Ethernet driver, written by Krzysztof Halasa, is included.
-      This driver is included in the mainline kernel whereas the driver
-      used in the old kernel for etch (2.6.18) is no longer maintained.</li>
-      <li>A kernel crash with bitmapped md device has been fixed (see bug
-      <a href="https://bugs.debian.org/443373">#443373</a>).</li>
-      <li>More modules have been activated, for example more netfilter
-      modules.</li>
-    </ul>
-  </li>
-  <li><strong>SRM-based Alpha systems</strong><br />
-  aboot, the bootloader for alpha machines that use SRM firmware, has been
-  updated to support booting recent linux kernel images. If you are
-  performing a new etch install of your system using the Debian
-  <q>lenny</q>-based installer, an updated aboot package will automatically
-  be used. To migrate an existing etch system to the 2.6.24
-  <q>etch-and-a-half</q> kernel, you must update to the latest aboot package
-  in etch and manually update the boot block on your disk with the swriteboot
-  command. See swriteboot(8) for more information.</li>
-</ul>
-
-</if-etchnhalf-released>
diff --git a/english/releases/etch/index.wml b/english/releases/etch/index.wml
index a3d6eafd888..b7a096c2788 100644
--- a/english/releases/etch/index.wml
+++ b/english/releases/etch/index.wml
@@ -1,7 +1,5 @@
 #use wml::debian::template title="Debian &ldquo;etch&rdquo; Release Information"
 #include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/etch/release.data"
-#include "$(ENGLISHDIR)/releases/arches.data"
 
 
 <p>Debian GNU/Linux <current_release_etch> was
@@ -19,26 +17,28 @@ Security updates have been discontinued as of the end of February 2010.
 
 
 <p>To obtain and install Debian GNU/Linux, see
-the <a href="debian-installer/">installation information</a> page and the
-<a href="installmanual">Installation Guide</a>. To upgrade from an older
+installation information page and the
+Installation Guide. To upgrade from an older
 Debian release, see the instructions in the
 <a href="releasenotes">Release Notes</a>.</p>
 
-<p>The following computer architectures are supported in this release:</p>
+<p>The following computer architectures were supported in this release:</p>
 
 <ul>
-<:
-foreach $arch (@arches) {
-	print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
-}
-:>
+<li><a href="../../ports/alpha/">Alpha</a>
+<li><a href="../../ports/amd64/">64-bit PC (amd64)</a>
+<li><a href="../../ports/arm/">ARM</a>
+<li><a href="../../ports/hppa/">HP PA-RISC</a>
+<li><a href="../../ports/i386/">32-bit PC (i386)</a>
+<li><a href="../../ports/ia64/">Intel Itanium IA-64</a>
+<li><a href="../../ports/mips/">MIPS (big endian)</a>
+<li><a href="../../ports/mipsel/">MIPS (little endian)</a>
+<li><a href="../../ports/powerpc/">PowerPC</a>
+<li><a href="../../ports/s390/">IBM S/390</a>
+<li><a href="../../ports/sparc/">SPARC</a>
 </ul>
 
 <p>Contrary to our wishes, there may be some problems that exist in the
 release, even though it is declared <em>stable</em>. We've made
 <a href="errata">a list of the major known problems</a>, and you can always
-<a href="reportingbugs">report other issues</a> to us.</p>
-
-<p>Last but not least, we have a list of <a href="credits">people who take
-credit</a> for making this release happen.</p>
-
+report other issues to us.</p>
diff --git a/english/releases/etch/installmanual.wml b/english/releases/etch/installmanual.wml
deleted file mode 100644
index 164e265a743..00000000000
--- a/english/releases/etch/installmanual.wml
+++ /dev/null
@@ -1,32 +0,0 @@
-#use wml::debian::template title="Debian GNU/Linux 4.0 -- Installation Guide" BARETITLE=true
-#use wml::debian::release
-#include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/arches.data"
-#include "$(ENGLISHDIR)/releases/etch/release.data"
-
-<p>Installation instructions, along with downloadable files, are available
-for each of the supported architectures:</p>
-
-<ul>
-<:= &permute_as_list('', 'Installation Guide'); :>
-</ul>
-
-<p>If you have set your browser's localization
-properly, you can use the above link to get the right HTML version
-automatically &mdash; see <a href="$(HOME)/intro/cn">content negotiation</a>.
-Otherwise, pick the exact architecture, language, and format you want
-from the table below.</p>
-
-<div class="centerdiv">
-<table class="reltable">
-<tr>
-  <th align="left"><strong>Architecture</strong></th>
-  <th align="left"><strong>Format</strong></th>
-  <th align="left"><strong>Languages</strong></th>
-</tr>
-<: &permute_as_matrix_new( file => 'install', langs => \%langsinstall,
-			   formats => \%formats, arches => \@arches,
-			   html_file => 'index', namingscheme => sub {
-			   "$_[0].$_[2].$_[1]" } ); :>
-</table>
-</div>
diff --git a/english/releases/etch/release.data b/english/releases/etch/release.data
deleted file mode 100644
index 8f4dea678db..00000000000
--- a/english/releases/etch/release.data
+++ /dev/null
@@ -1,127 +0,0 @@
-<perl>
-
-# list of architectures
-@arches = (
-	alpha,
-	amd64,
-	arm,
-	hppa,
-	i386,
-	ia64,
-	mips,
-	mipsel,
-	powerpc,
-	s390,
-	sparc,
-);
-
-# list of install manual output formats
-%formats = (
-	html => "HTML",
-	pdf  => "PDF",
-	txt  => "plain text",
-);
-
-# list of languages install manual is translated to
-%langsinstall = (
-	english => "en",
-	catalan => "ca",
-	czech => "cs",
-	danish => "da",
-	german => "de",
-	spanish => "es",
-	finnish => "fi",
-	french => "fr",
-	hungarian => "hu",
-	italian => "it",
-	japanese => "ja",
-	korean => "ko",
-	dutch => "nl",
-	portuguese => "pt",
-	portuguese_br => "pt_BR",
-	russian => "ru",
-	swedish => "sv",
-	vietnamese => "vi",
-	chinese_cn => "zh_CN",
-);
-
-# list of languages release notes are translated to
-%langsrelnotes = (
-	english => "en",
-	catalan => "ca",
-	czech => "cs",
-#	danish => "da",
-	german => "de",
-	spanish => "es",
-	finnish => "fi",
-	french => "fr",
-	italian => "it",
-	japanese => "ja",
-#	dutch => "nl",
-	polish => "pl",
-	portuguese => "pt",
-	portuguese_br => "pt_BR",
-	romanian => "ro",
-	russian => "ru",
-	swedish => "sv",
-	chinese => "zh_TW",
-);
-
-</perl>
-
-
-<set-var diversions:_enh=0 />
-<set-var etchnhalf-released="yes" />
-
-<define-tag if-etchnhalf-released endtag=required>
-<preserve released />
-<set-var %attributes />
-<ifneq "<get-var released />" "<get-var etchnhalf-released />"
-       "<enter NOenh<get-var diversions:_enh /> />"
-       "<enter enh<get-var diversions:_enh /> />" />
-%body
-<leave />
-<dump enh<get-var diversions:_enh /> />
-<increment diversions:_enh />
-<restore released />
-</define-tag>
-
-#use wml::debian::installer
-
-<define-tag etch-images-url>https://cdimage.debian.org/cdimage/archive/4.0_r9</define-tag>
-
-<define-tag netinst-images>
-<images-list url="<etch-images-url/>/@ARCH@/iso-cd/debian-40r9-@ARCH@-netinst.iso" arch="<strip-arches <etch-images-arches/> "s390 source" />" />
-</define-tag>
-
-<define-tag businesscard-images>
-<images-list url="<etch-images-url/>/@ARCH@/iso-cd/debian-40r9-@ARCH@-businesscard.iso" arch="<strip-arches <etch-images-arches/> "s390 source" />" />
-</define-tag>
-
-<define-tag full-cd-images>
-<images-list url="<etch-images-url/>/@ARCH@/iso-cd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag full-cd-torrent>
-<images-list url="<etch-images-url/>/@ARCH@/bt-cd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag full-cd-jigdo>
-<images-list url="<etch-images-url/>/@ARCH@/jigdo-cd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag full-dvd-images>
-<images-list url="<etch-images-url/>/@ARCH@/iso-dvd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag full-dvd-torrent>
-<images-list url="<etch-images-url/>/@ARCH@/bt-dvd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag full-dvd-jigdo>
-<images-list url="<etch-images-url/>/@ARCH@/jigdo-dvd/" arch="<etch-images-arches/>" />
-</define-tag>
-
-<define-tag other-images>
-<images-list url="http://archive.debian.org/debian/dists/etch/main/installer-@ARCH@/current/images/" arch="<strip-arches <etch-images-arches/> source />" />
-</define-tag>
diff --git a/english/releases/etch/releasenotes.wml b/english/releases/etch/releasenotes.wml
index 47f631b236e..04ecd2e0c1a 100644
--- a/english/releases/etch/releasenotes.wml
+++ b/english/releases/etch/releasenotes.wml
@@ -1,40 +1,23 @@
 #use wml::debian::template title="Debian GNU/Linux 4.0 -- Release Notes" BARETITLE=true
 #use wml::debian::release
 #include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/arches.data"
-#include "$(ENGLISHDIR)/releases/etch/release.data"
 
 <p>To find out what's new in Debian 4.0, see the Release Notes for your
 architecture:</p>
 
 <ul>
-<:= &permute_as_list('release-notes/', 'Release Notes'); :>
+<li> <a href="alpha/release-notes.en.txt">Release Notes for Alpha</a>
+<li> <a href="amd64/release-notes.en.txt">Release Notes for 64-bit PC (amd64)</a>
+<li> <a href="arm/release-notes.en.txt">Release Notes for ARM</a>
+<li> <a href="hppa/release-notes.en.txt">Release Notes for HP PA-RISC</a>
+<li> <a href="i386/release-notes.en.txt">Release Notes for 32-bit PC (i386)</a>
+<li> <a href="ia64/release-notes.en.txt">Release Notes for Intel Itanium IA-64</a>
+<li> <a href="mips/release-notes.en.txt">Release Notes for MIPS (big endian)</a>
+<li> <a href="mipsel/release-notes.en.txt">Release Notes for MIPS (little endian)</a>
+<li> <a href="powerpc/release-notes.en.txt">Release Notes for PowerPC</a>
+<li> <a href="s390/release-notes.en.txt">Release Notes for IBM S/390</a>
+<li> <a href="sparc/release-notes.en.txt">Release Notes for SPARC</a>
 </ul>
 
 <p>The Release Notes also contain instructions for users who are upgrading from prior
 releases.</p>
-
-<p>If you have set your browser's localization
-properly, you can use the above link to get the right HTML version
-automatically -- see <a href="$(HOME)/intro/cn">content negotiation</a>.
-Otherwise, pick the exact architecture, language, and format you want
-from the table below.</p>
-
-<div class="centerdiv">
-<table class="reltable">
-<tr>
-  <th align="left"><strong>Architecture</strong></th>
-  <th align="left"><strong>Format</strong></th>
-  <th align="left"><strong>Languages</strong></th>
-</tr>
-<: &permute_as_matrix_new( file => 'release-notes', langs => \%langsrelnotes,
-                           formats => \%formats, arches => \@arches,
-                           html_file => 'release-notes/index' ); :>
-</table>
-</div>
-
-#<p>A <a href="http://master.debian.org/~lapeyre/reports/">detailed
-#report</a> is available which describes packages which have changed
-#for the <:= $arches{'i386'} :>, <:= $arches{'alpha'} :>, 
-#<:= $arches{'sparc'} :>, and <:= $arches{'m68k'} :> architectures 
-#during the last two releases.</p>
diff --git a/english/releases/etch/reportingbugs.wml b/english/releases/etch/reportingbugs.wml
deleted file mode 100644
index ab64914471a..00000000000
--- a/english/releases/etch/reportingbugs.wml
+++ /dev/null
@@ -1,47 +0,0 @@
-#use wml::debian::template title="Debian GNU/Linux 4.0 -- Reporting Problems" BARETITLE=true
-
-<h2><a name="report-release">With the Release Notes</a></h2>
-
-<p>Errors in the <a href="releasenotes">Release Notes</a> should be
-<a href="$(HOME)/Bugs/Reporting">reported as bug</a> against the
-pseudo-package <tt>release-notes</tt>. Discussion of that document is
-coordinated through the debian-doc mailinglist at
-<a href="mailto:debian-doc@lists.debian.org">\
-&lt;debian-doc@lists.debian.org&gt;</a>. If you have issues with the document
-which aren't appropriate for a bug you should probably mail the list instead.
-</p>
-
-<h2><a name="report-installation">With the installation</a></h2>
-
-<p>If you have a problem with the installation system, please report
-bugs against the <tt>installation-reports</tt> package.  Fill out the
-<a href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">report template</a> 
-to ensure you include all the necessary information.</p>
-
-<p>If you have suggestions or corrections for the
-<a href="installmanual">Installation Guide</a>, you should
-<a href="$(HOME)/Bugs/Reporting">file these
-as bugs</a> against <tt>installation-guide</tt>, which is the source package
-in which that documentation is maintained. 
-
-<p>If you have issues with the installation system which aren't
-appropriate for a bug (e.g., you're not sure if it's truly a bug or
-not, the offending piece of the system is unclear, etc.) you should
-probably send an email to the mailing list,
-<a href="mailto:debian-boot@lists.debian.org">\
-&lt;debian-boot@lists.debian.org&gt;</a>.</p>
-
-<h2><a name="report-upgrade">With an upgrade</a></h2>
-
-<p>If you have problems when upgrading your system from previous releases,
-please file a bug against the <tt>upgrade-reports</tt> package, which is the
-pseudo-package used to track that information. For more information on 
-how to submit upgrade reports, please read the 
-<a href="releasenotes">Release Notes</a>.</p>
-
-<h2><a name="report-package">Any other issues</a></h2>
-
-<p>If you have problems with the system after installation, you should
-try to track down the offending package and
-<a href="$(HOME)/Bugs/Reporting">file a bug</a> against that
-package.</p>