docs version

3 files changed, 40 insertions, 18 deletions

diff --git a/api-merchant.rst b/api-merchant.rst
index 0d0302f9..9eb69812 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -75,8 +75,8 @@ Receiving Payments
       summary: string;
 
       // URL that will show that the order was successful after
-      // it has been paid for.  The wallet will automatically append
-      // the order_id (always) and the session_sig (if applicable).
+      // it has been paid for.  The wallet will always automatically append
+      // the order_id as a query parameter.
       fulfillment_url: string;
 
       // Merchant instance to use (leave empty to use instance "default")
@@ -101,13 +101,8 @@ Receiving Payments
   **Request:**
 
   :query order_id: order id that should be used for the payment
-  :query contract_url: FIXME-FLORIAN
-  :query instance: *Optional*. Instance used for the payment. Defaults to the instance named "default".
-  :query resource_url: *Optional*. A resource URL that allows the wallet to identify whether it has already paid for this resource.
-    Typically corresponds to the fulfillment URL.
+  :query instance: *Optional*. Instance used for the payment. Defaults to the instance with identifier "default".
   :query session_id: *Optional*. Session ID that the payment must be bound to.  If not specified, the payment is not session-bound.
-  :query session_sig: *Optional*. Signature from the wallet to prove that it paid with the given session_id.  Not specified
-    if the wallet has not paid yet or still has to replay payment to bound the payment to the session id.
 
   **Response:**
 
@@ -142,10 +137,9 @@ Receiving Payments
     interface CheckPaymentUnpaidResponse {
       paid: false;
 
-      // URL to redirect the customer to pay,
-      // replay payment or confirm that the payment
-      // is bound to a session.
-      payment_redirect_url: string;
+      // URI that the wallet must process to complete the payment.
+      taler_pay_uri: string;
+
     }
 
 
diff --git a/conf.py b/conf.py
index 6758983b..85fcfe32 100644
--- a/conf.py
+++ b/conf.py
@@ -75,9 +75,9 @@ copyright = u'2014, 2015, 2016 Florian Dold, Benedikt Muller, Sree Harsha Totaku
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.6pre1'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.0'
+release = '0.6.0pre1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -199,10 +199,6 @@ html_show_sphinx = False
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'neurodoc'
-
-
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
diff --git a/taler-uri.rst b/taler-uri.rst
index 5943f540..d69b4b0c 100644
--- a/taler-uri.rst
+++ b/taler-uri.rst
@@ -35,6 +35,38 @@ The following is a minimal example for a payment request from the demo merchant,
   taler://pay/backend.demo.taler.net/-/-/2019.08.26-ABCED
 
 
+-----------
+Withdrawing
+-----------
+
+.. code:: none
+
+  'taler://withdraw/' bank-host '/' bank-query '/' withdraw-uid
+
+When `bank-query` is `-`, the default `withdraw-operation` will be used.
+
+Example:
+
+.. code:: none
+
+  'taler://withdraw/bank.taler.net/-/ABDE123
+
+
+-------------------------
+Low-level Reserve Actions
+-------------------------
+
+The following actions are deprecated.  They might not be supported
+in newer wallets.
+
+.. code:: none
+
+  'taler://reserve-create/' reserve-pub
+
+.. code:: none
+
+  'taler://reserve-confirm/' query
+
 ----------------------------
 Special URLs for fulfillment
 ----------------------------