taler-docs

commit 24694623c552ba8eb3b246e636a3a14eb6b52bc8
parent cba780a60a6e63ef85ad10a6ffa6b74d37aaeb32
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 25 Oct 2016 11:07:29 +0200

Merge branch 'master' of ssh://taler.net/api

Diffstat:
M
api-exchange.rst
 | 
1
+
M
api-merchant.rst
 | 
7
++++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/api-exchange.rst b/api-exchange.rst
@@ -946,6 +946,7 @@ typically also view the balance.)
     The wire transfer identifier is unknown to the exchange.
 
   .. _TrackTransferResponse:
+  .. _tsref-type-TrackTransferResponse:
   .. code-block:: tsref
 
     interface TrackTransferResponse {
diff --git a/api-merchant.rst b/api-merchant.rst
@@ -235,7 +235,7 @@ The following API are made available by the merchant's `backend` to the merchant
 
   :status 200 OK:
     The wire transfer is known to the exchange, details about it follow in the body.
-    The body of the response is a :ref:`TrackTransactionResponse <TrackTransferResponse>`.  Note that
+    The body of the response is a :ref:`TrackTransferResponse <TrackTransferResponse>`.  Note that
     the similarity to the response given by the exchange for a /track/transfer
     is completely intended.
 
@@ -252,7 +252,7 @@ The following API are made available by the merchant's `backend` to the merchant
   .. code-block:: tsref
 
     interface TransactionConflictProof {
-      // A claim by the exchange about the transfers associated
+      // A claim by the exchange about the transactions associated
       // with a given wire transfer; it does not list the
       // transaction that `transaction_tracking_claim` says is part
       // of the aggregate.  This is
@@ -470,7 +470,7 @@ The `contract` must have the following structure:
       // 53-bit number chosen by the merchant to uniquely identify the contract.
       transaction_id: number;
 
-      // List of products that are part of the purchase (see `below)
+      // List of products that are part of the purchase (see `below <Product>`_)
       products: Product[];
 
       // Time when this contract was generated
@@ -510,6 +510,7 @@ The `contract` must have the following structure:
 
   The `product` object describes the product being purchased from the merchant. It has the following structure:
 
+  .. _Product:
   .. _tsref-type-Product:
   .. code-block:: tsref