From d4de73ec5b8b2fdbfa9ab092c9b804cf564efb08 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Mon, 16 Aug 2021 14:14:09 +0200
Subject: [PATCH] Update list of supported versions of Debian and Ubuntu

Per request from Christophe Berg

Discussion: https://postgr.es/m/CAFX21E+xUSZyJd_A6vVuqmnSLTgDf_4=cgTo9W+T8sdXP4j5ww@mail.gmail.com
---
 templates/pages/download/linux/debian.html |  3 +--
 templates/pages/download/linux/ubuntu.html | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html
index a2883423..0c61cb08 100644
--- a/templates/pages/download/linux/debian.html
+++ b/templates/pages/download/linux/debian.html
@@ -28,10 +28,9 @@ The PostgreSQL apt repository supports the currently supported stable
 versions of Debian:
 </p>
 <ul>
+  <li>Bullseye (11.x)</li>
   <li>Buster (10.x)</li>
   <li>Stretch (9.x)</li>
-  <li>Jessie (8.x)</li>
-  <li>Bullseye (11.x, testing)</li>
   <li>Sid (unstable)</li>
 </ul>
 <p>on the following architectures:</p>
diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html
index 2efd2ff1..5acf8f46 100644
--- a/templates/pages/download/linux/ubuntu.html
+++ b/templates/pages/download/linux/ubuntu.html
@@ -23,23 +23,24 @@ updates for all supported versions of PostgreSQL throughout the support
 <a href="/support/versioning/">lifetime</a> of PostgreSQL.
 </p>
 <p>
-The PostgreSQL Apt Repository supports the current LTS versions of Ubuntu:
+The PostgreSQL Apt Repository supports the current versions of Ubuntu:
+</p>
 <ul>
-  <li>20.04</li>
-  <li>18.04</li>
-  <li>16.04</li>
+  <li>impish (21.10)</li>
+  <li>hirsute (21.04)</li>
+  <li>focal (20.04)</li>
+  <li>bionic (18.04)</li>
 </ul>
+<p>
 on the following architectures:
+</p>
 <ul>
   <li>amd64</li>
-  <li>arm64 (18.04 and newer)</li>
+  <li>arm64 (18.04 and newer; LTS releases only)</li>
   <li>i386 (18.04 and older)</li>
-  <li>ppc64el</li>
+  <li>ppc64el (LTS releases only)</li>
 </ul>
 
-While not fully supported, the packages often work on other non-LTS versions as well,
-by using the closest LTS version available.
-</p>
 <p>
 To use the apt repository, follow these steps:
 </p>
-- 
2.39.5