[taler-docs] branch master updated (2c37f776 -> 0e8110c6)

[gnunet]

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

sebasjm pushed a change to branch master
in repository docs.

    from 2c37f776 jammy now also works
     new e9268f18 token instead of login
     new 0e8110c6 fix docs

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 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 732a35b1..81bac40a 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -107,7 +107,7 @@ Currently, the API supports two main authentication methods:
   header, where ``$TOKEN`` is a secret authentication token configured for the 
instance which must begin with the RFC 8959 prefix.
 
 Additionally, clients can send a **login token** which they may obtain from
-the ``/private/login`` endpoint.  Such a login token is valid only for a
+the ``/private/token`` endpoint.  Such a login token is valid only for a
 limited period of time and can be used by clients to avoid storing the
 long-term login secrets from an authentication method.
 
@@ -983,12 +983,12 @@ Setting up instances
 .. http:post:: /management/instances/$INSTANCE/auth
 .. http:post:: [/instances/$INSTANCE]/private/auth
 
-   Update the authentication settings for an instance.  POST operations against
-   an instance are authenticated by checking that an authorization is provided
-   that matches either the credential required by the instance being modified
-   OR the ``default`` instance, depending on the access path used.
+  Update the authentication settings for an instance.  POST operations against
+  an instance are authenticated by checking that an authorization is provided
+  that matches either the credential required by the instance being modified
+  OR the ``default`` instance, depending on the access path used.
 
-   **Request** the request must be an `InstanceAuthConfigurationMessage`.
+  **Request** the request must be an `InstanceAuthConfigurationMessage`.
 
   :http:statuscode:`204 No content`:
     The backend has successfully created the instance.
@@ -1006,7 +1006,7 @@ Setting up instances
       //   See "token" for details.
       method: "external" | "token";
 
-      // For method "external", this field is mandatory.
+      // For method "token", this field is mandatory.
       // The token MUST begin with the string "secret-token:".
       // After the auth token has been set (with method "token"),
       // the value must be provided in a "Authorization: Bearer $token"
@@ -1017,11 +1017,11 @@ Setting up instances
 
 .. http:post:: [/instances/$INSTANCE]/private/token
 
-   **Request:**
+  **Request:**
 
-   The request must be a `LoginTokenRequest`.
+  The request must be a `LoginTokenRequest`.
 
-   **Response:**
+  **Response:**
 
   :http:statuscode:`200 Ok`:
     The backend is returning the access token in a

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