Merge 695a97728d 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-03-26 13:04:10 +01:00 · 2025-03-28 16:31:19 -04:00 · 2025-03-28 14:13:17 +00:00 · 2025-01-31 11:23:26 +00:00 · 2025-01-31 11:21:05 +00:00
4 changed files with 11 additions and 2 deletions
--- a/changelogs/client_server/newsfragments/2068.clarification
+++ b/changelogs/client_server/newsfragments/2068.clarification
@ -0,0 +1 @@
+Clarify behaviour when the `topic` key of a `m.room.topic` event is absent, null, or empty.
--- a/changelogs/client_server/newsfragments/2121.clarification
+++ b/changelogs/client_server/newsfragments/2121.clarification
@ -0,0 +1 @@
+Fix various typos throughout the specification.
--- 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/data/event-schemas/schema/m.room.topic.yaml
+++ b/data/event-schemas/schema/m.room.topic.yaml
@ -1,7 +1,14 @@
 ---
 allOf:
  - $ref: core-event-schema/state_event.yaml
-description: 'A topic is a short message detailing what is currently being discussed in the room.  It can also be used as a way to display extra information about the room, which may not be suitable for the room name. The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
+description: |- 
+    A topic is a short message detailing what is currently being discussed in the room.
+    It can also be used as a way to display extra information about the room, which may not
+    be suitable for the room name.
+    The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
+    
+    If a room has an `m.room.topic` event with an absent, null, or empty `topic`
+    field, it should be treated the same as a room with no `m.room.topic` event.
 properties:
  content:
    properties:
Author	SHA1	Message	Date
Will Hunt	a89e4908e5	Merge `695a97728d` 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
Will Hunt	695a97728d	Create 2068.clarification	2025-01-31 11:23:26 +00:00
Will Hunt	97dfa16844	Describe behaviour when the `topic` key is falsey in a m.room.topic event. We seem to have [updated this for m.room.name](https://github.com/matrix-org/matrix-spec/pull/1639) some years back but omitted it for topic.	2025-01-31 11:21:05 +00:00
				`@ -0,0 +1 @@`
				Clarify behaviour when the `topic` key of a `m.room.topic` event is absent, null, or empty.
				`@ -0,0 +1 @@`
				`Fix various typos throughout the specification.`