diff --git a/changelogs/client_server/newsfragments/1421.clarification b/changelogs/client_server/newsfragments/1421.clarification
new file mode 100644
index 000000000..07b86e2f3
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1421.clarification
@@ -0,0 +1 @@
+Correct the order of the default override pushrules in the spec.
diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index 74da879fa..0a104bc15 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -524,29 +524,27 @@ Definition:
}
```
-**`.m.rule.tombstone`**
+**`.m.rule.roomnotif`**
-Matches any state event whose type is `m.room.tombstone`. This is
-intended to notify users of a room when it is upgraded, similar to what
-an `@room` notification would accomplish.
+Matches any message whose content is unencrypted and contains the text
+`@room`, signifying the whole room should be notified of the event.
Definition:
```json
{
- "rule_id": ".m.rule.tombstone",
+ "rule_id": ".m.rule.roomnotif",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
- "key": "type",
- "pattern": "m.room.tombstone"
+ "key": "content.body",
+ "pattern": "@room"
},
{
- "kind": "event_match",
- "key": "state_key",
- "pattern": ""
+ "kind": "sender_notification_permission",
+ "key": "room"
}
],
"actions": [
@@ -558,24 +556,24 @@ Definition:
}
```
-**`.m.rule.room.server_acl`**
-
-{{% added-in v="1.4" %}}
+**`.m.rule.tombstone`**
-Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.
+Matches any state event whose type is `m.room.tombstone`. This is
+intended to notify users of a room when it is upgraded, similar to what
+an `@room` notification would accomplish.
Definition:
```json
{
- "rule_id": ".m.rule.room.server_acl",
+ "rule_id": ".m.rule.tombstone",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
"key": "type",
- "pattern": "m.room.server_acl"
+ "pattern": "m.room.tombstone"
},
{
"kind": "event_match",
@@ -583,39 +581,41 @@ Definition:
"pattern": ""
}
],
- "actions": []
+ "actions": [
+ "notify",
+ {
+ "set_tweak": "highlight"
+ }
+ ]
}
```
-**`.m.rule.roomnotif`**
+**`.m.rule.room.server_acl`**
-Matches any message whose content is unencrypted and contains the text
-`@room`, signifying the whole room should be notified of the event.
+{{% added-in v="1.4" %}}
+
+Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.
Definition:
```json
{
- "rule_id": ".m.rule.roomnotif",
+ "rule_id": ".m.rule.room.server_acl",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
- "key": "content.body",
- "pattern": "@room"
+ "key": "type",
+ "pattern": "m.room.server_acl"
},
{
- "kind": "sender_notification_permission",
- "key": "room"
+ "kind": "event_match",
+ "key": "state_key",
+ "pattern": ""
}
],
- "actions": [
- "notify",
- {
- "set_tweak": "highlight"
- }
- ]
+ "actions": []
}
```