Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 25c0e69

Browse files
Document that the 'auto_join_rooms' option works with Spaces (#13931)
1 parent 220b219 commit 25c0e69

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

changelog.d/13931.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clarify that the `auto_join_rooms` config option can also be used with Space aliases.

docs/usage/configuration/config_documentation.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,6 +2229,9 @@ homeserver. If the room already exists, make certain it is a publicly joinable
22292229
room, i.e. the join rule of the room must be set to 'public'. You can find more options
22302230
relating to auto-joining rooms below.
22312231

2232+
As Spaces are just rooms under the hood, Space aliases may also be
2233+
used.
2234+
22322235
Example configuration:
22332236
```yaml
22342237
auto_join_rooms:
@@ -2240,7 +2243,7 @@ auto_join_rooms:
22402243

22412244
Where `auto_join_rooms` are specified, setting this flag ensures that
22422245
the rooms exist by creating them when the first user on the
2243-
homeserver registers.
2246+
homeserver registers. This option will not create Spaces.
22442247

22452248
By default the auto-created rooms are publicly joinable from any federated
22462249
server. Use the `autocreate_auto_join_rooms_federated` and
@@ -2258,7 +2261,7 @@ autocreate_auto_join_rooms: false
22582261
---
22592262
### `autocreate_auto_join_rooms_federated`
22602263

2261-
Whether the rooms listen in `auto_join_rooms` that are auto-created are available
2264+
Whether the rooms listed in `auto_join_rooms` that are auto-created are available
22622265
via federation. Only has an effect if `autocreate_auto_join_rooms` is true.
22632266

22642267
Note that whether a room is federated cannot be modified after

0 commit comments

Comments
 (0)