From 5a5c30fcc1593dfaaa6bd92258ab20877b5b4593 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 28 Sep 2022 14:30:30 +0100 Subject: [PATCH 1/2] Document that the 'auto_join_rooms' option works with Spaces --- docs/usage/configuration/config_documentation.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index 69d305b62e6d..f46b4932fd23 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -2229,6 +2229,9 @@ homeserver. If the room already exists, make certain it is a publicly joinable room, i.e. the join rule of the room must be set to 'public'. You can find more options relating to auto-joining rooms below. +As Spaces are just rooms under the hood, Space aliases may also be +used. + Example configuration: ```yaml auto_join_rooms: @@ -2240,7 +2243,7 @@ auto_join_rooms: Where `auto_join_rooms` are specified, setting this flag ensures that the rooms exist by creating them when the first user on the -homeserver registers. +homeserver registers. This option will not create Spaces. By default the auto-created rooms are publicly joinable from any federated server. Use the `autocreate_auto_join_rooms_federated` and @@ -2258,7 +2261,7 @@ autocreate_auto_join_rooms: false --- ### `autocreate_auto_join_rooms_federated` -Whether the rooms listen in `auto_join_rooms` that are auto-created are available +Whether the rooms listed in `auto_join_rooms` that are auto-created are available via federation. Only has an effect if `autocreate_auto_join_rooms` is true. Note that whether a room is federated cannot be modified after From 0154a3c8ee41400a3a9d65fd76450b12e83ae2eb Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 28 Sep 2022 14:32:28 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/13931.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13931.doc diff --git a/changelog.d/13931.doc b/changelog.d/13931.doc new file mode 100644 index 000000000000..85e74fbb3bd3 --- /dev/null +++ b/changelog.d/13931.doc @@ -0,0 +1 @@ +Clarify that the `auto_join_rooms` config option can also be used with Space aliases. \ No newline at end of file