summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api-merchant.rst2
-rw-r--r--taler-merchant-api-tutorial.rst6
2 files changed, 5 insertions, 3 deletions
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 2371d55..77575d9 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1397,6 +1397,8 @@ Payment processing
The ``h_contract`` (or the ``token`` for unclaimed orders) does not match the order.
:status 404 Not found:
The merchant backend is unaware of the order.
+ :status 406 Not Acceptable:
+ The merchant backend could not load the template required to generate a reply in the desired format. (Likely HTML templates were not properly installed.)
.. ts:def:: StatusPaidResponse
diff --git a/taler-merchant-api-tutorial.rst b/taler-merchant-api-tutorial.rst
index eb9505c..39cf36d 100644
--- a/taler-merchant-api-tutorial.rst
+++ b/taler-merchant-api-tutorial.rst
@@ -154,10 +154,10 @@ https://backend.demo.taler.net/:
Note that these are fictional merchants used for our demonstrators and
not affiliated with or officially approved by the respective projects.
-.. _Accepting-a-Simple-Payment:
+.. _Merchant-Payment-Processing:
-Accepting a Simple Payment
-==========================
+Merchant Payment Processing
+===========================
.. index:: order