From 32178bb07e60117be9377071a407ca4f1f5d6d31 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 9 Aug 2018 08:33:00 -0600 Subject: [PATCH] Tidy up the specification * Minor word choice changes * Remove the now-empty "Protocol URLs" section --- specification/server_server_api.rst | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 25c9189ec..a6d601e6e 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -23,14 +23,13 @@ Federation API Matrix homeservers use the Federation APIs (also known as server-server APIs) to communicate with each other. Homeservers use these APIs to push messages to -each other in real-time, to -historic messages from each other, and to +each other in real-time, to retrieve historic messages from each other, and to query profile and presence information about users on each other's servers. -The APIs are implemented using HTTPS GETs and PUTs between each of the -servers. These HTTPS requests are strongly authenticated using public key -signatures at the TLS transport layer and using public key signatures in -HTTP Authorization headers at the HTTP layer. +The APIs are implemented using HTTPS requests between each of the servers. +These HTTPS requests are strongly authenticated using public key signatures +at the TLS transport layer and using public key signatures in HTTP +Authorization headers at the HTTP layer. There are three main kinds of communication that occur between homeservers: @@ -485,15 +484,9 @@ A *conflict* occurs between states where those states have different ``event_ids`` for the same ``(state_type, state_key)``. The events thus affected are said to be *conflicting* events. -Protocol URLs -------------- -.. WARNING:: - This section may be misleading or inaccurate. -All these URLs are name-spaced within a prefix of:: - /_matrix/federation/v1/... Joining Rooms -------------