From 4932f9b605180e833e155e778071dab97808e5f1 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 15 Aug 2023 07:36:14 -0400
Subject: [PATCH 1/3] Document .m.rule.suppress_edits push rule (MSC3958).

---
 .../client_server/newsfragments/1617.feature  |  1 +
 content/client-server-api/modules/push.md     | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 changelogs/client_server/newsfragments/1617.feature

diff --git a/changelogs/client_server/newsfragments/1617.feature b/changelogs/client_server/newsfragments/1617.feature
new file mode 100644
index 000000000..78f112e09
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1617.feature
@@ -0,0 +1 @@
+Add the `m.rule.suppress_edits` default push rule from [MSC3958](https://github.com/matrix-org/matrix-spec-proposals/pull/3958).
diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index d1855f589..f3856a436 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -750,6 +750,30 @@ Definition:
 }
 ```
 
+**`.m.rule.suppress_edits`**
+
+{{% added-in v="1.8" %}}
+
+Suppresses notifications from events related to [event replacement](#event-replacements).
+
+Definition:
+
+```json
+{
+    "rule_id": ".m.rule.suppress_edits",
+    "default": true,
+    "enabled": true,
+    "conditions": [
+        {
+            "kind": "event_property_is",
+            "key": "content.m\\.relates_to.rel_type",
+            "value": "m.replace"
+        }
+    ],
+    "actions": []
+}
+```
+
 ##### Default Content Rules
 
 <a id="_m_rule_contains_user_name"/> **`.m.rule.contains_user_name`**

From 0d5f97a7a80731afe6b87cabbdf096cd84eaad28 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Tue, 15 Aug 2023 07:37:55 -0400
Subject: [PATCH 2/3] Less "events".

---
 content/client-server-api/modules/push.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index f3856a436..c3bb7c9bd 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -754,7 +754,7 @@ Definition:
 
 {{% added-in v="1.8" %}}
 
-Suppresses notifications from events related to [event replacement](#event-replacements).
+Suppresses notifications related to [event replacements](#event-replacements).
 
 Definition:
 

From b99a0cae10e77e7c7eabcfc2b7e11dc568538c5f Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:18:28 -0400
Subject: [PATCH 3/3] Bump added-in version.

---
 content/client-server-api/modules/push.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index c3bb7c9bd..23222ada1 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -752,7 +752,7 @@ Definition:
 
 **`.m.rule.suppress_edits`**
 
-{{% added-in v="1.8" %}}
+{{% added-in v="1.9" %}}
 
 Suppresses notifications related to [event replacements](#event-replacements).