From 7fb8b1cb4fba3fa4e881714ce45d9a85063029b5 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 28 Sep 2022 09:32:04 -0400
Subject: [PATCH 1/2] Add upgrade notes for receipts replication.

---
 docs/upgrade.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/upgrade.md b/docs/upgrade.md
index a43233e7c2f7..c4db19e23da8 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -88,6 +88,18 @@ process, for example:
     dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
     ```
 
+# Upgrading to v1.69.0
+
+## Changes to the receipts replication streams
+
+Synapse now includes information indicating if a receipt applies to a thread when
+replicating it to other workers. This is a forwards- and backwards-incompatible
+change: v1.68 and workers cannot process receipts replicated by v1.69 workers, and
+vice versa.
+
+Once all workers are upgraded to v1.69 (or downgraded to v1.68), receipts
+replication will resume as normal.
+
 # Upgrading to v1.68.0
 
 Two changes announced in the upgrade notes for v1.67.0 have now landed in v1.68.0.

From bf6b4fa05a504f84765039aecfb0608f8ab98c7e Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 28 Sep 2022 09:33:14 -0400
Subject: [PATCH 2/2] Newsfragment

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

diff --git a/changelog.d/13932.feature b/changelog.d/13932.feature
new file mode 100644
index 000000000000..d0cb902dffd0
--- /dev/null
+++ b/changelog.d/13932.feature
@@ -0,0 +1 @@
+Experimental support for thread-specific receipts ([MSC3771](https://github.com/matrix-org/matrix-spec-proposals/pull/3771)).