diff --git a/changelogs/client_server/newsfragments/2417.clarification b/changelogs/client_server/newsfragments/2417.clarification new file mode 100644 index 00000000..8dfa8727 --- /dev/null +++ b/changelogs/client_server/newsfragments/2417.clarification @@ -0,0 +1 @@ +Wording improvements and spelling fixes. Contributed by @HarHarLinks. diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 84605d5c..fd86251c 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -3660,7 +3660,7 @@ The actual aggregation format depends on the `rel_type`. When an event is served to the client through the APIs listed below, a `m.relations` property is included under `unsigned` if the event has child -events which can be aggregated and point at it. The `m.relations` property is +events which can be aggregated. The `m.relations` property is an object keyed by `rel_type` and value being the type-specific aggregated format for that `rel_type`. This `m.relations` property is known as a "bundled aggregation". diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md index e1780ddd..4969262d 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -1940,7 +1940,7 @@ As of `v1.3`, the `sender_key` and `device_id` keys are **deprecated**. They SHOULD continue to be sent, however they MUST NOT be used to verify the message's source. -Clients MUST NOT store or lookup sessions using the `sender_key` or `device_id`. +Clients MUST NOT store or look up sessions using the `sender_key` or `device_id`. In a future version of the specification the keys can be removed completely, including for sending new messages. diff --git a/content/client-server-api/modules/threading.md b/content/client-server-api/modules/threading.md index e3365a0d..5daea0a3 100644 --- a/content/client-server-api/modules/threading.md +++ b/content/client-server-api/modules/threading.md @@ -191,7 +191,7 @@ Note that, as in the example above, child events of the `latest_event` should themselves be aggregated and included under `m.relations` for that event. The server should be careful to avoid loops, though loops are not currently possible due to `m.thread` not being permitted to target an event with an -`m.relates_to` property. +`m.relates_to` property with a `rel_type`. `count` is simply the number of events using `m.thread` as a `rel_type` pointing to the target event. It does not include events sent by [ignored users](#ignoring-users).