[GNUnet-SVN] [taler-merchant-frontend-examples] branch master updated (a19d3c3 -> 45c16f7)

[gnunet]

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

dold pushed a change to branch master
in repository merchant-frontend-examples.

    from a19d3c3  As wanted to the latest protocol, returing /pay object to the 
wallet.  Used to make the wallet loop.
     new b82ebf6  user tipping
     new 45c16f7  refine tipping headers

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 python/doc/Makefile      |  2 +-
 python/doc/tutorial.texi | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/python/doc/Makefile b/python/doc/Makefile
index fc3c7c3..ebfb6fb 100644
--- a/python/doc/Makefile
+++ b/python/doc/Makefile
@@ -4,7 +4,7 @@ tutorial.pdf: arch.pdf tutorial.texi
        texi2pdf tutorial.texi
 
 tutorial.html: arch.jpg tutorial.texi
-       texi2html tutorial.texi
+       texi2any --html --no-split --css-ref=docstyle.css 
--css-ref=brown-paper.css tutorial.texi
 
 arch.pdf:
        cp ../../common/graphics/arch_nobo.pdf .
diff --git a/python/doc/tutorial.texi b/python/doc/tutorial.texi
index 98b2054..3d11468 100644
--- a/python/doc/tutorial.texi
+++ b/python/doc/tutorial.texi
@@ -2,6 +2,7 @@
 @c %**start of header
 @setfilename tutorial.info
 @include version.texi
address@hidden syntax.texi
 @settitle The GNU Taler tutorial for Python Web shop developers @value{VERSION}
 
 @c Define a new index for options.
@@ -530,6 +531,17 @@ this URL and process it.  This typically prompts the user 
to agree to pay.
 If there is no associated proposal and @code{X-Taler-Contract-Url} is not
 specified, the browser will navigate to this URL.
 
address@hidden X-Taler-User-Tipping-Url
+If this header present, the value of this header must be a URL that the user 
agent can use to obtain tips (small, non-binding
+financial rewards) payed from the merchant to the user's wallet.  If this 
field is present, @code{X-Taler-User-Tipping-Exchange}
+and @code{X-Taler-User-Tipping-Amount} must also be present.
+
address@hidden X-Taler-User-Tipping-Exchange
+Exchange base URL for the exchange that the merchant helps withdrawing the tip 
from.
+
address@hidden X-Taler-User-Tipping-Amount
+Amount of tip that the user is receiving, in the standard amount format 
(CURR:X.Y).
+
 @end table
 
 @node JavaScript API

-- 
To stop receiving notification emails like this one, please contact
address@hidden