Spec for MSC4312: Resetting cross-signing keys in the OAuth world

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
Add m.login.terms to enumeration of authentication types (#2233 )
2026-05-03 15:44:09 +02:00 · 2025-10-29 09:28:41 +01:00 · 2025-10-28 19:05:59 -04:00 · 2025-10-24 10:19:19 +00:00 · 2025-10-17 17:44:44 -04:00
6 changed files with 11 additions and 4 deletions
--- a/changelogs/client_server/newsfragments/2227.clarification
+++ b/changelogs/client_server/newsfragments/2227.clarification
@ -0,0 +1 @@
 Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2233.clarification
+++ b/changelogs/client_server/newsfragments/2233.clarification
@ -0,0 +1 @@
 Add `m.login.terms` to enumeration of authentication types.
--- a/changelogs/internal/newsfragments/2238.clarification
+++ b/changelogs/internal/newsfragments/2238.clarification
@ -0,0 +1 @@
 Silence failing redocly-cli rule.
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@ -906,6 +906,7 @@ This specification defines the following auth types:
 -   `m.login.msisdn`
 -   `m.login.dummy`
 -   `m.login.registration_token`
 -   {{% added-in v="1.11" %}} `m.login.terms`
 -   {{% added-in v="1.17" %}} `m.oauth`
 ###### Password-based
--- a/content/client-server-api/modules/rich_replies.md
+++ b/content/client-server-api/modules/rich_replies.md
@ -20,9 +20,9 @@ Previously, a rich reply could only reference another `m.room.message` event.
 {{% boxes/note %}}
 {{% changed-in v="1.13" %}}
 In previous versions of the specification, rich replies could include a fallback
-representation of the original message message in the `body` (using a prefix
+representation of the original message in the `body` (using a prefix sequence)
-sequence) and `formatted_body` (using a custom HTML element) for clients that do
+and `formatted_body` (using a custom HTML element) for clients that do not
-not support rich replies. This is no longer the case, but clients SHOULD still
+support rich replies. This is no longer the case, but clients SHOULD still
 remove this fallback before rendering the event.
 To strip the fallback on the `body`, the client should iterate over each
--- a/redocly.yaml
+++ b/redocly.yaml
@ -9,3 +9,6 @@ rules:
  no-path-trailing-slash: off
  operation-2xx-response: off
  spec-strict-refs: error
  # $ref in examples are not spec-compliant, yet we find them useful. Disable this rule
  # and instead check example schema using `check-event-schema-examples.py`
  no-invalid-schema-examples: off
Author	SHA1	Message	Date
Johannes Marbach	47cce0ca26	Spec for MSC4312: Resetting cross-signing keys in the OAuth world Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-29 09:28:41 +01:00
Johannes Marbach	9d063c8d2d	Add m.login.terms to enumeration of authentication types (#2233 ) 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 Spell Check / Spell Check with Typos (push) Waiting to run Details Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-28 19:05:59 -04:00
Kévin Commaille	74a0d5f289	Silence redocly-cli rule checking examples (#2238 ) 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 Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2025-10-24 10:19:19 +00:00
Tol Wassman	974b0b721e	fix typo (#2227 ) 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 * fix typo * create newsfragment This seems to be the standard message for typo fixes.	2025-10-17 17:44:44 -04:00
		`@ -0,0 +1 @@`
							`Fix various typos throughout the specification.`
		`@ -0,0 +1 @@`
							Add `m.login.terms` to enumeration of authentication types.