From 9c46fa3f35f5e1517c401b7654a2faad1fbf65d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Wed, 19 Jun 2024 21:52:21 -0600
Subject: [PATCH] Normalize the changelog for Matrix 1.11

---
 changelogs/application_service/newsfragments/1810.clarification | 2 +-
 changelogs/client_server/newsfragments/1644.clarification       | 2 +-
 .../newsfragments/{1755.clarification => 1755.feature}          | 0
 changelogs/client_server/newsfragments/1757.feature             | 2 +-
 changelogs/client_server/newsfragments/1772.clarification       | 1 -
 changelogs/client_server/newsfragments/1808.clarification       | 1 -
 changelogs/client_server/newsfragments/1808.deprecation         | 1 +
 changelogs/client_server/newsfragments/1813.clarification       | 2 +-
 .../newsfragments/{1816.clarification => 1816.feature}          | 0
 changelogs/client_server/newsfragments/1841.clarification       | 2 +-
 changelogs/client_server/newsfragments/1846.clarification       | 2 +-
 changelogs/client_server/newsfragments/1847.feature             | 2 +-
 changelogs/client_server/newsfragments/1861.clarification       | 2 +-
 changelogs/client_server/newsfragments/1863.clarification       | 2 +-
 changelogs/identity_service/newsfragments/1772.clarification    | 1 -
 changelogs/identity_service/newsfragments/1808.clarification    | 1 -
 changelogs/identity_service/newsfragments/1808.deprecation      | 1 +
 changelogs/internal/newsfragments/1769.clarification            | 2 +-
 changelogs/internal/newsfragments/1770.clarification            | 2 +-
 changelogs/internal/newsfragments/1771.clarification            | 2 +-
 .../newsfragments/1772.clarification                            | 0
 changelogs/internal/newsfragments/1781.clarification            | 2 +-
 changelogs/internal/newsfragments/1786.clarification            | 2 +-
 .../internal/newsfragments/{1793.misc => 1793.clarification}    | 0
 changelogs/internal/newsfragments/1803.clarification            | 2 +-
 changelogs/internal/newsfragments/1804.clarification            | 2 +-
 changelogs/internal/newsfragments/1813.clarification            | 1 +
 .../newsfragments/1822.clarification                            | 0
 changelogs/room_versions/newsfragments/1827.clarification       | 2 +-
 changelogs/server_server/newsfragments/1772.clarification       | 1 -
 changelogs/server_server/newsfragments/1813.clarification       | 2 +-
 31 files changed, 21 insertions(+), 23 deletions(-)
 rename changelogs/client_server/newsfragments/{1755.clarification => 1755.feature} (100%)
 delete mode 100644 changelogs/client_server/newsfragments/1772.clarification
 delete mode 100644 changelogs/client_server/newsfragments/1808.clarification
 create mode 100644 changelogs/client_server/newsfragments/1808.deprecation
 rename changelogs/client_server/newsfragments/{1816.clarification => 1816.feature} (100%)
 delete mode 100644 changelogs/identity_service/newsfragments/1772.clarification
 delete mode 100644 changelogs/identity_service/newsfragments/1808.clarification
 create mode 100644 changelogs/identity_service/newsfragments/1808.deprecation
 rename changelogs/{application_service => internal}/newsfragments/1772.clarification (100%)
 rename changelogs/internal/newsfragments/{1793.misc => 1793.clarification} (100%)
 create mode 100644 changelogs/internal/newsfragments/1813.clarification
 rename changelogs/{client_server => internal}/newsfragments/1822.clarification (100%)
 delete mode 100644 changelogs/server_server/newsfragments/1772.clarification

