summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2022-04-27 13:57:53 +0100
committerGitHub <noreply@github.com>2022-04-27 12:57:53 +0000
commite8d1ec0e92da96a01b6c723fcdb4eac27f801e87 (patch)
treea751bfd0999028ee404e1a373fa376c7762bfa15 /docs
parentAdd some type hints to datastore (#12485) (diff)
downloadsynapse-e8d1ec0e92da96a01b6c723fcdb4eac27f801e87.tar.xz
Add option to enable token registration without requiring 3pids (#12526)
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index b8d8c0dbf0..67184c6b1a 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1323,6 +1323,12 @@ oembed:
 #
 #registration_requires_token: true
 
+# Allow users to submit a token during registration to bypass any required 3pid
+# steps configured in `registrations_require_3pid`.
+# Defaults to false, requiring that registration tokens (if enabled) complete a 3pid flow.
+#
+#enable_registration_token_3pid_bypass: false
+
 # If set, allows registration of standard or admin accounts by anyone who
 # has the shared secret, even if registration is otherwise disabled.
 #