summary refs log tree commit diff
path: root/develop/usage
diff options
context:
space:
mode:
authorclokep <clokep@users.noreply.github.com>2023-09-08 13:48:35 +0000
committerclokep <clokep@users.noreply.github.com>2023-09-08 13:48:35 +0000
commit684215670ff1ebb3e05df7b8c4c13912be80f621 (patch)
tree716b32d5702607a769b88a56a554e2c9a14566e2 /develop/usage
parentdeploy: 8940d1b28ecbaf9185459e2af62169ecf39a96f5 (diff)
downloadsynapse-684215670ff1ebb3e05df7b8c4c13912be80f621.tar.xz
deploy: 5c8870cb28cc98d0b7a310b5dd2fade7ff45743d
Diffstat (limited to 'develop/usage')
-rw-r--r--develop/usage/administration/admin_api/federation.html2
-rw-r--r--develop/usage/configuration/config_documentation.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/develop/usage/administration/admin_api/federation.html b/develop/usage/administration/admin_api/federation.html

index 5eaa154eac..d3a6b8d4a2 100644 --- a/develop/usage/administration/admin_api/federation.html +++ b/develop/usage/administration/admin_api/federation.html
@@ -211,7 +211,7 @@ Destination objects contain the following fields: remote server, in ms. This is <code>0</code> if the last attempt to communicate with the remote server was successful.</li> <li><code>retry_interval</code> - integer - How long since the last time Synapse tried to reach -the remote server before trying again, in ms. This is <code>0</code> if no further retrying occuring.</li> +the remote server before trying again, in ms. This is <code>0</code> if no further retrying occurring.</li> <li><code>failure_ts</code> - nullable integer - The first time Synapse tried and failed to reach the remote server, in ms. This is <code>null</code> if communication with the remote server has never failed.</li> <li><code>last_successful_stream_ordering</code> - nullable integer - The stream ordering of the most diff --git a/develop/usage/configuration/config_documentation.html b/develop/usage/configuration/config_documentation.html
index e754a67b19..f848689619 100644 --- a/develop/usage/configuration/config_documentation.html +++ b/develop/usage/configuration/config_documentation.html
@@ -594,7 +594,7 @@ for <a href="../../workers.html">workers</a> and containers without listener e.g </code></pre> <p>Example configuration #2:</p> <pre><code class="language-yaml">listeners: - # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy + # Insecure HTTP listener: for when matrix traffic passes through a reverse proxy # that unwraps TLS. # # If you plan to use a reverse proxy, please see @@ -2574,7 +2574,7 @@ are still valid. Defaults to 1d.</p> <p>Normally, the connection to the key server is validated via TLS certificates. Additional security can be provided by configuring a <code>verify key</code>, which will make synapse check that the response is signed by that key.</p> -<p>This setting supercedes an older setting named <code>perspectives</code>. The old format +<p>This setting supersedes an older setting named <code>perspectives</code>. The old format is still supported for backwards-compatibility, but it is deprecated.</p> <p><code>trusted_key_servers</code> defaults to matrix.org, but using it will generate a warning on start-up. To suppress this warning, set