[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] 06/22: Moving payment protocol on 'docs'
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-api] 06/22: Moving payment protocol on 'docs' |
Date: |
Fri, 27 Jan 2017 10:52:26 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository api.
commit 26589150d9e5788f99ba31f710616e7aca2b1ee7
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Dec 26 23:27:28 2016 +0100
Moving payment protocol on 'docs'
---
api/api-merchant.rst | 6 +++---
{api => docs}/integration-bank.rst | 0
{api => docs}/integration-general.rst | 0
{api => docs}/integration-merchant.rst | 0
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index f659741..03644aa 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
similarity index 100%
rename from api/integration-bank.rst
rename to docs/integration-bank.rst
diff --git a/api/integration-general.rst b/docs/integration-general.rst
similarity index 100%
rename from api/integration-general.rst
rename to docs/integration-general.rst
diff --git a/api/integration-merchant.rst b/docs/integration-merchant.rst
similarity index 100%
rename from api/integration-merchant.rst
rename to docs/integration-merchant.rst
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-api] branch master updated (ebb7bc5 -> 98909f9), gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 09/22: Appears?, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 02/22: fix link, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 06/22: Moving payment protocol on 'docs',
gnunet <=
- [GNUnet-SVN] [taler-api] 10/22: Reverting previous (test) commit, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 12/22: fix link, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 16/22: Moving payment protocol on 'docs', gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 05/22: Fix missing links, commenting out superfluous/outdated section, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 01/22: Proof-reading blog example page, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 19/22: Appears?, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 04/22: Still on splitting, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 07/22: Nothing but APIs under api.taler.net, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 21/22: Removing trailing .rst from imported files, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 03/22: Splitting BUILDIR, gnunet, 2017/01/27