From c0e55bb99e2386c41d49d33e64a2bd5e103caa6d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 28 Mar 2015 21:40:12 -0400 Subject: [PATCH] make intro match order of sections as per max g-j feedback --- specification/10_client_server_api.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/10_client_server_api.rst b/specification/10_client_server_api.rst index 16883852..fd8709d7 100644 --- a/specification/10_client_server_api.rst +++ b/specification/10_client_server_api.rst @@ -190,16 +190,16 @@ Events in a room Room events are split into two categories: -:Message events: - These are events which describe transient "once-off" activity in a room: - typically communication such as sending an instant messaage or setting up a - VoIP call. These used to be called 'non-state' events. - :State Events: These are events which update the metadata state of the room (e.g. room topic, room membership etc). State is keyed by a tuple of event ``type`` and a ``state_key``. State in the room with the same key-tuple will be overwritten. +:Message events: + These are events which describe transient "once-off" activity in a room: + typically communication such as sending an instant messaage or setting up a + VoIP call. These used to be called 'non-state' events. + This specification outlines several events, all with the event type prefix ``m.``. However, applications may wish to add their own type of event, and this can be achieved using the REST API detailed in the following sections. If new