[taler-docs] branch master updated (e6f412e -> da2fdda)

[gnunet]

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

dold pushed a change to branch master
in repository docs.

    from e6f412e  onboarding -> developer's manual, add checklist
     new 3f3c152  ebics order id
     new f2e1d86  taler URI
     new da2fdda  wire deadline

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

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 0bddaf5..b74de79 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -780,6 +780,10 @@ The contract terms must have the following structure:
       // After this deadline, the merchant won't accept payments for the 
contact
       pay_deadline: Timestamp;
 
+      // Transfer deadline for the exchange.  Must be in the
+      // deposit permissions of coins used to pay for this order.
+      wire_transfer_deadline: Timestamp;
+
       // Merchant's public key used to sign this proposal; this information
       // is typically added by the backend Note that this can be an ephemeral 
key.
       merchant_pub: EddsaPublicKey;
diff --git a/core/taler-uri.rst b/core/taler-uri.rst
index caa32bb..a228d46 100644
--- a/core/taler-uri.rst
+++ b/core/taler-uri.rst
@@ -19,16 +19,16 @@ Payments are requested with the ``pay`` action.  The 
parameters are a hierarchic
 
 .. code:: none
 
-  'taler://pay/' merchant-host '/' merchant-query '/' merchant-instance  '/' 
order-id [ '/' session-id ]
+  'taler://pay/' merchant-host '/' merchant-public-prefix '/' 
merchant-instance  '/' order-id [ '/' session-id ]
 
-The components ``merchant-host``, ``merchant-query`` and ``order-id`` identify 
the URL that is used to claim the contract
+The components ``merchant-host``, ``merchant-prefix`` and ``order-id`` 
identify the URL that is used to claim the contract
 for this payment request.
 
 To make the URI shorter (which is important for QR code payments), ``-`` 
(minus) can be substituted to get a default value
 for some components:
 
 * the default for ``merchant-instance`` is ``default``
-* the default for ``merchant-query`` is ``/public/proposal``
+* the default for ``merchant-public-prefix`` is ``public``
 
 The following is a minimal example for a payment request from the demo 
merchant, using the default instance and no session-bound payment:
 
diff --git a/libeufin/ebics.rst b/libeufin/ebics.rst
index 4be25bb..58c22d2 100644
--- a/libeufin/ebics.rst
+++ b/libeufin/ebics.rst
@@ -358,6 +358,12 @@ The following elements are the allowed root elements of 
EBICS request/response m
 * ``ebicsUnsignedRequest``: Not used anymore.  Was used in FTAM migration with 
the HSA order type.
 
 
+Order ID Allocation
+===================
+
+In practice, the Order ID seems to be allocated via number of counters at the 
level of the **PartnerID**.
+
+
 EBICS Transaction
 =================
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.