[taler-docs] branch master updated: fix recursion

[gnunet]

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

grothoff pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new 5c775f3  fix recursion
     new 53343b7  Merge branch 'master' of git+ssh://git.taler.net/docs
5c775f3 is described below

commit 5c775f398da0e7cf224d62597224e4a80245efad
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Jul 23 15:28:51 2020 +0200

    fix recursion
---
 core/api-merchant.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 35dc2ff..047a646 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -800,7 +800,7 @@ Payment processing
     interface OrderHistory {
       // timestamp-sorted array of all orders matching the query.
       // The order of the sorting depends on the sign of ``delta``.
-      orders : OrderHistory[];
+      orders : OrderHistoryEntry[];
     }
 
 
@@ -967,7 +967,7 @@ Payment processing
   Note that this request does include the
   usual ``h_contract`` argument to authenticate the wallet and
   to allow the merchant to verify the signature before checking
-  with its own database. 
+  with its own database.
 
   **Request:**
 
@@ -1674,7 +1674,7 @@ Tracking Wire Transfers
       deposit_exchange_pub: EddsaPublicKey;
 
       // Signature of the exchange signing the (conflicting) response.
-      // Signs over a \struct TALER_DepositConfirmationPS\.
+      // Signs over a ``struct TALER_DepositConfirmationPS``.
       deposit_exchange_sig: EddsaSignature;
 
       // Hash of the merchant's bank account the wire transfer went to
@@ -1687,7 +1687,7 @@ Tracking Wire Transfers
       // to verify the \exchange_sig\.
       deposit_timestamp: Timestamp;
 
-      // At what time the refund possibility expired (needed to verify 
\exchange_sig\).
+      // At what time the refund possibility expired (needed to verify 
``exchange_sig``).
       refund_deadline: Timestamp;
 
       // Public key of the coin for which we have conflicting information.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.