diff --git a/changelogs/application_service/newsfragments/1810.clarification b/changelogs/application_service/newsfragments/1810.clarification
index 66dab495..fd21375c 100644
--- a/changelogs/application_service/newsfragments/1810.clarification
+++ b/changelogs/application_service/newsfragments/1810.clarification
@@ -1 +1 @@
-Clarify that appservices should be notified of events relating to the sender_localpart user.
+Clarify that appservices should be notified of events relating to the `sender_localpart` user.
diff --git a/changelogs/client_server/newsfragments/1644.clarification b/changelogs/client_server/newsfragments/1644.clarification
index 78c0919d..279c4312 100644
--- a/changelogs/client_server/newsfragments/1644.clarification
+++ b/changelogs/client_server/newsfragments/1644.clarification
@@ -1 +1 @@
-Clarify specification by adding `/logout` to the overview list of endpoints that don't take a JSON request body.
+Add `/logout` and clarify the endpoints which do not take a JSON request body.
diff --git a/changelogs/client_server/newsfragments/1755.clarification b/changelogs/client_server/newsfragments/1755.feature
similarity index 100%
rename from changelogs/client_server/newsfragments/1755.clarification
rename to changelogs/client_server/newsfragments/1755.feature
diff --git a/changelogs/client_server/newsfragments/1757.feature b/changelogs/client_server/newsfragments/1757.feature
index 3471c1b9..f65d48ba 100644
--- a/changelogs/client_server/newsfragments/1757.feature
+++ b/changelogs/client_server/newsfragments/1757.feature
@@ -1 +1 @@
-Add optional `animated` query string option to `GET /_matrix/media/v3/thumbnail`, as per [MSC2705](https://github.com/matrix-org/matrix-spec-proposals/pull/2705).
\ No newline at end of file
+Add optional `animated` query string option to `GET /thumbnail`, as per [MSC2705](https://github.com/matrix-org/matrix-spec-proposals/pull/2705).
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1772.clarification b/changelogs/client_server/newsfragments/1772.clarification
deleted file mode 100644
index b2aafa0d..00000000
--- a/changelogs/client_server/newsfragments/1772.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the OpenAPI definition of the security schemes.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1808.clarification b/changelogs/client_server/newsfragments/1808.clarification
deleted file mode 100644
index ff2c1651..00000000
--- a/changelogs/client_server/newsfragments/1808.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate authentication via a query string, as per [MSC4126](https://github.com/matrix-org/matrix-spec-proposals/issues/4126).
diff --git a/changelogs/client_server/newsfragments/1808.deprecation b/changelogs/client_server/newsfragments/1808.deprecation
new file mode 100644
index 00000000..ae9f620d
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1808.deprecation
@@ -0,0 +1 @@
+Authentication using a query string is now deprecated, as per [MSC4126](https://github.com/matrix-org/matrix-spec-proposals/issues/4126). The `Authorization` header should be used instead.
diff --git a/changelogs/client_server/newsfragments/1813.clarification b/changelogs/client_server/newsfragments/1813.clarification
index af643e2e..fa76c2a1 100644
--- a/changelogs/client_server/newsfragments/1813.clarification
+++ b/changelogs/client_server/newsfragments/1813.clarification
@@ -1 +1 @@
-Use `patternProperties` in more places with supported formats.
+Link to existing grammar where possible in types.
diff --git a/changelogs/client_server/newsfragments/1816.clarification b/changelogs/client_server/newsfragments/1816.feature
similarity index 100%
rename from changelogs/client_server/newsfragments/1816.clarification
rename to changelogs/client_server/newsfragments/1816.feature
diff --git a/changelogs/client_server/newsfragments/1841.clarification b/changelogs/client_server/newsfragments/1841.clarification
index faf8aae9..3ccb2333 100644
--- a/changelogs/client_server/newsfragments/1841.clarification
+++ b/changelogs/client_server/newsfragments/1841.clarification
@@ -1 +1 @@
-Fix broken link to push rule condition kinds.
+Fix various typos throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1846.clarification b/changelogs/client_server/newsfragments/1846.clarification
index 6f57eb35..ee5387a8 100644
--- a/changelogs/client_server/newsfragments/1846.clarification
+++ b/changelogs/client_server/newsfragments/1846.clarification
@@ -1 +1 @@
-Clarify that per-request UIA for /login/get_token is an RFC 2119 MUST requirement.
+Use RFC 2119 keywords more consistently.
diff --git a/changelogs/client_server/newsfragments/1847.feature b/changelogs/client_server/newsfragments/1847.feature
index 25d1914b..ab3dbc34 100644
--- a/changelogs/client_server/newsfragments/1847.feature
+++ b/changelogs/client_server/newsfragments/1847.feature
@@ -1 +1 @@
-Add the new `unsigned.membership` property to events served over the client-server API, as per [MSC4115](https://github.com/matrix-org/matrix-spec-proposals/pull/4115).
+Add the new `unsigned.membership` property to events, as per [MSC4115](https://github.com/matrix-org/matrix-spec-proposals/pull/4115).
diff --git a/changelogs/client_server/newsfragments/1861.clarification b/changelogs/client_server/newsfragments/1861.clarification
index 9d877ff5..ee5387a8 100644
--- a/changelogs/client_server/newsfragments/1861.clarification
+++ b/changelogs/client_server/newsfragments/1861.clarification
@@ -1 +1 @@
-Use RFC 2119 keywords more consistently throughout various parts of the specification.
\ No newline at end of file
+Use RFC 2119 keywords more consistently.
diff --git a/changelogs/client_server/newsfragments/1863.clarification b/changelogs/client_server/newsfragments/1863.clarification
index d054d41d..688288cf 100644
--- a/changelogs/client_server/newsfragments/1863.clarification
+++ b/changelogs/client_server/newsfragments/1863.clarification
@@ -1 +1 @@
-Minor clarifications to the "end-to-end encryption" module.
+Clarify where keys reside when checking an `m.room.encrypted` event.
diff --git a/changelogs/identity_service/newsfragments/1772.clarification b/changelogs/identity_service/newsfragments/1772.clarification
deleted file mode 100644
index b2aafa0d..00000000
--- a/changelogs/identity_service/newsfragments/1772.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the OpenAPI definition of the security schemes.
\ No newline at end of file
diff --git a/changelogs/identity_service/newsfragments/1808.clarification b/changelogs/identity_service/newsfragments/1808.clarification
deleted file mode 100644
index ff2c1651..00000000
--- a/changelogs/identity_service/newsfragments/1808.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate authentication via a query string, as per [MSC4126](https://github.com/matrix-org/matrix-spec-proposals/issues/4126).
diff --git a/changelogs/identity_service/newsfragments/1808.deprecation b/changelogs/identity_service/newsfragments/1808.deprecation
new file mode 100644
index 00000000..ae9f620d
--- /dev/null
+++ b/changelogs/identity_service/newsfragments/1808.deprecation
@@ -0,0 +1 @@
+Authentication using a query string is now deprecated, as per [MSC4126](https://github.com/matrix-org/matrix-spec-proposals/issues/4126). The `Authorization` header should be used instead.
diff --git a/changelogs/internal/newsfragments/1769.clarification b/changelogs/internal/newsfragments/1769.clarification
index ebf8030d..c092b8f7 100644
--- a/changelogs/internal/newsfragments/1769.clarification
+++ b/changelogs/internal/newsfragments/1769.clarification
@@ -1 +1 @@
-Formatting fixes in CONTRIBUTING.rst.
+Formatting fixes in `CONTRIBUTING.rst`.
diff --git a/changelogs/internal/newsfragments/1770.clarification b/changelogs/internal/newsfragments/1770.clarification
index e5fb516f..0eb57682 100644
--- a/changelogs/internal/newsfragments/1770.clarification
+++ b/changelogs/internal/newsfragments/1770.clarification
@@ -1 +1 @@
-Reduce whitespace on mobile viewports
+Improve rendering on mobile devices.
\ No newline at end of file
diff --git a/changelogs/internal/newsfragments/1771.clarification b/changelogs/internal/newsfragments/1771.clarification
index b1941e18..0eb57682 100644
--- a/changelogs/internal/newsfragments/1771.clarification
+++ b/changelogs/internal/newsfragments/1771.clarification
@@ -1 +1 @@
-Arrange rows in `.basic-info` tables vertically when horizontal space is constrained.
+Improve rendering on mobile devices.
\ No newline at end of file
diff --git a/changelogs/application_service/newsfragments/1772.clarification b/changelogs/internal/newsfragments/1772.clarification
similarity index 100%
rename from changelogs/application_service/newsfragments/1772.clarification
rename to changelogs/internal/newsfragments/1772.clarification
diff --git a/changelogs/internal/newsfragments/1781.clarification b/changelogs/internal/newsfragments/1781.clarification
index 4fb58650..8776d77b 100644
--- a/changelogs/internal/newsfragments/1781.clarification
+++ b/changelogs/internal/newsfragments/1781.clarification
@@ -1 +1 @@
-Fix `github-labels.rst`
+Fix `github-labels.rst`.
diff --git a/changelogs/internal/newsfragments/1786.clarification b/changelogs/internal/newsfragments/1786.clarification
index 1810c632..c66e15e3 100644
--- a/changelogs/internal/newsfragments/1786.clarification
+++ b/changelogs/internal/newsfragments/1786.clarification
@@ -1 +1 @@
-Upgrade jsonschema and python-jsonpath CI scripts dependencies.
+Update dependencies.
\ No newline at end of file
diff --git a/changelogs/internal/newsfragments/1793.misc b/changelogs/internal/newsfragments/1793.clarification
similarity index 100%
rename from changelogs/internal/newsfragments/1793.misc
rename to changelogs/internal/newsfragments/1793.clarification
diff --git a/changelogs/internal/newsfragments/1803.clarification b/changelogs/internal/newsfragments/1803.clarification
index dbfaa8c9..c66e15e3 100644
--- a/changelogs/internal/newsfragments/1803.clarification
+++ b/changelogs/internal/newsfragments/1803.clarification
@@ -1 +1 @@
-Update most CI actions.
+Update dependencies.
\ No newline at end of file
diff --git a/changelogs/internal/newsfragments/1804.clarification b/changelogs/internal/newsfragments/1804.clarification
index 39249cb8..c66e15e3 100644
--- a/changelogs/internal/newsfragments/1804.clarification
+++ b/changelogs/internal/newsfragments/1804.clarification
@@ -1 +1 @@
-Update typos CI action.
+Update dependencies.
\ No newline at end of file
diff --git a/changelogs/internal/newsfragments/1813.clarification b/changelogs/internal/newsfragments/1813.clarification
new file mode 100644
index 00000000..af643e2e
--- /dev/null
+++ b/changelogs/internal/newsfragments/1813.clarification
@@ -0,0 +1 @@
+Use `patternProperties` in more places with supported formats.
diff --git a/changelogs/client_server/newsfragments/1822.clarification b/changelogs/internal/newsfragments/1822.clarification
similarity index 100%
rename from changelogs/client_server/newsfragments/1822.clarification
rename to changelogs/internal/newsfragments/1822.clarification
diff --git a/changelogs/room_versions/newsfragments/1827.clarification b/changelogs/room_versions/newsfragments/1827.clarification
index c122052d..ca5f3aea 100644
--- a/changelogs/room_versions/newsfragments/1827.clarification
+++ b/changelogs/room_versions/newsfragments/1827.clarification
@@ -1 +1 @@
-Fix minor spelling mistake of object being spelt "obiect".
+Fix various typos throughout the specification.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1772.clarification b/changelogs/server_server/newsfragments/1772.clarification
deleted file mode 100644
index b2aafa0d..00000000
--- a/changelogs/server_server/newsfragments/1772.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the OpenAPI definition of the security schemes.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1813.clarification b/changelogs/server_server/newsfragments/1813.clarification
index af643e2e..fa76c2a1 100644
--- a/changelogs/server_server/newsfragments/1813.clarification
+++ b/changelogs/server_server/newsfragments/1813.clarification
@@ -1 +1 @@
-Use `patternProperties` in more places with supported formats.
+Link to existing grammar where possible in types.