summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authordykstranet <gary@dykstranet.com>2021-02-03 23:21:30 +0800
committerGitHub <noreply@github.com>2021-02-03 15:21:30 +0000
commite4cdecb3107727d17c34b253d65cd56e2acd526b (patch)
tree3c6a4dab93ccd2e7be5b10de388bf61ddd23eb0f /synapse
parentTypo fix in a comment: subequently -> subsequently. (#8988) (diff)
downloadsynapse-e4cdecb3107727d17c34b253d65cd56e2acd526b.tar.xz
config: Add detail to auto_join_rooms comment (#9291)
config: Add detail to auto_join_rooms comment

Signed-off-by: Gary Dykstra <gary@dykstranet.com>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/registration.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index ac48913a0b..afb3e0b2a1 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -378,6 +378,8 @@ class RegistrationConfig(Config):
         # By default, any room aliases included in this list will be created
         # as a publicly joinable room when the first user registers for the
         # homeserver. This behaviour can be customised with the settings below.
+        # If the room already exists, make certain it is a publicly joinable
+        # room. The join rule of the room must be set to 'public'.
         #
         #auto_join_rooms:
         #  - "#example:example.com"