diff options
| author | Özgür Kesim <oec-taler@kesim.org> | 2023-09-12 13:52:55 +0200 | 
|---|---|---|
| committer | Özgür Kesim <oec-taler@kesim.org> | 2023-09-12 13:52:55 +0200 | 
| commit | 121a6da78504204ddf34bf05b5136e09fab0261e (patch) | |
| tree | cd220a6e7168e9888b0f83219242f23744fa2cc2 /contrib/articles | |
| parent | 5495551071a3fdc36c38deb4c1cf6f4aa5b98bd4 (diff) | |
| parent | ee8993f11cf81721cc30b4473e40124c2fee0dff (diff) | |
Merge branch 'master' into age-withdraw
Diffstat (limited to 'contrib/articles')
| -rw-r--r-- | contrib/articles/spending.txt | 2 | ||||
| -rw-r--r-- | contrib/articles/ui/ui-cameraready.tex | 4 | ||||
| -rw-r--r-- | contrib/articles/ui/ui.tex | 4 | 
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/articles/spending.txt b/contrib/articles/spending.txt index 7f2c716f8..887a80910 100644 --- a/contrib/articles/spending.txt +++ b/contrib/articles/spending.txt @@ -45,7 +45,7 @@ If the above parameters have an optimal assignment, then replacing    v'[x] := 0  gives another optimal solution, as otherwise we'd get a better one for the first situation.   -There is however no assurence that t[x] = price mod v[x] for some x in D, so nievely such solutions give you running times like O(price * |D|), which kinda sucks actually.  Just one simplified example : +There is however no assurence that t[x] = price mod v[x] for some x in D, so naively such solutions give you running times like O(price * |D|), which kinda sucks actually.  Just one simplified example :   http://www.codeproject.com/Articles/31002/Coin-Change-Problem-Using-Dynamic-Programming diff --git a/contrib/articles/ui/ui-cameraready.tex b/contrib/articles/ui/ui-cameraready.tex index ef79d91ba..305b77258 100644 --- a/contrib/articles/ui/ui-cameraready.tex +++ b/contrib/articles/ui/ui-cameraready.tex @@ -881,7 +881,7 @@ the page.  Then the wallet inspects the response as it may contain  error reports about a failed payment which the wallet has to handle.  By submitting the payment this way, we also ensure that this  intermediate request does not require JavaScript and still does not -interfer with navigation.  Once the Web shop confirms the payment, the +interfere with navigation.  Once the Web shop confirms the payment, the  wallet causes the fulfillment URL to be reloaded.  If the contract hash does not match a payment which the user @@ -937,7 +937,7 @@ it has the following key advantages:      other users has the expected behavior      of asking the other user to pay for the resource.    \item Asynchronously transmitting coins from injected JavaScript costs -    one roundtrip, but does not interfer with navigation and allows +    one roundtrip, but does not interfere with navigation and allows      proper error handling.    \item The different pages of the merchant have clear      delineations: the shopping pages conclude by making an offer, and diff --git a/contrib/articles/ui/ui.tex b/contrib/articles/ui/ui.tex index 37cd8b076..620dd5ecd 100644 --- a/contrib/articles/ui/ui.tex +++ b/contrib/articles/ui/ui.tex @@ -933,7 +933,7 @@ the page.  Then the wallet inspects the response as it may contain  error reports about a failed payment which the wallet has to handle.  By submitting the payment this way, we also ensure that this  intermediate request does not require JavaScript and still does not -interfer with navigation.  Once the Web shop confirms the payment, the +interfere with navigation.  Once the Web shop confirms the payment, the  wallet causes the fulfillment URL to be reloaded.  If the contract hash does not match a payment which the user @@ -989,7 +989,7 @@ it has the following key advantages:      other users has the expected behavior      of asking the other user to pay for the resource.    \item Asynchronously transmitting coins from injected JavaScript costs -    one roundtrip, but does not interfer with navigation and allows +    one roundtrip, but does not interfere with navigation and allows      proper error handling.    \item The different pages of the merchant have clear      delineations: the shopping pages conclude by making an offer, and  | 
