commit 45d009f512d3b07dbeac8d5ce42b06f38aa28e7c
parent e066b10f725bed1b723d9942b81a48bb496e4a46
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 19 Nov 2016 14:39:05 +0100
render chapter 4, even if incomplete
Diffstat:
2 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/php/doc/tutorial.texi b/php/doc/tutorial.texi
@@ -54,9 +54,9 @@ Texts. A copy of the license is included in the section entitled
@menu
* Introduction:: Whom this tutorial is addressed to
-* Hello-world:: How to set up a minimalistic shop
+* Hello-world:: How to set up a donation page
* Back-office-integration:: How to integrate with the back office
-@c * Advanced topics:: Detailed solutions to specific issues
+* Advanced topics:: Detailed solutions to specific issues
Appendices
@@ -152,7 +152,7 @@ sensitive data. In particular, the merchant's signing keys and bank
account information are encapsulated within the Taler backend.
@node Hello-world
-@chapter Setting up a simple Web shop with GNU Taler
+@chapter Setting up a simple donation page
This section describes how to setup a simple shop, which exposes a
button to get donations via Taler. The expected behaviour is that once
@@ -346,11 +346,11 @@ header, requesting the wallet to pay:
@verbatiminclude ../fulfillment.php
@end smallexample
-@code 402 payment required
+@cindex 402 payment required
Here, this second 402 response contains the following Taler-specific
headers:
-@table
+@table @code
@item X-Taler-Contract-Hash
@cindex X-Taler-Contract-Hash
The wallet needs to know which contract we are asking it to pay for.
@@ -398,7 +398,7 @@ anything goes wrong, the wallet will handle the respective error.
@node Back-office-integration
-@chapter Integration of GNU Taler with the back office
+@chapter Integration with the back office
This chapter shows how to implement the back office Web interface.
Namely, we want to verify if we received a wire transfer in
@@ -468,35 +468,24 @@ loop we construct the list of the transaction IDs paid back by @code{wtid}.
@end smallexample
-@c **********************************************************
-@c ******************* Appendices *************************
-@c **********************************************************
-
-@node GNU-LGPL
-@unnumbered GNU-LGPL
-@cindex license
-@cindex LGPL
-@include lgpl.texi
+@node Advanced topics
+@chapter Advanced topics
-@node GNU-FDL
-@unnumbered GNU-FDL
-@cindex license
-@cindex GNU Free Documentation License
-@include fdl-1.3.texi
+@c FIXME: add menu!
-@node Concept Index
-@unnumbered Concept Index
+@section Reacting to the presence of a Taler wallet
-@printindex cp
+FIXME.
+@c with and without JavaScript!
+@section Building Taler contracts
-@bye
+FIXME.
+@c this should discuss all of the different items in a Taler contract.
-@node Advanced topics
-@chapter Advanced topics
-@section Inline contracts in HTTP headers
+@section Inlining contracts in HTTP headers
In the example in section FIXME, we told the wallet the URL from where
it should fetch the contract. Instead of specifying the contract via
@@ -505,7 +494,7 @@ an URL, it is also possible to inline short contracts directly.
FIXME: explain how.
-@section Payments using JavaScript
+@section Triggering payments using JavaScript
In the example in section FIXME, we used a GET request to trigger the
payment. This section describes how we could have instead performed
@@ -560,3 +549,28 @@ performed by returning JavaScript code from @code{taler-wallet-lib.js}
that triggers the wallet to send the payment to the pay page. Once
the pay page receives the payment, it sets the state for the payment
as "payed".
+
+
+
+@c **********************************************************
+@c ******************* Appendices *************************
+@c **********************************************************
+
+@node GNU-LGPL
+@unnumbered GNU-LGPL
+@cindex license
+@cindex LGPL
+@include lgpl.texi
+
+@node GNU-FDL
+@unnumbered GNU-FDL
+@cindex license
+@cindex GNU Free Documentation License
+@include fdl-1.3.texi
+
+@node Concept Index
+@unnumbered Concept Index
+
+@printindex cp
+
+@bye
diff --git a/php/doc/version.texi b/php/doc/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 11 November 2016
@set UPDATED-MONTH November 2016
-@set EDITION 0.1.0
-@set VERSION 0.1.0
+@set EDITION 0.2.0
+@set VERSION 0.2.0
