summary refs log tree commit diff
path: root/docs/sample_config.yaml
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-02 11:22:40 +0100
committerGitHub <noreply@github.com>2019-05-02 11:22:40 +0100
commitc193b39134e0afb5a185b535bf79027d1fa699d0 (patch)
treeaa3674c9fe285f74e6ba3ff67e50ce851cfb74c7 /docs/sample_config.yaml
parentFactor out an "assert_requester_is_admin" function (#5120) (diff)
parentAdd some limitations to alias creation (diff)
downloadsynapse-c193b39134e0afb5a185b535bf79027d1fa699d0.tar.xz
Merge pull request #5124 from matrix-org/babolivier/aliases
Add some limitations to alias creation
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r--docs/sample_config.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 61be7502bc..fa2bccd5ef 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -239,6 +239,11 @@ listeners:
 # Used by phonehome stats to group together related servers.
 #server_context: context
 
+# Whether to require a user to be in the room to add an alias to it.
+# Defaults to 'true'.
+#
+#require_membership_for_aliases: false
+
 
 ## TLS ##