taler-docs

commit 98909f952b3b7d3d257e623e4b887c35aa140768
parent ebf6d450d1e77d1af5b4d1ab707c713b9fcd9e46
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Fri, 27 Jan 2017 10:52:02 +0100

Merge branch 'split' of ssh://taler.net/api into split

Conflicts:
	docs/example-essay-store.rst

Diffstat:
M
docs/example-essay-store.rst
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/example-essay-store.rst b/docs/example-essay-store.rst
@@ -522,7 +522,7 @@ Required" HTTP status code, along with the HTTP headers ``X-Taler-Contract-Hash`
 
 ..
   FIXME:
-  Are those three parameters anywhere, at least 'kindof' introduced?
+  Are those three parameters previously introduced?
 
 Upon returning such a response, the wallet will automatically send the
 payment to the URL indicated in ``X-Taler-Pay-Url``.