From 212f150208b4d94d597653282b64ff02680e3a28 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Wed, 8 May 2024 12:49:32 +0100
Subject: [PATCH] Add note about MSC3886 being closed (#17151)

---
 changelog.d/17151.misc            | 1 +
 synapse/rest/client/rendezvous.py | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/17151.misc

diff --git a/changelog.d/17151.misc b/changelog.d/17151.misc
new file mode 100644
index 0000000000..7b23c1e18e
--- /dev/null
+++ b/changelog.d/17151.misc
@@ -0,0 +1 @@
+Add note to reflect that [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) is closed but will support will remain for some time.
diff --git a/synapse/rest/client/rendezvous.py b/synapse/rest/client/rendezvous.py
index 143f057651..27bf53314a 100644
--- a/synapse/rest/client/rendezvous.py
+++ b/synapse/rest/client/rendezvous.py
@@ -34,6 +34,9 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+# n.b [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) has now been closed.
+# However, we want to keep this implementation around for some time.
+# TODO: define an end-of-life date for this implementation.
 class MSC3886RendezvousServlet(RestServlet):
     """
     This is a placeholder implementation of [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886)
-- 
GitLab