Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-04-08 20:34:10 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge c12fbe4540 into f62aa09e60

Browse source
This commit is contained in:
Kim Brose 2026-02-20 14:01:40 +00:00 committed by GitHub
parent f62aa09e60 c12fbe4540
commit b5d0eb51c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/2318.clarification Normal file
View file

@ -0,0 +1 @@
Fix typos, formatting, wording. Contributed by @HarHarLinks.

1
changelogs/internal/newsfragments/2318.clarification Normal file
View file

@ -0,0 +1 @@
Fix typos, formatting, wording. Contributed by @HarHarLinks.

2
config/_default/hugo.toml
View file

@ -65,7 +65,7 @@ description = "Home of the Matrix specification for decentralised communication"
# Everything below this are Site Params # Everything below this are Site Params
[params] [params]
copyright = "The Matrix.org Foundation CIC" copyright = "The Matrix.org Foundation C.I.C."
[params.version] [params.version]
# must be one of "unstable", "current", "historical" # must be one of "unstable", "current", "historical"

2
content/client-server-api/_index.md
View file

@ -3418,7 +3418,7 @@ This specification describes the following relationship types:
* [Event replacements](#event-replacements). * [Event replacements](#event-replacements).
* [Event annotations](#event-annotations-and-reactions). * [Event annotations](#event-annotations-and-reactions).
* [Threads](#threading). * [Threads](#threading).
* [References](#reference-relations) * [References](#reference-relations).
#### Aggregations of child events #### Aggregations of child events

2
content/client-server-api/modules/threading.md
View file

@ -107,7 +107,7 @@ flag to `true`.
``` ```
{{% boxes/note %}} {{% boxes/note %}}
Clients which are acutely aware of threads (they do not render threads, but are otherwise Clients which are aware of threads (they do not render threads, but are otherwise
aware of the feature existing in the spec) can treat rich replies to an event with a `rel_type` aware of the feature existing in the spec) can treat rich replies to an event with a `rel_type`
of `m.thread` as a threaded reply, for conversation continuity on the threaded client's side. of `m.thread` as a threaded reply, for conversation continuity on the threaded client's side.

2
data/api/client-server/room_send.yaml
View file

@ -31,7 +31,7 @@ paths:
The body of the request should be the content object of the event; the The body of the request should be the content object of the event; the
fields in this object will vary depending on the type of event. See fields in this object will vary depending on the type of event. See
[Room Events](/client-server-api/#room-events) for the m. event specification. [Room Events](/client-server-api/#room-events) for the `m.` event specification.
Homeservers MUST allow clients to send `m.room.redaction` events with this Homeservers MUST allow clients to send `m.room.redaction` events with this
endpoint for all room versions. In rooms with a version older than 11 they endpoint for all room versions. In rooms with a version older than 11 they

2
data/event-schemas/schema/core-event-schema/event.yaml
View file

@ -8,7 +8,7 @@ properties:
type: object type: object
type: type:
description: The type of event. This SHOULD be namespaced similar to Java package description: The type of event. This SHOULD be namespaced similar to Java package
naming conventions e.g. 'com.example.subdomain.event.type' naming conventions e.g. `com.example.subdomain.event.type`
type: string type: string
required: required:
- type - type

2
layouts/_partials/events/render-event.html
View file

@ -49,7 +49,7 @@
</tr> </tr>
{{ if $state_key }} {{ if $state_key }}
<tr> <tr>
<th>State key</th> <th>State key:</th>
<td>{{ $state_key.description | markdownify }}</td> <td>{{ $state_key.description | markdownify }}</td>
</tr> </tr>
{{ end }} {{ end }}