Merge remote-tracking branch 'origin/main' into rav/rendered_data_colours

changelogs/client_server/newsfragments/1190.feature

@@ -0,0 +1 @@
+Add a `.m.rule.room.server_acl` push rule to match `m.room.server_acl` events, as per [MSC3786](https://github.com/matrix-org/matrix-spec-proposals/pull/3786).

changelogs/internal/newsfragments/1194.feature

@@ -0,0 +1 @@
+Add internal changes changelog section.

changelogs/room_versions/newsfragments/1175.clarification

@@ -0,0 +1 @@
+For room versions 7 through 10: Clarify that `invite->knock` is actually a legal transition.

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

@@ -520,6 +520,33 @@ Definition:
 }
 ```
 
+**`.m.rule.room.server_acl`**
+
+Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.
+
+Definition:
+
+```json
+{
+    "rule_id": ".m.rule.room.server_acl",
+    "default": true,
+    "enabled": true,
+    "conditions": [
+        {
+            "kind": "event_match",
+            "key": "type",
+            "pattern": "m.room.server_acl"
+        },
+        {
+            "kind": "event_match",
+            "key": "state_key",
+            "pattern": ""
+        }
+    ],
+    "actions": []
+}
+```
+
 **`.m.rule.roomnotif`**
 
 Matches any message whose content is unencrypted and contains the text

content/rooms/fragments/v8-auth-rules.md

@@ -118,8 +118,7 @@ The rules are as follows:
     7. If `membership` is `knock`:
         1.  If the `join_rule` is anything other than `knock`, reject.
         2.  If `sender` does not match `state_key`, reject.
-        3.  If the `sender`'s current membership is not `ban`, `invite`,
+        3.  If the `sender`'s current membership is not `ban` or `join`, allow.
-            or `join`, allow.
         4.  Otherwise, reject.
     8.  Otherwise, the membership is unknown. Reject.
 5.  If the `sender`'s current membership state is not `join`, reject.

content/rooms/v10.md

@@ -193,8 +193,7 @@ The rules are as follows:
             If the `join_rule` is anything other than `knock` or
             `knock_restricted`, reject.
         2.  If `sender` does not match `state_key`, reject.
-        3.  If the `sender`'s current membership is not `ban`, `invite`,
+        3.  If the `sender`'s current membership is not `ban` or `join`, allow.
-            or `join`, allow.
         4.  Otherwise, reject.
     8.  Otherwise, the membership is unknown. Reject.
 5.  If the `sender`'s current membership state is not `join`, reject.

content/rooms/v7.md

@@ -135,8 +135,7 @@ The rules are as follows:
     6. If `membership` is `knock`:
         1.  If the `join_rule` is anything other than `knock`, reject.
         2.  If `sender` does not match `state_key`, reject.
-        3.  If the `sender`'s current membership is not `ban`, `invite`,
+        3.  If the `sender`'s current membership is not `ban` or `join`, allow.
-            or `join`, allow.
         4.  Otherwise, reject.
     7.  Otherwise, the membership is unknown. Reject.
 5.  If the `sender`'s current membership state is not `join`, reject.

layouts/shortcodes/changelog/changelog-changes.html

@@ -38,6 +38,7 @@
 {{ partial "render-api-changes" (dict "title" "Push Gateway API" "id" "push-gateway-api" "path" (path.Join $path "push_gateway")) }}
 {{ partial "render-api-changes" (dict "title" "Room Versions" "id" "room-versions" "path" (path.Join $path "room_versions")) }}
 {{ partial "render-api-changes" (dict "title" "Appendices" "id" "appendices" "path" (path.Join $path "appendices")) }}
+{{ partial "render-api-changes" (dict "title" "Internal Changes/Tooling" "id" "internal" "path" (path.Join $path "internal")) }}
 
 {{ define "partials/render-api-changes" }}
 <h3 id="{{.id}}">{{ .title }}</h3>

scripts/generate-changelog.sh

@@ -12,6 +12,7 @@ cd changelogs
 rm -f rendered.*
 
 # Reversed order so that room versions ends up on the bottom
+towncrier --name "Internal Changes/Tooling" --dir "./internal" --config "./pyproject.toml" --yes
 towncrier --name "Appendices" --dir "./appendices" --config "./pyproject.toml" --yes
 towncrier --name "Room Versions" --dir "./room_versions" --config "./pyproject.toml" --yes
 towncrier --name "Push Gateway API" --dir "./push_gateway" --config "./pyproject.toml" --yes