[taler-docs] branch master updated: GET /orders/ should ignore timeout_ms if processing html request

[gnunet]

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

jonathan-buchanan pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new e225ee2  GET /orders/ should ignore timeout_ms if processing html 
request
e225ee2 is described below

commit e225ee2193443800608e4ff4e22196b0657a32df
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Sun Aug 9 21:23:15 2020 -0400

    GET /orders/ should ignore timeout_ms if processing html request
---
 core/api-merchant.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 0ef3f72..07efc86 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1385,9 +1385,9 @@ Payment processing
   they will be prompted for payment.
   This endpoint typically also supports requests with the "Accept" header
   requesting "text/html".  In this case, an HTML response suitable for
-  triggering the interaction with the wallet is returned. If the backend
-  installation does not include the required HTML templates, a 406 status
-  code is returned.
+  triggering the interaction with the wallet is returned, with ``timeout_ms``
+  ignored (treated as zero). If the backend installation does not include the
+  required HTML templates, a 406 status code is returned.
 
   **Request:**
 

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