changelogs/client_server/newsfragments/2389.clarification

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

changelogs/client_server/newsfragments/2392.feature

@@ -1 +0,0 @@
-The room directory now returns rooms in a server-defined order rather than largest first, as per [MSC4423](https://github.com/matrix-org/matrix-spec-proposals/pull/4423).

changelogs/server_server/newsfragments/2392.feature

@@ -1 +0,0 @@
-The room directory now returns rooms in a server-defined order rather than largest first, as per [MSC4423](https://github.com/matrix-org/matrix-spec-proposals/pull/4423).

data/api/client-server/cross_signing.yaml

@@ -203,8 +203,8 @@ paths:
                     "user_id": "@alice:example.com",
                     "device_id": "HIJKLMN",
                     "algorithms": [
-                      "m.olm.v1.curve25519-aes-sha2",
-                      "m.megolm.v1.aes-sha2"
+                      "m.olm.v1.curve25519-aes-sha256",
+                      "m.megolm.v1.aes-sha"
                     ],
                     "keys": {
                       "curve25519:HIJKLMN": "base64+curve25519+key",

data/api/client-server/list_public_rooms.yaml

@@ -137,12 +137,8 @@ paths:
       description: |-
         Lists a server's published room directory.
 
-        This API returns paginated responses.
-
-        {{% changed-in v="1.19" %}} The server determines the order of the rooms
-        returned by this endpoint. Previously, rooms were ordered with the largest
-        joined member count first. Continuing to order by largest first or another
-        stable order is recommended.
+        This API returns paginated responses. The rooms are ordered by the number
+        of joined members, with the largest rooms first.
       operationId: getPublicRooms
       parameters:
         - in: query
@@ -181,12 +177,8 @@ paths:
       description: |-
         Lists a server's published room directory with an optional filter.
 
-        This API returns paginated responses.
-
-        {{% changed-in v="1.19" %}} The server determines the order of the rooms
-        returned by this endpoint. Previously, rooms were ordered with the largest
-        joined member count first. Continuing to order by largest first or another
-        stable order is recommended.
+        This API returns paginated responses. The rooms are ordered by the number
+        of joined members, with the largest rooms first.
       operationId: queryPublicRooms
       security:
         - accessTokenQuery: []

data/api/server-server/public_rooms.yaml

@@ -22,12 +22,8 @@ paths:
       description: |-
         Lists the server's published room directory.
 
-        This API returns paginated responses.
-
-        {{% changed-in v="1.19" %}} The server determines the order of the rooms
-        returned by this endpoint. Previously, rooms were ordered with the largest
-        joined member count first. Continuing to order by largest first or another
-        stable order is recommended.
+        This API returns paginated responses. The rooms are ordered by the number
+        of joined members, with the largest rooms first.
 
         This SHOULD not return rooms that are listed on another homeserver's directory,
         just those listed on the receiving homeserver's directory.
@@ -80,12 +76,8 @@ paths:
       description: |-
         Lists the server's published room directory with an optional filter.
 
-        This API returns paginated responses.
-
-        {{% changed-in v="1.19" %}} The server determines the order of the rooms
-        returned by this endpoint. Previously, rooms were ordered with the largest
-        joined member count first. Continuing to order by largest first or another
-        stable order is recommended.
+        This API returns paginated responses. The rooms are ordered by the number
+        of joined members, with the largest rooms first.
       operationId: queryPublicRooms
       security:
         - signedRequest: []