Merge pull request #2042 from matrix-org/travis/1.0/ordered-flows

Clarify that login flows must be completed in order

changelogs/client_server/newsfragments/2042.clarification

@@ -0,0 +1 @@
+Clarify that login flows are meant to be completed in order.

specification/client_server_api.rst

@@ -406,8 +406,10 @@ an additional stage. This exchange continues until the final success.
 
 For each endpoint, a server offers one or more 'flows' that the client can use
 to authenticate itself. Each flow comprises a series of stages, as described
-above. The client is free to choose which flow it follows. When all stages in a
+above. The client is free to choose which flow it follows, however the flow's
-flow are complete, authentication is complete and the API call succeeds.
+stages must be completed in order. Failing to follow the flows in order must
+result in an HTTP 401 response, as defined below. When all stages in a flow
+are complete, authentication is complete and the API call succeeds.
 
 User-interactive API in the REST API
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<