Merge c4bbef30d1 into 0e280ed014

changelogs/client_server/newsfragments/2167.clarification

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

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: