[taler-docs] branch master updated (0ad320c -> 00cfe7f)

[gnunet]

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

grothoff pushed a change to branch master
in repository docs.

    from 0ad320c  Merge branch 'master' of git+ssh://git.taler.net/docs
     new c0fcbd3  link
     new 00cfe7f  syntax fix

The 2 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 | 6 +++---
 core/taler-uri.rst    | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 25cee22..010eebb 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1375,10 +1375,10 @@ Payment processing
 
   **Request:**
 
-  :query h_contract: hash of the order's contract terms (this is used to 
authenticate the wallet/customer in case $ORDER_ID is guessable). Either this 
field or *token* is *mandatory*.
+  :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). Either this 
field or *token* is *mandatory*.
   :query token=TOKEN: *Optional*. Authorizes the request via the claim token 
that was returned  in the `PostOrderResponse`.  Either this field or 
*h_contract* is *mandatory*.
-  :query session_id: *Optional*. Session ID that the payment must be bound to. 
 If not specified, the payment is not session-bound.
-  :query timeout_ms: *Optional.*  If specified, the merchant backend will
+  :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
     sending the HTTP response.  A client must never rely on this behavior, as 
the
     merchant backend may return a response immediately.
diff --git a/core/taler-uri.rst b/core/taler-uri.rst
index b713420..4dda319 100644
--- a/core/taler-uri.rst
+++ b/core/taler-uri.rst
@@ -32,7 +32,7 @@ Payments are requested with the ``pay`` action.  The 
parameters are a hierarchic
 * ``merchant_prefix_path`` is an optional list of path components that 
identifies the path prefix of the merchant base URL.
 * ``order_id`` is the order ID that the customer is asked to pay for
 * ``session_id`` is the optional session ID under which the payment takes place
-* ``c`` is the optional high-entropy order claim token
+* ``c`` is the optional high-entropy order `ClaimToken`
 * ``ssid`` is the optional WLAN SSID that the merchant can offer the wallet to 
connect to for internet connectivity
 
 Examples:
@@ -162,4 +162,3 @@ Example:
 .. code:: none
 
   taler://fulfillment-success/Thank+you+for+donating+to+GNUnet
-

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