diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-26 23:27:28 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-26 23:27:28 +0100 |
| commit | 26589150d9e5788f99ba31f710616e7aca2b1ee7 (patch) | |
| tree | 5cec0f9674eccc0026ff04c324a34e85ee6a75b2 | |
| parent | 02e2a778434f5e76ca97a6628d6ad957440edd93 (diff) | |
| download | docs-26589150d9e5788f99ba31f710616e7aca2b1ee7.tar.gz docs-26589150d9e5788f99ba31f710616e7aca2b1ee7.tar.bz2 docs-26589150d9e5788f99ba31f710616e7aca2b1ee7.zip | |
Moving payment protocol on 'docs'
| -rw-r--r-- | api/api-merchant.rst | 6 | ||||
| -rw-r--r-- | docs/integration-bank.rst (renamed from api/integration-bank.rst) | 0 | ||||
| -rw-r--r-- | docs/integration-general.rst (renamed from api/integration-general.rst) | 0 | ||||
| -rw-r--r-- | docs/integration-merchant.rst (renamed from api/integration-merchant.rst) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/api/api-merchant.rst b/api/api-merchant.rst index f6597411..03644aad 100644 --- 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 Frontent HTTP API @@ -139,8 +139,8 @@ The Frontent HTTP API 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 index 1dc2ec8d..1dc2ec8d 100644 --- a/api/integration-bank.rst +++ b/docs/integration-bank.rst diff --git a/api/integration-general.rst b/docs/integration-general.rst index 308ecf5a..308ecf5a 100644 --- a/api/integration-general.rst +++ b/docs/integration-general.rst diff --git a/api/integration-merchant.rst b/docs/integration-merchant.rst index 7cf93044..7cf93044 100644 --- a/api/integration-merchant.rst +++ b/docs/integration-merchant.rst |