Merge 332d867c86 into 8a2c58b1b1

Typo "not" -> "no" (#2121 )
* Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>
2026-04-29 05:44:10 +02:00 · 2025-03-28 16:31:19 -04:00 · 2025-03-28 14:13:17 +00:00 · 2025-03-17 18:40:52 +01:00 · 2025-03-17 18:34:21 +01:00
4 changed files with 5 additions and 3 deletions
--- a/changelogs/client_server/newsfragments/2121.clarification
+++ b/changelogs/client_server/newsfragments/2121.clarification
@ -0,0 +1 @@
 Fix various typos throughout the specification.
--- a/changelogs/server_server/newsfragments/2100.clarification
+++ b/changelogs/server_server/newsfragments/2100.clarification
@ -0,0 +1 @@
 Clarify that auth event of `content.join_authorised_via_users_server` is only necessary for `m.room.member` with a `membership` of `join`.
--- a/content/client-server-api/modules/secrets.md
+++ b/content/client-server-api/modules/secrets.md
@ -58,7 +58,7 @@ available on all their clients. Unless the user specifies otherwise,
 clients will try to use the default key to decrypt secrets.
 Clients that want to present a simplified interface to users by not supporting
-multiple keys should use the default key if one is specified. If not default
+multiple keys should use the default key if one is specified. If no default
 key is specified, the client may behave as if there is no key is present at
 all. When such a client creates a key, it should mark that key as being the
 default key.
--- a/content/server-server-api.md
+++ b/content/server-server-api.md
@ -543,8 +543,8 @@ the following subset of the room state:
      `third_party_invite` property, the current
      `m.room.third_party_invite` event with `state_key` matching
      `content.third_party_invite.signed.token`, if any.
-    - If `content.join_authorised_via_users_server` is present,
+    - If `membership` is `join`, `content.join_authorised_via_users_server`
-      and the [room version supports restricted rooms](/rooms/#feature-matrix),
+      is present, and the [room version supports restricted rooms](/rooms/#feature-matrix),
      then the `m.room.member` event with `state_key` matching
      `content.join_authorised_via_users_server`.
Author	SHA1	Message	Date
Kévin Commaille	6d26deb8e2	Merge `332d867c86` into `8a2c58b1b1`	2025-03-28 16:31:19 -04:00
Andy Balaam	8a2c58b1b1	Typo "not" -> "no" (#2121 ) 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 * Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>	2025-03-28 14:13:17 +00:00
Kévin Commaille	332d867c86	Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-03-17 18:40:52 +01:00
Kévin Commaille	75ba4a98bf	Clarify that `join_authorised_via_users_server` auth event is only necessary for join Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-03-17 18:34:21 +01:00
		`@ -0,0 +1 @@`
							`Fix various typos throughout the specification.`
		`@ -0,0 +1 @@`
							Clarify that auth event of `content.join_authorised_via_users_server` is only necessary for `m.room.member` with a `membership` of `join`.