From dcb39f8890af57e62ed37f9e894af4b5af5d9bc3 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sun, 5 Aug 2018 10:55:55 -0600 Subject: [PATCH] Fix wording from bad merge --- specification/server_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 30cf45ab..cf3333a1 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -629,7 +629,7 @@ if this optimisation fails. Once the joining server has the room ID and the join candidates, it then needs to obtain enough information about the room to fill in the required fields of -the ``m.room.member`` event. It obtains this by selecting a resident from t +the ``m.room.member`` event. It obtains this by selecting a resident from the candidate list, and using the ``GET /make_join`` endpoint. The resident server will then reply with enough information for the joining server to fill in the event.