From 3e03e7b17a29e7482dd9b4f54280a71880e611c4 Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 30 Jan 2021 21:12:53 -0800 Subject: [PATCH] A few small fixes in /data and /content --- .../modules/end_to_end_encryption.md | 2 +- data/api/client-server/create_room.yaml | 12 +++++------- data/api/client-server/keys.yaml | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) 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 13ecbdcc0..b5a444a48 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -1363,7 +1363,7 @@ messages. {{% event event="m.room_key_request" %}} -{{% event event="m.room_key" %}} +{{% event event="m.forwarded_room_key" %}} {{% event event="m.dummy" %}} diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml index 8fd8cbc83..fc558c03d 100644 --- a/data/api/client-server/create_room.yaml +++ b/data/api/client-server/create_room.yaml @@ -62,13 +62,11 @@ paths: The available presets do the following with respect to room state: - ======================== ============== ====================== ================ ========= - Preset `join_rules` `history_visibility` `guest_access` Other - ======================== ============== ====================== ================ ========= - `private_chat` `invite` `shared` `can_join` - `trusted_private_chat` `invite` `shared` `can_join` All invitees are given the same power level as the room creator. - `public_chat` `public` `shared` `forbidden` - ======================== ============== ====================== ================ ========= + | Preset | `join_rules` | `history_visibility` | `guest_access` | Other | + |------------------------|--------------|----------------------|----------------|-------| + | `private_chat` | `invite` | `shared` | `can_join` | | + | `trusted_private_chat` | `invite` | `shared` | `can_join` | All invitees are given the same power level as the room creator. | + | `public_chat` | `public` | `shared` | `forbidden` | | The server will create a `m.room.create` event in the room with the requesting user as the creator, alongside other keys provided in the diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml index 1ad5123d2..e0788b6ba 100644 --- a/data/api/client-server/keys.yaml +++ b/data/api/client-server/keys.yaml @@ -437,7 +437,7 @@ paths: type: string description: |- The desired start point of the list. Should be the `next_batch` field - from a response to an earlier call to |/sync|. Users who have not + from a response to an earlier call to [`/sync`](/client-server-api/#get_matrixclientr0sync). Users who have not uploaded new device identity keys since this point, nor deleted existing devices with identity keys since then, will be excluded from the results. @@ -448,7 +448,7 @@ paths: type: string description: |- The desired end point of the list. Should be the `next_batch` - field from a recent call to |/sync| - typically the most recent + field from a recent call to [`/sync`](/client-server-api/#get_matrixclientr0sync) - typically the most recent such call. This may be used by the server as a hint to check its caches are up to date. required: true