summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-07-20 20:46:29 +0200
committerChristian Grothoff <christian@grothoff.org>2021-07-20 20:46:29 +0200
commit9e83a77aa088fcff3a3e3c05349f4ee5d334abfc (patch)
treef3af5a282dcdd1c73f15cfd2c59e42a234434792 /core
parent3e5cbaacc1418f1a4b178a0d2ded8fdff9efc0ad (diff)
downloaddocs-9e83a77aa088fcff3a3e3c05349f4ee5d334abfc.tar.gz
docs-9e83a77aa088fcff3a3e3c05349f4ee5d334abfc.tar.bz2
docs-9e83a77aa088fcff3a3e3c05349f4ee5d334abfc.zip
-workshop doc updates
Diffstat (limited to 'core')
-rw-r--r--core/api-merchant.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index b451370..0a01cb7 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.