summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-14 18:21:24 +0000
committerErik Johnston <erik@matrix.org>2019-02-14 18:21:24 +0000
commit8e32f26cb8f8de8554b8b75870026fe80f45add3 (patch)
tree7892cccc54f617f576254c8daa613e69a930883a /synapse/config
parentClarify and fix behaviour when there are multiple aliases (diff)
downloadsynapse-8e32f26cb8f8de8554b8b75870026fe80f45add3.tar.xz
Clarify comments
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/room_directory.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py

index af84adf5fa..f86626c354 100644 --- a/synapse/config/room_directory.py +++ b/synapse/config/room_directory.py
@@ -60,9 +60,9 @@ class RoomDirectoryConfig(Config): # The format of this option is the same as that for # `alias_creation_rules`. # - # If the room has one or more aliases associated with it, the rules are - # run against each alias. If there are no aliases then only rules with - # `alias: *` match. + # If the room has one or more aliases associated with it, only one of + # the aliases needs to match the alias rule. If there are no aliases + # then only rules with `alias: *` match. room_list_publication_rules: - user_id: "*" # Matches against the user publishing the room alias: "*" # Matches against any current local or canonical