[taler-docs] branch master updated: fix link

[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 26182fa  fix link
     new a02ca72  Merge branch 'master' of git+ssh://git.taler.net/docs
26182fa is described below

commit 26182fa8f045ee79ad95211543610704f8d702f3
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed May 20 12:01:15 2020 +0200

    fix link
---
 core/api-merchant.rst | 26 ++++++++++++++------------
 developers-manual.rst |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index ea1750c..9aeb50a 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1624,6 +1624,8 @@ Giving Customer Tips
   :status 200 OK:
     The backend is waiting for the reserve to be established. The merchant
     must now perform the wire transfer indicated in the 
`ReserveCreateConfirmation`.
+  :status 408 Timeout:
+    The exchange did not respond on time.
   :status 409 Conflict:
     The exchange does not support the requested wire method.
   :status 424 Failed Dependency:
@@ -1658,13 +1660,13 @@ Giving Customer Tips
 
    Obtain list of reserves that have been created for tipping.
 
-   **Request:**
+  **Request:**
 
-   :query after: *Optional*.  Only return reserves created after the given 
timestamp in milliseconds
-   :query active: *Optional*.  Only return active/inactive reserves depending 
on the boolean given
-   :query failures: *Optional*.  Only return reserves where we disagree with 
the exchange about the initial balance.
+  :query after: *Optional*.  Only return reserves created after the given 
timestamp in milliseconds
+  :query active: *Optional*.  Only return active/inactive reserves depending 
on the boolean given
+  :query failures: *Optional*.  Only return reserves where we disagree with 
the exchange about the initial balance.
 
-   **Response:**
+  **Response:**
 
   :status 200 OK:
     Returns a list of known tipping reserves.
@@ -1712,13 +1714,13 @@ Giving Customer Tips
 
 .. http:get:: /private/reserves/$RESERVE_PUB
 
-   Obtain information about a specific reserve that have been created for 
tipping.
+  Obtain information about a specific reserve that have been created for 
tipping.
 
-   **Request:**
+  **Request:**
 
-   :query tips: *Optional*. If set to "yes", returns also information about 
all of the tips created
+  :query tips: *Optional*. If set to "yes", returns also information about all 
of the tips created
 
-   **Response:**
+  **Response:**
 
   :status 200 OK:
     Returns the `ReserveDetail`.
@@ -1876,11 +1878,11 @@ Giving Customer Tips
 
   Obtain information about a particular tip.
 
-   **Request:**
+  **Request:**
 
-   :query pickups: if set to "yes", returns also information about all of the 
pickups
+  :query pickups: if set to "yes", returns also information about all of the 
pickups
 
-   **Response:**
+  **Response:**
 
   :status 200 OK:
     The tip is known. The backend responds with a `TipDetails` message
diff --git a/developers-manual.rst b/developers-manual.rst
index 8dd8303..70d92f2 100644
--- a/developers-manual.rst
+++ b/developers-manual.rst
@@ -810,7 +810,7 @@ Components written in C
 These are the general coding style rules for Taler.
 
 * Baseline rules are to follow GNU guidelines, modified or extended
-  by the GNUnet style: https://gnunet.org/style
+  by the GNUnet style: 
https://docs.gnunet.org/handbook/gnunet.html#Coding-style
 
 Naming conventions
 ^^^^^^^^^^^^^^^^^^

-- 
To stop receiving notification emails like this one, please contact
address@hidden.