Merge cb31a6828b into 7066694571

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>

content/client-server-api/_index.md

@@ -2621,8 +2621,6 @@ An example of the capability API's response for this capability is:
 
 ### `m.forget_forced_upon_leave` capability
 
-{{% added-in v="1.18" %}}
-
 This capability has a single flag, `enabled`, which indicates whether or
 not the server automatically forgets rooms which the user has left.
 

data/api/client-server/capabilities.yaml

@@ -51,7 +51,6 @@ paths:
                         $ref: '#/components/schemas/booleanCapability'
                         description: Capability to indicate if the user can change their password.
                       m.forget_forced_upon_leave:
-                        x-addedInMatrixVersion: "1.18"
                         $ref: '#/components/schemas/booleanCapability'
                         description: |-
                           Capability to indicate if the server automatically forgets rooms once the user

data/api/client-server/leaving.yaml

@@ -19,6 +19,10 @@ paths:
   "/rooms/{roomId}/leave":
     post:
       summary: Stop the requesting user participating in a particular room.
+      x-changedInMatrixVersion:
+        "1.18": |-
+          Servers may additionally forget the room provided that they make this behavior
+          transparent.
       description: |-
         This API stops a user participating in a particular room.
 
@@ -28,15 +32,16 @@ paths:
 
         If the user was invited to the room, but had not joined, this call
         serves to reject the invite.
-      x-changedInMatrixVersion:
+
-        "1.18": |
+        Servers MAY additionally forget the room when this endpoint is called –
-          Servers MAY additionally forget the room when this endpoint is called –
+        just as if the user had also invoked [`/forget`](/client-server-api/#post_matrixclientv3roomsroomidforget).
-          just as if the user had also invoked [`/forget`](/client-server-api/#post_matrixclientv3roomsroomidforget).
+        Servers that do this, MUST inform clients about this behavior using the
-          Servers that do this, MUST inform clients about this behavior using the
+        [`m.forget_forced_upon_leave`](/client-server-api/#mforget_forced_upon_leave-capability)
-          [`m.forget_forced_upon_leave`](/client-server-api/#mforget_forced_upon_leave-capability)
+        capability.
-          capability. If the server doesn't automatically forget the room, the user
+
-          will still be allowed to retrieve history from the room which they were
+        If the server doesn't automatically forget the room, the user will still be
-          previously allowed to see.
+        allowed to retrieve history from the room which they were previously allowed
+        to see.
       operationId: leaveRoom
       security:
         - accessTokenQuery: []