Bug#960835: Debian Jessie site lists only 4 archs as supported -- patch for stretch

diff --git a/english/releases/stretch/index.wml b/english/releases/stretch/index.wml
index 9a507e96378..b427f92ff02 100644
--- a/english/releases/stretch/index.wml
+++ b/english/releases/stretch/index.wml
@@ -15,16 +15,17 @@ the <a href="releasenotes">Release Notes</a>.</p>
 
 <p><strong>Debian 9 has been superseded by
 <a href="../buster/">Debian 10.0 (<q>buster</q>)</a>.
-# Security updates have been discontinued as of <:=spokendate('XXXXXXXXXXX'):>.
+Security updates have been discontinued as of <:=spokendate('2020-07-06'):>.
 </strong></p>
 
 # 
 # This paragraph is orientative, please review before publishing
-#<p><strong>Stretch also benefits from Long Term Support (LTS) until
-# the end of June 2020. The LTS is limited to i386, amd64, armel, armhf and arm64 (to review before start).
-# For more information, please refer to the <a
-# href="https://wiki.debian.org/LTS">LTS section of the Debian Wiki</a>.
-# </strong></p>
+<p><strong>However, Stretch benefits from Long Term Support (LTS) until
+the end of June 2022. The LTS is limited to i386, amd64, armel, armhf and arm64.
+All other architectures are no longer supported in Stretch.
+For more information, please refer to the <a
+href="https://wiki.debian.org/LTS">LTS section of the Debian Wiki</a>.
+</strong></p>
 
 
 <p>To obtain and install Debian, see
@@ -33,7 +34,18 @@ the <a href="debian-installer/">installation information</a> page and the
 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>
+# Activate the following when LTS period starts.
+<p>Architectures supported during LTS support:</p>
+
+<ul>
+<:
+foreach $arch (@archeslts) {
+	print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
+}
+:>
+</ul>
+
+<p>Computer architectures supported at initial release of Stretch:</p>
 
 <ul>
 <:
diff --git a/english/releases/stretch/release.data b/english/releases/stretch/release.data
index 4d1f55a11d7..f59fc9dee11 100644
--- a/english/releases/stretch/release.data
+++ b/english/releases/stretch/release.data
@@ -1,6 +1,7 @@
 <perl>
 
-# list of architectures, ordered by Popularity Contest on 2014-04-26.
+# list of architectures, which are supported at initial release,
+# ordered by Popularity Contest on 2014-04-26.
 @arches = (
 	amd64,
 	i386,
@@ -28,6 +29,35 @@
 	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",
@@ -89,7 +119,7 @@
 </perl>
 
 ### While stretch is stable, we can reuse the tags defined in
-#### templates/debian/release_images.wml.
+#### 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).
@@ -98,48 +128,82 @@
 #
 ### 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 LTS period starts. Don't forget to define the archs in
+### template/debian/installer.wml.
 #use wml::debian::installer
 <define-tag stretch-images-url>https://cdimage.debian.org/cdimage/archive/9.12.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.12.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, and line 2+3 when LTS period starts
 <define-tag netinst-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/debian-<stretch-cd-release-filename/>-@[email protected]" arch="<strip-arches "<stretch-images-arches />" "source" />" />
+#<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/debian-<stretch-cd-release-filename/>-@[email protected]" arch="<strip-arches "<stretch-images-arches />" "source" />" />
+<images-list url="<stretch-lts-images-url/>/@ARCH@/iso-cd/debian-<stretch-lts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<stretch-lts-images-arches />" "source" />" />
+<images-list url="<stretch-nonlts-images-url/>/@ARCH@/iso-cd/debian-<stretch-nonlts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<stretch-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when LTS period starts
 <define-tag full-cd-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/iso-cd/" arch="<stretch-images-arches /> 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, and line 2+3 when LTS period starts
 <define-tag full-cd-torrent>
-<images-list url="<stretch-images-url/>/@ARCH@/bt-cd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/bt-cd/" arch="<stretch-images-arches /> 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, and line 2+3 when LTS period starts
 <define-tag full-cd-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-cd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/jigdo-cd/" arch="<stretch-images-arches /> 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, and line 2+3 when LTS period starts
 <define-tag full-dvd-images>
-<images-list url="<stretch-images-url/>/@ARCH@/iso-dvd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/iso-dvd/" arch="<stretch-images-arches /> multi-arch" />
+<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, and line 2+3 when LTS period starts
 <define-tag full-dvd-torrent>
-<images-list url="<stretch-images-url/>/@ARCH@/bt-dvd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/bt-dvd/" arch="<stretch-images-arches /> multi-arch" />
+<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, and line 2+3 when LTS period starts
 <define-tag full-dvd-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-dvd/" arch="<stretch-images-arches /> multi-arch" />
+#<images-list url="<stretch-images-url/>/@ARCH@/jigdo-dvd/" arch="<stretch-images-arches /> multi-arch" />
+<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, and the second when LTS period starts
 <define-tag full-bluray-jigdo>
-<images-list url="<stretch-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" />
+#<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>
 
 <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, and the second when LTS period starts
 <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/>-@[email protected]" arch="amd64 i386" />
+#<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/>-@[email protected]" 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/>-@[email protected]" arch="amd64 i386" />
 </define-tag>
diff --git a/english/template/debian/installer.wml b/english/template/debian/installer.wml
index 2fe3664681f..f1f7a49ebcf 100644
--- a/english/template/debian/installer.wml
+++ b/english/template/debian/installer.wml
@@ -11,6 +11,8 @@
 <define-tag jessie-nonlts-images-arches>arm64\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag>
 <define-tag jessie-lts-images-arches>amd64\narmel\narmhf\ni386\nsource</define-tag>
 <define-tag stretch-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag>
+<define-tag stretch-lts-images-arches>amd64\narmel\narmhf\ni386\nsource</define-tag>
+<define-tag stretch-nonlts-images-arches>arm64\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag>
 <define-tag buster-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag>
 <define-tag bullseye-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag>