diff --git a/changelogs/client_server/newsfragments/2387.new b/changelogs/client_server/newsfragments/2387.new
index a709a5fa..cfb5af1c 100644
--- a/changelogs/client_server/newsfragments/2387.new
+++ b/changelogs/client_server/newsfragments/2387.new
@@ -1 +1 @@
-Add key backup (``/room_keys/*``) endpoints.
+Add key backup (`/room_keys/*`) endpoints.
diff --git a/changelogs/client_server/newsfragments/2399.feature b/changelogs/client_server/newsfragments/2399.feature
index e9819639..3b0380b2 100644
--- a/changelogs/client_server/newsfragments/2399.feature
+++ b/changelogs/client_server/newsfragments/2399.feature
@@ -1 +1 @@
-Document how clients can advise recipients that it is withholding decryption keys as per `MSC2399 <https://github.com/matrix-org/matrix-doc/pull/2399>`_.
\ No newline at end of file
+Document how clients can advise recipients that it is withholding decryption keys as per [MSC2399](https://github.com/matrix-org/matrix-doc/pull/2399).
diff --git a/changelogs/client_server/newsfragments/2536.feature b/changelogs/client_server/newsfragments/2536.feature
index 1006ff52..56e4e79b 100644
--- a/changelogs/client_server/newsfragments/2536.feature
+++ b/changelogs/client_server/newsfragments/2536.feature
@@ -1 +1 @@
-Add cross-signing properties to the response of ``POST /keys/query`` per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
+Add cross-signing properties to the response of `POST /keys/query` per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
diff --git a/changelogs/client_server/newsfragments/2536.new b/changelogs/client_server/newsfragments/2536.new
index 88cb6703..8572e33a 100644
--- a/changelogs/client_server/newsfragments/2536.new
+++ b/changelogs/client_server/newsfragments/2536.new
@@ -1 +1 @@
-Add ``POST /keys/device_signing/upload`` and ``POST /keys/signatures/upload`` per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
+Add `POST /keys/device_signing/upload` and `POST /keys/signatures/upload` per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
diff --git a/changelogs/client_server/newsfragments/2591.clarification b/changelogs/client_server/newsfragments/2591.clarification
index 7473f453..dadf44ab 100644
--- a/changelogs/client_server/newsfragments/2591.clarification
+++ b/changelogs/client_server/newsfragments/2591.clarification
@@ -1 +1 @@
-Fix issues with ``age`` and ``unsigned`` being shown in the wrong places.
+Fix issues with `age` and `unsigned` being shown in the wrong places.
diff --git a/changelogs/client_server/newsfragments/2609.removal b/changelogs/client_server/newsfragments/2609.removal
index deafc77d..24b523e9 100644
--- a/changelogs/client_server/newsfragments/2609.removal
+++ b/changelogs/client_server/newsfragments/2609.removal
@@ -1 +1 @@
-Remove unimplemented ``m.login.oauth2`` and ``m.login.token`` user-interactive authentication mechanisms.
+Remove unimplemented `m.login.oauth2` and `m.login.token` user-interactive authentication mechanisms.
diff --git a/changelogs/client_server/newsfragments/2629.clarification b/changelogs/client_server/newsfragments/2629.clarification
index 07fc430e..0813de44 100644
--- a/changelogs/client_server/newsfragments/2629.clarification
+++ b/changelogs/client_server/newsfragments/2629.clarification
@@ -1 +1 @@
-Remove ``room_id`` from ``/sync`` examples.
+Remove `room_id` from `/sync` examples.
diff --git a/changelogs/client_server/newsfragments/2647.clarification b/changelogs/client_server/newsfragments/2647.clarification
index a0c5e7cc..e902980e 100644
--- a/changelogs/client_server/newsfragments/2647.clarification
+++ b/changelogs/client_server/newsfragments/2647.clarification
@@ -1 +1 @@
-Improve consistency and clarity of event schema ``title``\ s.
+Improve consistency and clarity of event schema `title` s.
diff --git a/changelogs/client_server/newsfragments/2709.feature b/changelogs/client_server/newsfragments/2709.feature
index a6b3e2a2..309b1c0d 100644
--- a/changelogs/client_server/newsfragments/2709.feature
+++ b/changelogs/client_server/newsfragments/2709.feature
@@ -1 +1 @@
-Add a ``device_id`` parameter to login fallback per `MSC2604 <https://github.com/matrix-org/matrix-doc/pull/2604>`_.
+Add a `device_id` parameter to login fallback per [MSC2604](https://github.com/matrix-org/matrix-doc/pull/2604).
diff --git a/changelogs/client_server/newsfragments/2754.clarification b/changelogs/client_server/newsfragments/2754.clarification
index d3f96b84..ddbafc87 100644
--- a/changelogs/client_server/newsfragments/2754.clarification
+++ b/changelogs/client_server/newsfragments/2754.clarification
@@ -1 +1 @@
-Clarify the behaviour of ``state`` for ``/sync`` with lazy-loading.
+Clarify the behaviour of `state` for `/sync` with lazy-loading.
diff --git a/changelogs/client_server/newsfragments/2795.feature b/changelogs/client_server/newsfragments/2795.feature
index 62fd9425..85637012 100644
--- a/changelogs/client_server/newsfragments/2795.feature
+++ b/changelogs/client_server/newsfragments/2795.feature
@@ -1 +1 @@
-Added support for ``reason`` on all membership events and related endpoints as per `MSC2367 <https://github.com/matrix-org/matrix-doc/pull/2367>`_.
+Added support for `reason` on all membership events and related endpoints as per [MSC2367](https://github.com/matrix-org/matrix-doc/pull/2367).
diff --git a/changelogs/client_server/newsfragments/2796.feature b/changelogs/client_server/newsfragments/2796.feature
index 526c061f..067d98d8 100644
--- a/changelogs/client_server/newsfragments/2796.feature
+++ b/changelogs/client_server/newsfragments/2796.feature
@@ -1 +1 @@
-Add a 404 ``M_NOT_FOUND`` error to push rule endpoints as per `MSC2663 <https://github.com/matrix-org/matrix-doc/pull/2663>`_.
+Add a 404 `M_NOT_FOUND` error to push rule endpoints as per [MSC2663](https://github.com/matrix-org/matrix-doc/pull/2663).
diff --git a/changelogs/client_server/newsfragments/2807.feature b/changelogs/client_server/newsfragments/2807.feature
index e011cde6..6a34b60f 100644
--- a/changelogs/client_server/newsfragments/2807.feature
+++ b/changelogs/client_server/newsfragments/2807.feature
@@ -1 +1 @@
-Make ``reason`` and ``score`` parameters optional in the content reporting API (MSC2414).
+Make `reason` and `score` parameters optional in the content reporting API (MSC2414).
diff --git a/changelogs/server_server/newsfragments/2536.feature b/changelogs/server_server/newsfragments/2536.feature
index 62a66562..c2ea2d32 100644
--- a/changelogs/server_server/newsfragments/2536.feature
+++ b/changelogs/server_server/newsfragments/2536.feature
@@ -1,9 +1,9 @@
 Add cross-signing:
 
-- Add properties to the response of ``GET /user/keys`` and ``GET
-  /user/devices/{userId}``.
-- The ``m.device_list_update`` EDU is sent when a device gets a new signature.
-- A new ``m.signing_key_update`` EDU is sent when a user's cross-signing keys
+- Add properties to the response of `GET /user/keys` and `GET
+  /user/devices/{userId}`.
+- The `m.device_list_update` EDU is sent when a device gets a new signature.
+- A new `m.signing_key_update` EDU is sent when a user's cross-signing keys
   are changed.
 
 per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
diff --git a/changelogs/server_server/newsfragments/2688.clarification b/changelogs/server_server/newsfragments/2688.clarification
index 87e7792c..dfecfb59 100644
--- a/changelogs/server_server/newsfragments/2688.clarification
+++ b/changelogs/server_server/newsfragments/2688.clarification
@@ -1 +1 @@
-Specify that ``GET /_matrix/federation/v1/make_join/{roomId}/{userId}`` can return a 404 if the room is unknown.
\ No newline at end of file
+Specify that `GET /_matrix/federation/v1/make_join/{roomId}/{userId}` can return a 404 if the room is unknown.