--- a/templates/sat_website/features.html	Mon Apr 27 16:21:45 2015 +0200
+++ b/templates/sat_website/features.html	Wed Apr 29 13:04:15 2015 +0200
@@ -28,76 +28,44 @@
 {% block extra %}<span class="label label-success">{% trans "Click on the feature name to have a more detailed description" %}</span>{% endblock %}
 {% block main_container %}
 
-	<div class="row">
+    <div class="row">
+        <div class="col-md-2">
+            <strong>{% trans "Blogging" %}</strong>
+        </div>
+        <div class="col-md-7 feature">
+            {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %}
+        </div>
+    </div>
+    <div class="row">
 		<div class="col-md-2">
-			<strong>{% trans "Blogging" %}</strong>
+			<strong>{% trans "Chat" %}</strong>
 		</div>
 		<div class="col-md-7 feature">
-			{% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this combines many of the most popular usecases of the Internet nowaday. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %}
+			{% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %}
 		</div>
 	</div>
-	<div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Advanced chat and group chat" %}</strong>
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people... Most of the time you will like to record your communication history, but you can also encrypt it to ensure that the one and only one person you chose will be able to read it.{% endblocktrans %}
-		</div>
-	</div>
-	<div class="row">
+    <div class="row">
 		<div class="col-md-2">
 			<strong>{% trans "Activities" %}</strong>
 		</div>
 		<div class="col-md-7 feature">
-			{% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same window with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allow you to share some music with your friends and hear it at the same time.{% endblocktrans %}
+			{% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% endblocktrans %}
 		</div>
 	</div>
     <div class="row">
         <div class="col-md-2">
-            <strong>{% trans "File sharing and stream transmissions" %}</strong>
+            <strong>{% trans "File sharing" %}</strong>
         </div>
         <div class="col-md-7 feature">
-            {% blocktrans %}Easily send file to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralized file sharing system so you could create a private Bitorrent-like file sharing system within a group a friends.{% endblocktrans %}
+            {% blocktrans %}Easily send files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %}
         </div>
     </div>
 	<div class="row">
 		<div class="col-md-2">
-			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">E-mail clients interactions</a>{% endblocktrans %}
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to communicate through SàT. Combinate this with the gateway feature, and you can send message with it to any network (including traditional e-mail network). One of the goal of SàT is to allow easy transition to Jabber as an alternative to classical e-mail network, with a better protection against SPAM and identity spoofing.{% endblocktrans %}
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-2">
-			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/10/07/Shell%3A-pipe-you-commands-out-via-XMPP-with-S%C3%A0T">Pipe over XMPP</a>{% endblocktrans %}
+			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">Email interaction</a>{% endblocktrans %}
 		</div>
 		<div class="col-md-7 feature">
-			{% blocktrans %}This is a feature for power-user: SàT allows to send command-line tools' stdout to your contacts. This actually is as easy as knowing the name of your contact.{% endblocktrans %}
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-2">
-			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2013/02/22/Export-command-to-a-contact-%28with-video%29">Export Unix commands</a>{% endblocktrans %}
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}An other feature for power-user: you can export input/outputs of an Unix CLI command to any contact (using any XMPP client or even other protocols through gateways).{% endblocktrans %}
-		</div>
-	</div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-softwares">Ad-Hoc commands</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}You can remotely control your XMPP entities and all the softwares that offer DBus services. {% endblocktrans %}
-        </div>
-    </div>
-	<div class="row">
-		<div class="col-md-2">
-			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2012/02/02/Collective-radio-%28with-video%29">Collective radio</a>{% endblocktrans %}
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}Experiment music with your friends: in a multi-user room, you share a playlist; everybody can add songs to it, and everybody listens the same music at the same time. Good way to share your taste and discover new songs.{% endblocktrans %}
+			{% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -105,7 +73,7 @@
 			<strong>{% trans "Multiplatform" %}</strong>
 		</div>
 		<div class="col-md-7 feature">
-			{% blocktrans %}Since its begining, the SàT project was made with other platforms in mind. It's only avaible on Gnu/Linux so far (except of course Libervia, the web interface, which is available from every javascript powered browser), but other platforms are planed.{% endblocktrans %}
+			{% blocktrans %}Since its begining, the SàT project was made with other platforms in mind. It's only avaible on GNU/Linux so far (except of course Libervia, the web interface, which is available from any modern browser), but other platforms are planned.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -113,7 +81,7 @@
 			<a href="social_contract.html">{% trans "Social contract" %}</a>
 		</div>
 		<div class="col-md-7 feature">
-			{% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not exactly a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written as a moral engagement around the project. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
+			{% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
 		</div>
 	</div>