diff options
| author | Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> | 2022-05-16 15:50:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 13:50:07 +0000 |
| commit | 806003461226dc8db19bf9d631260b78c48d544e (patch) | |
| tree | aa75c33750835016ad1ac4e658d844f8e7e593bb | |
| parent | Fix room upgrades creating an empty room when auth fails (#12696) (diff) | |
| download | synapse-806003461226dc8db19bf9d631260b78c48d544e.tar.xz | |
Fix typo in listener config (#12742)
| -rw-r--r-- | changelog.d/12742.doc | 1 | ||||
| -rw-r--r-- | docs/sample_config.yaml | 2 | ||||
| -rw-r--r-- | docs/usage/configuration/config_documentation.md | 4 | ||||
| -rw-r--r-- | synapse/config/server.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/12742.doc b/changelog.d/12742.doc new file mode 100644 index 0000000000..0084e27a7d --- /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 05a3606da0..ee98d193cb 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 ca44363105..f0bf13976d 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 005a3ee48c..f73d5e1f66 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). # |