From f76194a02192d3c7ab0c821e56b403fbadf9c83d Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 12 Oct 2020 15:50:27 +0100
Subject: [PATCH 1/3] 1.21.0

---
 CHANGES.md          | 6 ++++++
 debian/changelog    | 6 ++++++
 synapse/__init__.py | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index dfdd8aa68a..f948869501 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.21.0 (2020-10-12)
+===========================
+
+No significant changes since v1.21.0rc3.
+
+
 Synapse 1.21.0rc3 (2020-10-08)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 264ef9ce7c..a08782f587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.21.0) stable; urgency=medium
+
+  * New synapse release 1.21.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 12 Oct 2020 15:47:44 +0100
+
 matrix-synapse-py3 (1.20.1) stable; urgency=medium
 
   * New synapse release 1.20.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a86dc07ddc..57f818125a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.21.0rc3"
+__version__ = "1.21.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when

From 4aa027ea70a4cf237a39c6bff48c225f73dcb0e8 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 12 Oct 2020 16:07:08 +0100
Subject: [PATCH 2/3] Add deprecation warning for admin api under client api
 prefixes

---
 CHANGES.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f948869501..fe496a8534 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,14 @@ Synapse 1.21.0 (2020-10-12)
 
 No significant changes since v1.21.0rc3.
 
+As [noted in
+v1.20.0](https://github.com/matrix-org/synapse/blob/release-v1.21.0/CHANGES.md#synapse-1200-2020-09-22),
+a future release will drop support for accessing Synapse's
+[Admin API](https://github.com/matrix-org/synapse/tree/master/docs/admin_api) under the
+`/_matrix/client/*` endpoint prefixes. Please update your
+[reverse proxy configuration](https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.md)
+accordingly.
+
 
 Synapse 1.21.0rc3 (2020-10-08)
 ==============================

From cd0f65d2c71ce8f6cadfa84a6eb6b882d97e36c0 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 12 Oct 2020 16:16:35 +0100
Subject: [PATCH 3/3] Reverse proxies are not the only thing to change;be
 explicit w/ new endpoint

---
 CHANGES.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fe496a8534..dec2630130 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,9 +7,8 @@ As [noted in
 v1.20.0](https://github.com/matrix-org/synapse/blob/release-v1.21.0/CHANGES.md#synapse-1200-2020-09-22),
 a future release will drop support for accessing Synapse's
 [Admin API](https://github.com/matrix-org/synapse/tree/master/docs/admin_api) under the
-`/_matrix/client/*` endpoint prefixes. Please update your
-[reverse proxy configuration](https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.md)
-accordingly.
+`/_matrix/client/*` endpoint prefixes. At that point, the Admin API will only
+be accessible under `/_synapse/admin`.
 
 
 Synapse 1.21.0rc3 (2020-10-08)
@@ -168,9 +167,11 @@ API](https://github.com/matrix-org/synapse/tree/master/docs) has been
 accessible under the `/_matrix/client/api/v1/admin`,
 `/_matrix/client/unstable/admin`, `/_matrix/client/r0/admin` and
 `/_synapse/admin` prefixes. In a future release, we will be dropping support
-for accessing Synapse's Admin API using the `/_matrix/client/*` prefixes. This
-makes it easier for homeserver admins to lock down external access to the Admin
-API endpoints.
+for accessing Synapse's Admin API using the `/_matrix/client/*` prefixes.
+
+From that point, the Admin API will only be accessible under `/_synapse/admin`.
+This makes it easier for homeserver admins to lock down external access to the
+Admin API endpoints.
 
 Synapse 1.20.0rc5 (2020-09-18)
 ==============================