diff --git a/pages/00.home/docs.fr.md b/pages/00.home/docs.fr.md
index 69225b9b..99504d71 100644
--- a/pages/00.home/docs.fr.md
+++ b/pages/00.home/docs.fr.md
@@ -1,34 +1,30 @@
 ---
-title: Documentation
+title: Bienvenue!
 template: docs
 taxonomy:
     category: docs
 routes:
   default: '/docs'
+  aliases:
+    - '/'
 visible: false
 ---
 
-! This page is obsolete and should be reworked
+Ce site contiens la documentation de [YunoHost, un système d'exploitation libre qui vise à simplifier l'administration d'un serveur et à démocratiser l'auto-hébergement](/whatsyunohost).
 
-La documentation de YunoHost s’articule autour de deux sections :
+En tant que futur jardinier de votre propre serveur, commencez par visiter le [guide de l'administrateur](/admindoc) pour en savoir plus sur l'autohébergement, comment installer votre serveur, et installer vos premières applications.
 
-[[fa=fa-lock /] Guide de l’administrateur](/administrate?classes=btn,btn-lg,btn-primary)  
-Incluant l’installation, la gestion du serveur et des applications.
+Vous pouvez explorer ici le [catalogue d'application](/apps) installable sur votre serveur (bien qu'il soit aussi consultable directement depuis votre interface d'administration !)
 
-[[fa=fa-heart /] Guide du contributeur](/contribute?classes=btn,btn-lg,btn-error)  
-Qui contient tout ce que vous devez savoir à propos de nous et de notre manière de travailler.
+La [communauté](/community) est là si vous avez besoin d'aide : venez discuter sur les [salons de discussions](/chat_rooms) ou posez vos questions sur le [forum](/community/forum) !
 
-* Vie du projet :
-   * [Foire aux questions](/faq)
-   * [Nouvelles du projet](/news)
-   * [Organisation du projet](/project_organization)
-   * [Budget previsionnel](/project_budget)
-   * [Forum](https://forum.yunohost.org)
-   * [Salons de discussions](/chat_rooms)
-   * [Communication extérieure](/communication)
-   * [Support / Aide](/help)
-   * [Mécénes et partenaires](/sponsors_partners_fr)
+[center]
 
-* Exemple d'utilisation :
-   * [YunoHost pour les organisations à but non lucratif](/use_case_non-profit_organisations)
-   * [YunoHost pour les CHATONS (Collectif des Hébergeurs Alternatifs, Transparents, Ouverts, Neutres et Solidaires)](https://wiki.chatons.org/doku.php/yunohost)
+<a href="/docbeta/en/admindoc" class="btn btn-lg btn-primary inline"><i class="fa fa-cogs"></i> Guide d'administration</a>
+<a href="/docbeta/en/apps" class="btn btn-lg btn-success inline"><i class="fa fa-cubes"></i> Applications</a>
+<a href="/docbeta/en/contribute" class="btn btn-lg btn-primary" style="background: blueviolet;border-color: blueviolet;"><i class="fa fa-users"></i> Communauté</a>
+<a href="/docbeta/en/contribute" style="background: orange; border-color: orange;" class="btn btn-lg btn-error"><i class="fa fa-heart"></i> Contribuer</a>
+
+[/center]
+
+!!!! Pour naviguer dans cette documentation, vous pouvez utiliser les flèches gauches et droites. Utilisez le [fa=bars /] panneau latéral pour aller directement dans les sections qui vous intéresse ou en utilisant la [fa=search /] barre de recherche. Enjoy!
diff --git a/pages/00.home/docs.md b/pages/00.home/docs.md
index a2c6cd5a..62ee92cc 100644
--- a/pages/00.home/docs.md
+++ b/pages/00.home/docs.md
@@ -10,23 +10,21 @@ routes:
 visible: false
 ---
 
-This is the documentation for YunoHost, a libre operating system whose aim is to democratize self-hosting and server administration.
+This is the documentation for [YunoHost, a libre operating system aiming to simplify server administration and democratize self-hosting](/whatsyunohost).
 
 As a soon-to-be administrator of your own server, go to the [Admin guide](/admindoc) to learn more about self-hosting, how to install your YunoHost server and install your first apps.
 
-Your server's administration interface offers an [Apps catalog](/apps). If you are eager to see which apps have been packaged for YunoHost, you can explore it here too!
+You can check out the [application catalog](/apps) to browse apps that can be installed on a server (though you can also explore it directly from your admin interface !)
 
-The [Community](/community) is here for you, if you need some help to [chat](/chat_rooms) with us or reach the [forum](/community/forum), or read more about our project organization.
+The [Community](/community) is here for you if you need some help : come [chat](/chat_rooms) with us or reach out on the [forum](/community/forum) !
 
 [center]
-[[fa=fa-cogs /] Administrator's guide](/admindoc?classes=btn,btn-lg,btn-primary,inline)
-[[fa=fa-cubes /] Applications](/apps?classes=btn,btn-lg,btn-success,inline)
-[[fa=fa-users /] Community](/contribute?classes=btn,btn-lg,btn-primary)
-[[fa=fa-heart /] Get involved](/contribute?classes=btn,btn-lg,btn-error)
+
+<a href="/docbeta/en/admindoc" class="btn btn-lg btn-primary inline"><i class="fa fa-cogs"></i> Administrator's guide</a>
+<a href="/docbeta/en/apps" class="btn btn-lg btn-success inline"><i class="fa fa-cubes"></i> Applications</a>
+<a href="/docbeta/en/contribute" class="btn btn-lg btn-primary" style="background: blueviolet;border-color: blueviolet;"><i class="fa fa-users"></i> Community</a>
+<a href="/docbeta/en/contribute" style="background: orange; border-color: orange;" class="btn btn-lg btn-error"><i class="fa fa-heart"></i> Get involved</a>
+
 [/center]
 
-If you are curious about what YunoHost can do, you can check out our use examples:
-* [YunoHost for non-profit organisations](/use_case_non-profit_organisations)
-* (FR) [YunoHost for CHATONS (A collective of independent, transparent, open, neutral and ethical hosters providing FLOSS-based online services.)](https://wiki.chatons.org/doku.php/yunohost)  
-
-!!!! To navigate this documentation, you can use your left and right arrow keys. Browse directly to the section you want with the [fa=bars /] side panel, which also shows you the pages you have already read and offers a [[fa=search /] search box](/search/query:hosting). Enjoy!
+!!!! To navigate this documentation, you can use your left and right arrow keys. Browse directly to the section you want with the [fa=bars /] side panel, or using the [fa=search /] search box. Enjoy!