commit 3ee973fe5892dba1384dc4ca97e46148e479febd parent 4feb2deebe4118468ef75ac0c7ccf52000e660fe Author: Marcello Stanisci <marcello.stanisci@inria.fr> Date: Mon, 26 Dec 2016 23:27:28 +0100 Moving payment protocol on 'docs' Diffstat:
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/api-merchant.rst b/api/api-merchant.rst @@ -25,7 +25,7 @@ Merchant API Before reading the API reference documentation, see the `merchant architecture <https://docs.taler.net/dev-merchant.html#merchant-arch>`_ -and :ref:`payprot` +and the `payment protocol <https://docs.taler.net/integration-merchant.html#payprot>`_ --------------------- The Frontend HTTP API @@ -141,8 +141,8 @@ This frontend API is non-normative, and only gives an example of what a typical Returns a cooperative merchant page (called the execution page) that will send the ``taler-execute-payment`` to the wallet and react to failure or success of the actual payment. ``fulfillment_url`` is included in the `contract`_. - Furthermore, :ref:`payprot` documents the payment protocol between wallets and - merchants. + Furthermore, `https://docs.taler.net/integration-merchant.html#payprot`_ + documents the payment protocol between wallets and merchants. The wallet will inject an ``XMLHttpRequest`` request to the merchant's ``$pay_url`` in the context of the execution page. This mechanism is diff --git a/api/integration-bank.rst b/docs/integration-bank.rst diff --git a/api/integration-general.rst b/docs/integration-general.rst diff --git a/api/integration-merchant.rst b/docs/integration-merchant.rst