[taler-docs] branch master updated (4bd847b -> a06ea33)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 4bd847b  grammar (parallelism): use gerund; also: s/pickup/pick up/
     new ebe692e  add period at end of sentence
     new 44d0f52  fix typo: s/The//; rewrite sentence
     new 51b25b3  diction: s/before//
     new b167616  s/later again/again later/
     new 7d81e8b  diction: s/like/such as/
     new c5eb448  s/later again/again later/
     new d05ca2d  s/later again/again later/ (five instances)
     new 74175ee  typo: s/spend/spent/
     new 744584f  s/they/it/
     new a06ea33  remove spurious space

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/api-merchant.rst | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index e28c8ba..2a8844b 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -170,7 +170,7 @@ claim orders (say in a case where stocks are limited).
 
   **Request:**
 
-  The request must be a `ClaimRequest`
+  The request must be a `ClaimRequest`.
 
   .. ts:def:: ClaimRequest
 
@@ -192,7 +192,7 @@ claim orders (say in a case where stocks are limited).
   :http:statuscode:`404 Not found`:
     The backend is unaware of the instance or order.
   :http:statuscode:`409 Conflict`:
-    The someone else claimed the same order ID with different nonce before.
+    Someone else has already claimed the same order ID with a different nonce.
 
   .. ts:def:: ClaimResponse
 
@@ -244,7 +244,7 @@ Making the payment
     The backend took too long to process the request. Likely the merchant's 
connection
     to the exchange timed out. Try again.
   :http:statuscode:`409 Conflict`:
-    The exchange rejected the payment because a coin was already spent before.
+    The exchange rejected the payment because a coin was already spent.
     The response will include the ``coin_pub`` for which the payment failed,
     in addition to the response from the exchange to the ``/deposit`` request.
   :http:statuscode:`410 Gone`:
@@ -254,12 +254,12 @@ Making the payment
     list of accepted exchanges and not audited by an approved auditor.
   :http:statuscode:`502 Bad gateway`:
     The merchant's interaction with the exchange failed in some way.
-    The client might want to try later again.
-    This includes failures like the denomination key of a coin not being
+    The client might want to try again later.
+    This includes failures such as the denomination key of a coin not being
     known to the exchange as far as the merchant can tell.
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   The backend will return verbatim the error codes received from the exchange's
   :ref:`deposit <deposit>` API.  If the wallet made a mistake, like by
@@ -294,7 +294,7 @@ Making the payment
       // Signature by the coin.
       coin_sig: EddsaSignature;
 
-      // Public key of the coin being spend.
+      // Public key of the coin being spent.
       coin_pub: EddsaPublicKey;
 
       // Signature made by the denomination public key.
@@ -317,7 +317,7 @@ Querying payment status
 
   Query the payment status of an order. This endpoint is for the wallet.
   When the wallet goes to this URL and it is unpaid,
-  they will be prompted for payment.
+  it will be prompted for payment.
   This endpoint typically also supports requests with the "Accept" header
   requesting "text/html".  In this case, an HTML response suitable for
   triggering the interaction with the wallet is returned, with ``timeout_ms``
@@ -333,7 +333,7 @@ Querying payment status
   **Request:**
 
   :query h_contract=HASH: hash of the order's contract terms (this is used to 
authenticate the wallet/customer in case $ORDER_ID is guessable). Required once 
an order was claimed.
-  :query token=TOKEN: *Optional*. Authorizes the request via the claim token 
that was returned  in the `PostOrderResponse`.  Used with unclaimed orders 
only. Whether token authorization is required is determined by the merchant 
when the frontend creates the order.
+  :query token=TOKEN: *Optional*. Authorizes the request via the claim token 
that was returned in the `PostOrderResponse`.  Used with unclaimed orders only. 
Whether token authorization is required is determined by the merchant when the 
frontend creates the order.
   :query session_id=STRING: *Optional*. Session ID that the payment must be 
bound to.  If not specified, the payment is not session-bound.
   :query timeout_ms=NUMBER: *Optional.*  If specified, the merchant backend 
will
     wait up to ``timeout_ms`` milliseconds for completion of the payment before
@@ -530,7 +530,7 @@ are for incomplete payments for an order and never for 
established contracts.
     The error from the exchange is included.
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   The backend will return an `abort response <AbortResponse>`, which includes
   verbatim the error codes received from the exchange's
@@ -1758,7 +1758,7 @@ Inspecting orders
     We failed to obtain a response from the exchange (about the wire transfer 
status).
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   .. ts:def:: MerchantOrderStatusResponse
 
@@ -2087,7 +2087,7 @@ Informing the backend about incoming wire transfers
     for this wire transfer. Details of the exchange error are returned.
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   **Details:**
 
@@ -2400,7 +2400,7 @@ funds to the exchange.
     We could not obtain /wire details from the specified exchange base URL.
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   .. ts:def:: ReserveCreateRequest
 
@@ -2505,7 +2505,7 @@ Query funds remaining
     reserve was not yet filled.
   :http:statuscode:`504 Gateway timeout`:
     The merchant's interaction with the exchange took too long.
-    The client might want to try later again.
+    The client might want to try again later.
 
   .. ts:def:: ReserveDetail
 

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