summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2022-05-09 13:51:08 -0700
committerH. Shay <hillerys@element.io>2022-05-09 13:51:08 -0700
commita6f6076c2249e504455d65fea6534be359d15aa5 (patch)
tree64c94fd606b280f0fe91e120cc03ad308fa1a514
parentfix newsfragment (diff)
parentMerge branch 'develop' into shay/super_docs (diff)
downloadsynapse-shay/super_docs.tar.xz
Merge branch 'shay/super_docs' of https://github.com/matrix-org/synapse into shay/super_docs github/shay/super_docs shay/super_docs
-rw-r--r--changelog.d/12665.misc1
-rw-r--r--synapse/federation/federation_client.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/12665.misc b/changelog.d/12665.misc
new file mode 100644
index 0000000000..37b96fea37
--- /dev/null
+++ b/changelog.d/12665.misc
@@ -0,0 +1 @@
+Fix spelling of `M_UNRECOGNIZED` in comments.
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index b5e0b84cbc..17eff60909 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -618,7 +618,7 @@ class FederationClient(FederationBase):
         #
         # Dendrite returns a 404 (with a body of "404 page not found");
         # Conduit returns a 404 (with no body); and Synapse returns a 400
-        # with M_UNRECOGNISED.
+        # with M_UNRECOGNIZED.
         #
         # This needs to be rather specific as some endpoints truly do return 404
         # errors.