Merge 3c17aa3789 into b1fd2af72c

changelogs/client_server/newsfragments/2255.clarification

@@ -1 +0,0 @@
-Usage of the `event_id_only` format for push notifications is not mandatory.

data/api/client-server/pusher.yaml

@@ -230,14 +230,11 @@ paths:
                     format:
                       type: string
                       description: |-
-                        The format in which to send notifications to the push gateway
-                        if the `kind` is `http`. The details about what fields the
-                        homeserver should include are defined in the
-                        [Push Gateway Specification](/push-gateway-api/). If omitted,
-                        the server is expected to populate all of the event-related fields
-                        specified in [`/_matrix/push/v1/notify`](/push-gateway-api/#post_matrixpushv1notify).
-                      enum:
-                        - "event_id_only"
+                        The format to send notifications in to Push Gateways if the
+                        `kind` is `http`. The details about what fields the
+                        homeserver should send to the push gateway are defined in the
+                        [Push Gateway Specification](/push-gateway-api/). Currently the only format
+                        available is 'event_id_only'.
                 append:
                   type: boolean
                   description: |-