From 684215670ff1ebb3e05df7b8c4c13912be80f621 Mon Sep 17 00:00:00 2001 From: clokep Date: Fri, 8 Sep 2023 13:48:35 +0000 Subject: deploy: 5c8870cb28cc98d0b7a310b5dd2fade7ff45743d --- develop/usage/administration/admin_api/federation.html | 2 +- develop/usage/configuration/config_documentation.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'develop/usage') 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 0 if the last attempt to communicate with the remote server was successful.
  • retry_interval - integer - How long since the last time Synapse tried to reach -the remote server before trying again, in ms. This is 0 if no further retrying occuring.
  • +the remote server before trying again, in ms. This is 0 if no further retrying occurring.
  • failure_ts - nullable integer - The first time Synapse tried and failed to reach the remote server, in ms. This is null if communication with the remote server has never failed.
  • last_successful_stream_ordering - 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 workers and containers without listener e.g

    Example configuration #2:

    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.

    Normally, the connection to the key server is validated via TLS certificates. Additional security can be provided by configuring a verify key, which will make synapse check that the response is signed by that key.

    -

    This setting supercedes an older setting named perspectives. The old format +

    This setting supersedes an older setting named perspectives. The old format is still supported for backwards-compatibility, but it is deprecated.

    trusted_key_servers defaults to matrix.org, but using it will generate a warning on start-up. To suppress this warning, set -- cgit 1.5.1