From 808bb1bc5a45fd74a89d2295ac6626fc0a43126f Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 28 Jun 2021 08:34:44 -0400 Subject: [PATCH] Pull note about ban & ACLs out of each join rule description. --- proposals/3083-restricted-rooms.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/3083-restricted-rooms.md b/proposals/3083-restricted-rooms.md index 63d290aa..6e30f09e 100644 --- a/proposals/3083-restricted-rooms.md +++ b/proposals/3083-restricted-rooms.md @@ -81,13 +81,13 @@ enforced over federation by event authorisation).[3](#f3) See the [join rules](https://matrix.org/docs/spec/client_server/r0.6.1#m-room-join-rules) specification for full details; the summary below is meant to highlight the differences -between `public`, `invite`, and `restricted`. +between `public`, `invite`, and `restricted`. Note that all join rules are subject +to `ban` and `server_acls`. -* `public`: anyone can join, subject to `ban` and `server_acls`, as today. -* `invite`: only people with membership `invite` can join, subject to `ban` and - `server_acls`, as today. -* `knock`: the same as `invite`, except anyone can knock, subject to `ban` and - `server_acls`. See [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403). +* `public`: anyone can join, as today. +* `invite`: only people with membership `invite` can join, as today. +* `knock`: the same as `invite`, except anyone can knock. See + [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403). * `private`: This is reserved, but unspecified. * `restricted`: the same as `public`, with the additional caveat that servers must verify the `m.room.member` event is signed by a homeserver whose users may issue