diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index d2ef7f2d..eb92c29d 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,3 +1,106 @@
+r0.4.0
+======
+
+New Endpoints
+-------------
+
+- ``POST /user_directory/search`` (`#1096 <https://github.com/matrix-org/matrix-doc/issues/1096>`_)
+- ``GET /rooms/{roomId}/event/{eventId}`` (`#1110 <https://github.com/matrix-org/matrix-doc/issues/1110>`_)
+- ``POST /delete_devices`` (`#1239 <https://github.com/matrix-org/matrix-doc/issues/1239>`_)
+- ``GET /thirdparty/*`` Endpoints (`#1353 <https://github.com/matrix-org/matrix-doc/issues/1353>`_)
+- ``POST /account/3pid/msisdn/requestToken``, ``POST /register/msisdn/requestToken``, and ``POST /account/password/msisdn/requestToken`` (`#1507 <https://github.com/matrix-org/matrix-doc/issues/1507>`_)
+- ``POST /account/3pid/delete`` (`#1567 <https://github.com/matrix-org/matrix-doc/issues/1567>`_)
+- ``POST /rooms/{roomId}/read_markers`` (`#1635 <https://github.com/matrix-org/matrix-doc/issues/1635>`_)
+
+
+Backwards Compatible Changes
+----------------------------
+
+- Add more presence options to the ``set_presence`` parameter of ``/sync``. (Thanks @mujx!) (`#780 <https://github.com/matrix-org/matrix-doc/issues/780>`_)
+- Add ``token`` parameter to the ``/keys/query`` endpoint (`#1104 <https://github.com/matrix-org/matrix-doc/issues/1104>`_)
+- Add the room visibility options for the room directory (`#1141 <https://github.com/matrix-org/matrix-doc/issues/1141>`_)
+- Add spec for ignoring users (`#1142 <https://github.com/matrix-org/matrix-doc/issues/1142>`_)
+- Add the ``/register/available`` endpoint for username availability (`#1151 <https://github.com/matrix-org/matrix-doc/issues/1151>`_)
+- Add sticker messages (`#1158 <https://github.com/matrix-org/matrix-doc/issues/1158>`_)
+- Specify how to control the power level required for ``@room`` (`#1176 <https://github.com/matrix-org/matrix-doc/issues/1176>`_)
+- Document ``/logout/all`` endpoint (`#1263 <https://github.com/matrix-org/matrix-doc/issues/1263>`_)
+- Add report content API (`#1264 <https://github.com/matrix-org/matrix-doc/issues/1264>`_)
+- Add ``allow_remote`` to the content repo to avoid routing loops (`#1265 <https://github.com/matrix-org/matrix-doc/issues/1265>`_)
+- Document `highlights` field in /search response (`#1274 <https://github.com/matrix-org/matrix-doc/issues/1274>`_)
+- End-to-end encryption for group chats:
+
+  * Olm and Megolm messaging algorithms.
+  * ``m.room.encrypted``, ``m.room.encryption``, ``m.room_key`` events.
+  * Device verification process.
+  * ``device_one_time_keys_count`` sync parameter.
+  * ``device_lists:left`` sync parameter. (`#1284 <https://github.com/matrix-org/matrix-doc/issues/1284>`_)
+- Add ``.well-known`` server discovery method (`#1359 <https://github.com/matrix-org/matrix-doc/issues/1359>`_)
+- Document the GET version of ``/login`` (`#1361 <https://github.com/matrix-org/matrix-doc/issues/1361>`_)
+- Document the ``server_name`` parameter on ``/join/{roomIdOrAlias}`` (`#1364 <https://github.com/matrix-org/matrix-doc/issues/1364>`_)
+- Document the CORS/preflight headers (`#1365 <https://github.com/matrix-org/matrix-doc/issues/1365>`_)
+- Add new user identifier object for logging in (`#1390 <https://github.com/matrix-org/matrix-doc/issues/1390>`_)
+- Document message formats on ``m.text`` and ``m.emote`` messages (`#1397 <https://github.com/matrix-org/matrix-doc/issues/1397>`_)
+- Encrypt file attachments (`#1420 <https://github.com/matrix-org/matrix-doc/issues/1420>`_)
+- Share room decryption keys between devices (`#1465 <https://github.com/matrix-org/matrix-doc/issues/1465>`_)
+- Document and improve client interaction with pushers. (`#1506 <https://github.com/matrix-org/matrix-doc/issues/1506>`_)
+- Add support for Room Versions. (`#1516 <https://github.com/matrix-org/matrix-doc/issues/1516>`_)
+- Guests can now call /context and /event to fetch events (`#1542 <https://github.com/matrix-org/matrix-doc/issues/1542>`_)
+- Add a common standard for user, room, and group mentions in messages. (`#1547 <https://github.com/matrix-org/matrix-doc/issues/1547>`_)
+- Add server ACLs as an option for controlling federation in a room. (`#1550 <https://github.com/matrix-org/matrix-doc/issues/1550>`_)
+- Add new push rules for encrypted events and ``@room`` notifications. (`#1551 <https://github.com/matrix-org/matrix-doc/issues/1551>`_)
+- Add third party network room directories, as provided by application services. (`#1554 <https://github.com/matrix-org/matrix-doc/issues/1554>`_)
+- Document the ``validated_at`` and ``added_at`` fields on ``GET /acount/3pid``. (`#1567 <https://github.com/matrix-org/matrix-doc/issues/1567>`_)
+- Add an ``inhibit_login`` registration option. (`#1589 <https://github.com/matrix-org/matrix-doc/issues/1589>`_)
+- Recommend that servers set a Content Security Policy for the content repository. (`#1600 <https://github.com/matrix-org/matrix-doc/issues/1600>`_)
+- Add "rich replies" - a way for users to better represent the conversation thread they are referencing in their messages. (`#1617 <https://github.com/matrix-org/matrix-doc/issues/1617>`_)
+- Add support for read markers. (`#1635 <https://github.com/matrix-org/matrix-doc/issues/1635>`_)
+
+
+Spec Clarifications
+-------------------
+
+- Mark ``home_server`` return field for ``/login`` and ``/register`` endpoints as deprecated (`#1097 <https://github.com/matrix-org/matrix-doc/issues/1097>`_)
+- Fix response format of ``/keys/changes`` endpoint (`#1106 <https://github.com/matrix-org/matrix-doc/issues/1106>`_)
+- Clarify default values for some fields on the ``/search`` API (`#1109 <https://github.com/matrix-org/matrix-doc/issues/1109>`_)
+- Fix the representation of ``m.presence`` events (`#1137 <https://github.com/matrix-org/matrix-doc/issues/1137>`_)
+- Clarify that ``m.tag`` ordering is done with numbers, not strings (`#1139 <https://github.com/matrix-org/matrix-doc/issues/1139>`_)
+- Clarify that ``/account/whoami`` should consider application services (`#1152 <https://github.com/matrix-org/matrix-doc/issues/1152>`_)
+- Update ``ImageInfo`` and ``ThumbnailInfo`` dimension schema descriptions to clarify that they relate to intended display size, as opposed to the intrinsic size of the image file. (`#1158 <https://github.com/matrix-org/matrix-doc/issues/1158>`_)
+- Mark ``GET /rooms/{roomId}/members`` as requiring authentication (`#1245 <https://github.com/matrix-org/matrix-doc/issues/1245>`_)
+- Clarify ``changed`` field behaviour in device tracking process (`#1284 <https://github.com/matrix-org/matrix-doc/issues/1284>`_)
+- Describe ``StateEvent`` for ``/createRoom`` (`#1329 <https://github.com/matrix-org/matrix-doc/issues/1329>`_)
+- Describe how the ``reason`` is handled for kicks/bans (`#1362 <https://github.com/matrix-org/matrix-doc/issues/1362>`_)
+- Mark ``GET /presence/{userId}/status`` as requiring authentication (`#1371 <https://github.com/matrix-org/matrix-doc/issues/1371>`_)
+- Describe the rate limit error response schema (`#1373 <https://github.com/matrix-org/matrix-doc/issues/1373>`_)
+- Clarify that clients must leave rooms before forgetting them (`#1378 <https://github.com/matrix-org/matrix-doc/issues/1378>`_)
+- Document guest access in ``/createRoom`` presets (`#1379 <https://github.com/matrix-org/matrix-doc/issues/1379>`_)
+- Define what a ``RoomEvent`` is on ``/rooms/{roomId}/messages`` (`#1380 <https://github.com/matrix-org/matrix-doc/issues/1380>`_)
+- Clarify the request and result types on ``/search`` (`#1381 <https://github.com/matrix-org/matrix-doc/issues/1381>`_)
+- Clarify some of the properties on the search result (`#1400 <https://github.com/matrix-org/matrix-doc/issues/1400>`_)
+- Clarify how access tokens are meant to be supplied to the homeserver. (`#1517 <https://github.com/matrix-org/matrix-doc/issues/1517>`_)
+- Document additional parameters on the ``/createRoom`` API. (`#1518 <https://github.com/matrix-org/matrix-doc/issues/1518>`_)
+- Clarify that new push rules should be enabled by default, and that unrecognised conditions should not match. (`#1551 <https://github.com/matrix-org/matrix-doc/issues/1551>`_)
+- Update all event examples to be accurate representations of their associated events. (`#1558 <https://github.com/matrix-org/matrix-doc/issues/1558>`_)
+- Clarify the supported HTML features for room messages. (`#1562 <https://github.com/matrix-org/matrix-doc/issues/1562>`_)
+- Move the ``invite_room_state`` definition under ``unsigned`` where it actually resides. (`#1568 <https://github.com/matrix-org/matrix-doc/issues/1568>`_)
+- Clarify the homeserver's behaviour for searching users. (`#1569 <https://github.com/matrix-org/matrix-doc/issues/1569>`_)
+- Clarify the object structures and defaults for Filters. (`#1570 <https://github.com/matrix-org/matrix-doc/issues/1570>`_)
+- Clarify instances of ``type: number`` in the swagger/OpenAPI schema definitions. (`#1571 <https://github.com/matrix-org/matrix-doc/issues/1571>`_)
+- Clarify that left rooms also have account data in ``/sync``. (`#1572 <https://github.com/matrix-org/matrix-doc/issues/1572>`_)
+- Clarify the event fields used in the ``/sync`` response. (`#1573 <https://github.com/matrix-org/matrix-doc/issues/1573>`_)
+- Fix naming of the body field in ``PUT /directory/room``. (`#1574 <https://github.com/matrix-org/matrix-doc/issues/1574>`_)
+- Clarify the filter object schema used in room searching. (`#1577 <https://github.com/matrix-org/matrix-doc/issues/1577>`_)
+- Document the 403 error for sending state events. (`#1590 <https://github.com/matrix-org/matrix-doc/issues/1590>`_)
+- specify how to handle multiple olm sessions with the same device (`#1596 <https://github.com/matrix-org/matrix-doc/issues/1596>`_)
+- Add the other keys that redactions are expected to preserve. (`#1602 <https://github.com/matrix-org/matrix-doc/issues/1602>`_)
+- Clarify that clients should not be generating invalid HTML for formatted events. (`#1605 <https://github.com/matrix-org/matrix-doc/issues/1605>`_)
+- Clarify the room tag structure (thanks @KitsuneRal!) (`#1606 <https://github.com/matrix-org/matrix-doc/issues/1606>`_)
+- Add a note that clients may use the transaction ID to avoid flickering when doing local echo. (`#1619 <https://github.com/matrix-org/matrix-doc/issues/1619>`_)
+- Include the request and response structures for the various ``/requestToken`` endpoints. (`#1636 <https://github.com/matrix-org/matrix-doc/issues/1636>`_)
+- Clarify the available error codes, and when to prefer the HTTP status code over the ``errcode``. (`#1637 <https://github.com/matrix-org/matrix-doc/issues/1637>`_)
+- Clarify and generalise the language used for describing pagination. (`#1642 <https://github.com/matrix-org/matrix-doc/issues/1642>`_)
+
+
 r0.3.0
 ======
 
diff --git a/changelogs/client_server/newsfragments/1096.new b/changelogs/client_server/newsfragments/1096.new
deleted file mode 100644
index 50d86879..00000000
--- a/changelogs/client_server/newsfragments/1096.new
+++ /dev/null
@@ -1 +0,0 @@
-``POST /user_directory/search``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1097.clarification b/changelogs/client_server/newsfragments/1097.clarification
deleted file mode 100644
index 2a7cb93a..00000000
--- a/changelogs/client_server/newsfragments/1097.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Mark ``home_server`` return field for ``/login`` and ``/register`` endpoints as deprecated
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1104.feature b/changelogs/client_server/newsfragments/1104.feature
deleted file mode 100644
index 9b85343f..00000000
--- a/changelogs/client_server/newsfragments/1104.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add ``token`` parameter to the ``/keys/query`` endpoint
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1106.clarification b/changelogs/client_server/newsfragments/1106.clarification
deleted file mode 100644
index f7a1fe3e..00000000
--- a/changelogs/client_server/newsfragments/1106.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix response format of ``/keys/changes`` endpoint
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1109.clarification b/changelogs/client_server/newsfragments/1109.clarification
deleted file mode 100644
index 176d9403..00000000
--- a/changelogs/client_server/newsfragments/1109.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify default values for some fields on the ``/search`` API
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1110.new b/changelogs/client_server/newsfragments/1110.new
deleted file mode 100644
index e1b80b8b..00000000
--- a/changelogs/client_server/newsfragments/1110.new
+++ /dev/null
@@ -1 +0,0 @@
-``GET /rooms/{roomId}/event/{eventId}``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1137.clarification b/changelogs/client_server/newsfragments/1137.clarification
deleted file mode 100644
index 5ad8ec34..00000000
--- a/changelogs/client_server/newsfragments/1137.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the representation of ``m.presence`` events
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1139.clarification b/changelogs/client_server/newsfragments/1139.clarification
deleted file mode 100644
index b5193ad3..00000000
--- a/changelogs/client_server/newsfragments/1139.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``m.tag`` ordering is done with numbers, not strings
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1141.feature b/changelogs/client_server/newsfragments/1141.feature
deleted file mode 100644
index da041819..00000000
--- a/changelogs/client_server/newsfragments/1141.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the room visibility options for the room directory
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1142.feature b/changelogs/client_server/newsfragments/1142.feature
deleted file mode 100644
index 0a0842c4..00000000
--- a/changelogs/client_server/newsfragments/1142.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add spec for ignoring users
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1151.feature b/changelogs/client_server/newsfragments/1151.feature
deleted file mode 100644
index 8875812b..00000000
--- a/changelogs/client_server/newsfragments/1151.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the ``/register/available`` endpoint for username availability
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1152.clarification b/changelogs/client_server/newsfragments/1152.clarification
deleted file mode 100644
index bbecc9b2..00000000
--- a/changelogs/client_server/newsfragments/1152.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``/account/whoami`` should consider application services
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1158.clarification b/changelogs/client_server/newsfragments/1158.clarification
deleted file mode 100644
index e005ab60..00000000
--- a/changelogs/client_server/newsfragments/1158.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Update ``ImageInfo`` and ``ThumbnailInfo`` dimension schema descriptions to clarify that they relate to intended display size, as opposed to the intrinsic size of the image file.
diff --git a/changelogs/client_server/newsfragments/1158.feature b/changelogs/client_server/newsfragments/1158.feature
deleted file mode 100644
index a55df4fb..00000000
--- a/changelogs/client_server/newsfragments/1158.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add sticker messages
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1176.feature b/changelogs/client_server/newsfragments/1176.feature
deleted file mode 100644
index 41e30799..00000000
--- a/changelogs/client_server/newsfragments/1176.feature
+++ /dev/null
@@ -1 +0,0 @@
-Specify how to control the power level required for ``@room``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1239.new b/changelogs/client_server/newsfragments/1239.new
deleted file mode 100644
index 9bcf357d..00000000
--- a/changelogs/client_server/newsfragments/1239.new
+++ /dev/null
@@ -1 +0,0 @@
-``POST /delete_devices``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1245.clarification b/changelogs/client_server/newsfragments/1245.clarification
deleted file mode 100644
index e0a63834..00000000
--- a/changelogs/client_server/newsfragments/1245.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Mark ``GET /rooms/{roomId}/members`` as requiring authentication
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1263.feature b/changelogs/client_server/newsfragments/1263.feature
deleted file mode 100644
index 04964a7d..00000000
--- a/changelogs/client_server/newsfragments/1263.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document ``/logout/all`` endpoint
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1264.feature b/changelogs/client_server/newsfragments/1264.feature
deleted file mode 100644
index 9cb06f71..00000000
--- a/changelogs/client_server/newsfragments/1264.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add report content API
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1265.feature b/changelogs/client_server/newsfragments/1265.feature
deleted file mode 100644
index 1e270fa8..00000000
--- a/changelogs/client_server/newsfragments/1265.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add ``allow_remote`` to the content repo to avoid routing loops
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1274.feature b/changelogs/client_server/newsfragments/1274.feature
deleted file mode 100644
index d4958131..00000000
--- a/changelogs/client_server/newsfragments/1274.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document `highlights` field in /search response
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1284.clarification b/changelogs/client_server/newsfragments/1284.clarification
deleted file mode 100644
index 7bc92f47..00000000
--- a/changelogs/client_server/newsfragments/1284.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify ``changed`` field behaviour in device tracking process
diff --git a/changelogs/client_server/newsfragments/1284.feature b/changelogs/client_server/newsfragments/1284.feature
deleted file mode 100644
index 47cbc6fd..00000000
--- a/changelogs/client_server/newsfragments/1284.feature
+++ /dev/null
@@ -1,7 +0,0 @@
-End-to-end encryption for group chats:
-
-* Olm and Megolm messaging algorithms.
-* ``m.room.encrypted``, ``m.room.encryption``, ``m.room_key`` events.
-* Device verification process.
-* ``device_one_time_keys_count`` sync parameter.
-* ``device_lists:left`` sync parameter.
diff --git a/changelogs/client_server/newsfragments/1329.clarification b/changelogs/client_server/newsfragments/1329.clarification
deleted file mode 100644
index 970d3d94..00000000
--- a/changelogs/client_server/newsfragments/1329.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Describe ``StateEvent`` for ``/createRoom``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1353.new b/changelogs/client_server/newsfragments/1353.new
deleted file mode 100644
index 0af0c520..00000000
--- a/changelogs/client_server/newsfragments/1353.new
+++ /dev/null
@@ -1 +0,0 @@
-``GET /thirdparty/*`` Endpoints
diff --git a/changelogs/client_server/newsfragments/1359.feature b/changelogs/client_server/newsfragments/1359.feature
deleted file mode 100644
index 5354e69e..00000000
--- a/changelogs/client_server/newsfragments/1359.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add ``.well-known`` server discovery method
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1361.feature b/changelogs/client_server/newsfragments/1361.feature
deleted file mode 100644
index b1d4c2f1..00000000
--- a/changelogs/client_server/newsfragments/1361.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document the GET version of ``/login``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1362.clarification b/changelogs/client_server/newsfragments/1362.clarification
deleted file mode 100644
index 1deb4500..00000000
--- a/changelogs/client_server/newsfragments/1362.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Describe how the ``reason`` is handled for kicks/bans
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1364.feature b/changelogs/client_server/newsfragments/1364.feature
deleted file mode 100644
index 733d6a1f..00000000
--- a/changelogs/client_server/newsfragments/1364.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document the ``server_name`` parameter on ``/join/{roomIdOrAlias}``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1365.feature b/changelogs/client_server/newsfragments/1365.feature
deleted file mode 100644
index d2864e96..00000000
--- a/changelogs/client_server/newsfragments/1365.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document the CORS/preflight headers
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1371.clarification b/changelogs/client_server/newsfragments/1371.clarification
deleted file mode 100644
index 88552fcd..00000000
--- a/changelogs/client_server/newsfragments/1371.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Mark ``GET /presence/{userId}/status`` as requiring authentication
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1373.clarification b/changelogs/client_server/newsfragments/1373.clarification
deleted file mode 100644
index 21e18966..00000000
--- a/changelogs/client_server/newsfragments/1373.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Describe the rate limit error response schema
diff --git a/changelogs/client_server/newsfragments/1378.clarification b/changelogs/client_server/newsfragments/1378.clarification
deleted file mode 100644
index f952428b..00000000
--- a/changelogs/client_server/newsfragments/1378.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that clients must leave rooms before forgetting them
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1379.clarification b/changelogs/client_server/newsfragments/1379.clarification
deleted file mode 100644
index 122b3900..00000000
--- a/changelogs/client_server/newsfragments/1379.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Document guest access in ``/createRoom`` presets
diff --git a/changelogs/client_server/newsfragments/1380.clarification b/changelogs/client_server/newsfragments/1380.clarification
deleted file mode 100644
index 490a9a43..00000000
--- a/changelogs/client_server/newsfragments/1380.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Define what a ``RoomEvent`` is on ``/rooms/{roomId}/messages``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1381.clarification b/changelogs/client_server/newsfragments/1381.clarification
deleted file mode 100644
index e5e599ac..00000000
--- a/changelogs/client_server/newsfragments/1381.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the request and result types on ``/search``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1390.feature b/changelogs/client_server/newsfragments/1390.feature
deleted file mode 100644
index 48a53b0a..00000000
--- a/changelogs/client_server/newsfragments/1390.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new user identifier object for logging in
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1397.feature b/changelogs/client_server/newsfragments/1397.feature
deleted file mode 100644
index e4bd248a..00000000
--- a/changelogs/client_server/newsfragments/1397.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document message formats on ``m.text`` and ``m.emote`` messages
diff --git a/changelogs/client_server/newsfragments/1400.clarification b/changelogs/client_server/newsfragments/1400.clarification
deleted file mode 100644
index 3fd29e92..00000000
--- a/changelogs/client_server/newsfragments/1400.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify some of the properties on the search result
diff --git a/changelogs/client_server/newsfragments/1420.feature b/changelogs/client_server/newsfragments/1420.feature
deleted file mode 100644
index f7cf687d..00000000
--- a/changelogs/client_server/newsfragments/1420.feature
+++ /dev/null
@@ -1 +0,0 @@
-Encrypt file attachments
diff --git a/changelogs/client_server/newsfragments/1465.feature b/changelogs/client_server/newsfragments/1465.feature
deleted file mode 100644
index 649cf222..00000000
--- a/changelogs/client_server/newsfragments/1465.feature
+++ /dev/null
@@ -1 +0,0 @@
-Share room decryption keys between devices
diff --git a/changelogs/client_server/newsfragments/1506.feature b/changelogs/client_server/newsfragments/1506.feature
deleted file mode 100644
index 62ad1260..00000000
--- a/changelogs/client_server/newsfragments/1506.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document and improve client interaction with pushers.
diff --git a/changelogs/client_server/newsfragments/1507.new b/changelogs/client_server/newsfragments/1507.new
deleted file mode 100644
index 6cc46870..00000000
--- a/changelogs/client_server/newsfragments/1507.new
+++ /dev/null
@@ -1 +0,0 @@
-``POST /account/3pid/msisdn/requestToken``, ``POST /register/msisdn/requestToken``, and ``POST /account/password/msisdn/requestToken``
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1516.feature b/changelogs/client_server/newsfragments/1516.feature
deleted file mode 100644
index 8e9b26df..00000000
--- a/changelogs/client_server/newsfragments/1516.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Room Versions.
diff --git a/changelogs/client_server/newsfragments/1517.clarification b/changelogs/client_server/newsfragments/1517.clarification
deleted file mode 100644
index b16928c1..00000000
--- a/changelogs/client_server/newsfragments/1517.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how access tokens are meant to be supplied to the homeserver.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1518.clarification b/changelogs/client_server/newsfragments/1518.clarification
deleted file mode 100644
index 3e2adea3..00000000
--- a/changelogs/client_server/newsfragments/1518.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Document additional parameters on the ``/createRoom`` API.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1542.feature b/changelogs/client_server/newsfragments/1542.feature
deleted file mode 100644
index 7e94bdc5..00000000
--- a/changelogs/client_server/newsfragments/1542.feature
+++ /dev/null
@@ -1 +0,0 @@
-Guests can now call /context and /event to fetch events
diff --git a/changelogs/client_server/newsfragments/1547.feature b/changelogs/client_server/newsfragments/1547.feature
deleted file mode 100644
index 76346f23..00000000
--- a/changelogs/client_server/newsfragments/1547.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a common standard for user, room, and group mentions in messages.
diff --git a/changelogs/client_server/newsfragments/1550.feature b/changelogs/client_server/newsfragments/1550.feature
deleted file mode 100644
index f04fa9ae..00000000
--- a/changelogs/client_server/newsfragments/1550.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add server ACLs as an option for controlling federation in a room.
diff --git a/changelogs/client_server/newsfragments/1551.clarification b/changelogs/client_server/newsfragments/1551.clarification
deleted file mode 100644
index 06eac4da..00000000
--- a/changelogs/client_server/newsfragments/1551.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that new push rules should be enabled by default, and that unrecognised conditions should not match.
diff --git a/changelogs/client_server/newsfragments/1551.feature b/changelogs/client_server/newsfragments/1551.feature
deleted file mode 100644
index dfce0f0a..00000000
--- a/changelogs/client_server/newsfragments/1551.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new push rules for encrypted events and ``@room`` notifications.
diff --git a/changelogs/client_server/newsfragments/1554.feature b/changelogs/client_server/newsfragments/1554.feature
deleted file mode 100644
index ec7ffe71..00000000
--- a/changelogs/client_server/newsfragments/1554.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add third party network room directories, as provided by application services.
diff --git a/changelogs/client_server/newsfragments/1558.clarification b/changelogs/client_server/newsfragments/1558.clarification
deleted file mode 100644
index 3482d89c..00000000
--- a/changelogs/client_server/newsfragments/1558.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Update all event examples to be accurate representations of their associated events.
diff --git a/changelogs/client_server/newsfragments/1562.clarification b/changelogs/client_server/newsfragments/1562.clarification
deleted file mode 100644
index c46e189d..00000000
--- a/changelogs/client_server/newsfragments/1562.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the supported HTML features for room messages.
diff --git a/changelogs/client_server/newsfragments/1567.feature b/changelogs/client_server/newsfragments/1567.feature
deleted file mode 100644
index 0c19b4be..00000000
--- a/changelogs/client_server/newsfragments/1567.feature
+++ /dev/null
@@ -1 +0,0 @@
-Document the ``validated_at`` and ``added_at`` fields on ``GET /acount/3pid``.
diff --git a/changelogs/client_server/newsfragments/1567.new b/changelogs/client_server/newsfragments/1567.new
deleted file mode 100644
index 36fa78ec..00000000
--- a/changelogs/client_server/newsfragments/1567.new
+++ /dev/null
@@ -1 +0,0 @@
-``POST /account/3pid/delete``
diff --git a/changelogs/client_server/newsfragments/1568.clarification b/changelogs/client_server/newsfragments/1568.clarification
deleted file mode 100644
index 4b7a6eaf..00000000
--- a/changelogs/client_server/newsfragments/1568.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Move the ``invite_room_state`` definition under ``unsigned`` where it actually resides.
diff --git a/changelogs/client_server/newsfragments/1569.clarification b/changelogs/client_server/newsfragments/1569.clarification
deleted file mode 100644
index 83185e02..00000000
--- a/changelogs/client_server/newsfragments/1569.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the homeserver's behaviour for searching users.
diff --git a/changelogs/client_server/newsfragments/1570.clarification b/changelogs/client_server/newsfragments/1570.clarification
deleted file mode 100644
index dbf8a821..00000000
--- a/changelogs/client_server/newsfragments/1570.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the object structures and defaults for Filters.
diff --git a/changelogs/client_server/newsfragments/1571.clarification b/changelogs/client_server/newsfragments/1571.clarification
deleted file mode 100644
index 2410baf3..00000000
--- a/changelogs/client_server/newsfragments/1571.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify instances of ``type: number`` in the swagger/OpenAPI schema definitions.
diff --git a/changelogs/client_server/newsfragments/1572.clarification b/changelogs/client_server/newsfragments/1572.clarification
deleted file mode 100644
index 7e84098f..00000000
--- a/changelogs/client_server/newsfragments/1572.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that left rooms also have account data in ``/sync``.
diff --git a/changelogs/client_server/newsfragments/1573.clarification b/changelogs/client_server/newsfragments/1573.clarification
deleted file mode 100644
index 74efa28f..00000000
--- a/changelogs/client_server/newsfragments/1573.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the event fields used in the ``/sync`` response.
diff --git a/changelogs/client_server/newsfragments/1574.clarification b/changelogs/client_server/newsfragments/1574.clarification
deleted file mode 100644
index 8d07ef56..00000000
--- a/changelogs/client_server/newsfragments/1574.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix naming of the body field in ``PUT /directory/room``.
diff --git a/changelogs/client_server/newsfragments/1577.clarification b/changelogs/client_server/newsfragments/1577.clarification
deleted file mode 100644
index aec3248f..00000000
--- a/changelogs/client_server/newsfragments/1577.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the filter object schema used in room searching.
diff --git a/changelogs/client_server/newsfragments/1589.feature b/changelogs/client_server/newsfragments/1589.feature
deleted file mode 100644
index 8c8b1a86..00000000
--- a/changelogs/client_server/newsfragments/1589.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add an ``inhibit_login`` registration option.
diff --git a/changelogs/client_server/newsfragments/1590.clarification b/changelogs/client_server/newsfragments/1590.clarification
deleted file mode 100644
index 27999193..00000000
--- a/changelogs/client_server/newsfragments/1590.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Document the 403 error for sending state events.
diff --git a/changelogs/client_server/newsfragments/1596.clarification b/changelogs/client_server/newsfragments/1596.clarification
deleted file mode 100644
index 3dde069f..00000000
--- a/changelogs/client_server/newsfragments/1596.clarification
+++ /dev/null
@@ -1 +0,0 @@
-specify how to handle multiple olm sessions with the same device
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1600.feature b/changelogs/client_server/newsfragments/1600.feature
deleted file mode 100644
index 142a67b2..00000000
--- a/changelogs/client_server/newsfragments/1600.feature
+++ /dev/null
@@ -1 +0,0 @@
-Recommend that servers set a Content Security Policy for the content repository.
diff --git a/changelogs/client_server/newsfragments/1602.clarification b/changelogs/client_server/newsfragments/1602.clarification
deleted file mode 100644
index def503cb..00000000
--- a/changelogs/client_server/newsfragments/1602.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add the other keys that redactions are expected to preserve.
diff --git a/changelogs/client_server/newsfragments/1605.clarification b/changelogs/client_server/newsfragments/1605.clarification
deleted file mode 100644
index ce9f967d..00000000
--- a/changelogs/client_server/newsfragments/1605.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that clients should not be generating invalid HTML for formatted events.
diff --git a/changelogs/client_server/newsfragments/1606.clarification b/changelogs/client_server/newsfragments/1606.clarification
deleted file mode 100644
index f65ed257..00000000
--- a/changelogs/client_server/newsfragments/1606.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the room tag structure (thanks @KitsuneRal!)
diff --git a/changelogs/client_server/newsfragments/1617.feature b/changelogs/client_server/newsfragments/1617.feature
deleted file mode 100644
index b2169dd5..00000000
--- a/changelogs/client_server/newsfragments/1617.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add "rich replies" - a way for users to better represent the conversation thread they are referencing in their messages.
diff --git a/changelogs/client_server/newsfragments/1619.clarification b/changelogs/client_server/newsfragments/1619.clarification
deleted file mode 100644
index fa06e969..00000000
--- a/changelogs/client_server/newsfragments/1619.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add a note that clients may use the transaction ID to avoid flickering when doing local echo.
diff --git a/changelogs/client_server/newsfragments/1635.feature b/changelogs/client_server/newsfragments/1635.feature
deleted file mode 100644
index 3a5bb45f..00000000
--- a/changelogs/client_server/newsfragments/1635.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for read markers.
diff --git a/changelogs/client_server/newsfragments/1635.new b/changelogs/client_server/newsfragments/1635.new
deleted file mode 100644
index bda34d81..00000000
--- a/changelogs/client_server/newsfragments/1635.new
+++ /dev/null
@@ -1 +0,0 @@
-``POST /rooms/{roomId}/read_markers``
diff --git a/changelogs/client_server/newsfragments/1636.clarification b/changelogs/client_server/newsfragments/1636.clarification
deleted file mode 100644
index 842cd1f0..00000000
--- a/changelogs/client_server/newsfragments/1636.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Include the request and response structures for the various ``/requestToken`` endpoints.
diff --git a/changelogs/client_server/newsfragments/1637.clarification b/changelogs/client_server/newsfragments/1637.clarification
deleted file mode 100644
index 5833554d..00000000
--- a/changelogs/client_server/newsfragments/1637.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the available error codes, and when to prefer the HTTP status code over the ``errcode``.
diff --git a/changelogs/client_server/newsfragments/1642.clarification b/changelogs/client_server/newsfragments/1642.clarification
deleted file mode 100644
index 0ccb0f3c..00000000
--- a/changelogs/client_server/newsfragments/1642.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify and generalise the language used for describing pagination.
diff --git a/changelogs/client_server/newsfragments/780.feature b/changelogs/client_server/newsfragments/780.feature
deleted file mode 100644
index 74725754..00000000
--- a/changelogs/client_server/newsfragments/780.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add more presence options to the ``set_presence`` parameter of ``/sync``. (Thanks @mujx!)