Merge branch 'dbkr/dont_line_wrap_rst' into dbkr/more_requesttokens

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
+    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: object

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 "" }}