Merge branch 'dbkr/dont_line_wrap_rst' into dbkr/more_requesttokens

This commit is contained in:
David Baker 2016-07-08 13:54:30 +01:00
commit cf13c8997c
2 changed files with 3 additions and 3 deletions

View file

@ -6,7 +6,7 @@ properties:
on the filter on the filter
type: boolean type: boolean
prev_batch: prev_batch:
description: If the batch was limited then this is a token that can be supplied description: A token that can be supplied to to the ``from`` parameter of the
to the server to retrieve earlier events rooms/{roomId}/messages endpoint
type: string type: string
type: object type: object

View file

@ -8,7 +8,7 @@
{% endif -%} {% endif -%}
{{endpoint.desc | wrap(80)}} {{endpoint.desc}}
{{":Rate-limited: Yes." if endpoint.rate_limited else "" }} {{":Rate-limited: Yes." if endpoint.rate_limited else "" }}
{{":Requires auth: Yes." if endpoint.requires_auth else "" }} {{":Requires auth: Yes." if endpoint.requires_auth else "" }}