Merge c175953e80 into 486a8f8764

Improvements to "Events" section (#2349 )
* Clarify string formats of event endpoints and schemas Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Fix links to endpoints Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> --------- Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
2026-04-30 14:14:09 +02:00 · 2026-04-16 17:21:20 +01:00 · 2026-04-14 21:30:06 -04:00 · 2026-04-14 16:34:47 -04:00 · 2026-03-31 23:27:39 +01:00 · 2026-03-31 22:20:49 +00:00
91 changed files with 283 additions and 99 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -28,7 +28,7 @@ jobs:

      # Ensure npm 11.5.1 or later is installed
      - name: Update npm
-        run: npm install -g npm@latest
+        run: sudo npm install -g npm@latest

      - name: 🔨 Install dependencies
        run: "yarn install --frozen-lockfile"
--- a/changelogs/appendices/newsfragments/2307.clarification
+++ b/changelogs/appendices/newsfragments/2307.clarification
@ -1 +0,0 @@
-Add identifier pronunciation guidelines. Contributed by @HarHarLinks.
--- a/changelogs/application_service/newsfragments/2330.clarification
+++ b/changelogs/application_service/newsfragments/2330.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2270.feature
+++ b/changelogs/client_server/newsfragments/2270.feature
@ -1 +0,0 @@
-Add the account management capabilities for the OAuth 2.0 authentication API, as per [MSC4191](https://github.com/matrix-org/matrix-spec-proposals/pull/4191).
--- a/changelogs/client_server/newsfragments/2272.feature
+++ b/changelogs/client_server/newsfragments/2272.feature
@ -1 +0,0 @@
-Add OAuth 2.0 aware clients, as per [MSC3824](https://github.com/matrix-org/matrix-spec-proposals/pull/3824).
--- a/changelogs/client_server/newsfragments/2277.clarification
+++ b/changelogs/client_server/newsfragments/2277.clarification
@ -1,3 +0,0 @@
-The optional `submit_url` response parameter of the `/requestToken` endpoints uses the same request
-and response parameters and error codes as the Identity Service API's `POST /_matrix/identity/v2/validate/email/submitToken`,
-as per [MSC4183](https://github.com/matrix-org/matrix-spec-proposals/pull/4183).
--- a/changelogs/client_server/newsfragments/2278.feature
+++ b/changelogs/client_server/newsfragments/2278.feature
@ -1 +0,0 @@
-Add administrator endpoints to lock and suspend server-local users and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
--- a/changelogs/client_server/newsfragments/2278.new.1
+++ b/changelogs/client_server/newsfragments/2278.new.1
@ -1 +0,0 @@
-Add `GET /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
--- a/changelogs/client_server/newsfragments/2278.new.2
+++ b/changelogs/client_server/newsfragments/2278.new.2
@ -1 +0,0 @@
-Add `PUT /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
--- a/changelogs/client_server/newsfragments/2278.new.3
+++ b/changelogs/client_server/newsfragments/2278.new.3
@ -1 +0,0 @@
-Add `GET /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
--- a/changelogs/client_server/newsfragments/2278.new.4
+++ b/changelogs/client_server/newsfragments/2278.new.4
@ -1 +0,0 @@
-Add `PUT /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
--- a/changelogs/client_server/newsfragments/2280.clarification
+++ b/changelogs/client_server/newsfragments/2280.clarification
@ -1 +0,0 @@
-Update non-historic mentions of matrix-doc repo to matrix-spec/-proposals. Contributed by @HarHarLinks.
--- a/changelogs/client_server/newsfragments/2283.clarification
+++ b/changelogs/client_server/newsfragments/2283.clarification
@ -1 +0,0 @@
-Remove unintended TeX formatting. Contributed by @HarHarLinks.
--- a/changelogs/client_server/newsfragments/2291.feature
+++ b/changelogs/client_server/newsfragments/2291.feature
@ -1 +0,0 @@
-Add `m.recent_emoji` account data event to track recently used emoji as per [MSC4356](https://github.com/matrix-org/matrix-spec-proposals/pull/4356).
--- a/changelogs/client_server/newsfragments/2292.feature
+++ b/changelogs/client_server/newsfragments/2292.feature
@ -1 +0,0 @@
-Add `m.forget_forced_upon_leave` capability for servers to transparently auto-forget rooms that the user leaves as per [MSC4267](https://github.com/matrix-org/matrix-spec-proposals/pull/4267).
--- a/changelogs/client_server/newsfragments/2298.feature
+++ b/changelogs/client_server/newsfragments/2298.feature
@ -1 +0,0 @@
-Add support for `m.room.redaction` events at the `PUT /rooms/{roomId}/send/{eventType}/{txnId}` endpoint, as per [MSC4169](https://github.com/matrix-org/matrix-spec-proposals/pull/4169).
--- a/changelogs/client_server/newsfragments/2299.feature
+++ b/changelogs/client_server/newsfragments/2299.feature
@ -1 +0,0 @@
-Clients supporting the `ol` HTML element must also support the `start` attribute, as per [MSC4313](https://github.com/matrix-org/matrix-spec-proposals/pull/4313).
--- a/changelogs/client_server/newsfragments/2301.feature
+++ b/changelogs/client_server/newsfragments/2301.feature
@ -1 +0,0 @@
-Add recommendation about excluding non-cross-signed devices from encrypted conversations, as per [MSC4153](https://github.com/matrix-org/matrix-spec-proposals/pull/4153).
--- a/changelogs/client_server/newsfragments/2304.clarification
+++ b/changelogs/client_server/newsfragments/2304.clarification
@ -1 +0,0 @@
-Clarify the requiredness of `event_id` in `predecessor`.
--- a/changelogs/client_server/newsfragments/2305.feature
+++ b/changelogs/client_server/newsfragments/2305.feature
@ -1 +0,0 @@
-Add invite blocking, as per [MSC4380](https://github.com/matrix-org/matrix-spec-proposals/pull/4380).
--- a/changelogs/client_server/newsfragments/2306.clarification
+++ b/changelogs/client_server/newsfragments/2306.clarification
@ -1 +0,0 @@
-Clarify terminology for keys in cross-signing module.
--- a/changelogs/client_server/newsfragments/2311.feature
+++ b/changelogs/client_server/newsfragments/2311.feature
@ -1 +0,0 @@
-`/_matrix/client/v3/rooms/{roomId}/report` and `/_matrix/client/v3/rooms/{roomId}/report/{eventId}` may respond with HTTP 200 regardless of the reported subject's existence or add a random delay when generating responses as per [MSC4277](https://github.com/matrix-org/matrix-spec-proposals/pull/4277).
--- a/changelogs/client_server/newsfragments/2311.removal
+++ b/changelogs/client_server/newsfragments/2311.removal
@ -1 +0,0 @@
-The `score` request parameter on `/_matrix/client/v3/rooms/{roomId}/report/{eventId}` was removed as per [MSC4277](https://github.com/matrix-org/matrix-spec-proposals/pull/4277).
--- a/changelogs/client_server/newsfragments/2315.feature
+++ b/changelogs/client_server/newsfragments/2315.feature
@ -1 +0,0 @@
-Add `M_USER_LIMIT_EXCEEDED` common error code, as per [MSC4335](https://github.com/matrix-org/matrix-spec-proposals/pull/4335).
--- a/changelogs/client_server/newsfragments/2316.clarification
+++ b/changelogs/client_server/newsfragments/2316.clarification
@ -1 +0,0 @@
-Add 404 responses to the OpenAPI of `GET /login` and `GET /auth_metadata` endpoints. The responses were already defined in text but not written in OpenAPI.
--- a/changelogs/client_server/newsfragments/2318.clarification
+++ b/changelogs/client_server/newsfragments/2318.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification. Contributed by @HarHarLinks.
--- a/changelogs/client_server/newsfragments/2320.feature
+++ b/changelogs/client_server/newsfragments/2320.feature
@ -1 +0,0 @@
-Add the OAuth 2.0 Device Authorization Grant (RFC 8628) as a supported grant type, as per [MSC4341](https://github.com/matrix-org/matrix-spec-proposals/pull/4341).
--- a/changelogs/client_server/newsfragments/2324.clarification
+++ b/changelogs/client_server/newsfragments/2324.clarification
@ -1 +0,0 @@
-Clarified attachment encryption to require secure generation of keys and hash verification.
--- a/changelogs/client_server/newsfragments/2328.feature
+++ b/changelogs/client_server/newsfragments/2328.feature
@ -1 +0,0 @@
-Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
--- a/changelogs/client_server/newsfragments/2332.feature
+++ b/changelogs/client_server/newsfragments/2332.feature
@ -1 +0,0 @@
-Add a "Policy Servers" module, as per [MSC4284](https://github.com/matrix-org/matrix-spec-proposals/pull/4284).
--- a/changelogs/client_server/newsfragments/2336.clarification
+++ b/changelogs/client_server/newsfragments/2336.clarification
@ -1 +0,0 @@
-Order the common and other error codes alphabetically and remove duplicate `M_THREEPID_IN_USE` definition.
--- a/changelogs/client_server/newsfragments/2337.clarification
+++ b/changelogs/client_server/newsfragments/2337.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2338.feature
+++ b/changelogs/client_server/newsfragments/2338.feature
@ -1 +0,0 @@
-Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
--- a/changelogs/client_server/newsfragments/2344.clarification
+++ b/changelogs/client_server/newsfragments/2344.clarification
@ -0,0 +1 @@
+Clarify SAS commitment calculation for `m.key.verification.accept` messages.
--- a/changelogs/client_server/newsfragments/2347.clarification
+++ b/changelogs/client_server/newsfragments/2347.clarification
@ -0,0 +1 @@
+Clarify formats of string types.
--- a/changelogs/client_server/newsfragments/2348.clarification
+++ b/changelogs/client_server/newsfragments/2348.clarification
@ -0,0 +1 @@
+Fix ordering of common error codes.
--- a/changelogs/client_server/newsfragments/2349.clarification
+++ b/changelogs/client_server/newsfragments/2349.clarification
@ -0,0 +1 @@
+Clarify formats of string types.
--- a/changelogs/identity_service/newsfragments/2277.clarification
+++ b/changelogs/identity_service/newsfragments/2277.clarification
@ -1,3 +0,0 @@
-Clarify the error codes that can be returned with a 400 HTTP status code by the `POST /_matrix/identity/v2/validate/email/submitToken`
-and `POST /_matrix/identity/v2/validate/msisdn/submitToken` endpoints, introducing the `M_TOKEN_INCORRECT`
-error code, as per [MSC4183](https://github.com/matrix-org/matrix-spec-proposals/pull/4183).
--- a/changelogs/identity_service/newsfragments/2336.clarification
+++ b/changelogs/identity_service/newsfragments/2336.clarification
@ -1 +0,0 @@
-Order the standard error codes alphabetically.
--- a/changelogs/internal/newsfragments/2222.clarification
+++ b/changelogs/internal/newsfragments/2222.clarification
@ -1 +0,0 @@
-Clarify vendor prefixing requirements.
--- a/changelogs/internal/newsfragments/2275.clarification
+++ b/changelogs/internal/newsfragments/2275.clarification
@ -1 +0,0 @@
-Auto-create draft releases when building release tags.
--- a/changelogs/internal/newsfragments/2276.feature
+++ b/changelogs/internal/newsfragments/2276.feature
@ -1 +0,0 @@
-Include the spec release version in the filenames in the tarballs generated by CI.
--- a/changelogs/internal/newsfragments/2282.clarification
+++ b/changelogs/internal/newsfragments/2282.clarification
@ -1 +0,0 @@
-Replace the Twitter link in the footer with our BlueSky and Mastodon socials.
--- a/changelogs/internal/newsfragments/2287.clarification
+++ b/changelogs/internal/newsfragments/2287.clarification
@ -1 +0,0 @@
-Upgrade to docsy v0.13.0.
--- a/changelogs/internal/newsfragments/2289.clarification
+++ b/changelogs/internal/newsfragments/2289.clarification
@ -1 +0,0 @@
-Updates to the release documentation.
--- a/changelogs/internal/newsfragments/2290.clarification
+++ b/changelogs/internal/newsfragments/2290.clarification
@ -1 +0,0 @@
-Remove unused leftover CSS files.
--- a/changelogs/internal/newsfragments/2317.clarification
+++ b/changelogs/internal/newsfragments/2317.clarification
@ -1 +0,0 @@
-Update the footer social links to match matrix.org. Contributed by @HarHarLinks.
--- a/changelogs/internal/newsfragments/2318.clarification
+++ b/changelogs/internal/newsfragments/2318.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification. Contributed by @HarHarLinks.
--- a/changelogs/internal/newsfragments/2323.clarification
+++ b/changelogs/internal/newsfragments/2323.clarification
@ -1 +0,0 @@
-Render error code sections as definition lists to improve readability.
--- a/changelogs/internal/newsfragments/2343.clarification
+++ b/changelogs/internal/newsfragments/2343.clarification
@ -0,0 +1 @@
+Update and fix GitHub Actions.
--- a/changelogs/room_versions/newsfragments/2297.clarification
+++ b/changelogs/room_versions/newsfragments/2297.clarification
@ -1 +0,0 @@
-Clarify meaning of floating-point powerlevels.
--- a/changelogs/room_versions/newsfragments/2303.clarification
+++ b/changelogs/room_versions/newsfragments/2303.clarification
@ -1 +0,0 @@
-Remove the post-1.16 release note for room version 12.
--- a/changelogs/server_server/newsfragments/2191.clarification
+++ b/changelogs/server_server/newsfragments/2191.clarification
@ -1 +0,0 @@
-Clarify what the `minimum_valid_until_ts` field means when it is set in key queries.
--- a/changelogs/server_server/newsfragments/2284.clarification
+++ b/changelogs/server_server/newsfragments/2284.clarification
@ -1 +0,0 @@
-Specify validation for PDUs passed to and returned from federation membership endpoints.
--- a/changelogs/server_server/newsfragments/2288.clarification
+++ b/changelogs/server_server/newsfragments/2288.clarification
@ -1 +0,0 @@
-Specify that callers of `/_matrix/federation/v1/openid/userinfo` must validate the returned user ID.
--- a/changelogs/server_server/newsfragments/2300.clarification
+++ b/changelogs/server_server/newsfragments/2300.clarification
@ -1 +0,0 @@
-Change `m.signing_update` typo to `m.signing_key_update`. Contributed by @velikopter
--- a/changelogs/server_server/newsfragments/2319.removal
+++ b/changelogs/server_server/newsfragments/2319.removal
@ -1 +0,0 @@
-Remove `/v1/send_join` and `/v1/send_leave`, as per [MSC4376](https://github.com/matrix-org/matrix-spec-proposals/pull/4376).
--- a/changelogs/server_server/newsfragments/2329.clarification
+++ b/changelogs/server_server/newsfragments/2329.clarification
@ -1 +0,0 @@
-Add link to JSON signing algorithm in server-server auth section for clarity. Contributed by @thetayloredman.
--- a/changelogs/server_server/newsfragments/2332.feature
+++ b/changelogs/server_server/newsfragments/2332.feature
@ -1 +0,0 @@
-Add a concept of "Policy Servers", as per [MSC4284](https://github.com/matrix-org/matrix-spec-proposals/pull/4284).
--- a/changelogs/server_server/newsfragments/2338.clarification
+++ b/changelogs/server_server/newsfragments/2338.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@ -76,7 +76,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 = "17"
+#minor = "18"

 [[params.versions]]
 # We must include this parameter to enable docsy's version picker in the navbar. The picker
--- a/content/changelog/v1.18.md
+++ b/content/changelog/v1.18.md
@ -0,0 +1,127 @@
+---
+title: v1.18 Changelog
+linkTitle: v1.18
+type: docs
+layout: changelog
+outputs:
+  - html
+  - checklist
+date: 2026-03-25
+---
+
+## Client-Server API
+
+**New Endpoints**
+
+- Add `GET /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). ([#2278](https://github.com/matrix-org/matrix-spec/issues/2278))
+- Add `PUT /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). ([#2278](https://github.com/matrix-org/matrix-spec/issues/2278))
+- Add `GET /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). ([#2278](https://github.com/matrix-org/matrix-spec/issues/2278))
+- Add `PUT /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). ([#2278](https://github.com/matrix-org/matrix-spec/issues/2278))
+
+**Removed Endpoints**
+
+- The `score` request parameter on `/_matrix/client/v3/rooms/{roomId}/report/{eventId}` was removed as per [MSC4277](https://github.com/matrix-org/matrix-spec-proposals/pull/4277). ([#2311](https://github.com/matrix-org/matrix-spec/issues/2311))
+
+**Backwards Compatible Changes**
+
+- Add the account management capabilities for the OAuth 2.0 authentication API, as per [MSC4191](https://github.com/matrix-org/matrix-spec-proposals/pull/4191). ([#2270](https://github.com/matrix-org/matrix-spec/issues/2270))
+- Add OAuth 2.0 aware clients, as per [MSC3824](https://github.com/matrix-org/matrix-spec-proposals/pull/3824). ([#2272](https://github.com/matrix-org/matrix-spec/issues/2272))
+- Add administrator endpoints to lock and suspend server-local users and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). ([#2278](https://github.com/matrix-org/matrix-spec/issues/2278))
+- Add `m.recent_emoji` account data event to track recently used emoji as per [MSC4356](https://github.com/matrix-org/matrix-spec-proposals/pull/4356). ([#2291](https://github.com/matrix-org/matrix-spec/issues/2291))
+- Add `m.forget_forced_upon_leave` capability for servers to transparently auto-forget rooms that the user leaves as per [MSC4267](https://github.com/matrix-org/matrix-spec-proposals/pull/4267). ([#2292](https://github.com/matrix-org/matrix-spec/issues/2292))
+- Add support for `m.room.redaction` events at the `PUT /rooms/{roomId}/send/{eventType}/{txnId}` endpoint, as per [MSC4169](https://github.com/matrix-org/matrix-spec-proposals/pull/4169). ([#2298](https://github.com/matrix-org/matrix-spec/issues/2298))
+- Clients supporting the `ol` HTML element must also support the `start` attribute, as per [MSC4313](https://github.com/matrix-org/matrix-spec-proposals/pull/4313). ([#2299](https://github.com/matrix-org/matrix-spec/issues/2299))
+- Add recommendation about excluding non-cross-signed devices from encrypted conversations, as per [MSC4153](https://github.com/matrix-org/matrix-spec-proposals/pull/4153). ([#2301](https://github.com/matrix-org/matrix-spec/issues/2301))
+- Add invite blocking, as per [MSC4380](https://github.com/matrix-org/matrix-spec-proposals/pull/4380). ([#2305](https://github.com/matrix-org/matrix-spec/issues/2305))
+- `/_matrix/client/v3/rooms/{roomId}/report` and `/_matrix/client/v3/rooms/{roomId}/report/{eventId}` may respond with HTTP 200 regardless of the reported subject's existence or add a random delay when generating responses as per [MSC4277](https://github.com/matrix-org/matrix-spec-proposals/pull/4277). ([#2311](https://github.com/matrix-org/matrix-spec/issues/2311))
+- Add `M_USER_LIMIT_EXCEEDED` common error code, as per [MSC4335](https://github.com/matrix-org/matrix-spec-proposals/pull/4335). ([#2315](https://github.com/matrix-org/matrix-spec/issues/2315))
+- Add the OAuth 2.0 Device Authorization Grant (RFC 8628) as a supported grant type, as per [MSC4341](https://github.com/matrix-org/matrix-spec-proposals/pull/4341). ([#2320](https://github.com/matrix-org/matrix-spec/issues/2320))
+- Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230). ([#2328](https://github.com/matrix-org/matrix-spec/issues/2328), [#2338](https://github.com/matrix-org/matrix-spec/issues/2338))
+- Add a "Policy Servers" module, as per [MSC4284](https://github.com/matrix-org/matrix-spec-proposals/pull/4284). ([#2332](https://github.com/matrix-org/matrix-spec/issues/2332))
+
+**Spec Clarifications**
+
+- The optional `submit_url` response parameter of the `/requestToken` endpoints uses the same request and response parameters and error codes as the Identity Service API's `POST /_matrix/identity/v2/validate/email/submitToken`, as per [MSC4183](https://github.com/matrix-org/matrix-spec-proposals/pull/4183). ([#2277](https://github.com/matrix-org/matrix-spec/issues/2277))
+- Update non-historic mentions of matrix-doc repo to matrix-spec/-proposals. Contributed by @HarHarLinks. ([#2280](https://github.com/matrix-org/matrix-spec/issues/2280))
+- Remove unintended TeX formatting. Contributed by @HarHarLinks. ([#2283](https://github.com/matrix-org/matrix-spec/issues/2283))
+- Clarify the requiredness of `event_id` in `predecessor`. ([#2304](https://github.com/matrix-org/matrix-spec/issues/2304))
+- Clarify terminology for keys in cross-signing module. ([#2306](https://github.com/matrix-org/matrix-spec/issues/2306))
+- Add 404 responses to the OpenAPI of `GET /login` and `GET /auth_metadata` endpoints. The responses were already defined in text but not written in OpenAPI. ([#2316](https://github.com/matrix-org/matrix-spec/issues/2316))
+- Fix various typos throughout the specification. Contributed by @HarHarLinks. ([#2318](https://github.com/matrix-org/matrix-spec/issues/2318))
+- Clarified attachment encryption to require secure generation of keys and hash verification. ([#2324](https://github.com/matrix-org/matrix-spec/issues/2324))
+- Order the common and other error codes alphabetically and remove duplicate `M_THREEPID_IN_USE` definition. ([#2336](https://github.com/matrix-org/matrix-spec/issues/2336))
+- Fix various typos throughout the specification. ([#2337](https://github.com/matrix-org/matrix-spec/issues/2337))
+
+
+## Server-Server API
+
+**Removed Endpoints**
+
+- Remove `/v1/send_join` and `/v1/send_leave`, as per [MSC4376](https://github.com/matrix-org/matrix-spec-proposals/pull/4376). ([#2319](https://github.com/matrix-org/matrix-spec/issues/2319))
+
+**Backwards Compatible Changes**
+
+- Add a concept of "Policy Servers", as per [MSC4284](https://github.com/matrix-org/matrix-spec-proposals/pull/4284). ([#2332](https://github.com/matrix-org/matrix-spec/issues/2332))
+
+**Spec Clarifications**
+
+- Clarify what the `minimum_valid_until_ts` field means when it is set in key queries. ([#2191](https://github.com/matrix-org/matrix-spec/issues/2191))
+- Specify validation for PDUs passed to and returned from federation membership endpoints. ([#2284](https://github.com/matrix-org/matrix-spec/issues/2284))
+- Specify that callers of `/_matrix/federation/v1/openid/userinfo` must validate the returned user ID. ([#2288](https://github.com/matrix-org/matrix-spec/issues/2288))
+- Change `m.signing_update` typo to `m.signing_key_update`. Contributed by @velikopter ([#2300](https://github.com/matrix-org/matrix-spec/issues/2300))
+- Add link to JSON signing algorithm in server-server auth section for clarity. Contributed by @thetayloredman. ([#2329](https://github.com/matrix-org/matrix-spec/issues/2329))
+- Fix various typos throughout the specification. ([#2338](https://github.com/matrix-org/matrix-spec/issues/2338))
+
+
+## Application Service API
+
+**Spec Clarifications**
+
+- Fix various typos throughout the specification. ([#2330](https://github.com/matrix-org/matrix-spec/issues/2330))
+
+
+## Identity Service API
+
+**Spec Clarifications**
+
+- Clarify the error codes that can be returned with a 400 HTTP status code by the `POST /_matrix/identity/v2/validate/email/submitToken` and `POST /_matrix/identity/v2/validate/msisdn/submitToken` endpoints, introducing the `M_TOKEN_INCORRECT` error code, as per [MSC4183](https://github.com/matrix-org/matrix-spec-proposals/pull/4183). ([#2277](https://github.com/matrix-org/matrix-spec/issues/2277))
+- Order the standard error codes alphabetically. ([#2336](https://github.com/matrix-org/matrix-spec/issues/2336))
+
+
+## Push Gateway API
+
+No significant changes.
+
+
+## Room Versions
+
+**Spec Clarifications**
+
+- Clarify meaning of floating-point powerlevels. ([#2297](https://github.com/matrix-org/matrix-spec/issues/2297))
+- Remove the post-1.16 release note for room version 12. ([#2303](https://github.com/matrix-org/matrix-spec/issues/2303))
+
+
+## Appendices
+
+**Spec Clarifications**
+
+- Add identifier pronunciation guidelines. Contributed by @HarHarLinks. ([#2307](https://github.com/matrix-org/matrix-spec/issues/2307))
+
+
+## Internal Changes/Tooling
+
+**Backwards Compatible Changes**
+
+- Include the spec release version in the filenames in the tarballs generated by CI. ([#2276](https://github.com/matrix-org/matrix-spec/issues/2276))
+
+**Spec Clarifications**
+
+- Clarify vendor prefixing requirements. ([#2222](https://github.com/matrix-org/matrix-spec/issues/2222))
+- Auto-create draft releases when building release tags. ([#2275](https://github.com/matrix-org/matrix-spec/issues/2275))
+- Replace the Twitter link in the footer with our BlueSky and Mastodon socials. ([#2282](https://github.com/matrix-org/matrix-spec/issues/2282))
+- Upgrade to docsy v0.13.0. ([#2287](https://github.com/matrix-org/matrix-spec/issues/2287))
+- Updates to the release documentation. ([#2289](https://github.com/matrix-org/matrix-spec/issues/2289))
+- Remove unused leftover CSS files. ([#2290](https://github.com/matrix-org/matrix-spec/issues/2290))
+- Update the footer social links to match matrix.org. Contributed by @HarHarLinks. ([#2317](https://github.com/matrix-org/matrix-spec/issues/2317))
+- Fix various typos throughout the specification. Contributed by @HarHarLinks. ([#2318](https://github.com/matrix-org/matrix-spec/issues/2318))
+- Render error code sections as definition lists to improve readability. ([#2323](https://github.com/matrix-org/matrix-spec/issues/2323))
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@ -126,6 +126,25 @@ state (e.g.: sending messages, account data, etc) and not routes which
 only read state (e.g.: [`/sync`](#get_matrixclientv3sync),
 [`/user/{userId}/account_data/{type}`](#get_matrixclientv3useruseridaccount_datatype), etc).

+`M_UNKNOWN`
+: An unknown error has occurred.
+
+`M_UNKNOWN_DEVICE`
+: {{% added-in v="1.17" %}} The device ID supplied by the application service does
+not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
+
+`M_UNKNOWN_TOKEN`
+: The access or refresh token specified was not recognised.
+
+: An additional response parameter, `soft_logout`, might be present on the
+response for 401 HTTP status codes. See [the soft logout
+section](#soft-logout) for more information.
+
+`M_UNRECOGNIZED`
+: The server did not understand the request. This is expected to be returned with
+a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
+code if the endpoint is implemented, but the incorrect HTTP method is used.
+
 `M_USER_LIMIT_EXCEEDED`
 : {{% added-in v="1.18" %}} The request cannot be completed because the user has
 exceeded (or the request would cause them to exceed) a limit associated with
@ -157,25 +176,6 @@ limit is a hard limit that cannot be increased.
  }
  ```

-`M_UNKNOWN`
-: An unknown error has occurred.
-
-`M_UNKNOWN_DEVICE`
-: {{% added-in v="1.17" %}} The device ID supplied by the application service does
-not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
-
-`M_UNKNOWN_TOKEN`
-: The access or refresh token specified was not recognised.
-
-: An additional response parameter, `soft_logout`, might be present on the
-response for 401 HTTP status codes. See [the soft logout
-section](#soft-logout) for more information.
-
-`M_UNRECOGNIZED`
-: The server did not understand the request. This is expected to be returned with
-a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
-code if the endpoint is implemented, but the incorrect HTTP method is used.
-
 `M_USER_LOCKED`
 : The account has been [locked](#account-locking) and cannot be used at this time.

@ -3120,19 +3120,20 @@ events they have already been sent, and choose to skip sending membership
 events for members whose membership has not changed. These are called
 'redundant membership events'. Clients may request that redundant membership
 events are always included in responses by setting `include_redundant_members`
-to true in the filter.
+to `true` in the filter.

 The expected pattern for using lazy-loading is currently:

-   Client performs an initial /sync with lazy-loading enabled, and
+-   Client performs an initial `/sync` with lazy-loading enabled, and
    receives only the membership events which relate to the senders of
    the events it receives.
 -   Clients which support display-name tab-completion or other
    operations which require rapid access to all members in a room
-    should call /members for the currently selected room, with an `?at`
-    parameter set to the /sync response's from token. The member list
-    for the room is then maintained by the state in subsequent
-    incremental /sync responses.
+    should call [`/members`](#get_matrixclientv3roomsroomidmembers) for
+    the currently selected room, with an `?at` parameter set to the
+    `/sync` response's `from` token. The member list for the room is
+    then maintained by the state in subsequent incremental `/sync`
+    responses.
 -   Clients which do not support tab-completion may instead pull in
    profiles for arbitrary users (e.g. read receipts, typing
    notifications) on demand by querying the room state or [`/profile`](#get_matrixclientv3profileuserid).
@ -3347,8 +3348,8 @@ room at the start of the returned timeline. The response also includes a
 `next_batch` field, which should be used as the value of the `since`
 parameter in the next call to `/sync`. Finally, the response includes,
 for each room, a `prev_batch` field, which can be passed as a `from`/`to`
-parameter to the [`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientv3roomsroomidmessages) API to retrieve earlier
-messages.
+parameter to the [`/rooms/{roomId}/messages`](#get_matrixclientv3roomsroomidmessages)
+API to retrieve earlier messages.

 For example, a `/sync` request might return a range of four events
 `E2`, `E3`, `E4` and `E5` within a given room, omitting two prior events
@ -3367,7 +3368,8 @@ response to the previous call as the `since` parameter. The client
 should also pass a `timeout` parameter. The server will then hold open
 the HTTP connection for a short period of time waiting for new events,
 returning early if an event occurs. Only the `/sync` API (and the
-deprecated `/events` API) support long-polling in this way.
+deprecated [`/events`](#get_matrixclientv3events) API) support
+long-polling in this way.

 Continuing the example above, an incremental sync might report
 a single new event `E6`. The response can be visualised as:
@ -3387,7 +3389,7 @@ containing only the most recent message events. A state "delta" is also
 returned, summarising any state changes in the omitted part of the
 timeline. The client may therefore end up with "gaps" in its knowledge
 of the message timeline. The client can fill these gaps using the
-[`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientv3roomsroomidmessages) API.
+[`/rooms/{roomId}/messages`](#get_matrixclientv3roomsroomidmessages) API.

 Continuing our example, suppose we make a third `/sync` request asking for
 events since the last sync, by passing the `next_batch` token `x-y-z` as
@ -3410,7 +3412,7 @@ The limited response includes a state delta which describes how the state
 of the room changes over the gap. This delta explains how to build the state
 prior to returned timeline (i.e. at `E7`) from the state the client knows
 (i.e. at `E6`). To close the gap, the client should make a request to
-[`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientv3roomsroomidmessages)
+[`/rooms/{roomId}/messages`](#get_matrixclientv3roomsroomidmessages)
 with the query parameters `from=x-y-z` and `to=d-e-f`.

 {{% boxes/warning %}}
--- a/data/api/client-server/definitions/client_event.yaml
+++ b/data/api/client-server/definitions/client_event.yaml
@ -24,8 +24,9 @@ allOf:
      room_id:
        description: The ID of the room associated with this event.
        type: string
+        format: mx-room-id
+        pattern: "^!"
        example: '!jEsUZKDJdhlrceRyVU:example.org'
-
      unsigned:
        properties:
            redacted_because:
@ -43,6 +44,6 @@ allOf:
                "unsigned": {
                  "age": 1257,
                }
-            }
+              }
    required:
      - room_id
--- a/data/api/client-server/definitions/client_event_without_room_id.yaml
+++ b/data/api/client-server/definitions/client_event_without_room_id.yaml
@ -28,6 +28,8 @@ properties:
  event_id:
    description: The globally unique identifier for this event.
    type: string
+    format: mx-event-id
+    pattern: "^\\$"
    example: '$26RqwJMLw-yds1GAH_QxjHRC1Da9oasK0e5VLnck_45'
  type:
    description: The type of the event.
@ -47,6 +49,8 @@ properties:
  sender:
    description: Contains the fully-qualified ID of the user who sent this event.
    type: string
+    format: mx-user-id
+    pattern: "^@"
    example: "@example:example.org"
  origin_server_ts:
    description: |-
--- a/data/api/client-server/definitions/event_filter.yaml
+++ b/data/api/client-server/definitions/event_filter.yaml
@ -26,6 +26,8 @@ properties:
      `senders` filter.
    items:
      type: string
+      format: mx-user-id
+      pattern: "^@"
    type: array
  not_types:
    description: A list of event types to exclude. If this list is absent then no
@ -40,6 +42,8 @@ properties:
      senders are included.
    items:
      type: string
+      format: mx-user-id
+      pattern: "^@"
    type: array
  types:
    description: A list of event types to include. If this list is absent then all
--- a/data/api/client-server/definitions/m.relates_to.yaml
+++ b/data/api/client-server/definitions/m.relates_to.yaml
@ -39,5 +39,7 @@ properties:
      such.
  event_id:
    type: string
+    format: mx-event-id
+    pattern: "^\\$"
    description: The event ID of the event that this event relates to.
 required: ['rel_type', 'event_id']
--- a/data/api/client-server/definitions/room_event_filter.yaml
+++ b/data/api/client-server/definitions/room_event_filter.yaml
@ -43,12 +43,16 @@ allOf:
        filter.
      items:
        type: string
+        format: mx-room-id
+        pattern: "^!"
      type: array
    rooms:
      description: A list of room IDs to include. If this list is absent then all rooms
        are included.
      items:
        type: string
+        format: mx-room-id
+        pattern: "^!"
      type: array
    contains_url:
      type: boolean
--- a/data/api/client-server/definitions/sync_filter.yaml
+++ b/data/api/client-server/definitions/sync_filter.yaml
@ -50,6 +50,8 @@ properties:
          `state`, `timeline` or `account_data`
        items:
          type: string
+          format: mx-room-id
+          pattern: "^!"
        type: array
      rooms:
        description: A list of room IDs to include. If this list is absent then all rooms
@ -57,6 +59,8 @@ properties:
          `state`, `timeline` or `account_data`
        items:
          type: string
+          format: mx-room-id
+          pattern: "^!"
        type: array
      ephemeral:
        allOf:
--- a/data/api/client-server/filter.yaml
+++ b/data/api/client-server/filter.yaml
@ -36,6 +36,8 @@ paths:
          example: "@alice:example.com"
          schema:
            type: string
+            format: mx-user-id
+            pattern: "^@"
      requestBody:
        content:
          application/json:
@ -130,6 +132,8 @@ paths:
          example: "@alice:example.com"
          schema:
            type: string
+            format: mx-user-id
+            pattern: "^@"
        - in: path
          name: filterId
          description: The filter ID to download.
--- a/data/api/client-server/message_pagination.yaml
+++ b/data/api/client-server/message_pagination.yaml
@ -37,6 +37,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: query
          name: from
          x-changedInMatrixVersion:
--- a/data/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@ -148,6 +148,8 @@ paths:
                      properties:
                        room_id:
                          type: string
+                          format: mx-room-id
+                          pattern: "^!"
                          description: The ID of this room.
                        membership:
                          type: string
@ -337,6 +339,8 @@ paths:
          example: $asfDuShaf7Gafaw:matrix.org
          schema:
            type: string
+            format: mx-event-id
+            pattern: "^\\$"
      responses:
        "200":
          description: The full event.
--- a/data/api/client-server/redaction.yaml
+++ b/data/api/client-server/redaction.yaml
@ -43,13 +43,17 @@ paths:
          example: "!637q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: path
          name: eventId
-          description: The ID of the event to redact
+          description: The ID of the event to redact.
          required: true
-          example: bai2b1i9:matrix.org
+          example: $bai2b1i9:matrix.org
          schema:
            type: string
+            format: mx-event-id
+            pattern: "^\\$"
        - in: path
          name: txnId
          description: |-
@ -82,6 +86,8 @@ paths:
                properties:
                  event_id:
                    type: string
+                    format: mx-event-id
+                    pattern: "^\\$"
                    description: A unique identifier for the event.
              examples:
                response:
--- a/data/api/client-server/relations.yaml
+++ b/data/api/client-server/relations.yaml
@ -233,6 +233,8 @@ components:
      example: "!636q39766251:matrix.org"
      schema:
        type: string
+        format: mx-room-id
+        pattern: "^!"
    eventId:
      in: path
      name: eventId
@ -241,6 +243,8 @@ components:
      example: $asfDuShaf7Gafaw
      schema:
        type: string
+        format: mx-event-id
+        pattern: "^\\$"
    from:
      in: query
      name: from
--- a/data/api/client-server/room_event_by_timestamp.yaml
+++ b/data/api/client-server/room_event_by_timestamp.yaml
@ -56,6 +56,8 @@ paths:
          example: "!636q39766251:matrix.org"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: query
          name: ts
          description: |-
@ -86,6 +88,8 @@ paths:
                properties:
                  event_id:
                    type: string
+                    format: mx-event-id
+                    pattern: "^\\$"
                    description: The ID of the event found
                  origin_server_ts:
                    type: integer
--- a/data/api/client-server/room_initial_sync.yaml
+++ b/data/api/client-server/room_initial_sync.yaml
@ -27,6 +27,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
      responses:
        "200":
          description: The current state of the room
@ -38,6 +40,8 @@ paths:
                properties:
                  room_id:
                    type: string
+                    format: mx-room-id
+                    pattern: "^!"
                    description: The ID of this room.
                  membership:
                    type: string
--- a/data/api/client-server/room_send.yaml
+++ b/data/api/client-server/room_send.yaml
@ -49,6 +49,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: path
          name: eventType
          description: The type of event to send.
@ -86,6 +88,8 @@ paths:
                properties:
                  event_id:
                    type: string
+                    format: mx-event-id
+                    pattern: "^\\$"
                    description: A unique identifier for the event.
                required:
                  - event_id
--- a/data/api/client-server/room_state.yaml
+++ b/data/api/client-server/room_state.yaml
@ -49,6 +49,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: path
          name: eventType
          description: The type of event to send.
@ -86,6 +88,8 @@ paths:
                properties:
                  event_id:
                    type: string
+                    format: mx-event-id
+                    pattern: "^\\$"
                    description: A unique identifier for the event.
                required:
                  - event_id
--- a/data/api/client-server/rooms.yaml
+++ b/data/api/client-server/rooms.yaml
@ -34,6 +34,8 @@ paths:
          example: "!636q39766251:matrix.org"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: path
          name: eventId
          description: The event ID to get.
@ -41,6 +43,8 @@ paths:
          example: $asfDuShaf7Gafaw:matrix.org
          schema:
            type: string
+            format: mx-event-id
+            pattern: "^\\$"
      responses:
        "200":
          description: The full event.
@ -89,6 +93,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: path
          name: eventType
          description: The type of state to look up.
@ -158,6 +164,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
      responses:
        "200":
          description: The current state of the room
@ -211,6 +219,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
        - in: query
          name: at
          description: |-
@ -305,6 +315,8 @@ paths:
          example: "!636q39766251:example.com"
          schema:
            type: string
+            format: mx-room-id
+            pattern: "^!"
      security:
        - accessTokenQuery: []
        - accessTokenBearer: []
--- a/data/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@ -209,6 +209,8 @@ paths:
                                      field may be omitted.
                                    items:
                                      type: string
+                                      format: mx-user-id
+                                      pattern: "^@"
                                  m.joined_member_count:
                                    type: integer
                                    description: |-
--- a/data/event-schemas/schema/components/signed_third_party_invite.yaml
+++ b/data/event-schemas/schema/components/signed_third_party_invite.yaml
@ -20,10 +20,13 @@ properties:
      The signatures are calculated using the process described at
      [Signing JSON](/appendices/#signing-json).
    type: object
-    additionalProperties:
-      type: object
-      additionalProperties:
-        type: string
+    patternProperties:
+      "":
+        x-pattern-format: mx-server-name
+        type: object
+        additionalProperties:
+          type: string
+          format: mx-unpadded-base64
    example: {
      "magic.forest": {
        "ed25519:3": "fQpGIW1Snz+pwLZu6sTy2aHy/DYWWTspTJRPyNp0PKkymfIsNffysMl6ObMMFdIJhk6g6pwlIqZ54rxo8SLmAg"
--- a/data/event-schemas/schema/core-event-schema/room_event.yaml
+++ b/data/event-schemas/schema/core-event-schema/room_event.yaml
@ -11,5 +11,7 @@ allOf:
        The ID of the room associated with this event. Will not be present on events
        that arrive through `/sync`, despite being required everywhere else.
      type: string
+      format: mx-room-id
+      pattern: "^!"
  required:
  - room_id
--- a/data/event-schemas/schema/core-event-schema/stripped_state.yaml
+++ b/data/event-schemas/schema/core-event-schema/stripped_state.yaml
@ -39,6 +39,8 @@ properties:
  sender:
    description: The `sender` for the event.
    type: string
+    format: mx-user-id
+    pattern: "^@"
 required:
  - type
  - state_key
--- a/data/event-schemas/schema/core-event-schema/sync_room_event.yaml
+++ b/data/event-schemas/schema/core-event-schema/sync_room_event.yaml
@ -29,9 +29,13 @@ allOf:
    event_id:
      description: The globally unique event identifier.
      type: string
+      format: mx-event-id
+      pattern: "^\\$"
    sender:
      description: Contains the fully-qualified ID of the user who sent this event.
      type: string
+      format: mx-user-id
+      pattern: "^@"
    origin_server_ts:
      description: Timestamp in milliseconds on originating homeserver
        when this event was sent.
--- a/data/event-schemas/schema/m.key.verification.accept.yaml
+++ b/data/event-schemas/schema/m.key.verification.accept.yaml
@ -44,7 +44,8 @@ properties:
        description: |-
          The hash (encoded as unpadded base64) of the concatenation of the device's
          ephemeral public key (encoded as unpadded base64) and the canonical JSON
-          representation of the `m.key.verification.start` message.
+          representation of the `content` object of the `m.key.verification.start`
+          message.
      m.relates_to:
        $ref: m.key.verification.m.relates_to.yaml
    required:
--- a/data/event-schemas/schema/m.room.canonical_alias.yaml
+++ b/data/event-schemas/schema/m.room.canonical_alias.yaml
@ -16,6 +16,8 @@ properties:
          The canonical alias for the room. If not present, null, or empty the
          room should be considered to have no canonical alias.
        type: string
+        format: mx-room-alias
+        pattern: "^#"
      alt_aliases:
        description: |
          Alternative aliases the room advertises. This list can have aliases
@ -23,6 +25,8 @@ properties:
        type: array
        items:
          type: string
+          format: mx-room-alias
+          pattern: "^#"
    type: object
  state_key:
    description: A zero-length string.
--- a/data/event-schemas/schema/m.room.create.yaml
+++ b/data/event-schemas/schema/m.room.create.yaml
@ -12,6 +12,8 @@ properties:
          The `user_id` of the room creator. **Required** for, and only present in, room versions 1 - 10. Starting with
          room version 11 the event `sender` should be used instead.
        type: string
+        format: mx-user-id
+        pattern: "^@"
      m.federate:
        description: Whether users on other servers can join this room. Defaults to `true` if key does not exist.
        type: boolean
@ -32,9 +34,13 @@ properties:
        properties:
          room_id:
            type: string
+            format: mx-room-id
+            pattern: "^!"
            description: The ID of the old room.
          event_id:
            type: string
+            format: mx-event-id
+            pattern: "^\\$"
            deprecated: true
            x-changedInMatrixVersion:
              "1.16": |-
@ -51,6 +57,8 @@ properties:
        type: array
        items:
          type: string
+          format: mx-user-id
+          pattern: "^@"
          description: Additional user ID to consider a creator of the room, if supported by the room version.
        x-addedInMatrixVersion: "1.16"
        description: |-
--- a/data/event-schemas/schema/m.room.join_rules.yaml
+++ b/data/event-schemas/schema/m.room.join_rules.yaml
@ -55,6 +55,8 @@ properties:
              enum: ['m.room_membership']
            room_id:
              type: string
+              format: mx-room-id
+              pattern: "^!"
              description: |-
                Required if `type` is `m.room_membership`. The room ID to check the
                user's membership against. If the user is joined to this room, they
--- a/data/event-schemas/schema/m.room.member.yaml
+++ b/data/event-schemas/schema/m.room.member.yaml
@ -76,6 +76,8 @@ properties:
      join_authorised_via_users_server:
        x-addedInMatrixVersion: "1.2"
        type: string
+        format: mx-user-id
+        pattern: "^@"
        description: |-
          Usually found on `join` events, this field is used to denote which homeserver (through
          representation of a user with sufficient power level) authorised the user's join. More
@ -127,6 +129,8 @@ properties:
      `join`, the user ID sending the event does not need to match the user ID in the `state_key`,
      unlike other events. Regular authorisation rules still apply.
    type: string
+    format: mx-user-id
+    pattern: "^@"
  type:
    enum:
      - m.room.member
--- a/data/event-schemas/schema/m.room.redaction.yaml
+++ b/data/event-schemas/schema/m.room.redaction.yaml
@ -10,6 +10,8 @@ properties:
      redacts:
        description: The event ID that was redacted. Required for, and present starting in, room version 11.
        type: string
+        format: mx-event-id
+        pattern: "^\\$"
      reason:
        description: 'The reason for the redaction, if any.'
        type: string
@ -17,6 +19,8 @@ properties:
  redacts:
    description: Required for, and only present in, room versions 1 - 10. The event ID that was redacted.
    type: string
+    format: mx-event-id
+    pattern: "^\\$"
  type:
    enum:
      - m.room.redaction
--- a/data/string-formats.yaml
+++ b/data/string-formats.yaml
@ -66,6 +66,11 @@ mx-mxc-uri:
  url: client-server-api#matrix-content-mxc-uris
  # regex: "^mxc:\\/\\/"

+mx-unpadded-base64:
+  title: Unpadded Base64
+  url: appendices#unpadded-base64
+  # no regex
+
 uri:
  title: URI
  url: https://datatracker.ietf.org/doc/html/rfc3986
Author	SHA1	Message	Date
timedout	1549efe8d6	Merge `c175953e80` into `486a8f8764`	2026-04-16 17:21:20 +01:00
Kévin Commaille	486a8f8764	Improvements to "Events" section (#2349 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details Spec / Create release (push) Has been cancelled Details * Clarify string formats of event endpoints and schemas Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Fix links to endpoints Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> --------- Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2026-04-14 21:30:06 -04:00
Kévin Commaille	96799c287a	Improvements to "Filtering" section (#2347 ) Some checks are pending Spec / 🔎 Validate OpenAPI specifications (push) Waiting to run Details Spec / 🔎 Check Event schema examples (push) Waiting to run Details Spec / 🔎 Check OpenAPI definitions examples (push) Waiting to run Details Spec / 🔎 Check JSON Schemas inline examples (push) Waiting to run Details Spec / ⚙️ Calculate baseURL for later jobs (push) Waiting to run Details Spec / 🐍 Build OpenAPI definitions (push) Blocked by required conditions Details Spec / 📢 Run towncrier for changelog (push) Waiting to run Details Spec / 📖 Build the spec (push) Blocked by required conditions Details Spec / 🔎 Validate generated HTML (push) Blocked by required conditions Details Spec / 📖 Build the historical backup spec (push) Blocked by required conditions Details Spec / Create release (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details * Clarify string format of filtering endpoints. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Use inline code for endpoints and add link to /members definition Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> --------- Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2026-04-14 16:34:47 -04:00
Hugh Nimmo-Smith	156d1b878a	Fix ordering of CS API common error codes (#2348 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details Spec / Create release (push) Has been cancelled Details I suspect that I forgot to rebase https://github.com/matrix-org/matrix-spec/pull/2315 after https://github.com/matrix-org/matrix-spec/pull/2336 was merged (or vice versa). This PR restores the alphabetical ordering.	2026-03-31 23:27:39 +01:00
No.	9c014a9045	Clarify SAS commitment calculation (#2344 ) Signed-off-by: tusooa <tusooa@kazv.moe> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2026-03-31 22:20:49 +00:00
Travis Ralston	2192bfa996	Try to fix npm release (#2343 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details Spec / Create release (push) Has been cancelled Details * Make npm a sudo * changelog	2026-03-26 11:48:21 -06:00
Travis Ralston	52e5af5f98	become unstable	2026-03-26 09:31:21 -06:00
Travis Ralston	c346686b0d	Matrix 1.18	2026-03-26 09:29:23 -06:00
				`@ -1 +0,0 @@`
				`Add identifier pronunciation guidelines. Contributed by @HarHarLinks.`
				`@ -1 +0,0 @@`
				`Fix various typos throughout the specification.`
				`@ -1 +0,0 @@`
				`Add the account management capabilities for the OAuth 2.0 authentication API, as per [MSC4191](https://github.com/matrix-org/matrix-spec-proposals/pull/4191).`
				`@ -1 +0,0 @@`
				`Add OAuth 2.0 aware clients, as per [MSC3824](https://github.com/matrix-org/matrix-spec-proposals/pull/3824).`
				`@ -1 +0,0 @@`
				Add administrator endpoints to lock and suspend server-local users and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
				`@ -1 +0,0 @@`
				Add `GET /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
				`@ -1 +0,0 @@`
				Add `PUT /_matrix/client/v1/admin/suspend/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
				`@ -1 +0,0 @@`
				Add `GET /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
				`@ -1 +0,0 @@`
				Add `PUT /_matrix/client/v1/admin/lock/{userId}`, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).