From e0fe3c42c8cb58c994396310279a18b9fa8b9f01 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 16 Oct 2015 14:19:00 +0100 Subject: [PATCH] Review comments --- api/client-server/v2_alpha/registration.yaml | 12 +++++++++--- specification/1-client_server_api.rst | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/client-server/v2_alpha/registration.yaml b/api/client-server/v2_alpha/registration.yaml index ad591206..9973d0b4 100644 --- a/api/client-server/v2_alpha/registration.yaml +++ b/api/client-server/v2_alpha/registration.yaml @@ -80,9 +80,15 @@ paths: description: The hostname of the Home Server on which the account has been registered. 400: description: |- - Part of the request was invalid. For example, this user ID may be taken. This may - be returned at any stage of the registration process, including after authentication - if the requested user ID was registered whilst the client was performing authentication. + Part of the request was invalid. This may include one of the following error codes: + + * ``M_USER_IN_USE`` : The desired user ID is already taken. + * ``M_EXCLUSIVE`` : The desired user ID is in the exclusive namespace + claimed by an application service. + + This errors may be returned at any stage of the registration process, + including after authentication if the requested user ID was registered + whilst the client was performing authentication. examples: application/json: |- { diff --git a/specification/1-client_server_api.rst b/specification/1-client_server_api.rst index 84de17da..331f951a 100644 --- a/specification/1-client_server_api.rst +++ b/specification/1-client_server_api.rst @@ -1006,7 +1006,7 @@ Account operations Registration ~~~~~~~~~~~~ -This API endpoint uses the User-Interactive Authentication API. +This API endpoint uses the `User-Interactive Authentication API`_. {{v2_registration_http_api}}