summary refs log tree commit diff
path: root/docs/tcp_replication.md
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-09-13 11:12:26 +0100
committerErik Johnston <erik@matrix.org>2023-09-13 11:12:26 +0100
commit3bb8cce692532ac61494c1767720d3bc9d60f08e (patch)
tree58b737f49bfe29959a8fb455df3ea57db87ac296 /docs/tcp_replication.md
parentMerge branch 'release-v1.92' into matrix-org-hotfixes (diff)
parentImprove logging of replication (#16309) (diff)
downloadsynapse-3bb8cce692532ac61494c1767720d3bc9d60f08e.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'docs/tcp_replication.md')
-rw-r--r--docs/tcp_replication.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tcp_replication.md b/docs/tcp_replication.md

index 083cda8413..c3b8c76609 100644 --- a/docs/tcp_replication.md +++ b/docs/tcp_replication.md
@@ -38,7 +38,7 @@ noted when manually using the protocol: been disabled on the main process. - The server will only time connections out that have sent a `PING` command. If a ping is sent then the connection will be closed if no - further commands are receieved within 15s. Both the client and + further commands are received within 15s. Both the client and server protocol implementations will send an initial PING on connection and ensure at least one command every 5s is sent (not necessarily `PING`). @@ -128,7 +128,7 @@ batching. See `RdataCommand` for more details. ### Example -An example iteraction is shown below. Each line is prefixed with '>' +An example interaction is shown below. Each line is prefixed with '>' or '<' to indicate which side is sending, these are *not* included on the wire: