Merge branch 'master' of github.com:iinuwa/matrix-doc

api/client-server/pushrules.yaml

@@ -498,6 +498,8 @@ paths:
                 type: boolean
                 description: Whether the push rule is enabled or not.
             required: ["enabled"]
+      tags:
+        - Push notifications
     put:
       summary: "Enable or disable a push rule."
       description: |-
@@ -601,6 +603,8 @@ paths:
                 items:
                   type: string
             required: ["actions"]
+      tags:
+        - Push notifications
     put:
       summary: "Set the actions for a push rule."
       description: |-

changelogs/server_server/newsfragments/2392.clarification

@@ -0,0 +1 @@
+Move auth event selection to a more obvious location.

specification/identity_service_api.rst

@@ -336,7 +336,7 @@ it would first format the query as ``alice@example.org email ThePepperGoesHere``
 After formatting each query, the string is run through SHA-256 as defined by
 `RFC 4634 <https://tools.ietf.org/html/rfc4634>`_. The resulting bytes are then
 encoded using URL-Safe `Unpadded Base64`_ (similar to `room version 4's
-event ID format <../../rooms/v4.html#event-ids>`_).
+event ID format <../rooms/v4.html#event-ids>`_).
 
 An example set of queries when using the pepper ``matrixrocks`` would be::
 

specification/server_server_api.rst

@@ -391,28 +391,9 @@ creating a new event in this room should populate the new event's
   |
   E4
 
-.. _`auth events selection`:
-
-The ``auth_events`` field of a PDU identifies the set of events which give the
-sender permission to send the event. The ``auth_events`` for the
-``m.room.create`` event in a room is empty; for other events, it should be the
-following subset of the room state:
-
-- The ``m.room.create`` event.
-- The current ``m.room.power_levels`` event, if any.
-- The sender's current ``m.room.member`` event, if any.
-- If type is ``m.room.member``:
-
-    - The target's current ``m.room.member`` event, if any.
-    - If ``membership`` is ``join`` or ``invite``, the current
-      ``m.room.join_rules`` event, if any.
-    - If membership is ``invite`` and ``content`` contains a
-      ``third_party_invite`` property, the current
-      ``m.room.third_party_invite`` event with ``state_key`` matching
-      ``content.third_party_invite.signed.token``, if any.
-
 For a full schema of what a PDU looks like, see the `room version specification`_.
 
+
 Checks performed on receipt of a PDU
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -466,6 +447,29 @@ specified above. Each room version can have a different algorithm for how the
 rules work, and which rules are applied. For more detailed information, please
 see the `room version specification`_.
 
+
+Auth events selection
+^^^^^^^^^^^^^^^^^^^^^
+
+The ``auth_events`` field of a PDU identifies the set of events which give the
+sender permission to send the event. The ``auth_events`` for the
+``m.room.create`` event in a room is empty; for other events, it should be the
+following subset of the room state:
+
+- The ``m.room.create`` event.
+- The current ``m.room.power_levels`` event, if any.
+- The sender's current ``m.room.member`` event, if any.
+- If type is ``m.room.member``:
+
+    - The target's current ``m.room.member`` event, if any.
+    - If ``membership`` is ``join`` or ``invite``, the current
+      ``m.room.join_rules`` event, if any.
+    - If membership is ``invite`` and ``content`` contains a
+      ``third_party_invite`` property, the current
+      ``m.room.third_party_invite`` event with ``state_key`` matching
+      ``content.third_party_invite.signed.token``, if any.
+
+
 Rejection
 +++++++++