Merge e8faaf461d into d9f5a1e97c

Remove the post-1.16 release note for room version 12 (#2303 )
fix m.signing_update typo (#2300 )
2026-03-05 11:14:11 +01:00 · 2026-02-02 10:15:47 +01:00 · 2026-02-02 09:15:34 +00:00 · 2026-01-28 16:53:00 +00:00
4 changed files with 3 additions and 14 deletions
--- a/changelogs/room_versions/newsfragments/2303.clarification
+++ b/changelogs/room_versions/newsfragments/2303.clarification
@ -0,0 +1 @@
+Remove the post-1.16 release note for room version 12.
--- a/changelogs/server_server/newsfragments/2300.clarification
+++ b/changelogs/server_server/newsfragments/2300.clarification
@ -0,0 +1 @@
+Change `m.signing_update` typo to `m.signing_key_update`. Contributed by @velikopter
--- a/content/rooms/_index.md
+++ b/content/rooms/_index.md
@ -56,19 +56,6 @@ Clients should not ask room administrators to upgrade their rooms if the
 room is running a stable version. Servers SHOULD use **room version 12** as
 the default room version when creating new rooms.

-{{% boxes/note %}}
-
-{{% added-in v="1.16" %}}
-
-Room version 12 is introduced and made default in this specification release.
-Servers are encouraged to continue using room version 11 as the default room
-version for the early days and weeks following this specification release,
-and then gradually switch the default over when they deem appropriate.
-
-<!-- TODO(SCT): Remove this note box in Matrix 1.17 -->
-
-{{% /boxes/note %}}
-
 The available room versions are:

 -   [Version 1](/rooms/v1) - **Stable**. The initial room version.
--- a/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
@ -25,7 +25,7 @@ allOf:
      edu_type:
        type: string
        enum: ['m.signing_key_update']
-        description: The string `m.signing_update`.
+        description: The string `m.signing_key_update`.
        example: "m.signing_key_update"
      content:
        type: object
Author	SHA1	Message	Date
Kévin Commaille	77ec11800e	Merge `e8faaf461d` into `d9f5a1e97c`	2026-02-02 10:15:47 +01:00
Johannes Marbach	d9f5a1e97c	Remove the post-1.16 release note for room version 12 (#2303 ) 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	2026-02-02 09:15:34 +00:00
Kierre Sametti	f92c3579ac	fix `m.signing_update` typo (#2300 ) 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 Signed-off-by: Kierre Sametti vel@riseup.net	2026-01-28 16:53:00 +00:00
				`@ -0,0 +1 @@`
				`Remove the post-1.16 release note for room version 12.`
				`@ -0,0 +1 @@`
				Change `m.signing_update` typo to `m.signing_key_update`. Contributed by @velikopter