[GNUnet-SVN] [taler-api] branch master updated: minor fixes to protocol spec

[gnunet]

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

grothoff pushed a commit to branch master
in repository api.

The following commit(s) were added to refs/heads/master by this push:
     new c345246  minor fixes to protocol spec
c345246 is described below

commit c34524651e97324f5c48e96f2f49db8395573246
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Nov 1 12:17:17 2017 +0100

    minor fixes to protocol spec
---
 api-merchant.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api-merchant.rst b/api-merchant.rst
index ee9238c..2a20dba 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -368,6 +368,8 @@ The following API are made available by the merchant's 
`backend` to the merchant
 
   :status 200 OK:
     A tip has been created. The backend responds with a 
`TipCreateConfirmation`_
+  :status 404 Not Found:
+    The instance is unknown to the backend.    
   :status 412 Precondition Failed:
     The tip amount requested exceeds the available reserve balance for tipping.
 
@@ -393,7 +395,7 @@ The following API are made available by the merchant's 
`backend` to the merchant
       tip_id: HashCode;
 
       // Expiration time for obtaining the tip
-      tip_expiration: Timestamp;
+      expiration: Timestamp;
 
       // URI of the exchange from where the tip can be withdrawn
       exchange_uri: String;

-- 
To stop receiving notification emails like this one, please contact
address@hidden