Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-13 23:14:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tidy up the specification

Browse source 
* Minor word choice changes
* Remove the now-empty "Protocol URLs" section
This commit is contained in:
Travis Ralston 2018-08-09 08:33:00 -06:00
parent 56dbeeb22a
commit 32178bb07e
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
specification/server_server_api.rst
View file

@ -23,14 +23,13 @@ Federation API
Matrix homeservers use the Federation APIs (also known as server-server APIs) 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 to communicate with each other. Homeservers use these APIs to push messages to
each other in real-time, to each other in real-time, to retrieve historic messages from each other, and to
historic messages from each other, and to
query profile and presence information about users on each other's servers. 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 The APIs are implemented using HTTPS requests between each of the servers.
servers. These HTTPS requests are strongly authenticated using public key These HTTPS requests are strongly authenticated using public key signatures
signatures at the TLS transport layer and using public key signatures in at the TLS transport layer and using public key signatures in HTTP
HTTP Authorization headers at the HTTP layer. Authorization headers at the HTTP layer.
There are three main kinds of communication that occur between homeservers: 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 ``event_ids`` for the same ``(state_type, state_key)``. The events thus
affected are said to be *conflicting* events. 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 Joining Rooms
------------- -------------