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

Fix list formatting so that we aren't including everything in blockquotes

Browse source
This commit is contained in:
Mark Haines 2015-10-23 10:51:31 +01:00
parent f0c74a9c83
commit e3e8026025
8 changed files with 120 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

20
api/client-server/v1/membership.yaml
View file

@ -52,8 +52,8 @@ paths:
403:
description: |-
You do not have permission to join the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejection are:
- The room is invite-only and the user was not invited.
- The user has been banned from the room.
- The room is invite-only and the user was not invited.
- The user has been banned from the room.
examples:
application/json: |-
{"errcode": "M_FORBIDDEN", "error": "You are not invited to this room."}
@ -119,10 +119,10 @@ paths:
403:
description: |-
You do not have permission to invite the user to the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejections are:
- The invitee has been banned from the room.
- The invitee is already a member of the room.
- The inviter is not currently in the room.
- The inviter's power level is insufficient to invite users to the room.
- The invitee has been banned from the room.
- The invitee is already a member of the room.
- The inviter is not currently in the room.
- The inviter's power level is insufficient to invite users to the room.
examples:
application/json: |-
{"errcode": "M_FORBIDDEN", "error": "@cheeky_monkey:matrix.org is banned from the room"}
@ -164,13 +164,13 @@ paths:
user ID, the identity server will give the user a list of pending
invitations, each containing:
- The room ID to which they were invited
- The room ID to which they were invited
- The token given to the homeserver
- The token given to the homeserver
- A signature of the token, signed with the identity server's private key
- A signature of the token, signed with the identity server's private key
- The matrix user ID who invited them to the room
- The matrix user ID who invited them to the room
If a token is requested from the identity server, the home server will
append a ``m.room.third_party_invite`` event to the room.

6
api/client-server/v2_alpha/registration.yaml
View file

@ -82,9 +82,9 @@ paths:
description: |-
Part of the request was invalid. This may include one of the following error codes:
* ``M_USER_IN_USE`` : The desired user ID is already taken.
* ``M_EXCLUSIVE`` : The desired user ID is in the exclusive namespace
claimed by an application service.
* ``M_USER_IN_USE`` : The desired user ID is already taken.
* ``M_EXCLUSIVE`` : The desired user ID is in the exclusive namespace
claimed by an application service.
These errors may be returned at any stage of the registration process,
including after authentication if the requested user ID was registered