Merge b41698af55 into 68994d7fcd

Remove line wrapping from changelog
Co-authored-by: Travis Ralston <travpc@gmail.com>
2026-08-04 15:07:47 +02:00 · 2026-07-14 00:56:27 +00:00 · 2026-07-13 17:56:24 -07:00 · 2026-07-13 17:45:29 -07:00
2 changed files with 5 additions and 1 deletions
--- a/changelogs/client_server/newsfragments/2411.feature
+++ b/changelogs/client_server/newsfragments/2411.feature
@ -1 +1 @@
-Introduce room type `m.policy` to indicate rooms likely to contain policy lists.
+Introduce room type `m.policy` to indicate rooms likely to contain policy lists, as per [MSC3784](https://github.com/matrix-org/matrix-spec-proposals/pull/3784).
--- a/content/client-server-api/modules/moderation_policies.md
+++ b/content/client-server-api/modules/moderation_policies.md
@ -22,6 +22,10 @@ restrictions on how the rooms can be configured in terms of
 [join rules](#mroomjoin_rules), [history visibility](#room-history-visibility),
 encryption, etc.

+A moderation policy list may be designated by the [`m.policy` room type](#types),
+however, policy events may still be sent in rooms without this room type. Sending
+messages in rooms with the `m.policy` room type is discouraged, but not forbidden.
+
 There are currently 3 kinds of entities which can be affected by rules:
 `user`, `server`, and `room`. All 3 are described with
 `m.policy.rule.<kind>` state events. The `state_key` for a policy rule
Author	SHA1	Message	Date
Logan Devine	063b10f24c	Merge `b41698af55` into `68994d7fcd`	2026-07-14 00:56:27 +00:00
Logan Devine	b41698af55	Remove line wrapping from changelog Co-authored-by: Travis Ralston <travpc@gmail.com>	2026-07-13 17:56:24 -07:00
Logan Devine	89cc8a71a7	Specify behavior of the m.policy room type, fix changelog Signed-off-by: Logan Devine <logan@zirco.dev>	2026-07-13 17:45:29 -07:00