summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 17:26:31 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 17:26:31 +0100
commit7fffd3789b0cf50917d6d4e01b48d3bdb255574b (patch)
treef41cf82c6b68d631792f7847fca7945e0d47e3a6 /synapse/config
parentMerge commit '15c788e22' into anoa/dinsic_release_1_31_0 (diff)
parentPrevent the config-lint script erroring out on any sample_config changes (#9562) (diff)
downloadsynapse-7fffd3789b0cf50917d6d4e01b48d3bdb255574b.tar.xz
Merge commit '22db45bd4' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 29ff7718fd..c8b1a25004 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -847,8 +847,7 @@ class ServerConfig(Config):
         # Whether to require authentication to retrieve profile data (avatars,
         # display names) of other users through the client API. Defaults to
         # 'false'. Note that profile data is also available via the federation
-        # API, so this setting is of limited value if federation is enabled on
-        # the server.
+        # API, unless allow_profile_lookup_over_federation is set to false.
         #
         #require_auth_for_profile_requests: true