Merge 9dbb0c8f7b into 7066694571

changelogs/client_server/newsfragments/2298.feature

@@ -1 +0,0 @@
-Add support for `m.room.redaction` events at the `PUT /rooms/{roomId}/send/{eventType}/{txnId}` endpoint, as per [MSC4169](https://github.com/matrix-org/matrix-spec-proposals/pull/4169).

content/client-server-api/_index.md

@@ -3315,14 +3315,6 @@ the topic to be removed from the room.
 
 #### Client behaviour
 
-{{% changed-in v="1.18" %}}
-
-If the server advertises support for a spec version that supports it, clients
-MAY use the [`PUT /rooms/{roomId}/send/{eventType}/{txnId}`](#put_matrixclientv3roomsroomidsendeventtypetxnid)
-endpoint to send `m.room.redaction` events in all room versions.
-
-They can also use the following endpoint.
-
 {{% http-api spec="client-server" api="redaction" %}}
 
 ### Forming relationships between events

content/client-server-api/modules/instant_messaging.md

@@ -84,9 +84,9 @@ Additionally, web clients should ensure that *all* `a` tags get a
 `rel="noopener"` to prevent the target page from referencing the
 client's tab/window.
 
-{{% added-in v="1.18" %}} Clients that support rendering numbered lists via the
+{{% added-in v="1.18" %}} Clients that support the `ol` tag MUST also support
-`ol` tag MUST also support the `start` attribute in order to prevent loss of
+the `start` attribute in order to prevent loss of meaning of a message due to
-meaning of a message due to the numbering of list items.
+the numbering of list items.
 
 Tags must not be nested more than 100 levels deep. Clients should only
 support the subset of tags they can render, falling back to other

data/api/client-server/room_send.yaml

@@ -20,10 +20,6 @@ paths:
   "/rooms/{roomId}/send/{eventType}/{txnId}":
     put:
       summary: Send a message event to the given room.
-      x-changedInMatrixVersion:
-        "1.18": |-
-          Homeservers must support sending `m.room.redaction` events with this endpoint
-          for all room versions.
       description: |-
         This endpoint is used to send a message event to a room. Message events
         allow access to historical events and pagination, making them suited
@@ -32,11 +28,6 @@ paths:
         The body of the request should be the content object of the event; the
         fields in this object will vary depending on the type of event. See
         [Room Events](/client-server-api/#room-events) for the m. event specification.
-
-        Homeservers MUST allow clients to send `m.room.redaction` events with this
-        endpoint for all room versions. In rooms with a version older than 11 they
-        MUST move the `redacts` property inside the `content` to the top level of
-        the event.
       operationId: sendMessage
       security:
         - accessTokenQuery: []