Merge branch 'master' of git+ssh://git.taler.net/docs

1 files changed, 11 insertions, 16 deletions

diff --git a/core/api-donau.rst b/core/api-donau.rst
index 4f3ce390..09f644ec 100644
--- a/core/api-donau.rst
+++ b/core/api-donau.rst
@@ -15,6 +15,8 @@
 
   @author Christian Grothoff
   @author Pius Loosli
+  @author Lukas Matyja
+  @author Johannes Casaburi
 
 =====================
 The Donau RESTful API
@@ -26,6 +28,7 @@ The `glossary <https://docs.taler.net/glossary.html#glossary>`_
 defines all specific terms used in this section.
 
 .. contents:: Table of Contents
+  :local:
 
 .. _donau-overview:
 
@@ -67,23 +70,11 @@ long-term offline signing key of the Donau, which clients should cache.
 
   **Request:**
 
-  :query last_issue_date: Optional argument specifying the maximum value of
-                          any of the ``stamp_start`` members of the
-                          donation unit keys of a ``/keys`` response that is
-                          already known to the client. Allows the Donau to
-                          only return keys that have changed since that
-                          timestamp.  The given value must be an unsigned
-                          64-bit integer representing seconds after 1970.  If
-                          the timestamp does not exactly match the
-                          ``stamp_start`` of one of the donation unit keys, all
-                          keys are returned.
-
   **Response:**
 
   :http:statuscode:`200 OK`:
     The Donau responds with a `DonauKeysResponse` object. This request should
-    virtually always be successful. It only fails if the Donau is misconfigured or
-    has not yet been provisioned with key signatures via ``taler-donau-offline``.
+    virtually always be successful. It only fails if the Donau is misconfigured.
 
   **Details:**
 
@@ -228,7 +219,7 @@ long-term offline signing key of the Donau, which clients should cache.
   **Response:**
 
   :http:statuscode:`200 OK`:
-    The body is a `VersionResponse`.
+    The body is a `DonauVersionResponse`.
 
   .. ts:def:: DonauVersionResponse
 
@@ -554,6 +545,7 @@ The GET status requests require an authorized bearer token as well.
     interface Charity {
       charity_pub: EddsaPublicKey;
       name: string;
+      url: string;
       max_per_year: Amount;
       receipts_to_date: Amount;
       current_year: Integer;
@@ -579,8 +571,11 @@ The GET status requests require an authorized bearer token as well.
 
     interface CharityRequest{
       charity_pub: EddsaPublicKey;
-      max_per_year: Amount;
       name: string;
+      url: string;
+      max_per_year: Amount;
+      receipts_to_date: Amount;
+      current_year: Integer;
     }
 
   .. ts:def:: CharityResponse
@@ -613,7 +608,7 @@ The GET status requests require an authorized bearer token as well.
 
   **Response:**
 
-  :http:statuscode:`200 OK`:
+  :http:statuscode:`204 No content`:
     The request was successful.
 
   :http:statuscode:`403 Forbidden`: