Fix a bunch of rst syntax errors.

This commit is contained in:
Kegan Dougal 2015-02-06 12:59:08 +00:00
parent b01e8165d0
commit 3b696878f5
5 changed files with 28 additions and 1303 deletions

View file

@ -198,12 +198,11 @@ Requests that a client can make to its Home Server
* get another user's Display Name / Avatar / metadata fields
[[TODO(paul): At some later stage we should consider the API for:
TODO(paul): At some later stage we should consider the API for:
* get/set ACL permissions on my metadata fields
* manage my ACL tokens
]]
Server-Server
-------------

View file

@ -3,7 +3,9 @@ Host: ...
Content-Length: ...
Content-Type: application/json
{
.. code :: javascript
{
"origin": "localhost:5000",
"pdus": [
{
@ -27,7 +29,7 @@ Content-Type: application/json
"1404381396852"
],
"ts": 1404381427823
}
}
HTTP/1.1 200 OK
...
@ -42,7 +44,9 @@ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: application/json
{
.. code :: javascript
{
origin: ...,
prev_ids: ...,
data: [
@ -59,6 +63,6 @@ Content-Type: application/json
},
...,
]
}
}

View file

@ -125,13 +125,14 @@ m.invite_level
m.join_rules
Encodes the rules on how non-members can join the room. Has the following
possibilities:
"public" - a non-member can join the room directly
"knock" - a non-member cannot join the room, but can post a single "knock"
message requesting access, which existing members may approve or deny
"invite" - non-members cannot join the room without an invite from an
existing member
"private" - nobody who is not in the 'may_join' list or already a member
may join by any mechanism
- "public" - a non-member can join the room directly
- "knock" - a non-member cannot join the room, but can post a single "knock"
message requesting access, which existing members may approve or deny
- "invite" - non-members cannot join the room without an invite from an
existing member
- "private" - nobody who is not in the 'may_join' list or already a member
may join by any mechanism
In any of the first three modes, existing members with sufficient permission
can send invites to non-members if allowed by the "m.invite_level" key. A
@ -263,10 +264,11 @@ resolve this:
that duplicate requests can be suppressed. On receipt of a room creation
request that the HS thinks there already exists a room for, the invitation to
join can be rejected if:
a) the HS believes the sending user is already a member of the room (and
maybe their HS has forgotten this fact), or
b) the proposed room has a lexicographically-higher ID than the existing
room (to resolve true race condition conflicts)
- a) the HS believes the sending user is already a member of the room (and
maybe their HS has forgotten this fact), or
- b) the proposed room has a lexicographically-higher ID than the existing
room (to resolve true race condition conflicts)
* The room ID for a private 1:1 chat has a special form, determined by
concatenting the User IDs of both members in a deterministic order, such that