[taler-docs] branch master updated (b864feea -> cea05d8b)

[gnunet]

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

grothoff pushed a change to branch master
in repository docs.

    from b864feea api-{common,exchange,merchant}: fix some API types
     new cdcbf165 document 308 redirect for deprecated /instances/default/* URLs
     new cea05d8b document auditor API changes

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-auditor.rst      |  7 ++++++-
 core/api-merchant.rst     | 16 +++++++++-------
 manpages/taler.conf.5.rst |  4 +++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/api-auditor.rst b/core/api-auditor.rst
index 7aae2df5..dcb39864 100644
--- a/core/api-auditor.rst
+++ b/core/api-auditor.rst
@@ -56,7 +56,7 @@ know-your-customer (KYC) registration before issuing 
contracts.
 .. http:get:: /config
 
   Get the protocol version and some meta data about the auditor.
-  This specification corresponds to ``current`` protocol being version **0**.
+  This specification corresponds to ``current`` protocol being version **1**.
 
   **Response:**
 
@@ -85,6 +85,10 @@ know-your-customer (KYC) registration before issuing 
contracts.
 
       // EdDSA master public key of the auditor.
       auditor_public_key: EddsaPublicKey;
+
+      // EdDSA master public key of the exchange.
+      // Added in protocol v1.
+      exchange_master_public_key: EddsaPublicKey;
     }
 
   .. note::
@@ -231,6 +235,7 @@ paid out first.
 
       // Master public key of the exchange corresponding to ``master_sig``.
       // Identifies the exchange this is about.
+      // @deprecated since v1 (now ignored, global per auditor)
       master_pub: EddsaPublicKey;
 
       // When does the validity of the exchange_pub end?
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 3582e628..652c7303 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -36,11 +36,13 @@ This is useful when multiple businesses want to share the 
same payment
 infrastructure.
 
 Merchant backends have one special ``default`` instance.  This ``default``
-instance is used when no explicit instance is specified.  Despite its name,
-this instance must be created after the installation.  In case *no* default
-instance is found - or its credentials got lost -, the administrator can use
-the default instance's rights by resorting on the ``--auth`` command line 
option,
-or by restarting the service by providing an environment variable called
+instance is used when no explicit instance is specified.  Note that using
+``/instances/default/$ANYTHING`` is deprecated and will result in a permanent
+redirect (HTTP status 308) to ``$ANYTHING``. a Despite its name, this instance
+must be created after the installation.  In case *no* default instance is
+found - or its credentials got lost -, the administrator can use the default
+instance's rights by resorting on the ``--auth`` command line option, or by
+restarting the service by providing an environment variable called
 ``TALER_MERCHANT_TOKEN``.
 
 Each instance (default and others) has a base URL.  The resources under
@@ -74,10 +76,10 @@ Examples:
    https://merchant-backend.example.com/instances/myinst/orders/ABCD
 
    A private endpoint (explicit "default" instance):
-   https://merchant-backend.example.com/instances/default/private/orders
+   https://merchant-backend.example.com/private/orders
 
    A public endpoint (explicit "default" instance):
-   https://merchant-backend.example.com/instances/default/orders
+   https://merchant-backend.example.com/orders
 
    Endpoints to manage other instances (ONLY for implicit "default" instance):
    https://merchant-backend.example.com/management/instances
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 09b993e0..191c7e59 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -151,7 +151,9 @@ BIND_TO
 
 MASTER_PUBLIC_KEY
   Crockford Base32-encoded master public key, public version of the
-  exchange's long-time offline signing key.
+  exchange's long-time offline signing key.  This configuration option
+  is also used by the **auditor** to determine the public key of the
+  exchange which it is auditing.
 
 AML_THRESHOLD
   Largest amount in this currency that can be transferred per month without

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