Merge branch 'master' of taler:www

6 files changed, 59 insertions, 22 deletions

diff --git a/about.html b/about.html
index 8c439850..1a6f7a56 100644
--- a/about.html
+++ b/about.html
@@ -14,7 +14,7 @@
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
-          <h2>Christian Grothoff</h2>
+          <h2><a href="http://grothoff.org/christian/">Christian Grothoff</a></h2>
           <p>Local megalomaniac. I mean, who'd create a new payment system and a new Internet?</p>
         </div>
         <div class="col-lg-4">
@@ -36,7 +36,7 @@
           <p>Loves SEPA.</p>
         </div>
         <div class="col-lg-4">
-          <h2>Richard M. Stallman</h2>
+          <h2><a href="https://www.stallman.org/">Richard M. Stallman</a></h2>
           <p>Ethics enthusiast.</p>
         </div>
       </div>
diff --git a/citizens.html b/citizens.html
index b617c286..1f3964da 100644
--- a/citizens.html
+++ b/citizens.html
@@ -18,23 +18,38 @@
 
       <!-- Example row of columns -->
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Security</h2>
-          <p>.</p>
+          <p>Taler is the electronic equivalent of cash, except harder to fake.
+             If your digital wallet is lost -- say because
+             your computer is irreparably damaged or compromised -- only the amount of coin
+             stored in your wallet will be lost. Unlike a physical wallet, you can make
+             backups of your digital wallet which can provide security against data loss.
+             So your digital wallet works mostly just like
+             a physical wallet, except online and without the need to manually count coins.</p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Privacy</h2>
-          <p>.</p>
+          <p>Your transactions are private, neither the mint (bank) nor merchant needs to
+             learn your identity. There is no need to give our credit card numbers or
+             other sensitive information, and the merchant will only be able to do
+             exactly the transaction you confirmed using your digital wallet.</p>
        </div>
       </div>
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Convenience</h2>
-          <p>.</p>
+          <p>You will be able to withdraw digital coins to replenish your wallet using
+             your credit card or SEPA transactions, similar to how you pay or withdraw
+             cash today.  </p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Stability </h2>
-          <p>.</p>
+          <p>Coins in your digital wallet will be of the same denomination as the
+             cash in your physical wallet. So you will not have to worry about
+             currency fluctuations or conversion rates. Like a physical wallet,
+             you can carry digital coins of different currencies in your digital
+             wallet at the same time.</p>
         </div>
       </div>
 
diff --git a/developers.html b/developers.html
index d6eec334..75f952a1 100644
--- a/developers.html
+++ b/developers.html
@@ -18,14 +18,14 @@
 
       <!-- Example row of columns -->
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Libre</h2>
           <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.
              Different components of Taler are being made available under different licenses. The Affero GPLv3+ is used for the Mint, the LGPLv3+ is used for reference
              code demonstrating integration with merchant platforms, and licenses like Apache/Mozilla/GPLv3+ are used for wallets and related customer-facing software.
              We are open for constructive suggestions for maximizing the adoption of this libre payment platform.</p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>RESTful</h2>
           <p>Taler is designed to work on the Internet.  To ensure that Taler payments can work with restrictive network setups, Taler uses a RESTful protocol over
              HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but obviously merchants may choose to offer HTTPS for consistency and because
@@ -34,13 +34,13 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Code</h2>
           <p>Taler is currently primarily developed by a research team at Inria and TU Munich. However, contributions from anyone are welcome.
              Our Git repositories can be cloned using the Git and HTTP access methods against <tt>git.taler.net</tt> with the name of the
              respective repository.  A list of public repositories can be found in our <a href="http://www.git.taler.net/">GitWeb</a>.</p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Documentation</h2>
           <p>In addition to this website, the <a href="http://www.git.taler.net/">documented code</a>
              and the <a href="http://api.taler.net/">API documentation</a>, we are in the process of
diff --git a/governments.html b/governments.html
index 45a64af0..c9527c76 100644
--- a/governments.html
+++ b/governments.html
@@ -19,7 +19,7 @@
 
       <!-- Example row of columns -->
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Taxable</h2>
           <p lang="en">Taler is an electronic payment system that was built with the goal of supporting taxation.
              With Taler, the receiver of any form of payment is known, and the payment information comes
@@ -34,7 +34,7 @@
 	     Schwarzmarkthandel.</p>
 	  <p lang="fr">Cécile</p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Secure</h2>
           <p lang="en">Taler's payments are cryptographically secured. Thus, customers, merchants and
              the mint can mathemtically demonstrate their lawful behavior in court in case
@@ -55,7 +55,7 @@
        </div>
       </div>
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Libre</h2>
           <p lang="en">Taler is free software implementing an open protocol standard.  Thus, Taler will
              enable competition and avoid the monopolization of payment systems that threatens
@@ -66,7 +66,7 @@
 	     Zahlungssystemen, welche heute in globalem Ausma&szlig; die politische
 	     sowie aber auch die finanzielle Stabilit&auml;t bedroht.</p>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-6">
           <h2>Efficient</h2>
           <p lang="en">Taler is designed to be efficient.  Unlike timeline-based payment systems like
              BitCoin, Taler will not threaten the availability of national electric grids or
diff --git a/investors.html b/investors.html
index 309b8266..9fa62a58 100644
--- a/investors.html
+++ b/investors.html
@@ -18,15 +18,32 @@
       <div class="row">
         <div class="col-lg-4">
           <h2>Efficient</h2>
-          <p>.</p>
+          <p>Taler uses efficient cryptographic primitives (such as RSA 2048 and
+             EdDSA) and is thus expected to be able to handle large transaction
+             volumes, only limited by the input/output capabilities of the
+             database. Thus, running a Taler mint should be profitable even
+             with very low (less than 1 cent) transaction fees (at appropriate
+             transaction volume).</p>
         </div>
         <div class="col-lg-4">
           <h2>Secure</h2>
-          <p>.</p>
+          <p>All transactions in Taler are secured using modern cryptography and
+             trust in all parties is minimized. Financial damage is bounded
+             (for customers, merchants and the mint) even
+             in the case that systems are compromised and private keys are stolen.
+             Databases can be audited for consistency, resulting in either the
+             detection of compromised systems or the demonstration that
+             participants were honest.</p>
        </div>
         <div class="col-lg-4">
           <h2>Business Model</h2>
-          <p>.</p>
+          <p>The basic business model for Taler is the operation of a mint.  A
+             mint converts money from traditional payment systems (Mastercard,
+             SEPA, Visa, BitCoin, ACH, SWIFT, etc.) to anonymous electronic
+             coins in the same currency. The customer can then redeem the electronic
+             coins at a merchant, who can exchange them for money represented using
+             traditional payment systems at the mint.  The mint can then charge
+             fees (to the customer, merchant or both) to facilitate the transactions.</p>
         </div>
       </div>
       <!--# include file="common/footer.inc" -->
diff --git a/main.html b/main.html
index a329b0fe..0ae00ed3 100644
--- a/main.html
+++ b/main.html
@@ -5,17 +5,22 @@
     <title lang="en">Taler - Taxable Anonymous Libre Electronic Reserves</title>
     <title lang="de">Taler - Taxierbare Anonyme Liberale Elektronische Reserven</title>
     <title lang="fr">Taler - Taxable Anonyme Libre Électronique Taxable Réserve</title>
-    <meta name="description" content="">
+    <meta name="description" content="Anonymous electronic payments for civil society">
       <!--# include file="common/header.inc" -->
   </head>
   <body class="en">
     <div class="container">
       <!--# include file="common/navigation.inc" -->
       <!-- Jumbotron -->
+      <img width="100%" src="images/logo-2014.png"></img>
       <div class="jumbotron">
          <h1 lang="en">Electronic Payments for Libre Society!</h1>
          <h1 lang="de">Elektronisches Bezahlen f&uuml;r eine freiheitliche Gesellschaft!</h1>
          <h1 lang="fr">Paiements électroniques pour société libre!</h1>
+         <p lang="en">Taler is a new electronic payment system under development at <a href="http://www.inria.fr/">Inria</a>.
+                      Today, this website only presents the advantages our system is expected to provide.
+                      During 2015, we will make more code and documentation public.  We expect to make
+                      the payment system available to the general public in 2016.</p>
          <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get started today</a></p -->
       </div>