summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-02 14:25:47 +0100
committerErik Johnston <erik@matrix.org>2014-10-02 14:25:47 +0100
commitb2d41b1cd94d6278f5d3e090d45762fff4219d2f (patch)
treea7dc760baa0bcd8c3407b9ffff73d2b5af2849f4
parentMerge branch 'master' into develop (diff)
downloadsynapse-b2d41b1cd94d6278f5d3e090d45762fff4219d2f.tar.xz
All room state is currently shared.
-rw-r--r--docs/specification.rst11
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/specification.rst b/docs/specification.rst

index 0a421e9e38..f45c75fca9 100644 --- a/docs/specification.rst +++ b/docs/specification.rst
@@ -167,7 +167,7 @@ The following diagram shows an ``m.room.message`` event being sent in the room | matrix.org |<-------Federation------->| domain.com | +------------------+ +------------------+ | ................................. | - |______| Partially Shared State |_______| + |______| Shared State |_______| | Room ID: !qporfwt:matrix.org | | Servers: matrix.org, domain.com | | Members: | @@ -177,11 +177,10 @@ The following diagram shows an ``m.room.message`` event being sent in the room Federation maintains shared state between multiple home servers, such that when an event is sent to a room, the home server knows where to forward the event on -to, and how to process the event. Home servers do not need to have completely -shared state in order to participate in a room. State is scoped to a single -room, and federation ensures that all home servers have the information they -need, even if that means the home server has to request more information from -another home server before processing the event. +to, and how to process the event. State is scoped to a single room, and +federation ensures that all home servers have the information they need, even +if that means the home server has to request more information from another home +server before processing the event. Room Aliases ------------