From d028dc4b826fb94a508ed487becbec9a1deaa9f0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 23 May 2023 16:14:54 -0600
Subject: [PATCH] Normalize changelog for v1.7

---
 changelogs/appendices/newsfragments/1468.clarification         | 2 +-
 changelogs/appendices/newsfragments/1483.clarification         | 2 +-
 changelogs/appendices/newsfragments/1484.clarification         | 2 +-
 changelogs/application_service/newsfragments/1516.new          | 1 -
 changelogs/application_service/newsfragments/1516.new.1        | 1 +
 changelogs/application_service/newsfragments/1516.new.2        | 1 +
 changelogs/client_server/newsfragments/1439.clarification      | 2 +-
 changelogs/client_server/newsfragments/1442.clarification      | 2 +-
 changelogs/client_server/newsfragments/1455.clarification      | 2 +-
 changelogs/client_server/newsfragments/1464.clarification      | 2 +-
 changelogs/client_server/newsfragments/1464.feature            | 2 +-
 .../newsfragments/{1465.clarifications => 1465.clarification}  | 0
 changelogs/client_server/newsfragments/1485.clarification      | 2 +-
 changelogs/client_server/newsfragments/1487.clarification      | 2 +-
 changelogs/client_server/newsfragments/1495.clarification      | 2 +-
 changelogs/client_server/newsfragments/1499.feature            | 3 +--
 changelogs/client_server/newsfragments/1499.new.1              | 1 +
 changelogs/client_server/newsfragments/1499.new.2              | 1 +
 changelogs/client_server/newsfragments/1501.clarification      | 2 +-
 changelogs/client_server/newsfragments/1508.feature            | 3 +--
 changelogs/client_server/newsfragments/1510.feature            | 3 +--
 changelogs/client_server/newsfragments/1511.feature            | 2 +-
 changelogs/client_server/newsfragments/1529.feature            | 2 +-
 changelogs/client_server/newsfragments/1530.new                | 2 +-
 changelogs/identity_service/newsfragments/1457.clarification   | 1 -
 .../newsfragments/1457.clarification                           | 0
 changelogs/internal/newsfragments/1488.clarification           | 2 +-
 changelogs/server_server/newsfragments/1431.clarification      | 2 +-
 changelogs/server_server/newsfragments/1454.clarification      | 2 +-
 changelogs/server_server/newsfragments/1457.clarification      | 1 -
 changelogs/server_server/newsfragments/1466.clarification      | 2 +-
 changelogs/server_server/newsfragments/1518.clarification      | 2 +-
 32 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 changelogs/application_service/newsfragments/1516.new
 create mode 100644 changelogs/application_service/newsfragments/1516.new.1
 create mode 100644 changelogs/application_service/newsfragments/1516.new.2
 rename changelogs/client_server/newsfragments/{1465.clarifications => 1465.clarification} (100%)
 create mode 100644 changelogs/client_server/newsfragments/1499.new.1
 create mode 100644 changelogs/client_server/newsfragments/1499.new.2
 delete mode 100644 changelogs/identity_service/newsfragments/1457.clarification
 rename changelogs/{client_server => internal}/newsfragments/1457.clarification (100%)
 delete mode 100644 changelogs/server_server/newsfragments/1457.clarification

