From ca901e4b99a037553a5afe1beeb50255aeecb27c Mon Sep 17 00:00:00 2001
From: ng0 <ng0@taler.net>
Date: Tue, 10 Dec 2019 00:47:36 +0000
Subject: merge new website generation.

---
 template/features.html.j2 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'template/features.html.j2')

diff --git a/template/features.html.j2 b/template/features.html.j2
index e4c44485..c97517ee 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -42,7 +42,7 @@
          When making a payment, customers only need a charged wallet.
          A merchant can accept payments
          <span class="tlr">without making their customers register</span>
-         on the merchant's Website.
+         on the merchant&#39;s Website.
        {% endtrans %}
     </p>
 
@@ -57,7 +57,7 @@
     </p>
     </div>
     <div class="col">
-      <img class="img-fluid" src="../images/diagram-simple.png">
+      <img class="img-fluid" src="{{ url_static('images/diagram-simple.png') }}">
     </div>
   </div>
 </div>
@@ -71,7 +71,7 @@
           {% trans %}
             To pay with Taler, customers install an electronic wallet
             on their device.  Before the first payment, the desired currency
-            must be added to the wallet's balance
+            must be added to the wallet&#39;s balance
             by some other means of payment.
           {% endtrans %}
         </p>
@@ -97,8 +97,8 @@
             To receive Taler payments, a merchant needs a bank account
             in the desired currency.  We provide supporting software
             in various programming languages to make the integration painless.
-            The merchant's backend for Taler transaction processing can run
-            on the merchant's premises or be hosted by a third party.
+            The merchant&#39;s backend for Taler transaction processing can run
+            on the merchant&#39;s premises or be hosted by a third party.
           {% endtrans %}
         </p>
         <p>
@@ -144,7 +144,7 @@
           Taler does not introduce a new currency. Taler
           uses a digital wallet storing coins and payment service
           providers with escrow accounts in existing currencies.
-          Thus, Taler's cryptographic coins correspond to existing
+          Thus, Taler&#39;s cryptographic coins correspond to existing
           currencies, such as US Dollars, Euros or even Bitcoins.
         {% endtrans %}
       </p>
@@ -170,7 +170,7 @@
 
       <p>
         {% trans %}
-          When using Taler, merchant's revenue is transparent for tax
+          When using Taler, merchant&#39;s revenue is transparent for tax
           collection authorities.  Unlike cash and most digital currencies,
           Taler helps prevent black markets.  Taler is not suitable for
           illegal activities.
-- 
cgit v1.2.3