Merge 8cb0b3e7f6 into d968774fb7

changelogs/client_server/newsfragments/2214.clarification

@@ -1 +0,0 @@
-Push rule IDs are globally unique within their kind.

changelogs/client_server/newsfragments/2215.clarification

@@ -1 +0,0 @@
-Don't advertise `creator` field in description of room creation.

content/client-server-api/_index.md

@@ -3386,10 +3386,10 @@ Unspecified room types are permitted through the use of
 ### Creation
 
 The homeserver will create an `m.room.create` event when a room is
-created, which serves as the root of the event graph for this room. The
+created, which serves as the root of the event graph for this room. This
-event `sender` is the user ID of the room creator. The server will also
+event also has a `creator` key which contains the user ID of the room
-generate several other events in order to manage permissions in this room.
+creator. It will also generate several other events in order to manage
-This includes:
+permissions in this room. This includes:
 
 -   `m.room.power_levels` : Sets the power levels of users and required power
     levels for various actions within the room such as sending events.

content/client-server-api/modules/push.md

@@ -83,7 +83,7 @@ Push Ruleset
 :   A push ruleset *scopes a set of rules according to some criteria*. For
     example, some rules may only be applied for messages from a particular
     sender, a particular room, or by default. The push ruleset contains the
-    entire set of rules.
+    entire set of scopes and rules.
 
 #### Push Rules
 
@@ -91,8 +91,10 @@ A push rule is a single rule that states under what *conditions* an
 event should be passed onto a push gateway and *how* the notification
 should be presented. There are different "kinds" of push rules and each
 rule has an associated priority. Every push rule MUST have a `kind` and
-`rule_id`. The `rule_id` is a unique string within the kind of rule.
+`rule_id`. The `rule_id` is a unique string within the kind of rule and
-Rules may have extra keys depending on the value of `kind`.
+its' scope: `rule_ids` do not need to be unique between rules of the
+same kind on different devices. Rules may have extra keys depending on
+the value of `kind`.
 
 The different `kind`s of rule, in the order that they are checked, are: