[GNUnet-SVN] [taler-www] branch master updated (5735495 -> 1c4b198)

[gnunet]

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

dold pushed a change to branch master
in repository www.

    from 5735495  i18 marking cleanup
     new 62ef7c1  link bibliography
     new 1c4b198  add FAQ answer

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 common/footer.j2.inc     |  1 +
 common/navigation.j2.inc |  1 +
 faq.html.j2              | 11 +++++++++++
 web-common               |  2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 55d181d..a44f159 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -20,6 +20,7 @@
           <ul class="footer-list">
             <li><p><a href="developers.html">{{ _("Developer Resources") 
}}</a></p></li>
             <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
+            <li><p><a href="bibliography.html">{{ _("Bibliography") 
}}</a></p></li>
           </ul>
         </div>
       </div>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 9f9845e..3be7f17 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -11,6 +11,7 @@
           <li><a href="architecture.html">System Architecture</a></li>
           <li><a href="faq.html">FAQ</a></li>
           <li><a href="developers.html">Developer Introduction</a></li>
+          <li><a href="bibliography.html">Bibliography</a></li>
         </ul>
       </li>
     </ul>
diff --git a/faq.html.j2 b/faq.html.j2
index 6f49d32..fc76f95 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -23,5 +23,16 @@ like with a physical wallet for cash, you are responsible 
for keeping it safe.</
 
 <p>In case of a compromise of one of your devices, an attacker that spends 
coins on your behalf will
 make it possible for you to know that you've been compromised, which can be an 
advantage.</p>
+
+<h2>Can I send money to my friend with Taler?</h2>
+You can <emph>share</emh> coins in your wallet with people you trust, like
+family or friends.  Whenever these shared coins are spent, the other copies
+become invalid.  Sharing coins this does not constitute a transaction, is not 
taxable
+and requires trust between the sharing parties.
+
+If your friend provides goods or services for you in exchange for a payment,
+they can easily set up a Taler merchant and receive the payment on their bank 
account.
+
+
 </div>
 {% endblock body_content %}
diff --git a/web-common b/web-common
index 80f1e27..caf5a98 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit 80f1e2708dbe4b19349244b611a6167b4b7a98c9
+Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c

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