summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--INSTALL.md11
-rw-r--r--changelog.d/7801.doc1
2 files changed, 12 insertions, 0 deletions
diff --git a/INSTALL.md b/INSTALL.md
index ef80a26c3f..38af275fc2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -259,6 +259,17 @@ Synapse via https://packages.matrix.org/debian/. They are available for Debian
 
 ```
 sudo apt install -y lsb-release wget apt-transport-https
+```
+
+for Debian/Ubuntu versions shipping `apt` < 1.6 (Debian < 10 / Ubuntu < 18.04), or
+
+```
+sudo apt install -y lsb-release wget
+```
+
+for Debian 10 / Ubuntu 18.04 and newer, followed by
+
+```
 sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg
 echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" |
     sudo tee /etc/apt/sources.list.d/matrix-org.list
diff --git a/changelog.d/7801.doc b/changelog.d/7801.doc
new file mode 100644
index 0000000000..9e5cebf3ef
--- /dev/null
+++ b/changelog.d/7801.doc
@@ -0,0 +1 @@
+Change the installation documentation regarding the `apt-transport-https` package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer.