Merge branch 'master' of gnunet.org:www

1 files changed, 3 insertions, 20 deletions

diff --git a/index.html.j2 b/index.html.j2
index 5e93204f..8af94b14 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -7,27 +7,13 @@
 
     <p>
       {% trans %}
-<!-- GNUnet is neither just P2P nor just a framework.
-     It's a new Internet protocol stack.
-     Also: it makes no sense to always update/regenerate
-     the locale files if we are not agreeing on the
-     content of these web pages, yet.
- -->
 GNUnet is a new network stack for building secure, decentralized and
 privacy-preserving applications. Our goal is to replace the
 old insecure Internet protocol stack.
 <br><br>
-GNUnet uses the physical Internet infrastructure as a basis for a 100%% peer-to-peer framework for applications to run on [link to GNUnet layer grafic].
+GNUnet uses the physical Internet infrastructure as a basis for a 100% peer-to-peer framework for applications to run on [link to GNUnet layer grafic].
 <br><br>
 GNUnet is made for an open society: GNUnet is a self-organizing network, it's free software, as in freedom [link free software]. GNUnet puts you in control of your data. You determine which data to share with whom.
-<!--
-  Why did this part get removed?
-
-Starting from an application
-for secure publication of files, GNUnet has grown to include all
-kinds of basic protocol components and applications towards the
-creation of a GNU Internet.
- -->
       {% endtrans %}
      </p>
 
@@ -42,7 +28,7 @@ creation of a GNU Internet.
 <div class="container text-center">
   <h3>
     {% trans %}
-    The conventional Internet currently is like a system of roads with deep potholes and highwaymen all over the place: Even if you still can use the roads (e.g. send emails or browse websites) your car might get hijacked, damaged, or long ugly arms might reach into its back windows and steal your items (data) to use it against you and sell it to others - while you can't even notice the thievery nor accuse and hold the scroungers accountable.
+    The conventional Internet is currently like a system of roads with deep potholes and highwaymen all over the place; Even if you still can use the roads (e.g. send emails, or browse websites) your vehicle might get hijacked, damaged, or long ugly arms might reach into its back and steal your items (data) to use it against you and sell it to others - while you can't even notice the thievery nor accuse and hold the scroungers accountable.
     <br><br>
     The Internet of tomorrow needs GNUnet today.
     {% endtrans %}
@@ -61,10 +47,7 @@ creation of a GNU Internet.
   Please name abbreviations + short explanations for abbreviations.
  -->
         <br><br>
-        GNUnet is an Internet <a href="https://www.w3.org/2014/strint/papers/65.pdf">secure-by-design</a>, addressing addressing, routing, naming and content distribution in a technically robust manner - as opposed to ad-hoc designs in place today.
-<!--
-  "addressing addressing"? correct?
- -->
+        GNUnet is an Internet <a href="https://www.w3.org/2014/strint/papers/65.pdf">secure-by-design</a>, improving addressing, routing, naming and content distribution in a technically robust manner - as opposed to ad-hoc designs in place today.
         {% endtrans %}
       </p>
     </div>