gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-docs] branch master updated: adding missing instance parameter in


From: gnunet
Subject: [taler-docs] branch master updated: adding missing instance parameter into the public urls
Date: Wed, 21 Jul 2021 22:43:18 +0200

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

sebasjm pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new c3d3595  adding missing instance parameter into the public urls
c3d3595 is described below

commit c3d35951d2f895c31efa1d1ebd9ca81569b842f8
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Wed Jul 21 17:43:07 2021 -0300

    adding missing instance parameter into the public urls
---
 core/api-merchant.rst                          | 20 ++++++++++----------
 design-documents/013-peer-to-peer-payments.rst |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index a6cb94d..7994c56 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -165,7 +165,7 @@ where order IDs are predictable and malicious actors may 
try to
 claim orders (say in a case where stocks are limited).
 
 
-.. http:post:: /orders/$ORDER_ID/claim
+.. http:post:: [/instances/$INSTANCE]/orders/$ORDER_ID/claim
 
   Wallet claims ownership (via nonce) over an order.  By claiming
   an order, the wallet obtains the full contract terms, and thereby
@@ -212,7 +212,7 @@ claim orders (say in a case where stocks are limited).
 Making the payment
 ------------------
 
-.. http:post:: /orders/$ORDER_ID/pay
+.. http:post:: [/instances/$INSTANCE]/orders/$ORDER_ID/pay
 
   Pay for an order by giving a deposit permission for coins.  Typically used by
   the customer's wallet.  Note that this request does not include the
@@ -318,7 +318,7 @@ Making the payment
 Querying payment status
 -----------------------
 
-.. http:get:: /orders/$ORDER_ID
+.. http:get:: [/instances/$INSTANCE]/orders/$ORDER_ID
 
   Query the payment status of an order. This endpoint is for the wallet.
   When the wallet goes to this URL and it is unpaid,
@@ -428,7 +428,7 @@ if the user is using a different client, demonstrating 
payment will allow
 the user to regain access to the digital good without having to pay for it
 again.
 
-.. http:post:: /orders/$ORDER_ID/paid
+.. http:post:: [/instances/$INSTANCE]/orders/$ORDER_ID/paid
 
   Prove that the client previously paid for an order by providing
   the merchant's signature from the `payment response <PaymentResponse>`.
@@ -492,7 +492,7 @@ are for incomplete payments for an order and never for 
established contracts.
 
 
 .. _order-abort:
-.. http:post:: /orders/$ORDER_ID/abort
+.. http:post:: [/instances/$INSTANCE]/orders/$ORDER_ID/abort
 
   Abort paying for an order and obtain a refund for coins that
   were already deposited as part of a failed payment.
@@ -637,7 +637,7 @@ for example because the merchant determined that it could 
not actually fulfill
 the contract. Refunds must be approved by the merchant's business logic.
 
 
-.. http:post:: /orders/$ORDER_ID/refund
+.. http:post:: [/instances/$INSTANCE]/orders/$ORDER_ID/refund
 
   Obtain refunds for an order. After talking to the exchange, the refunds will
   no longer be pending if processed successfully.
@@ -753,7 +753,7 @@ Picking up tips
 Tips are a way for wallets to obtain e-cash from
 a website.
 
-.. http:get:: /tips/$TIP_ID
+.. http:get:: [/instances/$INSTANCE]/tips/$TIP_ID
 
   Handle request from wallet to provide details about a tip.
 
@@ -791,7 +791,7 @@ a website.
     }
 
 
-.. http:post:: /tips/$TIP_ID/pickup
+.. http:post:: [/instances/$INSTANCE]/tips/$TIP_ID/pickup
 
   Handle request from wallet to pick up a tip.
 
@@ -861,7 +861,7 @@ instance setup before it can be used to manage inventory or 
process payments.
 Setting up instances
 --------------------
 
-.. http:post:: /private/instances
+.. http:post:: [/instances/$INSTANCE]/private/instances
 
   This request will be used to create a new merchant instance in the backend.
   It is only available for the implicit ``default`` instance.
@@ -2789,7 +2789,7 @@ Checking tip status
     }
 
 
-.. http:get:: [/instances/$INSTANCES]/private/tips
+.. http:get:: [/instances/$INSTANCE]/private/tips
 
   Return the list of all tips.
 
diff --git a/design-documents/013-peer-to-peer-payments.rst 
b/design-documents/013-peer-to-peer-payments.rst
index 68c7564..c44ab34 100644
--- a/design-documents/013-peer-to-peer-payments.rst
+++ b/design-documents/013-peer-to-peer-payments.rst
@@ -547,10 +547,10 @@ Cross-exchange W2W payment offer:
   opens her Taler wallet and initiates a P2P payment.  She sends the resulting
   ``taler://purse/{EXCHANGE_URL}/{PURSE_PRIV}`` in an e-mail to Dave.
   Dave opens they link in the e-mail with his Taler wallet.
-  Since Dave is using a different exchange than Alice, Dave's wallet
-  issues a **merge** request to Alice's exchange pointing Alice's exchange
+  Since Dave is using a different exchange than Carol, Dave's wallet
+  issues a **merge** request to Carol's exchange pointing Carol's exchange
   to Dave's account at his exchange.  Shortly after,
-  Dave's exchange receives a **wad** from Alice's exchange,
+  Dave's exchange receives a **wad** from Carol's exchange,
   and credits Dave's account with the money.
 
 

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]