From b65b0d049e21c426ff60b60ce93ecfec451182f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 15 Aug 2016 18:32:35 +0100
Subject: [PATCH 1/3] Make the display name rule an override rule

---
 specification/modules/push.rst | 62 +++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/specification/modules/push.rst b/specification/modules/push.rst
index a88f5953..e1355f22 100644
--- a/specification/modules/push.rst
+++ b/specification/modules/push.rst
@@ -327,6 +327,37 @@ Definition:
     }
 
 
+``.m.rule.contains_display_name``
+`````````````````````````````````
+Matches any message whose content is unencrypted and contains the user's
+current display name in the room in which it was sent.
+
+Definition:
+
+.. code:: json
+
+    {
+        "rule_id": ".m.rule.contains_display_name",
+        "default": true,
+        "enabled": true,
+        "conditions": [
+            {
+                "kind": "contains_display_name"
+            }
+        ],
+        "actions": [
+            "notify",
+            {
+                "set_tweak": "sound",
+                "value": "default"
+            },
+            {
+                "set_tweak": "highlight"
+            }
+        ]
+    }
+
+
 Default Content Rules
 ^^^^^^^^^^^^^^^^^^^^^
 
@@ -388,37 +419,6 @@ Definition:
         ]
     },
 
-
-``.m.rule.contains_display_name``
-`````````````````````````````````
-Matches any message whose content is unencrypted and contains the user's
-current display name in the room in which it was sent.
-
-Definition:
-
-.. code:: json
-
-    {
-        "rule_id": ".m.rule.contains_display_name",
-        "default": true,
-        "enabled": true,
-        "conditions": [
-            {
-                "kind": "contains_display_name"
-            }
-        ],
-        "actions": [
-            "notify",
-            {
-                "set_tweak": "sound",
-                "value": "default"
-            },
-            {
-                "set_tweak": "highlight"
-            }
-        ]
-    }
-
 ``.m.rule.room_one_to_one``
 ```````````````````````````
 Matches any message sent in a room with exactly two members.

From 9fb68f54cec79372c968b301ae1c4824c406f2f3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 Aug 2016 18:16:47 +0100
Subject: [PATCH 2/3] Changelog

---
 changelogs/client_server.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index ba0a4ecf..085d6245 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,6 +1,13 @@
 <Unreleased changes>
 ====================
 
+- Breaking changes:
+  - Change the rule kind of `.m.rule.contains_display_name` from
+    `underride` to `override`. This works with all known clients
+    which support push rules, but any other clients implementing
+    the push rules API should be aware of this change. This
+    makes it simple to mute rooms correctly in the API.
+
 - Spec clarifications:
 
   - Spell out the way that state is handled by ``POST /createRoom``

From 311c0a6eb517d3b3e9ebe5e31625c2f988016e25 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 17 Aug 2016 09:42:46 +0100
Subject: [PATCH 3/3] Hopefully correct indentation on changelog

---
 changelogs/client_server.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 085d6245..1c66de34 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -2,6 +2,7 @@
 ====================
 
 - Breaking changes:
+
   - Change the rule kind of `.m.rule.contains_display_name` from
     `underride` to `override`. This works with all known clients
     which support push rules, but any other clients implementing