Merge branch 'master' into robert-ancell-screenshots

2 files changed, 39 insertions, 2 deletions

diff --git a/docs/interfaces.md b/docs/interfaces.md
index 12d7868fce..de14523c86 100644
--- a/docs/interfaces.md
+++ b/docs/interfaces.md
@@ -258,6 +258,24 @@ printing.
 
 * Auto-Connect: no
 
+### docker
+
+Can access snaps providing the docker interface which gives privileged access
+to the system.
+
+* Auto-Connect: no
+
+### docker-support
+
+Can access resources and syscalls necessary to run Docker application
+containers. The ``privileged-containers`` attribute may be used to give the
+necessary access to run privileged containers. Providing snaps specifying this
+interface currently may only be established with the Docker project.
+
+* Auto-Connect: no
+* Attributes:
+ * privileged-containers (plug): true|false (defaults to ``false``)
+
 ### firewall-control
 
 Can configure network firewalling giving privileged access to networking.
@@ -385,6 +403,13 @@ networking information.
 
 * Auto-Connect: no
 
+### network-setup-observe
+
+Can read network setup configuration files. This is restricted because it gives
+access to system network configuration which can contain network security details.
+
+* Auto-Connect: no
+
 ### ppp
 
 Can access Point-to-Point protocol daemon which gives privileged access to
diff --git a/docs/rest.md b/docs/rest.md
index 4109520a19..151a10bb00 100644
--- a/docs/rest.md
+++ b/docs/rest.md
@@ -120,6 +120,8 @@ kind | value description
 `two-factor-failed` | the OTP provided wasn't recognised
 `login-required` | the requested operation cannot be performed without an authenticated user. This is the kind of any other 401 Unauthorized response.
 `invalid-auth-data` | the authentication data provided failed to validate (e.g. a malformed email address). The `value` of the error is an object with a key per failed field and a list of the failures on each field.
+`terms-not-accepted` | the user has not accepted the store's terms of service.
+`no-payment-methods` | the user does not have a payment method registered to complete a purchase.
 
 ### Timestamps
 
@@ -605,6 +607,15 @@ Generally the UUID of a background operation you are interested in.
 }
 ```
 
+## /v2/buy/ready
+
+### GET
+
+* Description: Determine if the user's account ready to make purchases.
+* Access: authenticated
+* Operation: sync
+* Return: true, or error.
+
 ## /v2/buy/methods
 
 ### GET
@@ -673,7 +684,7 @@ Generally the UUID of a background operation you are interested in.
 * Description: Create a local user
 * Access: trusted
 * Operation: sync
-* Return: an object with the created username and the amount of imported ssh keys
+* Return: an object with the created username and the ssh keys imported.
 
 Sample input:
 
@@ -688,6 +699,7 @@ Sample return:
 ```javascript
 {
 "username":"mvo",
- "ssk-key-count": 2
+ "ssh-keys": ["key1","key2"]
+ "ssk-key-count": 2,
 }
 ```