Merge b41698af55 into bf5fbc9945

Co-authored-by: Travis Ralston <travpc@gmail.com>

changelogs/client_server/newsfragments/2411.feature

@@ -0,0 +1 @@
+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).

content/client-server-api/_index.md

@@ -3820,6 +3820,7 @@ the create room request.
 In this specification the following room types are specified:
 
 * [`m.space`](#spaces)
+* [`m.policy`](#moderation-policy-lists)
 
 Unspecified room types are permitted through the use of
 [Namespaced Identifiers](/appendices/#common-namespaced-identifier-grammar).

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