diff --git a/changelogs/appendices/newsfragments/1468.clarification b/changelogs/appendices/newsfragments/1468.clarification
index 6f8ab86f..b3bb0bf4 100644
--- a/changelogs/appendices/newsfragments/1468.clarification
+++ b/changelogs/appendices/newsfragments/1468.clarification
@@ -1 +1 @@
-Clarify that the term "Canonical JSON" is a specific thing within the matrix specification.
+Clarify that the term "Canonical JSON" is a specific thing within the Matrix specification.
diff --git a/changelogs/appendices/newsfragments/1483.clarification b/changelogs/appendices/newsfragments/1483.clarification
index 4c2042e3..27a3b11d 100644
--- a/changelogs/appendices/newsfragments/1483.clarification
+++ b/changelogs/appendices/newsfragments/1483.clarification
@@ -1 +1 @@
-Remove references to groups
+Remove references to groups.
\ No newline at end of file
diff --git a/changelogs/appendices/newsfragments/1484.clarification b/changelogs/appendices/newsfragments/1484.clarification
index b29c7ad3..72edfa2f 100644
--- a/changelogs/appendices/newsfragments/1484.clarification
+++ b/changelogs/appendices/newsfragments/1484.clarification
@@ -1 +1 @@
-Clarifications of event ID formats in early room versions
+Clarifications of event ID formats in early room versions.
\ No newline at end of file
diff --git a/changelogs/application_service/newsfragments/1516.new b/changelogs/application_service/newsfragments/1516.new
deleted file mode 100644
index c6244075..00000000
--- a/changelogs/application_service/newsfragments/1516.new
+++ /dev/null
@@ -1 +0,0 @@
-Add `POST /_matrix/app/v1/ping` and `POST /_matrix/client/v1/appservice/{appserviceId}/ping` endpoints as per [MSC2659](https://github.com/matrix-org/matrix-spec-proposals/pull/2659).
diff --git a/changelogs/application_service/newsfragments/1516.new.1 b/changelogs/application_service/newsfragments/1516.new.1
new file mode 100644
index 00000000..7290a87c
--- /dev/null
+++ b/changelogs/application_service/newsfragments/1516.new.1
@@ -0,0 +1 @@
+[`POST /_matrix/app/v1/ping`](/application-service-api/#post_matrixappv1ping)
diff --git a/changelogs/application_service/newsfragments/1516.new.2 b/changelogs/application_service/newsfragments/1516.new.2
new file mode 100644
index 00000000..ccde9078
--- /dev/null
+++ b/changelogs/application_service/newsfragments/1516.new.2
@@ -0,0 +1 @@
+[`POST /_matrix/client/v1/appservice/{appserviceId}/ping`](/application-service-api/#post_matrixclientv1appserviceappserviceidping)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1439.clarification b/changelogs/client_server/newsfragments/1439.clarification
index ed05216d..0323f6de 100644
--- a/changelogs/client_server/newsfragments/1439.clarification
+++ b/changelogs/client_server/newsfragments/1439.clarification
@@ -1 +1 @@
-Clarify that reply chain fallback for threads may not be present.
+Clarify that reply chain fallback for threads might not be present.
diff --git a/changelogs/client_server/newsfragments/1442.clarification b/changelogs/client_server/newsfragments/1442.clarification
index 3ccb2333..ca5f3aea 100644
--- a/changelogs/client_server/newsfragments/1442.clarification
+++ b/changelogs/client_server/newsfragments/1442.clarification
@@ -1 +1 @@
-Fix various typos throughout the specification.
+Fix various typos throughout the specification.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1455.clarification b/changelogs/client_server/newsfragments/1455.clarification
index 3ccb2333..ca5f3aea 100644
--- a/changelogs/client_server/newsfragments/1455.clarification
+++ b/changelogs/client_server/newsfragments/1455.clarification
@@ -1 +1 @@
-Fix various typos throughout the specification.
+Fix various typos throughout the specification.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1464.clarification b/changelogs/client_server/newsfragments/1464.clarification
index f5bd822e..6096584f 100644
--- a/changelogs/client_server/newsfragments/1464.clarification
+++ b/changelogs/client_server/newsfragments/1464.clarification
@@ -1 +1 @@
-Disambiguate using property names with dots in them during push rule processing, per [MSC3873](https://github.com/matrix-org/matrix-spec-proposals/pull/3873) and [MSC3980](https://github.com/matrix-org/matrix-spec-proposals/pull/3980).
+Disambiguate using property names with dots in them during push rule processing, as per [MSC3873](https://github.com/matrix-org/matrix-spec-proposals/pull/3873) and [MSC3980](https://github.com/matrix-org/matrix-spec-proposals/pull/3980).
diff --git a/changelogs/client_server/newsfragments/1464.feature b/changelogs/client_server/newsfragments/1464.feature
index 7c1c01ec..fa09a067 100644
--- a/changelogs/client_server/newsfragments/1464.feature
+++ b/changelogs/client_server/newsfragments/1464.feature
@@ -1 +1 @@
-Add new push rule conditions: `event_property_is` and `event_property_contains` from [MSC3758](https://github.com/matrix-org/matrix-spec-proposals/pull/3758) and [MSC3966](https://github.com/matrix-org/matrix-spec-proposals/pull/3966).
+Add new push rule conditions `event_property_is` and `event_property_contains`, as per [MSC3758](https://github.com/matrix-org/matrix-spec-proposals/pull/3758) and [MSC3966](https://github.com/matrix-org/matrix-spec-proposals/pull/3966).
diff --git a/changelogs/client_server/newsfragments/1465.clarifications b/changelogs/client_server/newsfragments/1465.clarification
similarity index 100%
rename from changelogs/client_server/newsfragments/1465.clarifications
rename to changelogs/client_server/newsfragments/1465.clarification
diff --git a/changelogs/client_server/newsfragments/1485.clarification b/changelogs/client_server/newsfragments/1485.clarification
index 99e5fc79..0759c8cc 100644
--- a/changelogs/client_server/newsfragments/1485.clarification
+++ b/changelogs/client_server/newsfragments/1485.clarification
@@ -1 +1 @@
-Remove fictitious `token` parameter on `/keys/query` endpoint
+Remove fictitious `token` parameter on `/keys/query` endpoint.
diff --git a/changelogs/client_server/newsfragments/1487.clarification b/changelogs/client_server/newsfragments/1487.clarification
index 44494576..f94a56f1 100644
--- a/changelogs/client_server/newsfragments/1487.clarification
+++ b/changelogs/client_server/newsfragments/1487.clarification
@@ -1 +1 @@
-Fix rendering of properties with a list of types
+Fix rendering of properties with a list of types.
diff --git a/changelogs/client_server/newsfragments/1495.clarification b/changelogs/client_server/newsfragments/1495.clarification
index 8132e060..69672a4c 100644
--- a/changelogs/client_server/newsfragments/1495.clarification
+++ b/changelogs/client_server/newsfragments/1495.clarification
@@ -1 +1 @@
-Clarify parts of the end-to-end encryption sections.
+Clarify parts of the cross-signing signature upload request.
diff --git a/changelogs/client_server/newsfragments/1499.feature b/changelogs/client_server/newsfragments/1499.feature
index efd70374..1532d281 100644
--- a/changelogs/client_server/newsfragments/1499.feature
+++ b/changelogs/client_server/newsfragments/1499.feature
@@ -1,2 +1 @@
-Add new endpoints `POST /_matrix/media/v1/create` and `PUT /_matrix/media/v3/upload/{serverName}/{mediaId}`, and other changes for asynchronous media upload, as per [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246).
-
+Support asynchronous media uploads, as per [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246).
diff --git a/changelogs/client_server/newsfragments/1499.new.1 b/changelogs/client_server/newsfragments/1499.new.1
new file mode 100644
index 00000000..d7fbdbb6
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1499.new.1
@@ -0,0 +1 @@
+[`POST /_matrix/media/v1/create`](/client-server-api/#post_matrixmediav1create)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1499.new.2 b/changelogs/client_server/newsfragments/1499.new.2
new file mode 100644
index 00000000..226cb2e4
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1499.new.2
@@ -0,0 +1 @@
+[`PUT /_matrix/media/v3/upload/{serverName}/{mediaId}`](/client-server-api/#put_matrixmediav3uploadservernamemediaid)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1501.clarification b/changelogs/client_server/newsfragments/1501.clarification
index 97fa837c..cdac3968 100644
--- a/changelogs/client_server/newsfragments/1501.clarification
+++ b/changelogs/client_server/newsfragments/1501.clarification
@@ -1 +1 @@
-Remove the `dont_notify` and `coalesce` push rule actions per [MSC3987](https://github.com/matrix-org/matrix-spec-proposals/pull/3987).
+Remove the `dont_notify` and `coalesce` push rule actions, as per [MSC3987](https://github.com/matrix-org/matrix-spec-proposals/pull/3987).
diff --git a/changelogs/client_server/newsfragments/1508.feature b/changelogs/client_server/newsfragments/1508.feature
index 66e9670f..324ca9a8 100644
--- a/changelogs/client_server/newsfragments/1508.feature
+++ b/changelogs/client_server/newsfragments/1508.feature
@@ -1,2 +1 @@
-Document the `m.mentions` property; the `.m.rule.is_user_mention` and `.m.rule.is_room_mention` push rules; and other behaviour from [MSC3952](https://github.com/matrix-org/matrix-spec-proposals/pull/3952).
-
+Document the `m.mentions` property; the `.m.rule.is_user_mention` and `.m.rule.is_room_mention` push rules; and other notification behaviour, as per [MSC3952](https://github.com/matrix-org/matrix-spec-proposals/pull/3952).
diff --git a/changelogs/client_server/newsfragments/1510.feature b/changelogs/client_server/newsfragments/1510.feature
index efd70374..1532d281 100644
--- a/changelogs/client_server/newsfragments/1510.feature
+++ b/changelogs/client_server/newsfragments/1510.feature
@@ -1,2 +1 @@
-Add new endpoints `POST /_matrix/media/v1/create` and `PUT /_matrix/media/v3/upload/{serverName}/{mediaId}`, and other changes for asynchronous media upload, as per [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246).
-
+Support asynchronous media uploads, as per [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246).
diff --git a/changelogs/client_server/newsfragments/1511.feature b/changelogs/client_server/newsfragments/1511.feature
index d3526b8e..295a23da 100644
--- a/changelogs/client_server/newsfragments/1511.feature
+++ b/changelogs/client_server/newsfragments/1511.feature
@@ -1 +1 @@
-Update VoIP spec for [MSC2746](https://github.com/matrix-org/matrix-spec-proposals/pull/2746).
+Improve VoIP signaling, as per [MSC2746](https://github.com/matrix-org/matrix-spec-proposals/pull/2746).
diff --git a/changelogs/client_server/newsfragments/1529.feature b/changelogs/client_server/newsfragments/1529.feature
index 48f1d90b..e53bdfd8 100644
--- a/changelogs/client_server/newsfragments/1529.feature
+++ b/changelogs/client_server/newsfragments/1529.feature
@@ -1 +1 @@
-Addition of redirect downloads, as per [MSC3860](https://github.com/matrix-org/matrix-spec-proposals/pull/3860).
+Add an ability to redirect media downloads, as per [MSC3860](https://github.com/matrix-org/matrix-spec-proposals/pull/3860).
diff --git a/changelogs/client_server/newsfragments/1530.new b/changelogs/client_server/newsfragments/1530.new
index ffe9abd9..94cb6715 100644
--- a/changelogs/client_server/newsfragments/1530.new
+++ b/changelogs/client_server/newsfragments/1530.new
@@ -1 +1 @@
-[`POST /_matrix/client/v1/login/get_token`](/client-server-api/#post_matrixclientv1loginget_token).
\ No newline at end of file
+[`POST /_matrix/client/v1/login/get_token`](/client-server-api/#post_matrixclientv1loginget_token)
\ No newline at end of file
diff --git a/changelogs/identity_service/newsfragments/1457.clarification b/changelogs/identity_service/newsfragments/1457.clarification
deleted file mode 100644
index 0abd9b6c..00000000
--- a/changelogs/identity_service/newsfragments/1457.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Wrap $ref in allOf where other attributes are present, to improve OpenAPI compliance.
diff --git a/changelogs/client_server/newsfragments/1457.clarification b/changelogs/internal/newsfragments/1457.clarification
similarity index 100%
rename from changelogs/client_server/newsfragments/1457.clarification
rename to changelogs/internal/newsfragments/1457.clarification
diff --git a/changelogs/internal/newsfragments/1488.clarification b/changelogs/internal/newsfragments/1488.clarification
index d54557d9..6411f662 100644
--- a/changelogs/internal/newsfragments/1488.clarification
+++ b/changelogs/internal/newsfragments/1488.clarification
@@ -1 +1 @@
-Fix generation of anchors for additional properties
+Fix generation of anchors for additional properties.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1431.clarification b/changelogs/server_server/newsfragments/1431.clarification
index 3ccb2333..ca5f3aea 100644
--- a/changelogs/server_server/newsfragments/1431.clarification
+++ b/changelogs/server_server/newsfragments/1431.clarification
@@ -1 +1 @@
-Fix various typos throughout the specification.
+Fix various typos throughout the specification.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1454.clarification b/changelogs/server_server/newsfragments/1454.clarification
index 6d68b88a..559c1442 100644
--- a/changelogs/server_server/newsfragments/1454.clarification
+++ b/changelogs/server_server/newsfragments/1454.clarification
@@ -1 +1 @@
-Fix invalid OpenAPI specifications caused by overridden references to `examples/minimal_pdu.json`.
+Fix PDU examples by removing invalid OpenAPI reference to `examples/minimal_pdu.json`.
diff --git a/changelogs/server_server/newsfragments/1457.clarification b/changelogs/server_server/newsfragments/1457.clarification
deleted file mode 100644
index 0abd9b6c..00000000
--- a/changelogs/server_server/newsfragments/1457.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Wrap $ref in allOf where other attributes are present, to improve OpenAPI compliance.
diff --git a/changelogs/server_server/newsfragments/1466.clarification b/changelogs/server_server/newsfragments/1466.clarification
index 3ccb2333..ca5f3aea 100644
--- a/changelogs/server_server/newsfragments/1466.clarification
+++ b/changelogs/server_server/newsfragments/1466.clarification
@@ -1 +1 @@
-Fix various typos throughout the specification.
+Fix various typos throughout the specification.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1518.clarification b/changelogs/server_server/newsfragments/1518.clarification
index 3ccb2333..ca5f3aea 100644
--- a/changelogs/server_server/newsfragments/1518.clarification
+++ b/changelogs/server_server/newsfragments/1518.clarification
@@ -1 +1 @@
-Fix various typos throughout the specification.
+Fix various typos throughout the specification.
\ No newline at end of file