summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2020-06-05 11:18:15 -0600
committerGitHub <noreply@github.com>2020-06-05 18:18:15 +0100
commit09099313e6d527938013bb46640efc3768960d21 (patch)
treeda6619c87dfa606f1b81ce432509317e4a77d525 /docs
parentClarifications to the admin api documentation (#7647) (diff)
downloadsynapse-09099313e6d527938013bb46640efc3768960d21.tar.xz
Add an option to disable autojoin for guest accounts (#6637)
Fixes https://github.com/matrix-org/synapse/issues/3177
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index b06394a2bd..94e1ec698f 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1223,6 +1223,13 @@ account_threepid_delegates:
 #
 #autocreate_auto_join_rooms: true
 
+# When auto_join_rooms is specified, setting this flag to false prevents
+# guest accounts from being automatically joined to the rooms.
+#
+# Defaults to true.
+#
+#auto_join_rooms_for_guests: false
+
 
 ## Metrics ###