update chapter about proposals

1 files changed, 32 insertions, 6 deletions

diff --git a/php/doc/tutorial.texi b/php/doc/tutorial.texi
index 1bacd49..a53eefb 100644
--- a/php/doc/tutorial.texi
+++ b/php/doc/tutorial.texi
@@ -656,11 +656,11 @@ if not.  Note that since now we can use JavaScript we can register
 callbacks that do more than just showing and hiding elements.
 
 
-@node Taler contracts
-@section Building Taler contracts
+@node Taler proposals
+@section Building Taler proposals
 @cindex contract
 
-A Taler contract can specify many details about the transaction.
+A Taler proposal can specify many details about the transaction.
 This section describes each of the fields in depth.
 
 @table @var
@@ -680,6 +680,32 @@ willing to pay.  If the deposit fees for the coins exceed this amount,
 the customer has to include it in the payment total.  The fee is
 specified using the same triplet used for @var{amount}.
 
+
+@item max_wire_fee
+@cindex fees
+@cindex maximum wire fee
+Maximum wire fee accepted by the merchant (customer share to be
+divided by the 'wire_fee_amortization' factor, and further reduced
+if deposit fees are below 'max_fee').  Default if missing is zero.
+
+
+@item wire_fee_amortization
+@cindex fees
+@cindex maximum fee amortization
+Over how many customer transactions does the merchant expect to
+amortize wire fees on average?  If the exchange's wire fee is
+above 'max_wire_fee', the difference is divided by this number
+to compute the expected customer's contribution to the wire fee.
+The customer's contribution may further be reduced by the difference
+between the 'max_fee' and the sum of the actual deposit fees.
+Optional, default value if missing is 1.  0 and negative values are
+invalid and also interpreted as 1.
+
+@item pay_url
+@cindex pay_url
+Which URL accepts payments. This is the URL where the wallet will POST
+coins.
+
 @item fulfillment_url
 @cindex fulfillment URL
 Which URL should the wallet go to for obtaining the fulfillment,
@@ -687,9 +713,9 @@ for example the HTML or PDF of an article that was bought, or an
 order tracking system for shipments, or a simple human-readable
 Web page indicating the status of the contract.
 
-@item transaction_id
-@cindex transaction ID
-Numeric transaction ID, must be in the range @math{[0,2^{51})}.
+@item order_id
+@cindex order ID
+Alphanumeric identifier, freely definable by the merchant.
 Used by the merchant to uniquely identify the transaction.
 
 @item summary