[GNUnet-SVN] [taler-www] branch stable updated (02a6191 -> 9e7994a)

[gnunet]

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

grothoff pushed a change to branch stable
in repository www.

    from 02a6191  minor fixes
     add c59f9d3  clearer answer
     add 9e7994a  update footer, rename design to princiles

No new revisions were added by this update.

Summary of changes:
 common/footer.j2.inc                 | 8 ++++----
 common/navigation.j2.inc             | 4 ++--
 faq.html.j2                          | 8 +++++---
 design.html.j2 => principles.html.j2 | 0
 about.html.j2 => team.html.j2        | 0
 web-common                           | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename design.html.j2 => principles.html.j2 (100%)
 rename about.html.j2 => team.html.j2 (100%)

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 5d197b8..7b97597 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -6,19 +6,19 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-12 col-sm-4">
+      <div class="col-12 col-sm-6">
         <ul class="footer-list">
           <li><p><a href="about.html">{{ _("About") }}</a></p></li>
           <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
         </ul>
       </div>
-      <div class="col-12 col-sm-4">
+      <!-- div class="col-12 col-sm-4">
         <ul class="footer-list">
           <li><p><a href="gsoc-codeless.html.j2">{{ _("GSoc 2018") 
}}</a></p></li>
           <li><p><a href="developers.html">{{ _("Developer Resources") 
}}</a></p></li>
         </ul>
-      </div>
-      <div class="col-12 col-sm-4">
+      </div -->
+      <div class="col-12 col-sm-6">
         <ul class="footer-list">
           <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
           <li><p><a href="bibliography.html">{{ _("Bibliography") 
}}</a></p></li>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 420e57e..74d932b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -13,9 +13,9 @@
     <ul class="navbar-nav mr-auto">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a 
class="navbar-brand taler_home" href="index.html">Taler</a></li>
       <li class="nav-item {{ 'active' if filename == 'features.html' else '' 
}}"><a class="nav-link" href="features.html">{{ _("Features") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'design.html' else '' 
}}"><a class="nav-link" href="design.html">{{ _("Design") }} </a></li>
+      <li class="nav-item {{ 'active' if filename == 'principles.html' else '' 
}}"><a class="nav-link" href="principles.html">{{ _("Principles") }} </a></li>
       <li class="nav-item"><a class="nav-link" 
href="https://docs.taler.net/";>{{ _("Docs") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'about.html' else '' 
}}"><a class="nav-link" href="about.html">{{ _("Team") }}</a></li>
+      <li class="nav-item {{ 'active' if filename == 'team.html' else '' 
}}"><a class="nav-link" href="team.html">{{ _("Team") }}</a></li>
     </ul>
     <ul class="navbar-nav navbar-right">
       <li class="nav-item dropdown">
diff --git a/faq.html.j2 b/faq.html.j2
index 0feabc8..f3657f7 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/design.html.j2 b/principles.html.j2
similarity index 100%
rename from design.html.j2
rename to principles.html.j2
diff --git a/about.html.j2 b/team.html.j2
similarity index 100%
rename from about.html.j2
rename to team.html.j2
diff --git a/web-common b/web-common
index caf5a98..dc9d5ab 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
+Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb

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