summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdrian <adrian@planetcoding.net>2020-07-20 19:42:52 +0200
committerGitHub <noreply@github.com>2020-07-20 13:42:52 -0400
commit64d228029958c396c09cfd57cac9eafa865fe206 (patch)
tree5518178f0326f15596fef00f00bfe314010d8dd8
parentFix deprecation warning: import ABC from collections.abc (#7892) (diff)
downloadsynapse-64d228029958c396c09cfd57cac9eafa865fe206.tar.xz
Fix a typo in the sample config. (#7890)
-rw-r--r--changelog.d/7890.misc1
-rw-r--r--docs/sample_config.yaml2
-rw-r--r--synapse/config/server.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/7890.misc b/changelog.d/7890.misc
new file mode 100644
index 0000000000..8c127084bc
--- /dev/null
+++ b/changelog.d/7890.misc
@@ -0,0 +1 @@
+Fix typo in generated config file. Contributed by @ThiefMaster.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2e001fb674..3227294e0b 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -148,7 +148,7 @@ pid_file: DATADIR/homeserver.pid
 #       names: a list of names of HTTP resources. See below for a list of
 #           valid resource names.
 #
-#       compress: set to true to enable HTTP comression for this resource.
+#       compress: set to true to enable HTTP compression for this resource.
 #
 #   additional_resources: Only valid for an 'http' listener. A map of
 #        additional endpoints which should be loaded via dynamic modules.
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 3586a7d491..3747a01ca7 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -739,7 +739,7 @@ class ServerConfig(Config):
         #       names: a list of names of HTTP resources. See below for a list of
         #           valid resource names.
         #
-        #       compress: set to true to enable HTTP comression for this resource.
+        #       compress: set to true to enable HTTP compression for this resource.
         #
         #   additional_resources: Only valid for an 'http' listener. A map of
         #        additional endpoints which should be loaded via dynamic modules.