From ee5054fb426e502795d255383e771ba1f292a9f1 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 7 Jul 2016 01:26:18 -0700 Subject: [PATCH 1/2] Supply prev_batch unconditionally in timelines Signed-off-by: Benjamin Saunders --- api/client-server/definitions/timeline_batch.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/client-server/definitions/timeline_batch.yaml b/api/client-server/definitions/timeline_batch.yaml index 095bb61e..1bc03c40 100644 --- a/api/client-server/definitions/timeline_batch.yaml +++ b/api/client-server/definitions/timeline_batch.yaml @@ -6,7 +6,7 @@ properties: on the filter type: boolean prev_batch: - description: If the batch was limited then this is a token that can be supplied - to the server to retrieve earlier events + description: A token that can be supplied to to the ``from`` parameter of the + rooms/{roomId}/messages endpoint type: string type: object From d66ea3c3ce453f72eb05a9e62fc7b7388a230bbe Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 8 Jul 2016 11:57:40 +0100 Subject: [PATCH 2/2] Don't line wrap the API descriptions They are in RST format which is whitespace sensitive and threfore can't be line wrapped without breaking the syntax. There is more wrapping in other places but some of it is into tables where it does need to be fixed width in order for the RST table to parse correctly. --- templating/matrix_templates/templates/http-api.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templating/matrix_templates/templates/http-api.tmpl b/templating/matrix_templates/templates/http-api.tmpl index ebf3b4ff..7496ea72 100644 --- a/templating/matrix_templates/templates/http-api.tmpl +++ b/templating/matrix_templates/templates/http-api.tmpl @@ -8,7 +8,7 @@ {% endif -%} -{{endpoint.desc | wrap(80)}} +{{endpoint.desc}} {{":Rate-limited: Yes." if endpoint.rate_limited else "" }} {{":Requires auth: Yes." if endpoint.requires_auth else "" }}