remove all unneeded info from obsolete release

10 files changed, 33 insertions, 643 deletions

diff --git a/english/releases/stretch/Makefile b/english/releases/stretch/Makefile
index 34cd6fb504d..680178167ec 100644
--- a/english/releases/stretch/Makefile
+++ b/english/releases/stretch/Makefile
@@ -3,19 +3,13 @@
 
 WMLBASE=../..
 CUR_DIR=releases/stretch
-SUBS=debian-installer
+SUBS=
 
 include $(WMLBASE)/Make.lang
 
 index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml
+  $(TEMPLDIR)/release_info.wml
 
 releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \
-  $(ENGLISHDIR)/releases/arches.data \
+  $(TEMPLDIR)/release_info.wml \
   $(sort $(wildcard $(HTMLDIR)/*/release-notes*))
-
-installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \
-  $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \
-  $(ENGLISHDIR)/releases/arches.data \
-  $(sort $(wildcard $(HTMLDIR)/*/install*))
diff --git a/english/releases/stretch/credits.wml b/english/releases/stretch/credits.wml
deleted file mode 100644
index 21d4db2e3c8..00000000000
--- a/english/releases/stretch/credits.wml
+++ /dev/null
@@ -1,13 +0,0 @@
-#use wml::debian::template title="Debian 9 -- Credits (or Blame)" BARETITLE=true
-
-<h2>Release management</h2>
-
-<p>This release of Debian was managed by Emilio Pozuelo Monfort and
-Niels Thykier, with the assistance of Adam D. Barratt, Cyril
-Brulebois, Julien Cristau, Mehdi Dogguy, Philipp Kern, Ivo De Decker
-and Jonathan Wiltshire.</p>
-
-<h2>The rest of Debian</h2>
-
-<p>The developers and everyone else
-who contributed.</p>
diff --git a/english/releases/stretch/debian-installer/Makefile b/english/releases/stretch/debian-installer/Makefile
deleted file mode 100644
index 3c0678b0012..00000000000
--- a/english/releases/stretch/debian-installer/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# If this makefile is not generic enough to support a translation,
-# please contact debian-www.
-
-WMLBASE=../../..
-CUR_DIR=releases/stretch/debian-installer
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-index.$(LANGUAGE).html:: $(ENGLISHDIR)/releases/stretch/release.data \
-	$(TEMPLDIR)/release_images.wml \
-	$(TEMPLDIR)/release_info.wml \
-	$(TEMPLDIR)/installer.wml
diff --git a/english/releases/stretch/debian-installer/index.wml b/english/releases/stretch/debian-installer/index.wml
deleted file mode 100644
index 31c8a8cbdb2..00000000000
--- a/english/releases/stretch/debian-installer/index.wml
+++ /dev/null
@@ -1,207 +0,0 @@
-#use wml::debian::template title="Debian &ldquo;stretch&rdquo; Installation Information" NOHEADER="true"
-#include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/stretch/release.data"
-
-<h1>Installing Debian <current_release_stretch></h1>
-
-<if-stable-release release="buster">
-<p><strong>Debian 9 has been superseded by
-<a href="../../buster/">Debian 10 (<q>buster</q>)</a>. Some of these
-installation images may no longer be available, or may no longer work, and
-you are recommended to install buster instead.
-</strong></p> 
-</if-stable-release>
-
-<p>
-<strong>To install Debian</strong> <current_release_stretch>
-(<em>stretch</em>), download any of the following images (all i386 and amd64
-CD/DVD images can be used on USB sticks too):
-</p>
-
-<div class="line">
-<div class="item col50">
-	<p><strong>netinst CD image (generally 150-280 MB)</strong></p>
-		<netinst-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>Blu-ray  (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
-<full-bluray-jigdo />
-</div>
-
-<div class="item col50 lastcol">
-<p><strong>other images (netboot, flexible usb stick, etc.)</strong></p>
-<other-images />
-</div>
-</div>
-
-<div id="firmware_nonfree" class="warning">
-<p>
-If any of the hardware in your system <strong>requires non-free firmware to be
-loaded</strong> with the device driver, you can use one of the
-<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stretch/current/">\
-tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
-and general information about loading firmware during an installation can
-be found in the Installation Guide (see Documentation below).
-</p>
-<div class="line">
-<div class="item col50">
-<p><strong>netinst (generally 240-290 MB) <strong>non-free</strong>
-CD images <strong>with firmware</strong></strong></p>
-<small-non-free-cd-images />
-</div>
-</div>
-</div>
-
-
-
-<p>
-<strong>Notes</strong>
-</p>
-<ul>
-    <li>
-	For downloading full CD and DVD images the use of BitTorrent or jigdo
-	is recommended.
-    </li><li>
-	For the less common architectures only a limited number of images
-	from the CD and DVD sets is available as ISO file or via BitTorrent.
-	The full sets are only available via jigdo.
-    </li><li>
-	The multi-arch <em>CD</em> images support i386/amd64; the installation is similar to installing
-	from a single architecture netinst image.
-    </li><li>
-	The multi-arch <em>DVD</em> image supports i386/amd64; 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">Stretch 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 <current_release_stretch>. 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>
-
-## Translators: copy/paste from devel/debian-installer/errata
-<h3 id="errata-r0">Errata for release 9.0</h3>
-
-<dl class="gloss">
-
-<!--
-     <dt>Desktop installations may not work using CD#1 alone</dt>
-
-     <dd>Due to space constraints on the first CD, not all of the
-     expected GNOME desktop packages fit on CD#1. For a successful
-     installation, use extra package sources (e.g. a second CD or a
-     network mirror) or use a DVD instead.
-
-     <br /> <b>Status:</b> It is unlikely more efforts can be made to
-     fit more packages on CD#1. </dd>
--->
-
-     <dt>pkgsel did not install updates with ABI changes (by default)</dt>
-
-     <dd>Bug <a href="https://bugs.debian.org/908711">#908711</a>:
-     during installation with network sources enabled, the
-     installed security updates don't include updates that depend on a new
-     binary package, due to a kernel or library ABI change.
-
-     <br /> <b>Status:</b> This has been fixed in 9.6</dd>
-
-     <dt>APT was vulnerable to a man-in-the-middle attack</dt>
-
-     <dd>A bug in the APT HTTP transport method
-     (<a href="https://www.debian.org/security/2019/dsa-4371">CVE-2019-3462</a>)
-     could be exploited by an attacker located as a man-in-the-middle between APT
-     and a mirror to cause the installation of additional, malicious, packages.
-
-     <br /> This can be mitigated by disabling use of the network during
-     initial installation and then upgrading following the instructions in
-     <a href="$(HOME)/security/2019/dsa-4371">DSA-4371</a>.
-
-     <br /> <b>Status:</b> This has been fixed in 9.7</dd>
-
-</dl>
-
-<if-stable-release release="stretch">
-<p>
-Improved versions of the installation system are being developed
-for the next Debian release, and can also be used to install stretch.
-For details, see 
-<a href="$(HOME)/devel/debian-installer/">the Debian-Installer project
-page</a>.
-</p>
-</if-stable-release>
diff --git a/english/releases/stretch/errata.wml b/english/releases/stretch/errata.wml
index 1de1aa7a54c..69c77d76c95 100644
--- a/english/releases/stretch/errata.wml
+++ b/english/releases/stretch/errata.wml
@@ -94,5 +94,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/stretch/index.wml b/english/releases/stretch/index.wml
index 441ac81c48a..e42bec57ba0 100644
--- a/english/releases/stretch/index.wml
+++ b/english/releases/stretch/index.wml
@@ -1,7 +1,5 @@
 #use wml::debian::template title="Debian &ldquo;stretch&rdquo; Release Information"
 #include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/stretch/release.data"
-#include "$(ENGLISHDIR)/releases/arches.data"
 
 <p>Debian <current_release_stretch> was
 released <a href="$(HOME)/News/<current_release_newsurl_stretch/>"><current_release_date_stretch></a>.
@@ -26,8 +24,8 @@ href="https://wiki.debian.org/LTS">LTS section of the Debian Wiki</a>.
 </strong></p>
 
 <p>To obtain and install Debian, see
-the <a href="debian-installer/">installation information</a> page and the
-<a href="installmanual">Installation Guide</a>. To upgrade from an older
+the 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>
 
@@ -36,82 +34,29 @@ Debian release, see the instructions in the
 <p>Architectures supported during Long Term Support:</p>
 
 <ul>
-<:
-foreach $arch (@archeslts) {
-	print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
-}
-:>
+<li><a href="../../ports/amd64/">64-bit PC (amd64)</a>
+<li><a href="../../ports/i386/">32-bit PC (i386)</a>
+<li><a href="../../ports/armel/">EABI ARM (armel)</a>
+<li><a href="../../ports/armhf/">Hard Float ABI ARM (armhf)</a>
+<li><a href="../../ports/arm64/">64-bit ARM (AArch64)</a>
 </ul>
 
 <p>Computer architectures supported at initial release of stretch:</p>
-
 <ul>
-<:
-foreach $arch (@arches) {
-	print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
-}
-:>
+<li><a href="../../ports/amd64/">64-bit PC (amd64)</a>
+<li><a href="../../ports/i386/">32-bit PC (i386)</a>
+<li><a href="../../ports/armel/">EABI ARM (armel)</a>
+<li><a href="../../ports/armhf/">Hard Float ABI ARM (armhf)</a>
+<li><a href="../../ports/mipsel/">MIPS (little endian)</a>
+<li><a href="../../ports/mips/">MIPS (big endian)</a>
+<li><a href="../../ports/s390x/">IBM System z</a>
+<li><a href="../../ports/arm64/">64-bit ARM (AArch64)</a>
+<li><a href="../../ports/ppc64el/">POWER Processors</a>
+<li><a href="../../ports/mips64el/">64-bit MIPS (little endian)</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>
-
-<if-stable-release release="wheezy">
-<p>No information available yet.</p>
-</if-stable-release>
-
-<if-stable-release release="jessie">
-
-<p>The code name for the next major Debian release after <a
-href="../jessie/">jessie</a> is <q>stretch</q>.</p>
-
-<p>This release started as a copy of jessie, and is currently in a state
-called <q><a href="$(DOC)/manuals/debian-faq/ftparchives#testing">testing</a></q>.
-This means that things should not break as badly as in unstable or
-experimental distributions, because packages are allowed to enter this
-distribution only after a certain period of time has passed, and when they
-don't have any release-critical bugs filed against them.</p>
-
-<p>Please note that security updates for <q>testing</q> distribution are
-<strong>not</strong> yet managed by the security team. Hence, <q>testing</q> does
-<strong>not</strong> get security updates in a timely manner.
-# For more information please see the
-# <a href="https://lists.debian.org/debian-testing-security-announce/2008/12/msg00019.html">announcement</a>
-# of the Testing Security Team.
-You are encouraged to switch your
-sources.list entries from testing to jessie for the time being if you
-need security support. See also the entry in the
-<a href="$(HOME)/security/faq#testing">Security Team's FAQ</a> for
-the <q>testing</q> distribution.</p>
-
-<p>There may be a <a href="releasenotes">draft of the release notes available</a>.
-Please also <a href="https://bugs.debian.org/release-notes">check the
-proposed additions to the release notes</a>.</p>
-
-<p>For installation images and documentation about how to install <q>testing</q>,
-see <a href="$(HOME)/devel/debian-installer/">the Debian-Installer page</a>.</p>
-
-<p>To find out more about how the <q>testing</q> distribution works, check
-<a href="$(HOME)/devel/testing">the developers' information about it</a>.</p>
-
-<p>People often ask if there is a single release <q>progress meter</q>.
-Unfortunately there isn't one, but we can refer you to several places
-that describe things needed to be dealt with for the release to happen:</p>
-
-<ul>
-  <li><a href="https://release.debian.org/">Generic release status page</a></li>
-  <li><a href="https://bugs.debian.org/release-critical/">Release-critical bugs</a></li>
-  <li><a href="https://udd.debian.org/bugs.cgi?base=only&amp;rc=1">Base system bugs</a></li>
-  <li><a href="https://udd.debian.org/bugs.cgi?standard=only&amp;rc=1">Bugs in standard and task packages</a></li>
-</ul>
-
-<p>In addition, general status reports are posted by the release manager
-to the <a href="https://lists.debian.org/debian-devel-announce/">\
-debian-devel-announce mailing list</a>.</p>
-
-</if-stable-release>
+report other issues to us.</p>
diff --git a/english/releases/stretch/installmanual.wml b/english/releases/stretch/installmanual.wml
deleted file mode 100644
index f871a692bd8..00000000000
--- a/english/releases/stretch/installmanual.wml
+++ /dev/null
@@ -1,44 +0,0 @@
-#use wml::debian::template title="Debian stretch -- Installation Guide" BARETITLE=true
-#use wml::debian::release
-#include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/arches.data"
-#include "$(ENGLISHDIR)/releases/stretch/release.data"
-
-<if-stable-release release="jessie">
-<p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-9, codename stretch, which isn't released yet. The information
-presented here might be outdated and/or incorrect because of changes to
-the installer. You might be interested in the
-<a href="../jessie/installmanual">Installation Guide for Debian
-8, codename jessie</a>, which is the latest released version of
-Debian; or in the <a href="https://d-i.debian.org/manual/">Development
-version of the Installation Guide</a>, which is the most up-to-date version
-of this document.</p>
-</if-stable-release>
-
-<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/stretch/release.data b/english/releases/stretch/release.data
deleted file mode 100644
index 1def2061f11..00000000000
--- a/english/releases/stretch/release.data
+++ /dev/null
@@ -1,211 +0,0 @@
-<perl>
-
-# list of architectures, which are supported at initial release,
-# ordered by Popularity Contest on 2014-04-26.
-@arches = (
-	amd64,
-	i386,
-	armel,
-#	powerpc,
-	armhf,
-#	sparc,
-#	'kfreebsd-amd64',
-	mipsel,
-#	'kfreebsd-i386',
-#	arm,
-#	ia64,
-#	'hurd-i386',
-#	hppa,
-#	s390,
-#	alpha,
-#	sh4,
-#	m68k,
-#	sh4,
-	mips,
-	s390x,
-	arm64,
-	ppc64el,
-#	ppc64,
-	mips64el,
-);
-
-# list of architectures supported during LTS period,
-# ordered by Popularity Contest on 2014-04-26.
-@archeslts = (
-	amd64,
-	i386,
-	armel,
-#	powerpc,
-	armhf,
-#	sparc,
-#	'kfreebsd-amd64',
-#	mipsel,
-#	'kfreebsd-i386',
-#	arm,
-#	ia64,
-#	'hurd-i386',
-#	hppa,
-#	s390,
-#	alpha,
-#	sh4,
-#	m68k,
-#	sh4,
-#	mips,
-#	s390x,
-	arm64,
-#	ppc64el,
-#	ppc64,
-#	mips64el,
-);
-
-# list of languages install manual is translated to
-%langsinstall = (
-	english => "en",
-	catalan => "ca",
-	czech => "cs",
-	danish => "da",
-	german => "de",
-	greek => "el",
-	spanish => "es",
-#	basque => "eu,
-#	finnish => "fi",
-	french => "fr",
-#	hungarian => "hu",
-	italian => "it",
-	japanese => "ja",
-	korean => "ko",
-	dutch => "nl",
-#	norwegian_nynorsk => "nn",
-	portuguese => "pt",
-#	portuguese_br => "pt-br",
-#	romanian => "ro",
-	russian => "ru",
-	swedish => "sv",
-#	tagalog => "tl",
-	vietnamese => "vi",
-	chinese_cn => "zh-cn",
-#	chinese => "zh-tw",
-);
-
-# list of languages release notes are translated to
-%langsrelnotes = (
-	english => "en",
-	belarusian => "be",
-#	catalan => "ca",
-	czech => "cs",
-	danish => "da",
-	german => "de",
-	spanish => "es",
-#	finnish => "fi",
-	french => "fr",
-	italian => "it",
-	japanese => "ja",
-	lithuanian => "lt",
-	malayalam => "ml",
-	norwegian_bokmal => "nb",
-	dutch => "nl",
-	polish => "pl", 
-	portuguese => "pt",
-	portuguese_br => "pt-br",
-	romanian => "ro",
-	russian => "ru",
-	slovak => "sk",
-	swedish => "sv",
-	vietnamese => "vi",
-#	chinese_cn => "zh-cn",
-#	chinese => "zh-tw",
-);
-
-</perl>
-
-#### While stretch is stable, we can reuse the tags defined in
-#### template/debian/release_images.wml.
-#### When the website gets prepared for the next stable release,
-#### the tags should be defined here instead (see previous releases
-#### for examples).
-#### Note that images for the new oldstable release will be moved to
-#### cdimage/archive at the time of the release!
-#
-### Next line should be changed to 'wml::debian::installer' when
-### preparing for next stable release; don't forget the Makefile!
-#
-### Hint: the first line of three here need to be used during 'full security support' time,
-### while line2+3 are needed, when during LTS period there are different point-release
-### version numbers for lts archs and non-lts archs (for example, that's the case for Jessie). 
-### Don't forget to define the archs in template/debian/installer.wml for that.
-#use wml::debian::installer
-<define-tag stretch-images-url>https://cdimage.debian.org/cdimage/archive/9.13.0</define-tag>
-#<define-tag stretch-lts-images-url>https://cdimage.debian.org/cdimage/archive/9.13.1</define-tag>
-#<define-tag stretch-nonlts-images-url>https://cdimage.debian.org/cdimage/archive/9.13.0</define-tag>
-<define-tag stretch-cd-release-filename>9.13.0</define-tag>
-#<define-tag stretch-lts-cd-release-filename>9.13.1</define-tag>
-#<define-tag stretch-nonlts-cd-release-filename>9.13.0</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag netinst-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/debian-<stretch-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<stretch-images-arches />" "source" />" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/iso-cd/debian-<stretch-lts-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<stretch-lts-images-arches />" "source" />" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/iso-cd/debian-<stretch-nonlts-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<stretch-nonlts-images-arches />" "source" />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-cd-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/" arch="<strip-arches "<stretch-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/iso-cd/" arch="<strip-arches "<stretch-lts-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/iso-cd/" arch="<strip-arches "<stretch-nonlts-images-arches />" "source" />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-cd-torrent>
-<images-list url="<stretch-images-url/>/@ARCH@/bt-cd/" arch="<strip-arches "<stretch-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/bt-cd/" arch="<strip-arches "<stretch-lts-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/bt-cd/" arch="<strip-arches "<stretch-nonlts-images-arches />" "source" />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-cd-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-cd/" arch="<strip-arches "<stretch-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/jigdo-cd/" arch="<strip-arches "<stretch-lts-images-arches />" "source" /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/jigdo-cd/" arch="<strip-arches "<stretch-nonlts-images-arches />" "source" />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-dvd-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-dvd/" arch="<stretch-images-arches />" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/iso-dvd/" arch="<stretch-lts-images-arches /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/iso-dvd/" arch="<stretch-nonlts-images-arches />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-dvd-torrent>
-<images-list url="<stretch-images-url/>/@ARCH@/bt-dvd/" arch="<stretch-images-arches />" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/bt-dvd/" arch="<stretch-lts-images-arches /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/bt-dvd/" arch="<stretch-nonlts-images-arches />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2+3 during LTS period; see above.
-<define-tag full-dvd-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-dvd/" arch="<stretch-images-arches />" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/jigdo-dvd/" arch="<stretch-lts-images-arches /> multi-arch" />
-#<images-list url="<stretch-nonlts-images-url/>/@ARCH@/jigdo-dvd/" arch="<stretch-nonlts-images-arches />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2 during LTS period; see above.
-<define-tag full-bluray-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" />
-#<images-list url="<stretch-lts-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" />
-</define-tag>
-
-<define-tag otherimages-url>http://ftp.debian.org/debian/dists/stretch/main/installer-@ARCH@/current/images/</define-tag>
-
-# Use the first line during full security support time, and line 2 during LTS period; see above.
-<define-tag other-images>
-<images-list url="<otherimages-url/>" arch="<strip-arches "<stretch-images-arches />" "source" />" />
-#<images-list url="<otherimages-url/>" arch="<strip-arches "<stretch-lts-images-arches />" "source" />" />
-</define-tag>
-
-# Use the first line during full security support time, and line 2 during LTS period; see above.
-<define-tag small-non-free-cd-images>
-<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<stretch-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<stretch-cd-release-filename/>-@ARCH@-netinst.iso" arch="amd64 i386" />
-#<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<stretch-lts-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<stretch-lts-cd-release-filename/>-@ARCH@-netinst.iso" arch="amd64 i386" />
-</define-tag>
diff --git a/english/releases/stretch/releasenotes.wml b/english/releases/stretch/releasenotes.wml
index b34a2dc61ea..e24b6616b40 100644
--- a/english/releases/stretch/releasenotes.wml
+++ b/english/releases/stretch/releasenotes.wml
@@ -1,8 +1,6 @@
 #use wml::debian::template title="Debian 9 -- Release Notes" BARETITLE=true
 #use wml::debian::release
 #include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/arches.data"
-#include "$(ENGLISHDIR)/releases/stretch/release.data"
 
 <if-stable-release release="jessie">
 <p>This is a <strong>work-in-progress version</strong> of the Release Notes
@@ -15,27 +13,17 @@ likely incomplete.</p>
 architecture:</p>
 
 <ul>
-<:= &permute_as_list('release-notes/', 'Release Notes'); :>
+<li> <a href="amd64/release-notes.en.txt">Release Notes for 64-bit PC (amd64)</a>
+<li> <a href="i386/release-notes.en.txt">Release Notes for 32-bit PC (i386)</a>
+<li> <a href="armel/release-notes.en.txt">Release Notes for EABI ARM (armel)</a>
+<li> <a href="armhf/release-notes.en.txt">Release Notes for Hard Float ABI ARM (armhf)</a>
+<li> <a href="mipsel/release-notes.en.txt">Release Notes for MIPS (little endian)</a>
+<li> <a href="mips/release-notes.en.txt">Release Notes for MIPS (big endian)</a>
+<li> <a href="s390x/release-notes.en.txt">Release Notes for IBM System z</a>
+<li> <a href="arm64/release-notes.en.txt">Release Notes for 64-bit ARM (AArch64)</a>
+<li> <a href="ppc64el/release-notes.en.txt">Release Notes for POWER Processors</a>
+<li> <a href="mips64el/release-notes.en.txt">Release Notes for 64-bit MIPS (little endian)</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 &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 => 'release-notes', langs => \%langsrelnotes,
-                           formats => \%formats, arches => \@arches,
-                           html_file => 'release-notes/index' ); :>
-</table>
-</div>
diff --git a/english/releases/stretch/reportingbugs.wml b/english/releases/stretch/reportingbugs.wml
deleted file mode 100644
index bd4800f9335..00000000000
--- a/english/releases/stretch/reportingbugs.wml
+++ /dev/null
@@ -1,49 +0,0 @@
-#use wml::debian::template title="Debian 9 -- Reporting Problems" BARETITLE=true
-
-# Translators: copy of jessie/reportingbug
-
-<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>
-
-<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>