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

Merge pull request #1159 from vyomshm/master

Browse source 
fixed minor typo
This commit is contained in:
Richard van der Hoff 2018-03-14 16:32:40 +00:00 committed by GitHub
parent a14cbe5f32 4f5ad35865
commit 72977014eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specification/intro.rst
View file

@ -116,7 +116,7 @@ model communication history as a partially ordered graph of events known as
the room's "event graph", which is synchronised with eventual consistency the room's "event graph", which is synchronised with eventual consistency
between the participating servers using the "Server-Server API". This process between the participating servers using the "Server-Server API". This process
of synchronising shared conversation history between homeservers run by of synchronising shared conversation history between homeservers run by
different parties is called "Federation". Matrix optimises for the the different parties is called "Federation". Matrix optimises for the
Availability and Partitioned properties of CAP theorem at Availability and Partitioned properties of CAP theorem at
the expense of Consistency. the expense of Consistency.