diff --git a/changelog.d/12742.doc b/changelog.d/12742.doc new file mode 100644 index 0000000000000000000000000000000000000000..0084e27a7d035e8bece994d694bf7ff8f4e3e12f --- /dev/null +++ b/changelog.d/12742.doc @@ -0,0 +1 @@ +Fix typo in server listener documentation. \ No newline at end of file diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 05a3606da0435d960570f0ceccb340c6b763787c..ee98d193cbb99f1e2cc7a4034de1667d7c79d848 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -289,7 +289,7 @@ presence: # federation: the server-server API (/_matrix/federation). Also implies # 'media', 'keys', 'openid' # -# keys: the key discovery API (/_matrix/keys). +# keys: the key discovery API (/_matrix/key). # # media: the media API (/_matrix/media). # diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index ca443631055f57624821322d93f5f34bd397b7e9..f0bf13976d2c27585d494ad6556f5ed243b7e248 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -467,13 +467,13 @@ Sub-options for each listener include: Valid resource names are: -* `client`: the client-server API (/_matrix/client), and the synapse admin API (/_synapse/admin). Also implies 'media' and 'static'. +* `client`: the client-server API (/_matrix/client), and the synapse admin API (/_synapse/admin). Also implies `media` and `static`. * `consent`: user consent forms (/_matrix/consent). See [here](../../consent_tracking.md) for more. * `federation`: the server-server API (/_matrix/federation). Also implies `media`, `keys`, `openid` -* `keys`: the key discovery API (/_matrix/keys). +* `keys`: the key discovery API (/_matrix/key). * `media`: the media API (/_matrix/media). diff --git a/synapse/config/server.py b/synapse/config/server.py index 005a3ee48ce4974433d2f80366b735889be089f2..f73d5e1f6666922d54c3fae2ec51dec94a939f5d 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -996,7 +996,7 @@ class ServerConfig(Config): # federation: the server-server API (/_matrix/federation). Also implies # 'media', 'keys', 'openid' # - # keys: the key discovery API (/_matrix/keys). + # keys: the key discovery API (/_matrix/key). # # media: the media API (/_matrix/media). #