[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] branch master updated: remove reference to tran
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-api] branch master updated: remove reference to transaction id |
Date: |
Wed, 08 Mar 2017 03:24:10 +0100 |
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 9a51571 remove reference to transaction id
9a51571 is described below
commit 9a51571b0f52e2748774e2f8348d6d13f6adc3ae
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 8 03:24:07 2017 +0100
remove reference to transaction id
---
api/api-merchant.rst | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index 470f306..a2c1fa3 100644
--- a/api/api-merchant.rst
+++ b/api/api-merchant.rst
@@ -31,13 +31,14 @@ and the `payment protocol
<https://docs.taler.net/integration-merchant.html#payp
The Frontend HTTP API
---------------------
+
Please refer to the `glossary <https://docs.taler.net/glossary.html>`_ for
terms
like `order`, `proposal`, `contract`, and others.
.. http:get:: proposal_url
- Requesting this URL generates a proposal, typically with a new (and unique)
transaction id. Note that the wallet will get properly triggered by the
merchant in order
+ Requesting this URL generates a proposal. Note that the wallet will get
properly triggered by the merchant in order
to issue this GET request. The merchant will also instruct the wallet
whether or
not to provide the optional `nonce` parameter. `Payment protocol
<https://docs.taler.net/integration-merchant.html#payprot>`_ explains how the
wallet is triggered to
fetch the proposal.
@@ -148,7 +149,7 @@ The following API are made available by the merchant's
`backend` to the merchant
.. _proposal:
- The backend expects an `order` as input. The order is a :ref:`ProposalData`_
+ The backend expects an `order` as input. The order is a `ProposalData`_
object **without** the fields:
* `exchanges`
@@ -157,7 +158,7 @@ The following API are made available by the merchant's
`backend` to the merchant
* `merchant_pub`
* `timestamp`
- The following fields from :ref:`ProposalData`_ are optional and will be
filled
+ The following fields from `ProposalData`_ are optional and will be filled
in by the backend if not present:
* `merchant.instance` (default instance will be used)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-api] branch master updated: remove reference to transaction id,
gnunet <=