summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2022-10-10 21:01:05 +0100
committerGitHub <noreply@github.com>2022-10-10 20:01:05 +0000
commite580f03e02171d72888be1a1c86e7b7c49a055f9 (patch)
tree4def862b784408eee3eef827f746264c0ae69bf4
parentBump types-psycopg2 from 2.9.9 to 2.9.21.1 (#14114) (diff)
downloadsynapse-e580f03e02171d72888be1a1c86e7b7c49a055f9.tar.xz
Fix name of "alias_creation_rules" option in config manual (#14124)
-rw-r--r--changelog.d/14124.doc1
-rw-r--r--docs/usage/configuration/config_documentation.md4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/14124.doc b/changelog.d/14124.doc
new file mode 100644

index 0000000000..f578f93616 --- /dev/null +++ b/changelog.d/14124.doc
@@ -0,0 +1 @@ +Fix name of `alias_creation_rules` option in the config manual documentation. \ No newline at end of file diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index df3a62b27e..2fbf3ea07c 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md
@@ -3541,9 +3541,9 @@ Example configuration: enable_room_list_search: false ``` --- -### `alias_creation` +### `alias_creation_rules` -The `alias_creation` option controls who is allowed to create aliases +The `alias_creation_rules` option controls who is allowed to create aliases on this server. The format of this option is a list of rules that contain globs that