Bug#960835: Debian Jessie site lists only 4 archs as supported

diff --git a/english/releases/jessie/index.wml b/english/releases/jessie/index.wml
index 5551b2b678b..1f933c69f5f 100644
--- a/english/releases/jessie/index.wml
+++ b/english/releases/jessie/index.wml
@@ -18,8 +18,9 @@ the <a href="releasenotes">Release Notes</a>.</p>
 Regular security support updates have been discontinued as of <:=spokendate('2018-06-17'):>.
 </strong></p>
 
-<p><strong>Jessie also benefits from Long Term Support (LTS) until
+<p><strong>However, Jessie benefits from Long Term Support (LTS) until
 the end of June 2020. The LTS is limited to i386, amd64, armel and armhf.
+All other architectures listed below are no longer supported in Jessie.
 For more information, please refer to the <a
 href="https://wiki.debian.org/LTS">LTS section of the Debian Wiki</a>.
 </strong></p>
@@ -30,7 +31,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>
+<p>Since Jessie is now under LTS support, only
+the following computer architectures are supported in Jessie:</p>
+
+<ul>
+<:
+foreach $arch (@archeslts) {
+	print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
+}
+:>
+</ul>
+
+<p>When initially releasing Jessie, it was supported by this architectures:</p>
 
 <ul>
 <:
diff --git a/english/releases/jessie/release.data b/english/releases/jessie/release.data
index e057f1960f6..38304967a0b 100644
--- a/english/releases/jessie/release.data
+++ b/english/releases/jessie/release.data
@@ -1,10 +1,39 @@
 <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,
 	armel,
+	powerpc,
+	armhf,
+#	sparc,
+#	'kfreebsd-amd64',
+	mipsel,
+#	'kfreebsd-i386',
+#	arm,
+#	ia64,
+#	'hurd-i386',
+#	hppa,
+#	s390,
+#	alpha,
+#	sh4,
+#	m68k,
+#	sh4,
+	mips,
+	s390x,
+	arm64,
+	ppc64el,
+#	ppc64,
+);
+
+# list of architectures supported during LTS period,
+# ordered by Popularity Contest on 2014-04-26.
+@archeslts = (
+	amd64,
+	i386,
+	armel,
 #	powerpc,
 	armhf,
 #	sparc,
@@ -97,52 +126,87 @@
 #
 ### 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 need to be used during 'full security support' time,
+### while line2+3 are needed when in LTS period.
 #use wml::debian::installer
-<define-tag jessie-images-url>https://cdimage.debian.org/cdimage/archive/8.11.1</define-tag>
-<define-tag jessie-cd-release-filename>8.11.1</define-tag>
-
+<define-tag jessie-images-url>https://cdimage.debian.org/cdimage/archive/8.10</define-tag>
+<define-tag jessie-lts-images-url>https://cdimage.debian.org/cdimage/archive/8.11.1</define-tag>
+<define-tag jessie-nonlts-images-url>https://cdimage.debian.org/cdimage/archive/8.11.0</define-tag>
+<define-tag jessie-cd-release-filename>8.10</define-tag>
+<define-tag jessie-lts-cd-release-filename>8.11.1</define-tag>
+<define-tag jessie-nonlts-cd-release-filename>8.11.0</define-tag>
+
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag netinst-images>
-<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-images-arches />" "source" />" />
+#<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-images-arches />" "source" />" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/debian-<jessie-lts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-lts-images-arches />" "source" />" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/iso-cd/debian-<jessie-nonlts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag businesscard-images>
-<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-images-arches />" "source" />" />
+#<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-images-arches />" "source" />" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/debian-<jessie-lts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-lts-images-arches />" "source" />" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/iso-cd/debian-<jessie-nonlts-cd-release-filename/>-@[email protected]" arch="<strip-arches "<jessie-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-cd-images>
-<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/" arch="<strip-arches "<jessie-lts-images-arches />" "source" /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/iso-cd/" arch="<strip-arches "<jessie-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-cd-torrent>
-<images-list url="<jessie-images-url/>/@ARCH@/bt-cd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/bt-cd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/bt-cd/" arch="<strip-arches "<jessie-lts-images-arches />" "source" /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/bt-cd/" arch="<strip-arches "<jessie-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-cd-jigdo>
-<images-list url="<jessie-images-url/>/@ARCH@/jigdo-cd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/jigdo-cd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-cd/" arch="<strip-arches "<jessie-lts-images-arches />" "source" /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/jigdo-cd/" arch="<strip-arches "<jessie-nonlts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-dvd-images>
-<images-list url="<jessie-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-lts-images-arches /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-nonlts-images-arches />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-dvd-torrent>
-<images-list url="<jessie-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-lts-images-arches /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-nonlts-images-arches />" />
 </define-tag>
 
+# Use the first line during full security support, and line 2+3 when in LTS period
 <define-tag full-dvd-jigdo>
-<images-list url="<jessie-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-images-arches /> multi-arch" />
+#<images-list url="<jessie-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-images-arches /> multi-arch" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-dvd/" arch="<strip-arches "<jessie-lts-images-arches />" "source" /> multi-arch" />
+<images-list url="<jessie-nonlts-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-images-arches />" />
 </define-tag>
 
+# Use the first line during full security support, and the second when in LTS period
 <define-tag full-bluray-jigdo>
-<images-list url="<jessie-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" />
+<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" />
 </define-tag>
 
 <define-tag otherimages-url>http://ftp.debian.org/debian/dists/jessie/main/installer-@ARCH@/current/images/</define-tag>
 
+# Use the first line during full security support, and the second when in LTS period
 <define-tag other-images>
-<images-list url="<otherimages-url/>" arch="<strip-arches "<stable-images-arches />" "source" />" />
+#<images-list url="<otherimages-url/>" arch="<strip-arches "<jessie-images-arches />" "source" />" />
+<images-list url="<otherimages-url/>" arch="<strip-arches "<jessie-lts-images-arches />" "source" />" />
 </define-tag>
 
+# Use the first line during full security support, and the second when in LTS period
 <define-tag small-non-free-cd-images>
-<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<jessie-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<jessie-cd-release-filename/>-@[email protected]" arch="amd64 i386" />
+#<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<jessie-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<jessie-cd-release-filename/>-@[email protected]" arch="amd64 i386" />
+<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<jessie-lts-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<jessie-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 9fb2074a574..e043a097f7e 100644
--- a/english/template/debian/installer.wml
+++ b/english/template/debian/installer.wml
@@ -8,6 +8,8 @@
 <define-tag squeeze-images-arches>amd64\narmel\nkfreebsd-i386\nkfreebsd-amd64\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag>
 <define-tag wheezy-images-arches>amd64\narmel\narmhf\ni386\nia64\nkfreebsd-i386\nkfreebsd-amd64\nmips\nmipsel\npowerpc\nsparc\ns390\ns390x\nsource</define-tag>
 <define-tag jessie-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag>
+<define-tag jessie-lts-images-arches>amd64\narmel\narmhf\ni386\nsource</define-tag>
+<define-tag jessie-nonlts-images-arches>arm64\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag>
 <define-tag stretch-images-arches>amd64\narm64\narmel\narmhf\ni386\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>