summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-08 03:24:07 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-08 03:24:07 +0100
commit9a51571b0f52e2748774e2f8348d6d13f6adc3ae (patch)
tree0a4ca2a30831281245b158f4ede6dcf0f0c49539 /api
parent1618db53416dcf0340e0bbde52f09464d6dcc925 (diff)
downloaddocs-9a51571b0f52e2748774e2f8348d6d13f6adc3ae.tar.gz
docs-9a51571b0f52e2748774e2f8348d6d13f6adc3ae.tar.bz2
docs-9a51571b0f52e2748774e2f8348d6d13f6adc3ae.zip
remove reference to transaction id
Diffstat (limited to 'api')
-rw-r--r--api/api-merchant.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index 470f3064..a2c1fa35 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)