Merge e8423193d4 into cb6d039c57

changelogs/appendices/newsfragments/1506.clarification

@@ -0,0 +1 @@
+Clarify that arbitrary unicode is allowed in user/room IDs and room aliases.

changelogs/client_server/newsfragments/2036.clarification

@@ -0,0 +1 @@
+The `POST /_matrix/client/v3/rooms/{roomId}/initialSync` endpoint is no longer deprecated, as it is still used for peeking.

changelogs/client_server/newsfragments/2038.clarification

@@ -0,0 +1 @@
+Clarify wording in the `/join` endpoints' summaries and descriptions. Contributed by @HarHarLinks.

changelogs/client_server/newsfragments/2046.clarification

@@ -0,0 +1 @@
+Clarify formats of string types.

changelogs/client_server/newsfragments/2047.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/client_server/newsfragments/2048.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/client_server/newsfragments/2051.clarification

@@ -0,0 +1 @@
+Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`.

changelogs/client_server/newsfragments/2055.clarification

@@ -0,0 +1 @@
+Applying redactions is a SHOULD for clients.

changelogs/client_server/newsfragments/2059.removal

@@ -0,0 +1 @@
+Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).

changelogs/client_server/newsfragments/2064.clarification

@@ -0,0 +1 @@
+Clarify which rooms are returned from `/hierarchy`.

changelogs/client_server/newsfragments/2072.clarification

@@ -0,0 +1 @@
+Clients can choose which history visibility options they offer to users when creating rooms.

changelogs/client_server/newsfragments/2080.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/client_server/newsfragments/2091.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/client_server/newsfragments/2093.new

@@ -0,0 +1 @@
+Add `POST /_matrix/client/v3/users/{userId}/report`, as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260).

changelogs/internal/newsfragments/2033.clarification

@@ -0,0 +1 @@
+Generate the changelog release info with Hugo, rather than the changelog generation script.

changelogs/internal/newsfragments/2041.clarification

@@ -0,0 +1 @@
+Update release steps documentation.

changelogs/internal/newsfragments/2042.clarification

@@ -0,0 +1 @@
+Remove unused `release_date` from Hugo config.

changelogs/internal/newsfragments/2045.clarification

@@ -0,0 +1 @@
+Clarify that v1.0 of Matrix was a release prior to the current global versioning system.

changelogs/internal/newsfragments/2049.clarification

@@ -0,0 +1 @@
+Fix syntax highlighting and click-to-copy buttons for code blocks by purging less CSS.

changelogs/internal/newsfragments/2061.clarification

@@ -0,0 +1 @@
+Fix the version of the Identity Service API when Matrix 1.0 was introduced.

changelogs/internal/newsfragments/2069.clarification

@@ -0,0 +1 @@
+Fix parsing of nested slices in `resolve-refs` and `resolve-allof` partials.

changelogs/internal/newsfragments/2073.clarification

@@ -0,0 +1 @@
+Deduplicate the definition of `RoomKeysUpdateResponse`.

changelogs/internal/newsfragments/2074.clarification

@@ -0,0 +1 @@
+Deduplicate the definitions of `Invite3pid`.

changelogs/internal/newsfragments/2076.clarification

@@ -0,0 +1 @@
+Support more locations for examples in OpenAPI definitions and JSON schemas.

changelogs/internal/newsfragments/2078.clarification

@@ -0,0 +1 @@
+Add link to the git commit for the unstable changelog.

changelogs/internal/newsfragments/2115.clarification

@@ -1 +0,0 @@
-Add [well-known funding manifest urls](https://floss.fund/funding-manifest/) to spec to authorise https://matrix.org/funding.json. Contributed by @HarHarLinks.

changelogs/room_versions/newsfragments/2065.clarification

@@ -0,0 +1 @@
+For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions.

changelogs/room_versions/newsfragments/2066.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/room_versions/newsfragments/2070.clarification

@@ -0,0 +1 @@
+Refactor PDU definitions to reduce duplication.

changelogs/room_versions/newsfragments/2105.feature

@@ -0,0 +1 @@
+Update the default room version to 11, as per [MSC4239](https://github.com/matrix-org/matrix-spec-proposals/pull/4239).

changelogs/server_server/newsfragments/2050.clarification

@@ -0,0 +1 @@
+Remove the `origin` field in `PUT /send_join` responses, because it was never sent in the first place.

changelogs/server_server/newsfragments/2063.clarification

@@ -0,0 +1 @@
+Clarify that `m.join_rules` should be in the `auth_events` of an `m.room.member` event with a `membership` of `knock`.

changelogs/server_server/newsfragments/2076.clarification

@@ -0,0 +1 @@
+Remove an erroneous `room_id` field in a few examples.

config/_default/hugo.toml

@@ -67,7 +67,7 @@ current_version_url = "https://spec.matrix.org/latest"
 # The following is used when status = "stable", and is displayed in various UI elements on a released version
 # of the spec.
 # major = "1"
-# minor = "14"
+# minor = "13"
 
 # User interface configuration
 [params.ui]

content/changelog/v1.14.md

@@ -1,93 +0,0 @@
----
-title: v1.14 Changelog
-linkTitle: v1.14
-type: docs
-layout: changelog
-outputs:
-  - html
-  - checklist
-date: 2025-03-27
----
-
-## Client-Server API
-
-**New Endpoints**
-
-- Add `POST /_matrix/client/v3/users/{userId}/report`, as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260). ([#2093](https://github.com/matrix-org/matrix-spec/issues/2093))
-
-**Removed Endpoints**
-
-- Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213). ([#2059](https://github.com/matrix-org/matrix-spec/issues/2059))
-
-**Spec Clarifications**
-
-- The `POST /_matrix/client/v3/rooms/{roomId}/initialSync` endpoint is no longer deprecated, as it is still used for peeking. ([#2036](https://github.com/matrix-org/matrix-spec/issues/2036))
-- Clarify wording in the `/join` endpoints' summaries and descriptions. Contributed by @HarHarLinks. ([#2038](https://github.com/matrix-org/matrix-spec/issues/2038))
-- Clarify formats of string types. ([#2046](https://github.com/matrix-org/matrix-spec/issues/2046))
-- Fix various typos throughout the specification. ([#2047](https://github.com/matrix-org/matrix-spec/issues/2047), [#2048](https://github.com/matrix-org/matrix-spec/issues/2048), [#2080](https://github.com/matrix-org/matrix-spec/issues/2080), [#2091](https://github.com/matrix-org/matrix-spec/issues/2091))
-- Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`. ([#2051](https://github.com/matrix-org/matrix-spec/issues/2051))
-- Applying redactions is a SHOULD for clients. ([#2055](https://github.com/matrix-org/matrix-spec/issues/2055))
-- Clarify which rooms are returned from `/hierarchy`. ([#2064](https://github.com/matrix-org/matrix-spec/issues/2064))
-- Clients can choose which history visibility options they offer to users when creating rooms. ([#2072](https://github.com/matrix-org/matrix-spec/issues/2072))
-
-
-## Server-Server API
-
-**Spec Clarifications**
-
-- Remove the `origin` field in `PUT /send_join` responses, because it was never sent in the first place. ([#2050](https://github.com/matrix-org/matrix-spec/issues/2050))
-- Clarify that `m.join_rules` should be in the `auth_events` of an `m.room.member` event with a `membership` of `knock`. ([#2063](https://github.com/matrix-org/matrix-spec/issues/2063))
-- Remove an erroneous `room_id` field in a few examples. ([#2076](https://github.com/matrix-org/matrix-spec/issues/2076))
-
-
-## Application Service API
-
-No significant changes.
-
-
-## Identity Service API
-
-No significant changes.
-
-
-## Push Gateway API
-
-No significant changes.
-
-
-## Room Versions
-
-**Backwards Compatible Changes**
-
-- Update the default room version to 11, as per [MSC4239](https://github.com/matrix-org/matrix-spec-proposals/pull/4239). ([#2105](https://github.com/matrix-org/matrix-spec/issues/2105))
-
-**Spec Clarifications**
-
-- For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions. ([#2065](https://github.com/matrix-org/matrix-spec/issues/2065))
-- Fix various typos throughout the specification. ([#2066](https://github.com/matrix-org/matrix-spec/issues/2066))
-- Refactor PDU definitions to reduce duplication. ([#2070](https://github.com/matrix-org/matrix-spec/issues/2070))
-- Clarify the maximum `depth` value for room versions 6, 7, 8, 9, 10, and 11. ([#2114](https://github.com/matrix-org/matrix-spec/issues/2114))
-
-
-## Appendices
-
-**Spec Clarifications**
-
-- Clarify that arbitrary unicode is allowed in user/room IDs and room aliases. ([#1506](https://github.com/matrix-org/matrix-spec/issues/1506))
-
-
-## Internal Changes/Tooling
-
-**Spec Clarifications**
-
-- Generate the changelog release info with Hugo, rather than the changelog generation script. ([#2033](https://github.com/matrix-org/matrix-spec/issues/2033))
-- Update release steps documentation. ([#2041](https://github.com/matrix-org/matrix-spec/issues/2041))
-- Remove unused `release_date` from Hugo config. ([#2042](https://github.com/matrix-org/matrix-spec/issues/2042))
-- Clarify that v1.0 of Matrix was a release prior to the current global versioning system. ([#2045](https://github.com/matrix-org/matrix-spec/issues/2045))
-- Fix syntax highlighting and click-to-copy buttons for code blocks by purging less CSS. ([#2049](https://github.com/matrix-org/matrix-spec/issues/2049))
-- Fix the version of the Identity Service API when Matrix 1.0 was introduced. ([#2061](https://github.com/matrix-org/matrix-spec/issues/2061))
-- Fix parsing of nested slices in `resolve-refs` and `resolve-allof` partials. ([#2069](https://github.com/matrix-org/matrix-spec/issues/2069))
-- Deduplicate the definition of `RoomKeysUpdateResponse`. ([#2073](https://github.com/matrix-org/matrix-spec/issues/2073))
-- Deduplicate the definitions of `Invite3pid`. ([#2074](https://github.com/matrix-org/matrix-spec/issues/2074))
-- Support more locations for examples in OpenAPI definitions and JSON schemas. ([#2076](https://github.com/matrix-org/matrix-spec/issues/2076))
-- Add link to the git commit for the unstable changelog. ([#2078](https://github.com/matrix-org/matrix-spec/issues/2078))

content/rooms/fragments/v6-event-format.md

@@ -1,4 +0,0 @@
-
-Events in rooms of this version have the following structure:
-
-{{% definition path="api/server-server/definitions/pdu_v6" %}}

content/rooms/v10.md

@@ -281,7 +281,7 @@ completeness.
 
 ### Event format
 
-{{% rver-fragment name="v6-event-format" %}}
+{{% rver-fragment name="v4-event-format" %}}
 
 ### State resolution
 

content/rooms/v6.md

@@ -39,13 +39,6 @@ in [room version 5](/rooms/v5).
 
 [See above](#redactions).
 
-### Event format
-
-{{% added-in v=6 %}} Through enforcement of [Canonical JSON](#canonical-json),
-the `depth` limit has been reduced in this room version.
-
-{{% rver-fragment name="v6-event-format" %}}
-
 ### Authorization rules
 
 {{% added-in v=6 %}} Rule 4, which related specifically to events
@@ -236,6 +229,10 @@ completeness.
 
 {{% rver-fragment name="v4-event-ids" %}}
 
+### Event format
+
+{{% rver-fragment name="v4-event-format" %}}
+
 #### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}

content/rooms/v7.md

@@ -225,7 +225,7 @@ completeness.
 
 ### Event format
 
-{{% rver-fragment name="v6-event-format" %}}
+{{% rver-fragment name="v4-event-format" %}}
 
 #### Deprecated event content schemas
 

content/rooms/v8.md

@@ -109,7 +109,7 @@ completeness.
 
 ### Event format
 
-{{% rver-fragment name="v6-event-format" %}}
+{{% rver-fragment name="v4-event-format" %}}
 
 #### Deprecated event content schemas
 

content/rooms/v9.md

@@ -74,7 +74,7 @@ completeness.
 
 ### Event format
 
-{{% rver-fragment name="v6-event-format" %}}
+{{% rver-fragment name="v4-event-format" %}}
 
 #### Deprecated event content schemas
 

data/api/server-server/definitions/components/pdu_base.yaml

@@ -41,6 +41,13 @@ properties:
     type: object
     description: The content of the event.
     example: {"key": "value"}
+  depth:
+    type: integer
+    description: |-
+      The maximum depth of the `prev_events`, plus one. Must be less than the
+      maximum value for an integer (2^63 - 1). If the room's depth is already at
+      the limit, the depth must be set to the limit.
+    example: 12
   hashes:
     $ref: "event_hash.yaml"
   signatures:

data/api/server-server/definitions/pdu_v1.yaml

@@ -28,13 +28,6 @@ allOf:
         type: string
         description: For redaction events, the ID of the event being redacted.
         example: "$def456:matrix.org"
-      depth:
-        type: integer
-        description: |-
-          The maximum depth of the `prev_events`, plus one. Must be less than the
-          maximum value for an integer (2^63 - 1). If the room's depth is already at
-          the limit, the depth must be set to the limit.
-        example: 12
       auth_events:
         type: array
         description: |-

data/api/server-server/definitions/pdu_v11.yaml

@@ -17,16 +17,6 @@ description: A persistent data unit (event) for room version 11 and beyond.
 example:
   $ref: "../examples/pdu_v11.json"
 allOf:
-  # v11 is the v6 event, but without redacts.
+  # v11 is the v4 event, but without redacts.
   - $ref: "components/pdu_base.yaml"
   - $ref: "components/auth_events_prev_events_v4.yaml"
-  - type: object
-    properties:
-      # v6 enforces Canonical JSON and therefore needs a depth limit change
-      depth:
-        type: integer
-        description: |-
-          The maximum depth of the `prev_events`, plus one. Must be less than the
-          maximum value for an integer (2^53 - 1). If the room's depth is already at
-          the limit, the depth must be set to the limit.
-        example: 12

data/api/server-server/definitions/pdu_v3.yaml

@@ -24,13 +24,6 @@ allOf:
         type: string
         description: For redaction events, the ID of the event being redacted.
         example: "$def/456+oldevent"
-      depth:
-        type: integer
-        description: |-
-          The maximum depth of the `prev_events`, plus one. Must be less than the
-          maximum value for an integer (2^63 - 1). If the room's depth is already at
-          the limit, the depth must be set to the limit.
-        example: 12
       auth_events:
         type: array
         items:

data/api/server-server/definitions/pdu_v4.yaml

@@ -26,10 +26,3 @@ allOf:
         type: string
         description: For redaction events, the ID of the event being redacted.
         example: "$def_456-oldevent"
-      depth:
-        type: integer
-        description: |-
-          The maximum depth of the `prev_events`, plus one. Must be less than the
-          maximum value for an integer (2^63 - 1). If the room's depth is already at
-          the limit, the depth must be set to the limit.
-        example: 12

data/api/server-server/definitions/pdu_v6.yaml

@@ -1,36 +0,0 @@
-# Copyright 2025 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-type: object
-title: Persistent Data Unit
-description: |-
-  A persistent data unit (event) for room versions 4, 5, 6, 7, 8, 9 and 10.
-example:
-  $ref: "../examples/pdu_v4.json"
-allOf:
-  - $ref: "components/pdu_base.yaml"
-  - $ref: "components/auth_events_prev_events_v4.yaml"
-  - type: object
-    properties:
-      redacts:
-        type: string
-        description: For redaction events, the ID of the event being redacted.
-        example: "$def_456-oldevent"
-      # v6 enforces Canonical JSON and therefore needs a depth limit change
-      depth:
-        type: integer
-        description: |-
-          The maximum depth of the `prev_events`, plus one. Must be less than the
-          maximum value for an integer (2^53 - 1). If the room's depth is already at
-          the limit, the depth must be set to the limit.
-        example: 12

static/.well-known/funding-manifest-urls

@@ -1 +0,0 @@
-https://matrix.org/funding.json