[taler-docs] branch master updated: -workshop doc updates

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new 9e83a77  -workshop doc updates
9e83a77 is described below

commit 9e83a77aa088fcff3a3e3c05349f4ee5d334abfc
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jul 20 20:46:29 2021 +0200

    -workshop doc updates
---
 core/api-merchant.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.