summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-16 15:26:53 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-16 15:26:53 +0100
commit3d45a3d91266b23a78ed576c134073e6e98585ac (patch)
tree927831e0befccf05003994aed079fd844ccd4f39
parentced35e543da11aeb3eefbf04f6522279ca31d377 (diff)
parent4adff4ab1d2a05a4b14743b345da6f7885156437 (diff)
downloaddocs-3d45a3d91266b23a78ed576c134073e6e98585ac.tar.gz
docs-3d45a3d91266b23a78ed576c134073e6e98585ac.tar.bz2
docs-3d45a3d91266b23a78ed576c134073e6e98585ac.zip
Merge branch 'master' of ssh://taler.net/api
-rw-r--r--api-exchange.rst2
-rw-r--r--operate-exchange.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/api-exchange.rst b/api-exchange.rst
index 1e828a4..e6d5c93 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -324,7 +324,7 @@ exchange.
:status 200 OK:
The exchange responds with a `ReserveStatus`_ object; the reserve was known to the exchange,
- :status 404 Not Found: The withdrawal key does not belong to a reserve known to the exchange.
+ :status 404 Not Found: The reserve key does not belong to a reserve known to the exchange.
**Details:**
diff --git a/operate-exchange.rst b/operate-exchange.rst
index fabb808..06dee2f 100644
--- a/operate-exchange.rst
+++ b/operate-exchange.rst
@@ -101,7 +101,7 @@ format.
The command line tool `taler-exchange-wire` is used to create such a file.
For example, the utility may be invoked as follows::
-
+
$ taler-exchange-wire -j '{"name": "The Exchange", "account_number": 10, "bank_uri": "https://bank.demo.taler.net", "type": "test"}' -t test -o exchange.json
Note that the value given to option `-t` must match the value in the JSON's field ``"type"``.
@@ -114,7 +114,7 @@ Outgoing
This exchange's bank account is used to give money to merchants, after successful :ref:`deposits <deposit-par>`
operations. If `test` is the chosen wireformat, the outcoming bank account is configured by the following
options under `[exchange-wire-outcoming-test]`:
-
+
* `exchange_account_numer`: which bank account number has the exchange
* `bank_uri`: base URL of the bank hosting the exchange bank account
@@ -181,5 +181,5 @@ Other
Reserve management
------------------
-Incoming transactions to the exchange's provider result in the creation or update of reserves, identified by their withdrawal key.
+Incoming transactions to the exchange's provider result in the creation or update of reserves, identified by their reserve key.
The command line tool `taler-exchange-reservemod` allows create and add money to reserves in the exchange's database.