[taler-docs] branch master updated: -fix access control

[gnunet]

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

grothoff pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new 33d99c3  -fix access control
     new e8ba4a9  Merge branch 'master' of git+ssh://git.taler.net/docs
33d99c3 is described below

commit 33d99c3106d8f69335d358595c7628958fe089d2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Nov 15 16:09:54 2022 +0100

    -fix access control
---
 _static/sample-pos-config.json |  2 +-
 core/taler-uri.rst             | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/_static/sample-pos-config.json b/_static/sample-pos-config.json
index f078910..db4dca6 100644
--- a/_static/sample-pos-config.json
+++ b/_static/sample-pos-config.json
@@ -1,7 +1,7 @@
 {
   "config": {
     "base_url": "https://backend.demo.taler.net/instances/pos";,
-    "api_key": "sandbox"
+    "api_key": "secret-token:sandbox"
   },
   "categories": [
     {
diff --git a/core/taler-uri.rst b/core/taler-uri.rst
index 80e8c7a..7b897ba 100644
--- a/core/taler-uri.rst
+++ b/core/taler-uri.rst
@@ -68,7 +68,7 @@ The action ``withdraw`` is used to trigger a bank-integrated 
withdrawal operatio
 
   taler://withdraw/{bank_host}{/bank_prefix_path*}/{withdrawal_uid}{#ssid}
 
-* ``bank_host`` is the hostname of the merchant.
+* ``bank_host`` is the hostname of the bank.
 * ``bank_prefix_path`` is an optional list of path components that identifies 
the path prefix of the bank integration API base URL.
 * ``withdrawal_uid`` is the unique ID of the withdrawal operation.
 * ``ssid`` is the optional WLAN SSID that the bank (typically in an ATM 
scenario) can offer the wallet
@@ -121,8 +121,6 @@ a merchant and ask the user to accept/decline it.
 * ``merchant_host`` is the hostname of the merchant.
 * ``merchant_prefix_path`` is an optional list of path components that 
identifies the path prefix of the merchant base URL.
 * ``tip_id`` uniquely identifies the tip.
-* ``insecure`` is an optional query parameter.  When "1", the 
``merchant_host`` is contacted via HTTP.
-  When absent or "0", the ``merchant_host`` is contacted via HTTPS.
 * ``ssid`` is the optional WLAN SSID that the merchant can offer the wallet to 
connect to for Internet connectivity.
 
 
@@ -130,13 +128,18 @@ a merchant and ask the user to accept/decline it.
 Peer-to-peer payments
 ---------------------
 
-A ``taler://pay-push/{exchange_host}{/exchange_prefix_path*}/{contract_priv}`` 
URI
-instructs the wallet to accept a P2P push payment.
+A pay-push URI instructs the wallet to accept a P2P push payment.
+
+.. code:: none
+
+  taler://pay-push/{exchange_host}{/exchange_prefix_path*}/{contract_priv}
 
 * ``exchange_host`` is the hostname of the exchange.
 * ``exchange_prefix_path`` is an optional list of path components that 
identifies the path prefix of the exchange base URL.
 * ``contract_priv`` is the private key of the peer push payment contract 
stored at the exchange
 
+FIXME: pay-pull URIs missing!
+  
 ----------------
 Adding exchanges
 ----------------

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