From 55f2617f8ce798da4e8ca0fa351db60dc13ef355 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 22 Jul 2020 16:17:23 +0100
Subject: [PATCH] Update the dates for ACME v1 EOL

As per https://community.letsencrypt.org/t/end-of-life-plan-for-acmev1/88430
---
 changelog.d/7934.doc | 1 +
 docs/ACME.md         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/7934.doc

diff --git a/changelog.d/7934.doc b/changelog.d/7934.doc
new file mode 100644
index 0000000000..992d5358a7
--- /dev/null
+++ b/changelog.d/7934.doc
@@ -0,0 +1 @@
+Update the dates of ACME v1's end of life in [`ACME.md`](https://github.com/matrix-org/synapse/blob/master/docs/ACME.md).
diff --git a/docs/ACME.md b/docs/ACME.md
index f4c4740476..a7a498f575 100644
--- a/docs/ACME.md
+++ b/docs/ACME.md
@@ -12,13 +12,14 @@ introduced support for automatically provisioning certificates through
 In [March 2019](https://community.letsencrypt.org/t/end-of-life-plan-for-acmev1/88430),
 Let's Encrypt announced that they were deprecating version 1 of the ACME
 protocol, with the plan to disable the use of it for new accounts in
-November 2019, and for existing accounts in June 2020.
+November 2019, for new domains in June 2020, and for existing accounts and
+domains in June 2021.
 
 Synapse doesn't currently support version 2 of the ACME protocol, which
 means that:
 
 * for existing installs, Synapse's built-in ACME support will continue
-  to work until June 2020.
+  to work until June 2021.
 * for new installs, this feature will not work at all.
 
 Either way, it is recommended to move from Synapse's ACME support
-- 
GitLab