wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove duplicate sentences from merge conflicts

Browse source
This commit is contained in:
Kegan Dougal 2015-10-02 16:24:33 +01:00
parent cc6f256b24
commit 417c5b53c4
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
specification/modules/presence.rst
View file

@ -21,11 +21,8 @@ A presence list is a list of user IDs whose presence the user wants to follow.
To be added to this list, the user being added must be invited by the list owner To be added to this list, the user being added must be invited by the list owner
who must accept the invitation. who must accept the invitation.
Each user has presence information associated with them. This encodes the User's presence state is represented by the ``presence`` key, which is an enum
"availability" of that user, suitable for display on other clients. of one of the following:
This is transmitted as an ``m.presence`` event and is one of the few events
which are sent *outside the context of a room*. Their presence state is
represented by the ``presence`` key, which is an enum of one of the following:
- ``online`` : The default state when the user is connected to an event - ``online`` : The default state when the user is connected to an event
stream. stream.
@ -36,7 +33,6 @@ represented by the ``presence`` key, which is an enum of one of the following:
- ``free_for_chat`` : The user is generally willing to receive messages - ``free_for_chat`` : The user is generally willing to receive messages
moreso than default. moreso than default.
Events Events
------ ------