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

Merge pull request #123 from matrix-org/markjh/list_formatting

Browse source 
Fix list formatting
This commit is contained in:
Mark Haines 2015-10-23 16:53:29 +01:00
commit 1d7cb6937f
8 changed files with 127 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ paths:
403: 403:
description: |- 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: 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 room is invite-only and the user was not invited.
- The user has been banned from the room. - The user has been banned from the room.
examples: examples:
@ -119,6 +120,7 @@ paths:
403: 403:
description: |- 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: 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 has been banned from the room.
- The invitee is already a member of the room. - The invitee is already a member of the room.
- The inviter is not currently in the room. - The inviter is not currently in the room.
@ -221,6 +223,7 @@ paths:
403: 403:
description: |- 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: 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 has been banned from the room.
- The invitee is already a member of the room. - The invitee is already a member of the room.
- The inviter is not currently in the room. - The inviter is not currently in the room.

1
specification/modules/content_repo.rst
View file

@ -81,4 +81,3 @@ Homeservers have additional content-specific concerns:
- Clients or remote homeservers may try to upload malicious files targeting - Clients or remote homeservers may try to upload malicious files targeting
vulnerabilities in either the homeserver thumbnailing or the client decoders. vulnerabilities in either the homeserver thumbnailing or the client decoders.

2
specification/modules/push.rst
View file

@ -315,6 +315,7 @@ rule determines its behaviour. The following conditions are defined:
``event_match`` ``event_match``
This is a glob pattern match on a field of the event. Parameters: This is a glob pattern match on a field of the event. Parameters:
* ``key``: The dot-separated field of the event to match, e.g. ``content.body`` * ``key``: The dot-separated field of the event to match, e.g. ``content.body``
* ``pattern``: The glob-style pattern to match against. Patterns with no * ``pattern``: The glob-style pattern to match against. Patterns with no
special glob characters should be treated as having asterisks special glob characters should be treated as having asterisks
@ -334,6 +335,7 @@ rule determines its behaviour. The following conditions are defined:
``room_member_count`` ``room_member_count``
This matches the current number of members in the room. Parameters: This matches the current number of members in the room. Parameters:
* ``is``: A decimal integer optionally prefixed by one of, ``==``, ``<``, * ``is``: A decimal integer optionally prefixed by one of, ``==``, ``<``,
``>``, ``>=`` or ``<=``. A prefix of ``<`` matches rooms where the member ``>``, ``>=`` or ``<=``. A prefix of ``<`` matches rooms where the member
count is strictly less than the given number and so forth. If no prefix is count is strictly less than the given number and so forth. If no prefix is