Merge 7ba3818678 into 625ed5c599

changelogs/client_server/newsfragments/2167.clarification

@@ -1 +0,0 @@
-Clarify that `format` is required if `formatted_body` is specified.

changelogs/client_server/newsfragments/2177.clarification

@@ -1 +0,0 @@
-Fix various typos throughout the specification.

data/api/client-server/logout.yaml

@@ -47,7 +47,7 @@ paths:
         deleted alongside the device.
 
         This endpoint does not use the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api) because
-        User-Interactive Authentication is designed to protect against attacks where
+        User-Interactive Authentication is designed to protect against attacks where the
         someone gets hold of a single access token then takes over the account. This
         endpoint invalidates all access tokens for the user, including the token used in
         the request, and therefore the attacker is unable to take over the account in

data/event-schemas/schema/m.room.message$m.audio.yaml

@@ -15,8 +15,8 @@ properties:
           "1.10": This property can act as a caption for the audio.
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
         x-addedInMatrixVersion: "1.10"
       formatted_body:

data/event-schemas/schema/m.room.message$m.emote.yaml

@@ -14,8 +14,8 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-

data/event-schemas/schema/m.room.message$m.file.yaml

@@ -15,8 +15,8 @@ properties:
           "1.10": This property can act as a caption for the file.
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
         x-addedInMatrixVersion: "1.10"
       formatted_body:

data/event-schemas/schema/m.room.message$m.image.yaml

@@ -15,8 +15,8 @@ properties:
           "1.10": This property can act as a caption for the image.
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
         x-addedInMatrixVersion: "1.10"
       formatted_body:

data/event-schemas/schema/m.room.message$m.key.verification.request.yaml

@@ -22,8 +22,8 @@ properties:
           verification.
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-

data/event-schemas/schema/m.room.message$m.notice.yaml

@@ -14,8 +14,8 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-

data/event-schemas/schema/m.room.message$m.text.yaml

@@ -14,8 +14,8 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-

data/event-schemas/schema/m.room.message$m.video.yaml

@@ -15,8 +15,8 @@ properties:
           "1.10": This property can act as a caption for the video.
       format:
         description: |-
-          The format used in the `formatted_body`. This is required if `formatted_body`
-          is specified. Currently only `org.matrix.custom.html` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
         x-addedInMatrixVersion: "1.10"
       formatted_body: