[GNUnet-SVN] [taler-api] 16/22: Moving payment protocol on 'docs'

[gnunet]

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

marcello pushed a commit to branch master
in repository api.

commit 3ee973fe5892dba1384dc4ca97e46148e479febd
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 b2f6123..11ed325 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 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
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