summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-06-27 13:16:43 +0200
committerChristian Grothoff <christian@grothoff.org>2019-06-27 13:16:43 +0200
commitc59f9d3b6f4805eace9f2345a4f7f1d0e9344b96 (patch)
tree17a6708d68dbe3bfee0975870494f48cc92c4b54
parent02a6191a95a2cd9d5f54cadf473eb5b150662e7b (diff)
downloadwww-c59f9d3b6f4805eace9f2345a4f7f1d0e9344b96.tar.gz
www-c59f9d3b6f4805eace9f2345a4f7f1d0e9344b96.tar.bz2
www-c59f9d3b6f4805eace9f2345a4f7f1d0e9344b96.zip
clearer answer
-rw-r--r--faq.html.j28
m---------web-common0
2 files changed, 5 insertions, 3 deletions
diff --git a/faq.html.j2 b/faq.html.j2
index 0feabc82..f3657f7c 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -4,9 +4,11 @@
<h2>{{ _("How is Taler related to Bitcoin or Blockchains?") }}</h2>
{% trans %}
-<p>Taler does not use any Blockchain technology or Bitcoin directly.
-Taler is not based on proof-of-work or any other distributed consensus
-mechanism. Instead Taler is based on blind signatures.</p>
+<p>Taler does not require any Blockchain technology, and is
+also not based on proof-of-work or any other distributed consensus
+mechanism. Instead, Taler is based on blind signatures.
+However, it is theoretically possible to combine Taler with
+peer-to-peer crypto-currencies like Bitcoin.</p>
{% endtrans %}
{% trans %}
<p>It would be possible, however, to withdraw coins denominated in
diff --git a/web-common b/web-common
-Subproject caf5a98114402d057ba08b14279eb8e46481a02
+Subproject dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bf