[GNUnet-SVN] [taler-www] branch stable updated (60debf9 -> 23a6bd7)

[gnunet]

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

grothoff pushed a change to branch stable
in repository www.

    from 60debf9  fix principles page layout
     add 23a6bd7  shorten Free Software text blob

No new revisions were added by this update.

Summary of changes:
 principles.html.j2 | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/principles.html.j2 b/principles.html.j2
index 8b377c3..3aba840 100644
--- a/principles.html.j2
+++ b/principles.html.j2
@@ -27,28 +27,19 @@ h2 {
     <div class="col-lg-6">
       <h2>1. Free Software implementation</h2>
       <p>
-        Free refers to “free as in free speech”, as opposed to “free as in 
free beer”.
-        More specifically, the four essential freedoms of free software must
-        be respected, namely users must have the freedom to (1) run the 
software,
-        (2) study and modify it, (3) redistribute copies, and (4) distribute 
copies of
-        the modified version.
-      </p>
-      <p>
-        For merchants this prevents vendor lock-in, as another payment 
provider can
+        GNU Taler must be <a 
href="https://www.gnu.org/philosophy/free-sw.html";>Free Software</a>.
+        For merchants the Free Software
+        reference implementation prevents vendor lock-in, as another payment 
provider can
         take over, should the current one provide inadequate quality of 
service. As
         the software of the payment provider itself is free, smaller or 
disadvantaged
         countries or organizations can run the payment system without being
-        controlled by a foreign company. Customers benefit from this freedom,
+        controlled by a foreign company.
+       </p>
+       <p>
+        Customers benefit from Free Software
         as the wallet software can be made to run on a variety of platforms, 
and
-        user-hostile features such as tracking or telemetry could easily be 
removed
-        from wallet software.
-      </p>
-      <p>
-        This rules out the mandatory usage of specialized hardware such as 
smart
-        cards or other hardware security modules, as the software they run 
cannot
-        be modified by the user. These components can, however, be voluntarily
-        used by merchants, customers or payment processors to increase their
-        operational security.
+        the absence of user-hostile features such as tracking or telemetry can 
easily be
+        assured.
       </p>
     </div>
     <div class="col-lg-6">

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