[GNUnet-SVN] [taler-api] branch master updated: frontend api intro

[gnunet]

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

dold pushed a commit to branch master
in repository api.

The following commit(s) were added to refs/heads/master by this push:
     new 958978f  frontend api intro
958978f is described below

commit 958978fda810ae0c0e9179907401490fbeb7f4f4
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 8 03:32:19 2017 +0100

    frontend api intro
---
 api/api-merchant.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index a2c1fa3..17d645b 100644
--- a/api/api-merchant.rst
+++ b/api/api-merchant.rst
@@ -32,6 +32,10 @@ The Frontend HTTP API
 ---------------------
 
 
+  The merchant frontend API described here describes the minimal set of HTTP 
requests that a web shop
+  needs to understand in order to support Taler payments.  The names 
`proposal_url`, `pay_url` and `fulfillment_url`
+  are placeholders for the actual URLs that the merchant frontend uses.
+
   Please refer to the `glossary <https://docs.taler.net/glossary.html>`_ for 
terms
   like `order`, `proposal`, `contract`, and others.
 

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