From 273b162d403dc2cdfef7426907f4b4c0f38a15ac Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 14 Feb 2022 18:32:28 +0000
Subject: [PATCH 1/2] Note when unstable MSC3283 prefixes will be removed

---
 docs/upgrade.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/upgrade.md b/docs/upgrade.md
index a5da0076c656..477d7d0e81c8 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -129,7 +129,7 @@ The old `capabilities`
 - `org.matrix.msc3283.set_avatar_url` and
 - `org.matrix.msc3283.3pid_changes`
 
-are deprecated and scheduled to be removed in Synapse v1.(next+1).0.
+are deprecated and scheduled to be removed in Synapse v1.54.0.
 
 The new `capabilities`
 - `m.set_displayname`,

From a69bc7904ab98b90e67f6bb91531e380883e7853 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 14 Feb 2022 18:37:46 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/11989.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/11989.feature

diff --git a/changelog.d/11989.feature b/changelog.d/11989.feature
new file mode 100644
index 000000000000..5975281a168e
--- /dev/null
+++ b/changelog.d/11989.feature
@@ -0,0 +1 @@
+Support the stable API endpoint for [MSC3283](https://github.com/matrix-org/matrix-doc/pull/3283): new settings in `/capabilities` endpoint.
\ No newline at end of file