From 1051aff108ba814b62feaf01e978da288dc90ee7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Aug 2018 18:36:07 -0600
Subject: [PATCH 1/2] Document the inhibit_login registration option

Fixes https://github.com/matrix-org/matrix-doc/issues/1351
---
 api/client-server/registration.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/client-server/registration.yaml b/api/client-server/registration.yaml
index e4b05629..72ec1fb6 100644
--- a/api/client-server/registration.yaml
+++ b/api/client-server/registration.yaml
@@ -117,6 +117,13 @@ paths:
                   A display name to assign to the newly-created device. Ignored
                   if ``device_id`` corresponds to a known device.
                 example: Jungle Phone
+              inhibit_login:
+                type: boolean
+                description: |-
+                  If true, an ``access_token`` and ``device_id`` should not be
+                  returned from this call, therefore preventing an automatic
+                  login. Defaults to false.
+                example: false
       responses:
         200:
           description: The account has been registered.
@@ -141,6 +148,7 @@ paths:
                 description: |-
                   An access token for the account.
                   This access token can then be used to authorize other requests.
+                  Required if the ``inhibit_login`` option is false.
               home_server:
                 type: string
                 description: |-
@@ -155,6 +163,8 @@ paths:
                 description: |-
                   ID of the registered device. Will be the same as the
                   corresponding parameter in the request, if one was specified.
+                  Required if the ``inhibit_login`` option is false.
+            required: ['user_id']
         400:
           description: |-
             Part of the request was invalid. This may include one of the following error codes:

From 5d0f77de3abc058a12386e6fef2ff24d105d68a8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Aug 2018 18:38:12 -0600
Subject: [PATCH 2/2] changelog

---
 changelogs/client_server/newsfragments/1589.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/client_server/newsfragments/1589.feature

diff --git a/changelogs/client_server/newsfragments/1589.feature b/changelogs/client_server/newsfragments/1589.feature
new file mode 100644
index 00000000..8c8b1a86
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1589.feature
@@ -0,0 +1 @@
+Add an ``inhibit_login`` registration option.