From 671bc674cdb9979de8004e03eef84fb8d73bb52b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Wed, 17 Sep 2025 10:37:37 -0600
Subject: [PATCH] Changelog normalization

---
 changelogs/client_server/newsfragments/2182.clarification       | 1 -
 .../newsfragments/2190.clarification                            | 2 +-
 changelogs/client_server/newsfragments/2206.feature             | 2 +-
 changelogs/client_server/newsfragments/2210.removal             | 2 +-
 .../newsfragments/2132.clarification.1}                         | 0
 .../newsfragments/2132.clarification.2}                         | 0
 .../newsfragments/2182.clarification                            | 0
 changelogs/internal/newsfragments/2193.feature                  | 1 -
 8 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/client_server/newsfragments/2182.clarification
 rename changelogs/{internal => client_server}/newsfragments/2190.clarification (64%)
 rename changelogs/{application_service/newsfragments/2132.clarification => internal/newsfragments/2132.clarification.1} (100%)
 rename changelogs/{client_server/newsfragments/2132.clarification => internal/newsfragments/2132.clarification.2} (100%)
 rename changelogs/{application_service => internal}/newsfragments/2182.clarification (100%)
 delete mode 100644 changelogs/internal/newsfragments/2193.feature

diff --git a/changelogs/client_server/newsfragments/2182.clarification b/changelogs/client_server/newsfragments/2182.clarification
deleted file mode 100644
index 82426693..00000000
--- a/changelogs/client_server/newsfragments/2182.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Minor fixes to JSON schemas.
diff --git a/changelogs/internal/newsfragments/2190.clarification b/changelogs/client_server/newsfragments/2190.clarification
similarity index 64%
rename from changelogs/internal/newsfragments/2190.clarification
rename to changelogs/client_server/newsfragments/2190.clarification
index 019ac021..aefb6604 100644
--- a/changelogs/internal/newsfragments/2190.clarification
+++ b/changelogs/client_server/newsfragments/2190.clarification
@@ -1 +1 @@
-Clarify that clients should replace events with the most recent replacement by origin_server_ts.
+Clarify that clients should replace events with the most recent replacement by `origin_server_ts`.
diff --git a/changelogs/client_server/newsfragments/2206.feature b/changelogs/client_server/newsfragments/2206.feature
index b149ab6f..17b16ac3 100644
--- a/changelogs/client_server/newsfragments/2206.feature
+++ b/changelogs/client_server/newsfragments/2206.feature
@@ -1 +1 @@
-Add a profile field for a user's time zone, per [MSC4175](https://github.com/matrix-org/matrix-spec-proposals/pull/4175).
+Add a profile field for a user's time zone, as per [MSC4175](https://github.com/matrix-org/matrix-spec-proposals/pull/4175).
diff --git a/changelogs/client_server/newsfragments/2210.removal b/changelogs/client_server/newsfragments/2210.removal
index 97c512bf..c4fe42c2 100644
--- a/changelogs/client_server/newsfragments/2210.removal
+++ b/changelogs/client_server/newsfragments/2210.removal
@@ -1 +1 @@
-Remove unintentional intentional mentions in replies as per [MSC4142](https://github.com/matrix-org/matrix-spec-proposals/pull/4142).
+Remove unintentional intentional mentions in replies, as per [MSC4142](https://github.com/matrix-org/matrix-spec-proposals/pull/4142).
diff --git a/changelogs/application_service/newsfragments/2132.clarification b/changelogs/internal/newsfragments/2132.clarification.1
similarity index 100%
rename from changelogs/application_service/newsfragments/2132.clarification
rename to changelogs/internal/newsfragments/2132.clarification.1
diff --git a/changelogs/client_server/newsfragments/2132.clarification b/changelogs/internal/newsfragments/2132.clarification.2
similarity index 100%
rename from changelogs/client_server/newsfragments/2132.clarification
rename to changelogs/internal/newsfragments/2132.clarification.2
diff --git a/changelogs/application_service/newsfragments/2182.clarification b/changelogs/internal/newsfragments/2182.clarification
similarity index 100%
rename from changelogs/application_service/newsfragments/2182.clarification
rename to changelogs/internal/newsfragments/2182.clarification
diff --git a/changelogs/internal/newsfragments/2193.feature b/changelogs/internal/newsfragments/2193.feature
deleted file mode 100644
index 43972665..00000000
--- a/changelogs/internal/newsfragments/2193.feature
+++ /dev/null
@@ -1 +0,0 @@
-TODO: Placeholder
\ No newline at end of file