diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-09-28 15:13:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 14:13:19 +0000 |
| commit | 25c0e693924ddc5234ebb15cdfdc82b553a4b2c6 (patch) | |
| tree | 6e8bda65644ba3781de06e57a734daed828cd142 | |
| parent | Correct default number of bcrypt hash rounds in .1 man page (#13930) (diff) | |
| download | synapse-25c0e693924ddc5234ebb15cdfdc82b553a4b2c6.tar.xz | |
Document that the 'auto_join_rooms' option works with Spaces (#13931)
| -rw-r--r-- | changelog.d/13931.doc | 1 | ||||
| -rw-r--r-- | docs/usage/configuration/config_documentation.md | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelog.d/13931.doc b/changelog.d/13931.doc new file mode 100644 index 0000000000..85e74fbb3b --- /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 diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index 69d305b62e..f46b4932fd 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 |