diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-10-22 18:04:23 +0200 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-10-22 18:04:23 +0200 |
commit | 880e5301088392393451e31ca5ab8bb2eaaca1fa (patch) | |
tree | 77969b472eb4b82899b73a13449cf0b8af4d6d12 | |
parent | a68e5da8188b2dd468d768395c458456d602f0f4 (diff) | |
parent | 0d417057eb1a20102dd3bd900278ddbc88df19fa (diff) | |
download | docs-880e5301088392393451e31ca5ab8bb2eaaca1fa.tar.gz docs-880e5301088392393451e31ca5ab8bb2eaaca1fa.tar.bz2 docs-880e5301088392393451e31ca5ab8bb2eaaca1fa.zip |
Merge branch 'master' of ssh://taler.net/api
-rw-r--r-- | operate-merchant.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/operate-merchant.rst b/operate-merchant.rst index 418534be..b5215955 100644 --- a/operate-merchant.rst +++ b/operate-merchant.rst @@ -123,7 +123,7 @@ the chosen wireformat. In our demo, we have:: wireformat = test .. - [default-wireforma] + [merchant-instance-wireformat-default] test_response_file = ${TALER_CONFIG_HOME}/merchant/wire/test.json The file `test.json` obeys to the following specification @@ -177,7 +177,7 @@ instance `Tor` as follows:: .. - [Tor-wireformat] + [merchant-instance-wireformat-Tor] TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json Please note that :ref:`Taler messagging<merchant-api>` is designed so that the merchant |