From 9e83a77aa088fcff3a3e3c05349f4ee5d334abfc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 20 Jul 2021 20:46:29 +0200 Subject: -workshop doc updates --- core/api-merchant.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/api-merchant.rst b/core/api-merchant.rst index b4513704..0a01cb72 100644 --- a/core/api-merchant.rst +++ b/core/api-merchant.rst @@ -876,7 +876,11 @@ Setting up instances The backend has successfully created the instance. :http:statuscode:`409 Conflict`: This instance already exists, but with other configuration options. - Use "PATCH" to update an instance configuration. + Use "PATCH" to update an instance configuration. Alternatively, + the currency provided in the configuration does not match the + currency supported by this backend. Another possible conflict + would be if a deleted but not purged instance is known under this + ID to the backend. .. ts:def:: InstanceConfigurationMessage @@ -890,6 +894,7 @@ Setting up instances payto_uris: string[]; // Name of the merchant instance to create (will become $INSTANCE). + // Must match the regex ``^[A-Za-z0-9][A-Za-z0-9_.@-]+$``. id: string; // Merchant name corresponding to this instance. -- cgit v1.2.3