Merge branch 'master' into dev-doc

admindoc_de.md

@@ -0,0 +1,45 @@
+# Administrator-Dokumentation
+
+* Self-Hosting entdecken
+    * [Was ist Self-Hosting](/selfhosting)
+    * [Was ist YunoHost](/whatsyunohost)
+    * [Probiere YunoHost aus](/try)
+    * [Wie du selber hostest](howtohostyourself)
+        * [Wähle die Hardware](/hardware)
+        * [Über die Freundlichkeit von Internet-Service-Providern](/isp)
+* [YunoHost installieren](/install)
+    * [Auf einem normalen Computer](/install_iso)
+    * [Auf einem eigenen oder virtuellen Server](/install_on_vps)
+    * [Auf einem Raspberry Pi](/install_on_raspberry)
+    * [Auf einem ARM-Board](/install_on_arm_board)
+    * [Auf Debian](/install_on_debian)
+    * [Auf VirtualBox](/install_on_virtualbox)
+* Setup abschließen
+    * [Nach der Installation](/postinstall)
+    * [Port-Forwarding konfigurieren](/isp_box_config)
+    * [DNS-Einträge konfigurieren](/dns_config)
+    * [SSL-Zertifikate installieren](/certificate)
+    * [Diagnostiziere deine Installation](/diagnostic)
+* YunoHost kennenlernen
+    * [Übersicht über YunoHost](/overview)
+    * [Allgemeine Hinweise und Hilfestellungen](/guidelines)
+    * [Web-Administrations-Interface](/admin)
+    * [SSH](/ssh) and [command-line administration](/commandline)
+    * [Benutzer und SSO (Single-Sign-On)](/users)
+    * [Applicationen](/apps_overview)
+    * [Domains, DNS und Zertifikate](/domains)
+    * [E-Mail](/email)
+    * [XMPP](/XMPP)
+    * [Datensicherung](/backup)
+    * [System-Update](/update) and [apps](/app_update)
+    * [Sicherheit](/security)
+* Weiteres
+    * [Noho.st / nohost.me / ynh.fr Domain-Namen](/dns_nohost_me)
+    * [Grafischer Dateiaustausch mit deinem Server](/filezilla)
+    * [Passe das Aussehen vom Yunohost-Portal an](/theming)
+    * [Für externen Speicher hinzu](/external_storage)
+    * [Migriere E-Mails zu Yunohost](/email_migration)
+    * [Verstecke Services mit Tor](/torhiddenservice)
+* [Hinweise zur Fehlersuche](/troubleshooting_guide)
+    * [Entsperren von IPs in fail2ban](/fail2ban)
+    * [Administrator-Passwort ändern](/change_admin_password)

app_gogs_fr.md

@@ -0,0 +1,13 @@
+# ![Logo de GOGS](images/gogs_logo.png) Gogs
+
+[![Install Gogs with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gogs)
+
+Gogs est une forge logiciel minimaliste utilisant git. Gogs a été conçu pour pouvoir fonctionner de manières optimale sur du matériel peu puissant type Raspberry Pi.
+Il est donc adapté à l'auto-hébergement d'une forge git.
+Pour utiliser pleinement la puissance de gogs vous devez avoir appréhender ce qu'est git et l'utilisation d'un [logiciel de gestion de versions](https://fr.wikipedia.org/wiki/Logiciel_de_gestion_de_versions).
+
+## <a name=LiensUtiles>Liens utiles</a>
+ - [Site Officiel - gogs.io](https://gogs.io)
+ - [Dépot applications gogs pour YunoHost](https://github.com/YunoHost-Apps/gogs_ynh)
+ - [Site officiel de l'outils git - git-scm.com](https://git-scm.com/)
+ - [Trouver de l'aide et poser toutes vos questions : forum.yunohost.org](https://forum.yunohost.org/c/support/apps)

app_nextcloud.md

@@ -72,8 +72,8 @@ chmod 775 -R /media/storage/nextcloud_data
 Migrate your data to the new disk. To do this *(be patient, it can take a long time)*:
 
 ```bash
-Case A: cp -ir /home/yunohost.app/nextcloud /media/storage
+Case A: cp -ia /home/yunohost.app/nextcloud /media/storage
-Case B: cp -ir /home/yunohost.app/nextcloud /media/storage/nextcloud_data
+Case B: cp -ia /home/yunohost.app/nextcloud /media/storage/nextcloud_data
 ```
 
 The `i` option allows you to ask yourself what to do if there is a file conflict, especially if you overwrite an old Owncloud or Nextcloud data folder.  
@@ -91,7 +91,7 @@ Case B: ls -al /media/storage/nextcloud_data/nextcloud
 To inform Nextcloud of its new directory, modify the `/var/www/nextcloud/config/config.php` file with the command:
 
 ```bash
-nano /var/www/nextcloud/config/config/config.php
+nano /var/www/nextcloud/config/config.php
 ```
 
 Look for the line:
@@ -142,7 +142,7 @@ If you use Cloudflare for your DNS, *which may be useful if you have a dynamic I
 In the Cloudflare control panel select your domain and find Page Rules
 the url in your address bar will look like this: https://dash.cloudflare.com/*/domain.tld/page-rules  
 
-#### Add a rule
+##### Add a rule
 
 The rule to be added must apply to the url of your Nextcloud instance either:
 
@@ -158,10 +158,14 @@ Save and clean your caches (Cloudflare, browser,...) and that's it.
 
 ## Third Party Applications <a name="AppsTiers"></a>
 
- + [KeeWeb](app_nextcloud_keeweb)
+ - [Calendrier](app_nextcloud_calendar)
+ - [contact](app_nextcloud_contact)
+ - [KeeWeb](app_nextcloud_keeweb)
+ - [Carnet](app_nextcloud_carnet)
 
 ## Useful links <a name="UsefulLinks"></a>
 
-+ Official website : [nextcloud.com](https://nextcloud.com/)  
+ - Official website : [nextcloud.com](https://nextcloud.com/)  
-+ Application catalogue for nextcloud : [apps.nextcloud.com](https://apps.nextcloud.com/)  
+ - Application catalogue for nextcloud : [apps.nextcloud.com](https://apps.nextcloud.com/)  
-+ Find help and ask all your questions : [forum.yunohost.org](https://forum.yunohost.org/c/support)  
+ - Find help and ask all your questions : [forum.yunohost.org](https://forum.yunohost.org/c/support)  
+

app_nextcloud_fr.md

@@ -72,8 +72,8 @@ chmod 775 -R /media/stockage/nextcloud_data
 Migrez vos données vers le nouveau disque. Pour ce faire *(soyez patient, cela peut être long)* :
 
 ```bash
-Cas A : cp -ir /home/yunohost.app/nextcloud /media/stockage
+Cas A : cp -ia /home/yunohost.app/nextcloud /media/stockage
-Cas B : cp -ir /home/yunohost.app/nextcloud /media/stockage/nextcloud_data
+Cas B : cp -ia /home/yunohost.app/nextcloud /media/stockage/nextcloud_data
 ```
 
 L'option `i` permet de vous demander quoi faire en cas de conflit de fichier, notamment si vous écrasez un ancien dossier de données Owncloud ou Nextcloud.  
@@ -133,7 +133,6 @@ sudo -u nextcloud php occ files:scan --all
 
 C'est terminé. À présent testez si tout va bien, essayez de vous connecter à votre instance Nextcloud, envoyer un fichier, vérifiez sa bonne synchronisation.
 
-
 ### Nextcloud et Cloudflare
 
 Si vous utilisez Cloudflare pour vos DNS, *ce qui peut-être pratique si vous avez une IP dynamique*, vous aurez très probablement des problèmes d'authentification avec l'application Nextcloud. Sur Internet beaucoup de gens propose de créer une règle ayant pour effet de désactivé tous les options relié à la sécurité et à la vitesse de Cloudflare pour l'url pointant sur votre instance Nextcloud. Malgré que cela fonctionne, ce n'est pas la solution optimial. Je vous propose, certes de créé une règle pour l'url pointant sur votre instance Nextcloud mais de désactivé seulement 2 options. Voici donc comment:
@@ -146,12 +145,9 @@ l'url dans votre barre d'addresse ressemblera à : https://dash.cloudflare.com/*
 #### Ajouter une règle
 
 La règle à ajouter doit s'appliquer pour l'url de votre instance Nextcloud soit:
-
 - `https://nextcloud.domain.tld/*` si vous utilisez un sous domain
 - `https://domain.tld/nextcloud/*` si vous avez déployé Nextcloud dans un répertoire
-
 Les options à désactiver (Off) sont :
-
 - Rocket Loader
 - Email Obfuscation
 

apps_wishlist.md

@@ -15,6 +15,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Ajenti](http://ajenti.org)
 - [Akaunting](https://akaunting.com) Everything you need to manage your finances. Keep track of all of your payments, invoices, expenses, etc.
 - [aMule](https://github.com/amule-project/amule)
+- [Anki](https://github.com/dsnopek/anki-sync-server) is a powerful Open Source flashcard application, which helps you quickly and easily memorize facts over the long term utilizing a spaced repetition algorithm.
 - [Auth0 SSO Dashboard](https://github.com/auth0-extensions/auth0-sso-dashboard-extension)
 - [Autoblog](https://github.com/mitsukarenai/Projet-Autoblog) (/!\ last update: Jan 27, 2015)
 - [Bitmessage](https://bitmessage.org/wiki/Compiling_instructions)
@@ -52,6 +53,8 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [FEX](http://fex.rus.uni-stuttgart.de/)
 - [FileTea](https://filetea.me)
 - [FitTrackee](https://github.com/SamR1/FitTrackee)
+- [FlatPress](https://github.com/flatpressblog/flatpress)
+- [Flarum](https://flarum.org/)
 - [FoOlSlide](http://foolcode.github.io/FoOlSlide/) Open source comicbook/manga management software
 - [Fossil](http://www.fossil-scm.org)
 - [Framaslides](https://framagit.org/framasoft/framaslides/)
@@ -103,8 +106,10 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [LocomotiveCMS](https://github.com/locomotivecms/engine)
 - [Logstalgia](http://logstalgia.io)
 - [Loomio](https://www.loomio.org)
+- [MagicMirror²](https://github.com/MichMich/MagicMirror)
 - [MaidSafe](http://maidsafe.net)
 - [Mailpile](https://www.mailpile.is)
+- [Mailtrain](https://mailtrain.org/)
 - [Mautic](https://github.com/mautic/mautic)
 - [MediaCrush](https://github.com/MediaCrush/MediaCrush) (/!\ last update: Jan 23, 2015)
 - [microblog.pub](https://microblog.pub)
@@ -117,6 +122,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Museek+](https://github.com/eLvErDe/museek-plus)
 - [Netrunner](https://github.com/mtgred/netrunner)
 - [Nibbleblog](http://www.nibbleblog.com)
+- [Nitter](https://github.com/zedeus/nitter) (Twitter front-end focused on privacy)
 - [Nuage](https://nuage.kerjean.me/login)
 - [Ombi](https://github.com/tidusjar/Ombi)
 - [OpenBazaar](https://openbazaar.org)
@@ -140,6 +146,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Privoxy](http://www.privoxy.org)
 - [ProcessMaker](http://www.processmaker.com)
 - [ProtonMail’s WebClient](https://github.com/ProtonMail/WebClient)
+- [ProjeQtOr](https://www.projeqtor.org/en/product-en/downloads)
 - [PyLoad](https://github.com/pyload/pyload)
 - [Pulse](https://source.ind.ie/project/pulse-swift/tree/master)
 - [Pump.io](http://pump.io)
@@ -153,6 +160,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Restya](http://restya.com)
 - [Retroshare](http://retroshare.net/downloads.html)
 - [SABnzbd](https://sabnzbd.org)
+- [Samourai Dojo, Bitcoin coinjoin node] (https://github.com/Samourai-Wallet/samourai-dojo)
 - [ScenariChain-server](https://download.scenari.software/SCENARIchain-server/)
 - [Scramble, Browser-based PGP web mail](https://github.com/dcposch/scramble)
 - [Scribbleton](https://scribbleton.com)
@@ -162,6 +170,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Simone](https://github.com/Kloadut/Simone)
 - [SocialHome](https://github.com/jaywink/socialhome) (Socialhome is best described as a federated personal profile with social networking functionality) (https://socialhome.network)
 - [Sonarr](https://sonarr.tv)
+- [SpamGourmet](https://sourceforge.net/projects/spamgourmet/)
 - [Stackedit](https://stackedit.io)
 - [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion.
 - [Streama](https://github.com/dularion/streama)
@@ -187,6 +196,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [WebTorrent](https://github.com/feross/webtorrent)
 - [Wisemapping](http://www.wisemapping.com)
 - [Wireguard](https://www.wireguard.com/)
+- [Xibo](https://github.com/xibosignage)
 - [Xonotic](http://xonotic.org)
 - [YesWiki](https://yeswiki.net)
 - [Zammad](https://github.com/zammad/zammad)

boot_and_graphical_install.md

@@ -9,10 +9,10 @@ If you want the network configuration to be set up automatically, you have to pl
 The wireless connections are not supported yet, and if you use intermediate routers, the network ports opening will not be automatic: Your server will not be accessible externally.
 
 
-## <small>2.</small> Boot on CD / USB key
+## <small>2.</small> Boot on CD / USB stick
 
-Boot up your server with the USB key or a CD-ROM inserted, and select it as **bootable device** by pressing one of the following keys (hardware specific):    
+Boot up your server with the USB stick or a CD-ROM inserted, and select it as **bootable device** by pressing one of the following keys (hardware specific):    
-```<ESC>```, ```<F8>```, ```<F10>```, ```<F11>```, ```<F12>``` or ```<SUPPR>```
+```<ESC>```, ```<F9>```, ```<F10>```, ```<F11>```, ```<F12>``` or ```<SUPPR>```
 
 ## <small>3.</small> Launch graphical installation
 

boot_and_graphical_install_fr.md

@@ -11,7 +11,7 @@ Les connexions sans-fil ne sont pas supportées pour le moment, et si vous utili
 ## <small>2.</small> Démarrer sur le CD/la clé USB
 
 Démarrez votre serveur avec la clé USB ou le CD-ROM inséré, et sélectionnez-le comme **périphérique de démarrage** en pressant l’une des touches suivantes (dépendant de votre ordinateur) :    
-```<Échap>```, ```<F8>```, ```<F10>```, ```<F11>```, ```<F12>``` or ```<Suppr>```
+```<Échap>```, ```<F9>```, ```<F10>```, ```<F11>```, ```<F12>``` or ```<Suppr>```
 
 ## <small>3.</small> Lancer l’installation graphique
 

burn_or_copy_iso.md

@@ -1,13 +1,13 @@
-# Flashing YunoHost ISO on a USB key or CD/DVD
+# Flashing the YunoHost ISO on a USB stick or CD/DVD
 
-Now that you have the ISO image of YunoHost, you have to put it on a physical medium: **USB key** or **CD/DVD**
+Now that you downloaded the ISO image of YunoHost, you should flash/burn it on a physical medium. Typically, this is done on a **USB stick** but you might want to use a **CD/DVD** for older machines.
 
 <img src="/images/usb_key.png" width=150>
 <img src="/images/cd.jpg" width=150>
 
 ---
 
-## USB key
+## USB stick
 
 ### With Etcher
 
@@ -15,7 +15,7 @@ Download <a href="https://etcher.io/" target="_blank">Etcher</a> for your operat
 
 <img src="/images/etcher.gif">
 
-Put your USB key on, select your YunoHost ISO and click "Flash"
+Plug your USB stick, select your YunoHost ISO and click "Flash"
 
 ### With UNetbootin
 
@@ -23,12 +23,12 @@ Download <a href="https://unetbootin.github.io/">UNetbootin</a> for your operati
 
 <img src="/images/unetbootin.png">
 
-Put your USB key on, select your YunoHost ISO and click "OK"
+Put your USB stick on, select your YunoHost ISO and click "OK"
 
 ### With `dd`
 
-If you know your way around command line, you may also flash your USB key with
+If you know your way around command line, you may also flash your USB stick with
-`dd`. Assuming your USB key is `/dev/sdb` (be careful !!), you may run :
+`dd`. Assuming your USB stick is `/dev/sdb` (be careful !!), you may run :
 
 ```bash
 dd if=/path/to/yunohost.iso of=/dev/sdb

burn_or_copy_iso_fr.md

@@ -1,6 +1,6 @@
 # Flasher l'ISO YunoHost sur une clef USB ou un CD/DVD
 
-Maintenant que vous avez téléchargé l’image ISO de YunoHost, vous devez la mettre sur un support physique : une **Clé USB** ou un **CD/DVD**.
+Maintenant que vous avez téléchargé l’image ISO de YunoHost, vous devez la mettre sur un support physique. Classiquement, il s'agit d'une **Clé USB** mais pour certaines raisons vous pouvez aussi utiliser un **CD/DVD**.
 
 <img src="/images/usb_key.png" width=150>
 <img src="/images/cd.jpg" width=150>

create_live_usb.md

@@ -147,4 +147,4 @@ cp /usr/lib/syslinux/menu.c32 image/isolinux/
 cd image && genisoimage -rational-rock -volid "YunoHost Live" -cache-inodes -joliet -full-iso9660-filenames -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -output ../yunohost-live.iso . && cd ..
 ```
 
-Great success! Now you can burn the .iso or use [Unetbootin](http://unetbootin.sourceforge.net/) to copy it on a USB key.
+Great success! Now you can burn the .iso or use [Unetbootin](http://unetbootin.sourceforge.net/) to copy it on a USB stick.

docs.md

@@ -1,22 +1,17 @@
 #Documentation
 
 <p class="lead">
-YunoHost's documentation has 3 different sections:
+YunoHost's documentation has 2 different sections:
 </p>
 
 <div class="row text-center">
 
-<div class="col col-md-4 col-md-offset-1">
-<a class="btn btn-success btn-lg" href="/userdoc"><span class="glyphicon glyphicon-user"></span> User guide</a>
-<p><small class="text-muted">Regarding the daily usage of your server and some client configuration "HOW-TOs"</small></p>
-</div>
-
 <div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-primary btn-lg" href="/admindoc"><span class="glyphicon glyphicon-lock"></span> Administrator guide</a>
 <p><small class="text-muted">Including installation, server management and application management</small></p>
 </div>
 
-<div class="col col-md-5 col-md-offset-3">
+<div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-danger btn-lg" href="/contributordoc"><span class="glyphicon glyphicon-heart"></span> Contributor guide</a>
 <p><small class="text-muted">Which contains everything you have to know about us and the way we work</small></p>
 </div>

docs_ar.md

@@ -6,17 +6,12 @@
 
 <div class="row text-center">
 
-<div dir="rtl" class="col col-md-4 col-md-offset-1">
-<a class="btn btn-success btn-lg" href="/userdoc_fr"><span class="glyphicon glyphicon-user"></span> دليل المستخدم</a>
-<p><small class="text-muted">كل ما يخص طريقة استخدام السيرفر يوميًا</small></p>
-</div>
-
 <div dir="rtl" class="col col-md-4 col-md-offset-1">
 <a class="btn btn-primary btn-lg" href="/admindoc_fr"><span class="glyphicon glyphicon-lock"></span> دليل المدير</a>
 <p><small class="text-muted">يتطرق إلى طريقة التنصيب و إدارة السيرفر و التطبيقات</small></p>
 </div>
 
-<div dir="rtl" class="col col-md-5 col-md-offset-3">
+<div dir="rtl" class="col col-md-4 col-md-offset-1">
 <a class="btn btn-danger btn-lg" href="/contributordoc"><span class="glyphicon glyphicon-heart"></span> دليل المساهم</a>
 <p><small class="text-muted">يحتوي على كافة المعلومات التي تخصنا و أسلوب عملنا و مساهمتنا</small></p>
 </div>

docs_de.md

@@ -1,22 +1,17 @@
 #Documentation
 
 <p class="lead">
-Die YunoHost Dokumentation ist in 3 Bereiche aufgeteilt:
+Die YunoHost Dokumentation ist in 2 Bereiche aufgeteilt:
 </p>
 
 <div class="row text-center">
 
-<div class="col col-md-4 col-md-offset-1">
-<a class="btn btn-success btn-lg" href="/userdoc"><span class="glyphicon glyphicon-user"></span> Benutzerhandbuch</a>
-<p><small class="text-muted">Über die tägliche Nutzung des Servers und Anleitungen zur Konfiguration des Clients.</small></p>
-</div>
-
 <div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-primary btn-lg" href="/admindoc"><span class="glyphicon glyphicon-lock"></span> Handbuch für Administratoren</a>
 <p><small class="text-muted">Befasst sich mit den Installationsschritten und der Verwaltung von Server und Apps.</small></p>
 </div>
 
-<div class="col col-md-5 col-md-offset-3">
+<div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-danger btn-lg" href="/contributordoc"><span class="glyphicon glyphicon-heart"></span> Handbuch für Mitwirkende</a>
 <p><small class="text-muted">Alles, was du über uns und unsere Art zu arbeiten wissen musst.</small></p>
 </div>

docs_fr.md

@@ -1,22 +1,17 @@
 #Documentation
 
 <p class="lead">
-La documentation de YunoHost s’articule autour de trois sections :
+La documentation de YunoHost s’articule autour de deux sections :
 </p>
 
 <div class="row text-center">
 
-<div class="col col-md-4 col-md-offset-1">
-<a class="btn btn-success btn-lg" href="/userdoc_fr"><span class="glyphicon glyphicon-user"></span> Guide de l’utilisateur</a>
-<p><small class="text-muted">Concernant l’usage du serveur au quotidien</small></p>
-</div>
-
 <div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-primary btn-lg" href="/admindoc_fr"><span class="glyphicon glyphicon-lock"></span> Guide de l’administrateur</a>
 <p><small class="text-muted">Incluant l’installation, la gestion du serveur et des applications</small></p>
 </div>
 
-<div class="col col-md-5 col-md-offset-3">
+<div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-danger btn-lg" href="/contributordoc_fr"><span class="glyphicon glyphicon-heart"></span> Guide du contributeur</a>
 <p><small class="text-muted">Qui contient tout ce que vous devez savoir à propos de nous et de notre manière de travailler</small></p>
 </div>

docs_it.md

@@ -1,22 +1,17 @@
 #Documentazione
 
 <p class="lead">
-La documentazione di YunoHost ha 3 differenti sezioni:
+La documentazione di YunoHost ha 2 differenti sezioni:
 </p>
 
 <div class="row text-center">
 
-<div class="col col-md-4 col-md-offset-1">
-<a class="btn btn-success btn-lg" href="/userdoc"><span class="glyphicon glyphicon-user"></span> Guida utente</a>
-<p><small class="text-muted">Sull'utilizzo giornaliero del tuo server e con alcune configurazioni per client "HOW-TOs"</small></p>
-</div>
-
 <div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-primary btn-lg" href="/admindoc"><span class="glyphicon glyphicon-lock"></span> Guida di amministrazione</a>
 <p><small class="text-muted">Include l'installazione, la gestione del server e delle applicazioni</small></p>
 </div>
 
-<div class="col col-md-5 col-md-offset-3">
+<div class="col col-md-4 col-md-offset-1">
 <a class="btn btn-danger btn-lg" href="/contributordoc"><span class="glyphicon glyphicon-heart"></span> Guida del contributore</a>
 <p><small class="text-muted">Contiene tutto quello che devi sapere su di noi e su come lavoriamo</small></p>
 </div>

images_fr.md

@@ -6,7 +6,7 @@ Cette page requiert que Javascript soit activé pour s'afficher correctement :s.
 <br/>
 </span>
 
-N.B. : Même si l'image de corresponds pas à la dernière version de YunoHost, vous pouvez tout de même l'utiliser puis faire une mise à jour du système après l'installation !
+N.B. : Même si l'image ne correspond pas à la dernière version de YunoHost, vous pouvez tout de même l'utiliser puis faire une mise à jour du système après l'installation !
 
 <div id="cards-list">
 </div>

index_es.md

@@ -6,48 +6,46 @@
 
   <div class="punchline">
     <p>
-      <span class="yolo 1" style="color: #FF3399;">datalove <3</span>
+      <span class="yolo 1" style="color: #6699FF;">Okupa tu servidor</span>
-      <span class="yolo 2" style="color: #6699FF;">data@home</span>
+      <span class="yolo 2" style="color: #66FF33;">¡Yo me alojo a mi mismo!</span>
-      <span class="yolo 3" style="color: #66FF33;">Alojar arriba, dijeron</span>
+      <span class="yolo 3" style="color: #00FFCC;">¡Anda y que te alojen!</span>
-      <span class="yolo 4" style="color: #00FFCC;">Host me I'm famous</span>
+      <span class="yolo 4" style="color: #FF5050;">Fuera de mi nube</span>
-      <span class="yolo 5" style="color: #FF5050;">sudo internet</span>
+      <span class="yolo 5" style="color: #FF0066;">Alójame, soy famoso</span>
-      <span class="yolo 6" style="color: #FF0066;">Ellos alojamientido y tenía muchos hijos</span>
+      <span class="yolo 6" style="color: #3366FF;">Prueba Internet</span>
-      <span class="yolo 8" style="color: #FFFFFF;">Try Internet</span>
+      <span class="yolo 7" style="color: #FFFFFF;">Su fiel servidor</span>
-      <span class="yolo 7" style="color: #3366FF;">Internet, lectura y escritura</span>
+      <span class="yolo 8" style="color: #FF6600;">yo@mismo.parami</span>
-      <span class="yolo 9" style="color: #CC66FF;">No tengo nada que ocultar</span>
+      <span class="yolo 9" style="color: #FF5050;">Tío ¡¿X K NO alojas?!</span>
-      <span class="yolo 10" style="color: #FF6600;">How I met your server</span>
+      <span class="yolo 10" style="color: #66FF33;">Tranqui y alójate</span>
-      <span class="yolo 11" style="color: #FF3399;">datalove <3</span>
     </p>
-    <button class="btn btn-primary btn-lg btn-block yolobtn">Perdón ?</button>
+    <button class="btn btn-primary btn-lg btn-block yolobtn">¿Qué?</button>
   </div>
 
   <div class="main-links hidden-xs">
-    <a href="/whatsyunohost">About</a> <span class="colored-bar">•</span> 
+    <a href="/whatsyunohost">Acerca de</a> <span class="colored-bar">•</span> 
-    <a href="https://forum.yunohost.org/c/announcement" target="_blank">últimas noticias</a> <span class="colored-bar">•</span> 
+    <a href="https://forum.yunohost.org/c/announcement" target="_blank">Últimas noticias</a> <span class="colored-bar">•</span> 
-    <a href="/docs">Documentation</a>
+    <a href="/docs">Documentación</a>
   </div>
 
 </div><!-- teasing-part -->
 
 <div class="boring-part" markdown="1">
 
-  <h1>YunoHost <small>es una herramienta que permite instalar y utilizar fácilmente su propio servidor.</small></h1>
+  <h1>YunoHost <small>es un sistema operativo de servidor que pretende hacer accesible el autoalojamiento para todo el mundo.</small></h1>
-
 
   <div class="home-panel">
     <img src="/images/home_panel.jpg" />
   </div>
 
   <div class="call-to-action">
-    <!-- <a class="btn btn-primary btn-lg" href="/try">Try it</a>  -->
+    <a class="btn btn-primary btn-lg" href="/try">Probar</a>
-    <a class="btn btn-success btn-lg" href="/install">Get started</a>
+    <a class="btn btn-success btn-lg" href="/install">Instalar</a>
     <p class="text-muted"><small><a href="https://forum.yunohost.org/t/yunohost-3-6-release-sortie-de-yunohost-3-6/8359">YunoHost v3.6</a></small></p>
   </div>
 
   <div class="row cf">
     <div class="col-md-7">
-      <h1>Installar <small>su servidor simplemente, tienes todo en casa</small></h1>
+      <h1>Instale <small>su servidor fácilmente, ya tiene todo en su casa</small></h1>
-      <p><br /><a href="/hardware">Ver los prerrequisitos</a></p>
+      <p><br /><a href="/hardware">Vea los requisitos</a></p>
     </div>
     <div class="col-md-4">
       <div class="feature-pic">
@@ -65,8 +63,8 @@
       </div>
     </div>
     <div class="col-md-7 text-right">
-      <h1>Disfrutar <small>de sus aplicaciones web, y crea tu esquina de Internet</small></h1>
+      <h1>Disfrute <small>sus aplicaciones y construya su rinconcito de Internet</small></h1>
-      <p><br /><a href="/apps_es">Lista de aplicaciones disponible</a></p>
+      <p><br /><a href="/apps">Lista de aplicaciones disponibles</a></p>
     </div>
   </div>
 
@@ -74,8 +72,8 @@
 
   <div class="row cf">
     <div class="col-md-7">
-      <h1>Gestionar <small>tu servidor como quieras : vía web, móvil o en línea de comandos</small></h1>
+      <h1>Gestione <small>su servidor como le guste: vía web, móvil o línea de órdenes</small></h1>
-      <p><br /><a href="/try_es">Intentar la interfaz de administración</a></p>
+      <p><br /><a href="/try">Pruebe la administración</a></p>
     </div>
     <div class="col-md-4">
       <div class="feature-pic">
@@ -88,25 +86,27 @@
 
   <div class="row cf">
     <div class="col-md-4 button-list">
-      <a class="btn btn-lg btn-block btn-primary" href="/userdoc_es">Guía del usuario</a>
+      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost">Acerca de YunoHost</a>
-      <a class="btn btn-lg btn-block btn-info" href="https://ask.yunohost.org" target="_blank">Preguntas más frecuentes</a>
+      <a class="btn btn-lg btn-block btn-info" href="/docs">Documentación</a>
-      <a class="btn btn-lg btn-block btn-success" href="/whatsyunohost_es">¿ Que es YunoHost ?</a>
+      <a class="btn btn-lg btn-block btn-success" href="/contribute">Colaborar</a>
-      <a class="btn btn-lg btn-block btn-warning" href="/contribute_es">Cómo contribuir</a>
+      <a class="btn btn-lg btn-block btn-warning" href="https://forum.yunohost.org/" target="_blank">Foro</a>
-      <a class="btn btn-lg btn-block btn-danger btn-support" href="http://news.yunohost.org">últimas noticias</a>
+      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_en" target="_blank">Salas de chat</a>
+      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Últimas noticias</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help">Ayuda</a>
     </div>
     <div class="col-md-7 text-right">
-      <h1>Explorar <small>las posibilidad de su servidor, y aprender porque es importante</small></h1>
+      <h1>Explore <small>lo que puede hacer con un servidor y la razón de su importancia</small></h1>
-      <p><br /><a href="/docs_es">Leer la documentación</a></p>
+      <p><br /><a href="/docs">Lea la documentación</a></p>
     </div>
   </div>
 
   <hr />
 
   <div class="text-center">
-    <h1>¡ Hey ! Somos humanos<br /><small> Si tiene alguna pregunta, un problema, o simplemente estás interesado, ven decir "¡ Hola !" sobre nuestro salón de discusión clic en el botón abajo &nbsp;<span class="glyphicon glyphicon-share-alt"></span> </small></h1>
+    <h1>¡Oye! ¡Somos humanos!<br /><small> Si tiene alguna pregunta, problema o es simplemente un fan, deje un mensaje en nuestra sala de chat pulsando en el botón inferior &nbsp;<span class="glyphicon glyphicon-share-alt"></span> </small></h1>
 
    <p class="liberapay">
-   <a href="https://liberapay.com/YunoHost" target="_blank"><img src="/images/liberapay_logo.svg" alt="Donation button" title="Liberapay" /></a>
+     <a href="https://liberapay.com/YunoHost" target="_blank"><img src="/images/liberapay_logo.svg" alt="Botón de donación" title="Liberapay" /></a>
     </p>
 
   </div>
@@ -144,30 +144,5 @@
         scrollTop: jQuery(window).height() + 80
       }, 500);
     });
-    $(".actions").css('opacity', 0);
-    jQuery.ajaxSetup({cache: false});
-    jQuery.getScript('https://'+ location.host +'/mini/javascripts/mini.js', function() {
-        HOST_BOSH = 'https://'+ location.host +'/http-bind/';
-        JappixMini.launch({
-            connection: {
-              domain: 'anonymous.yunohost.org'
-            },
 
-            application: {
-              network: {
-                autoconnect: false
-              },
-
-              interface: {
-                showpane: true,
-                animate: true
-              },
-
-              groupchat: {
-                open: ['support@conference.yunohost.org'],
-                suggest: ['dev@conference.yunohost.org']
-              }
-            }
-        });
-    });
 </script> 

index_oc.md

@@ -0,0 +1,149 @@
+<div class="teasing-part">                                                                      
+
+  <div class="home-logo">
+    <img src="/images/ynh_logo_white_300dpi.png" width="100"/>
+  </div>
+
+  <div class="punchline">
+    <p>
+      <span class="yolo 1" style="color: #FF3399;">Ven a l’ostal, soi albergat en çò d’una amiga</span>
+      <span class="yolo 2" style="color: #FF0066;">S’alberguèron e aguèron un molon d’enfants</span>
+      <span class="yolo 3" style="color: #3366FF;">Internet, lectura e escritura</span>
+      <span class="yolo 4" style="color: #FFFFFF;">monssur@michu.fr</span>
+      <span class="yolo 5" style="color: #CC66FF;">Ai pas res a rescondre</span>
+      <span class="yolo 6" style="color: #FF6600;">How I met your server</span>
+    </p>
+    <button class="btn btn-primary btn-lg btn-block yolobtn">Perdon ?</button>
+  </div>
+
+  <div class="main-links hidden-xs">
+    <a href="/whatsyunohost_fr">A prepaus</a> <span class="colored-bar">•</span> 
+    <a href="https://forum.yunohost.org/c/announcement" target="_blank">Darrièras novèlas</a> <span class="colored-bar">•</span> 
+    <a href="/docs_fr">Documentacion</a>
+  </div>
+
+</div><!-- teasing-part -->
+
+<div class="boring-part" markdown="1">
+
+  <h1>YunoHost <small> es una aisina que vos permet d’installar e d’utilizar facilament vòstre pròpri servidor.</small></h1>
+
+  <div class="home-panel">
+    <img src="/images/home_panel.jpg" />
+  </div>
+
+  <div class="call-to-action">
+    <a class="btn btn-primary btn-lg" href="/try_fr">Ensajar</a>
+    <a class="btn btn-success btn-lg" href="/install_fr">Installar</a>
+    <p class="text-muted"><small><a href="https://forum.yunohost.org/t/yunohost-3-6-release-sortie-de-yunohost-3-6/8359">YunoHost v3.6</a></small></p>
+  </div>
+
+  <hr />
+
+  <div class="row cf">
+    <div class="col-md-7">
+      <h1>Installatz <small>vòstre servidor simplament, avètz ja tot çò que cal a l’ostal</small></h1>
+      <p><a href="/hardware_fr">Far veire los requistes</a></p>
+    </div>
+    <div class="col-md-4">
+      <div class="feature-pic">
+        <img src="/images/home_install.png" />
+      </div>
+    </div>
+  </div>
+
+  <hr />
+
+  <div class="row cf">
+    <div class="col-md-4">
+      <div class="feature-pic">
+        <img src="/images/home_enjoy.jpg" />
+      </div>
+    </div>
+    <div class="col-md-7 text-right">
+      <h1>Profitatz <small>de vòstras aplicacions web e fabricatz vòstre canton d’Internet</small></h1>
+      <p><br /><a href="/apps_fr">Lista de las aplicacions disponiblas</a></p>
+    </div>
+  </div>
+
+  <hr />
+
+  <div class="row cf">
+    <div class="col-md-7">
+      <h1>Gerissètz <small>vòstre servidor coma volgatz : via web, mobil o en linha de comanda</small></h1>
+      <p><br /><a href="/try_fr">Ensajar l’interfàcia d’administracion</a></p>
+    </div>
+    <div class="col-md-4">
+      <div class="feature-pic">
+        <img src="/images/home_manage.jpg" />
+      </div>
+    </div>
+  </div>
+
+  <hr />
+
+  <div class="row cf">
+    <div class="col-md-4 button-list">
+
+      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost_fr">Qu’es aquò YunoHost ?</a>
+      <a class="btn btn-lg btn-block btn-info" href="/docs_fr">Documentacion</a>
+      <a class="btn btn-lg btn-block btn-success" href="/contribute_fr">Cossí contribuir</a>
+      <a class="btn btn-lg btn-block btn-warning" href="https://forum.yunohost.org" target="_blank">Forum</a>
+      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_fr" target="_blank">Salas de discussions</a>
+      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Darrièras novèlas</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr">Assisténcia</a>
+
+    </div>
+    <div class="col-md-7 text-right">
+      <h1>Exploratz <small>las possibilitats de vòstre servidor, e aprenètz perque es important</small></h1>
+      <p><br /><a href="/docs_fr">Legir la documentacion</a></p>
+    </div>
+  </div>
+
+  <hr />
+
+  <div class="text-center">
+    <h1>Ou ! Sèm umans !<br /><small> S’avètz una question, un problèma, o que sètz simplament interessat, venètz dire « Bonjorn » dins nòstra sala de discussion en clicar lo boton aval &nbsp;<span class="glyphicon glyphicon-share-alt"></span> </small></h1>
+
+<p class="liberapay">
+      <a href="https://liberapay.com/YunoHost" target="_blank"><img src="/images/liberapay_logo.svg" alt="Donation button" title="Liberapay" /></a>
+    </p>
+    
+  </div>
+
+</div><!-- boring-part -->
+
+<script type="text/javascript">
+    jQuery('.teasing-part').css({
+        marginTop: '0',
+        display: 'block'
+    });
+    jQuery('.boring-part').css({
+        marginTop: jQuery(window).height() + 100
+    });
+    jQuery( window ).resize(function() {
+        jQuery('.boring-part').css({
+            marginTop: jQuery('.teasing-part').height() + 100
+        });
+    });
+    jQuery('.yolo').hide();
+    randomNumber = Math.floor((Math.random()*jQuery('.yolo').length)+1);
+    color = jQuery('.yolo.' + randomNumber).css('color');
+    jQuery('.yolo.' + randomNumber).fadeIn();
+    document.title = jQuery('.yolo.' + randomNumber).text();
+    jQuery('.colored-bar').css({
+      color: color,
+      fontWeight: 'bold',
+      padding: '1%'
+    });
+    jQuery('.yolobtn').css({
+      background: color,
+      borderColor: color
+    }).on('click', function() {
+      jQuery('html, body').animate({
+        scrollTop: jQuery(window).height() + 80
+      }, 500);
+    });
+
+</script>
+

install_iso.md

@@ -1,4 +1,4 @@
-# Install on a standard computer
+# Install on a regular computer
 
 *Find other ways to install YunoHost **[here](/install)**.*
 
@@ -20,13 +20,13 @@ You can use any computer with **256MB RAM or more**.
 ## Installation steps
 
 
-<a class="btn btn-lg btn-default" href="/images">0. Download your ISO image</a>
+<a class="btn btn-lg btn-default" href="/images">0. Download the YunoHost ISO image</a>
 
-<a class="btn btn-lg btn-default" href="/burn_or_copy_iso">1. Burn or copy ISO image</a>
+<a class="btn btn-lg btn-default" href="/burn_or_copy_iso">1. Burn the ISO image on a USB stick</a>
 
-<a class="btn btn-lg btn-default" href="/boot_and_graphical_install">2. Boot & install</a>
+<a class="btn btn-lg btn-default" href="/boot_and_graphical_install">2. Boot the machine and run the installation</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall">3. Post-install</a>
+<a class="btn btn-lg btn-default" href="/postinstall">3. Proceed with the initial configuration (post-installation)</a>
 
 ---
 

install_iso_fr.md

@@ -18,13 +18,13 @@
 
 ## Étapes d’installation
 
-<a class="btn btn-lg btn-default" href="/images_fr">0. Télécharger l'image ISO</a>
+<a class="btn btn-lg btn-default" href="/images_fr">0. Télécharger l'image ISO de YunoHost</a>
 
-<a class="btn btn-lg btn-default" href="/burn_or_copy_iso_fr">1. Copier l’image ISO</a>
+<a class="btn btn-lg btn-default" href="/burn_or_copy_iso_fr">1. Flasher l’image ISO sur une clef USB</a>
 
-<a class="btn btn-lg btn-default" href="/boot_and_graphical_install_fr">2. Démarrer & installer</a>
+<a class="btn btn-lg btn-default" href="/boot_and_graphical_install_fr">2. Démarrer la machine et installer YunoHost</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall_fr">3. Post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall_fr">3. Effectuer la configuration initiale (post-installation)</a>
 
 ---
 

install_on_arm_board.md

@@ -31,11 +31,11 @@ YunoHost doesn't yet support ARM64 boards. For more information, see [this issue
 
 <a class="btn btn-lg btn-default" href="/copy_image">1. Flash the SD card with the image</a>
 
-<a class="btn btn-lg btn-default" href="/plug_and_boot">2. Plug & boot</a>
+<a class="btn btn-lg btn-default" href="/plug_and_boot">2. Power up the board and let it boot</a>
 
 <a class="btn btn-lg btn-default" href="/ssh">3. Connect to your server with SSH</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall">4. Proceed to post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall">4. Proceed with the initial configuration (post-installation)</a>
 
 ---
 

install_on_arm_board_fr.md

@@ -29,11 +29,11 @@ YunoHost ne supporte pour le moment pas les cartes ARM64. Pour plus d'informatio
 
 <a class="btn btn-lg btn-default" href="/copy_image_fr">1. Flasher la carte SD avec l'image</a>
 
-<a class="btn btn-lg btn-default" href="/plug_and_boot_fr">2. Brancher & démarrer</a>
+<a class="btn btn-lg btn-default" href="/plug_and_boot_fr">2. Brancher la carte et la laisser démarrer</a>
 
-<a class="btn btn-lg btn-default" href="/ssh_fr">3. Se connecter en SSH</a>
+<a class="btn btn-lg btn-default" href="/ssh_fr">3. Se connecter en SSH sur le serveur</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall_fr">4. Procéder à la post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall_fr">4. Effectuer la configuration initiale (post-installation)</a>
 
 ---
 

install_on_raspberry.md

@@ -13,7 +13,7 @@ Before setting up a server at home, it is recommended that you know the [possibl
 
 ## Pre-requisites
 
-- A Raspberry Pi 0, 1, 2 or 3 ;
+- A Raspberry Pi 0, 1, 2 or 3 (does not currently work on RPI 4);
 - An microSD card: **8GB** capacity (at least) and **Class 10** speed rate are highly recommended (like the [Transcend 300x](http://www.amazon.fr/Transcend-microSDHC-adaptateur-TS32GUSDU1E-Emballage/dp/B00CES44EO)) ;
 - A power supply (either an adapter or a MicroUSB cable)i ;
 - An ethernet cable (RJ-45) to connect your Raspberry Pi to your router. (Raspberry Pi Zero users can connect the Pi using an OTG cable, [Wifi dongle](https://core-electronics.com.au/tutorials/raspberry-pi-zerow-headless-wifi-setup.html).) ;
@@ -27,11 +27,11 @@ Before setting up a server at home, it is recommended that you know the [possibl
 
 <a class="btn btn-lg btn-default" href="/copy_image">1. Flash the SD card with the image</a>
 
-<a class="btn btn-lg btn-default" href="/plug_and_boot">2. Plug & boot</a>
+<a class="btn btn-lg btn-default" href="/plug_and_boot">2. Power up the board and let it boot</a>
 
 <a class="btn btn-lg btn-default" href="/ssh">3. Connect to your server with your web browser</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall">4. Proceed to post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall">4. Proceed with the initial configuration (post-installation)</a>
 
 ---
 

install_on_raspberry_fr.md

@@ -27,11 +27,11 @@ Avant d'héberger un serveur chez vous, il est recommandé de prendre connaissan
 
 <a class="btn btn-lg btn-default" href="/copy_image_fr">2. Flasher la carte SD avec l'image</a>
 
-<a class="btn btn-lg btn-default" href="/plug_and_boot_fr">3. Brancher & démarrer</a>
+<a class="btn btn-lg btn-default" href="/plug_and_boot_fr">3. Brancher la carte et la laisser démarrer</a>
 
-<a class="btn btn-lg btn-default" href="/ssh_fr">4. Se connecter en SSH</a>
+<a class="btn btn-lg btn-default" href="/ssh_fr">4. Se connecter en SSH sur le serveur</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall_fr">5. Procéder à la post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall_fr">5. Effectuer la configuration initiale (post-installation)</a>
 
 ---
 

install_on_vps.md

@@ -16,5 +16,6 @@
 
 <a class="btn btn-lg btn-default" href="/install_manually">1. Install manually</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall">2. Post-install</a>
+<a class="btn btn-lg btn-default" href="/postinstall">2. Proceed with the initial configuration (post-installation)</a>
+
 

install_on_vps_fr.md

@@ -16,5 +16,4 @@
 
 <a class="btn btn-lg btn-default" href="/install_manually_fr">1. Installer manuellement</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall_fr">2. Post-installation</a>
+<a class="btn btn-lg btn-default" href="/postinstall_fr">2. Effectuer la configuration initiale (post-installation)</a>
-

isp.md

@@ -42,6 +42,9 @@ A list of French and Belgian ISPs is available on the [french page](/isp_fr).
 | --- | --- | --- | --- | --- | --- | --- |
 | Telia | Multiple | Yes | No. Business only. | Yes | No. Business only. | No. Business only. |
 | Bredbandsbolaget | Multiple | Yes | No. Business only. | Yes | No. Business only. | No. Business only. |
+| Ownit | Multiple | Yes | Yes | N/A? | ? | Yes |
+
+Ownit reserves port 3 and 4 of their router to TV. With a simple call to their hotline, explaining that you want to selfhost, they can reassign one of the ports to be in bridge mode. It means that your server will have its own public fixed IP address, in addition to the modem's.
 
 ### Switzerland
 

isp_fr.md

@@ -17,7 +17,7 @@ Tous les fournisseurs d’accès à Internet [membres de la Fédération French
 | **Box/routeur** | Personnel/OVH Télécom | Freebox | Neufbox | Livebox | Bbox | Dartybox |
 | **[UPnP](https://fr.wikipedia.org/wiki/Universal_Plug_and_Play)** | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
 | **[Port 25 ouvrable](email_fr)**<br> (fermé par défaut) | ✔ | ✔ | ✔ | ✘ | ✔ | ✔ |
-| **[Hairpinning](http://fr.wikipedia.org/wiki/Hairpinning)** | ✔ | ✔ | ✔/✘ | ✘ | ✔ | ✔ |
+| **[Hairpinning](http://fr.wikipedia.org/wiki/Hairpinning)** | ✔ | ✔ | ✔/✘ | ✔ (depuis la Livebox 4) | ✔ | ✔ |
 | **[Reverse DNS](https://en.wikipedia.org/wiki/Reverse_DNS_lookup)<br>personnalisable ** | ✔ | ✔ (sauf IPv6) | … | ✘ | ✘ | ✘ |
 | **[IP fixe](/dns_dynamicip_fr)** | ✔ | ✔ | ✔/✘ | ✘ | ✔ | ✔ |
 | **[IPv6](https://fr.wikipedia.org/wiki/IPv6)** | ✔ | ✔ | ✔ | ✔ | … | … |

packaging_apps.md

@@ -104,7 +104,7 @@ Here is a list of best practices for application install scripts:
 * scripts should be tested on Debian Stretch 32 bits, 64 bits and ARM architectures;
 * backup and restore scripts should be present and functional.
 
-To be define the quality of a package, it'll obtained a [level](packaging_apps_levels_fr), determined according to somes criteria of installation and according to respect to [package guidelines](packaging_apps_guidelines_fr).
+To be define the quality of a package, it'll obtained a [level](packaging_apps_levels_fr), determined according to somes criteria of installation and according to respect to [package guidelines](packaging_apps_guidelines).
 
 ### Package script checker
 <a class="btn btn-lg btn-default" href="https://github.com/YunoHost/package_checker">Package checker</a>

packaging_apps_guidelines.md

@@ -152,13 +152,11 @@ This involves monitoring updates to the upstream application, adhering to the ne
 #### YEP 1.6
 ##### Keeping up-to-date on the evolution of apps packaging | validated | manual | OFFICIAL |
 In order to keep up with the evolution of the packaging format and best practices, it is recommended to:
-* subscribe to the discussion list `apps @ list.yunohost.org`
+* follow [the forum's Apps category](https://forum.yunohost.org/c/contribute-room/apps-packaging)
-* follow [the forum's Apps category](https://forum.yunohost.org/c/apps-packaging)
 
 To follow the evolution of YunoHost more generally:
 * join XMPP dev@conference.yunohost.org ([three days of logs are available](https://im.yunohost.org/logs/dev/))
 * follow [Annoucement category of the forum](https://forum.yunohost.org/c/announcement)
-* follow discussions on contrib@list.yunohost.org
 
 #### YEP 1.7
 ##### Add the app to the [YunoHost-Apps Organization](https://github.com/YunoHost-Apps) | validated | manual | OFFICIAL |

packaging_apps_guidelines_fr.md

@@ -153,13 +153,11 @@ Cela implique de surveiller les mises à jour de l'application upstream, de resp
 #### YEP 1.6
 ##### Se tenir informé sur l'évolution du packaging d'apps  | validé | manuel | OFFICIAL |
 Afin de suivre l'évolution du format de packaging ainsi que des bonnes pratiques, il est recommandé de:
-* s'inscrire à la liste de discussion `apps@list.yunohost.org`
+* suivre [la catégorie Apps packaging du forum](https://forum.yunohost.org/c/contribute-room/apps-packaging)
-* suivre [la catégorie Apps packaging du forum](https://forum.yunohost.org/c/apps-packaging)
 
 Pour suivre l'évolution de YunoHost de façon plus générale :
 * rejoindre le salon XMPP dev@conference.yunohost.org ([trois jours de logs sont disponibles](https://im.yunohost.org/logs/dev/))
 * suivre [la catégorie Annoucement du forum](https://forum.yunohost.org/c/announcement)
-* suivre les discussions sur contrib@list.yunohost.org
 
 #### YEP 1.7
 ##### Ajouter l'app à l'[organisation YunoHost-Apps](https://github.com/YunoHost-Apps)  | validé | manuel | OFFICIAL |

packaging_apps_manifest.md

@@ -53,9 +53,9 @@ The `manifest.json` file defines the app's constants, a bunch of values that Yun
 }
 ```
 
-* **name**: app name. It does not have to be unique, but it should be, since it is the name shown to all the YunoHost administrators in the app list.
+* **name**: app name. It does not have to be unique, but it should be, since it is the name shown to all the YunoHost administrators in the app list. Any characters are allowed.
 
-* **id**: ID of the app. You have to ensure that this ID is unique before submit an app integration request.
+* **id**: ID of the app. You have to ensure that this ID is unique before submit an app integration request. See [packaging_apps_guidelines.md#yep-11](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines.md#yep-11) for valid rules.
 
 - **packaging_format**: package version. Actual version is **1**. This key has been set up to make independant packaging evolution versions from YunoHost versions evolution.
 

packaging_apps_start.md

@@ -12,7 +12,7 @@ To be able to do that, we need to remember that Yunohost at its core is a server
 
 If you have ever installed a web application manually, you already know that the process is in reality far more complex, usually involving a lot of steps and discipline.
 
-This is what application packaging is, a serie of scripts that automate the installation of a web application and its configuration in order to provide the final user with a few clicks installation process.
+This is what application packaging is, a series of scripts that automate the installation of a web application and its configuration in order to provide the final user with a few clicks installation process.
 
 ### How it works
 
@@ -41,17 +41,17 @@ Scripts used during application packaging are simply a serie of bash commands.
 
 ### ... bash command?
 
-A [bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) command is a line of text that will be interpreted by the computer and will produce a result. This is commonly refered to a command line.
+A [bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) command is a line of text that will be interpreted by the computer and will produce a result. This is commonly refered to as a command line.
 
-You only can interact with your server through command line as it does not provide a graphical interface. Usual access is through [ssh](/ssh_en).
+You can ony interact with your server through the command line as it does not provide a graphical interface. Usual access is through [ssh](/ssh_en).
 
-Package scripts are therefore a serie of bash commands as if you had typed them directly in the ssh console.
+Package scripts are therefore a series of bash commands as if you had typed them directly in the ssh console.
 
-To know what you can write in a bash script, you should start reading this [simple tuto](https://debian-facile.org/doc:programmation:shells:debuter-avec-les-scripts-shell-bash) or this [more advanced one](http://aral.iut-rodez.fr/fr/sanchis/enseignement/bash/index.html).
+To know what you can write in a bash script, you should start reading this [simple tutorial](https://debian-facile.org/doc:programmation:shells:debuter-avec-les-scripts-shell-bash) or this [more advanced one](http://aral.iut-rodez.fr/fr/sanchis/enseignement/bash/index.html).
 
 ### Ok, I'm good ! Where do I start?
 
-Before starting the packaging process, you need to successfully install the application. The script will only perform what you instruct him to do.
+Before starting the packaging process, you need to successfully install the application. The script will only perform what you instruct it to do.
 
 Once completed, you need to read a little bit more documentation about application packaging. [This one is more technical](/packaging_apps_en) but now you should understand all the wizardry.
 
@@ -59,7 +59,7 @@ Once completed, you need to read a little bit more documentation about applicati
 
 Fortunately, you are not alone in this!
 
-There is other packagers like you and you can meet them on the [forum](https://forum.yunohost.org/c/apps-packaging) or the [chat](xmpp:apps@conference.yunohost.org?join).
+There are other packagers like you and you can meet them on the [forum](https://forum.yunohost.org/c/apps-packaging) or the [chat](xmpp:apps@conference.yunohost.org?join).
 
 Feel free to join in and ask your questions, there always will be someone to help.
 

packaging_apps_virtualbox_fr.md

@@ -6,7 +6,7 @@ Cette page de documentation va vous expliquer comment mettre en place un serveur
 
 Il y a principalement deux raisons pour préférer l'usage d'un serveur virtuel plutôt que votre propre serveur :
 
-- Vous pouvez torturez à loisir un serveur virtuel sans courir le risque de le casser, puisque vous pourrez toujours restaurer un état précédent. Alors qu'il serait dommage de casser son propre serveur !
+- Vous pouvez torturer à loisir un serveur virtuel sans courir le risque de le casser, puisque vous pourrez toujours restaurer un état précédent. Alors qu'il serait dommage de casser son propre serveur !
 - Un serveur virtuel sera restauré avant de travailler dessus, pour garder en permanence un système sans résidus d'une précédente installation. Cela permet de se rapprocher au plus près d'une première installation par un utilisateur.
 
 Nous parlerons ici de VirtualBox, pour son approche graphique facile à utiliser. Si vous préférez une interface en ligne de commande pour la gestion de la machine virtuelle, tournez-vous de préférence vers [ynh-dev](/dev_fr).
@@ -14,7 +14,7 @@ Nous parlerons ici de VirtualBox, pour son approche graphique facile à utiliser
 ## Installer VirtualBox
 
 Depuis un système GNU Linux, installer simplement le paquet `virtualbox-qt`. 
-Depuis un système Windows ou macOS, il faudra se référer à la page de [téléchargement de VirtualBox](https://www.virtualbox.org/wiki/Downloads) pour récupérer le fichier d'installation adéquat.
+Depuis un système Windows ou macOS, il faudra se référer à la page de [téléchargement de VirtualBox](https://www.virtualbox.org/wiki/Downloads) pour récupérer le fichier d'installation adéquat. Le paquet virtualbox est déprécié depuis debian 9, un fichier d'installation .deb est disponible sur la même page.
 
 Quel que soit votre système, il ne devrait pas être nécessaire d'installer l'extension pack ou les additions invités.
 

plug_and_boot.md

@@ -2,7 +2,7 @@
 
 * Plug your server in wired Ethernet, or configure the wifi connection as explained [here](https://www.raspberrypi.org/documentation/configuration/wireless/wireless-cli.md). You can also mount the second partition of the SD card and edit the wpa-supplicant.conf file prior to boot the card for the first time - on Windows you can use [Paragon ExtFS](https://www.paragon-software.com/home/extfs-windows/), don't forget to unmount everytime for changes to take effect.
 
-* Optional : You can **plug a screen** if you want to see how boot is going, and a keyboard if you want to have a **command-line access** to your server.
+* Optional : You can **connect a screen** if you want to see how boot is going, and a keyboard if you want to have a **command-line access** to your server.
 
 * Power up the server, wait for the first reboot to happen, and then wait until you see a big squared `Y` :
 

user_interface.md

@@ -1,23 +0,0 @@
-# User interface
-
-The user interface is a portal that allows the loged-in user to see all the applications he is allowed to use, and 
-access them. This interface is also where the user can set his parameters (change password, define email alias and 
-redirections).
-
-<img src="/images/home_panel.jpg" width=800>
-
-### Access problem
-
-Access to user interface can only be done by using a domain name. You can’t access to it by using the local IP address of your server like that: https://your.server.ip.address/yunohost/sso/
-
-You can create a redirection of a domain name to IP address of your server by modifing `/etc/hosts` and by adding that line:
-
-```bash
-your.server.ip.address domain.tld
-```
-
-By replacing `your.server.ip.address` for instance by `192.168.1.05` and `domain.tld` by your domain name or by one you can choose if you doesn’t own one.
-
-### Software
-
-User interface is based on that software: https://github.com/Kloadut/ssowat

user_interface_fr.md

@@ -1,23 +0,0 @@
-# Interface utilisateur
-
-L'interface utilisateur est un portail permettant à un utilisateur connecté de voir toutes les applications qu'il peut
-utiliser, et d'y accéder. Cette interface permet aussi à l'utilisateur de gérer ses paramètres (changer de mot de passe, 
-définir ses alias et redirections courriel).
-
-<img src="/images/home_panel.jpg" width=800>
-
-### Problème d’accès
-
-L’accès à la partie utilisateur peut se faire uniquement avec un nom de domaine. Vous ne pouvez **pas** y accéder en utilisant l’adresse IP locale de votre serveur comme suit : https://adresse.ip.du.server/yunohost/sso
-
-Cependant, sur votre ordinateur, vous pouvez créer une redirection d’un nom de domaine vers l’adresse IP du serveur en modifiant le fichier `/etc/hosts` et en ajoutant cette ligne :
-
-```bash
-adresse.ip.du.server domaine.tld
-```
-
-en remplaçant `adresse.ip.du.server` par exemple par `192.168.1.5` et `domaine.tld` par votre nom de domaine ou par un [nom de domaine que vous pouvez choisir](/dns) si vous n’en avez pas. /!\ Cela ne fonctionne que localement /!\
-
-### Logiciel
-
-L’interface utilisateur est basé sur le logiciel suivant : https://github.com/Kloadut/ssowat

userdoc.md

@@ -1,7 +0,0 @@
-# User documentation
-
-* [What is YunoHost](/whatsyunohost)
-* [User interface](user_interface)
-* [Configure an email client](/email)
-* [Instant messaging usage](/XMPP)
-* [Applications](/apps)

userdoc_ar.md

@@ -1,7 +0,0 @@
-<div dir="RTL" align="right" style="direction:rtl;text-align:right;">
-# دليل مستخدمي واي يونوهوست YunoHost
-
-* [واجهة المستخدم](user_interface)
-* [البريد الإلكتروني](/email_fr)
-* [المحادثة الفورية و شبكات التواصل الإجتماعي XMPP](/XMPP_fr)
-* [التطبيقات](/apps_ar)

userdoc_fr.md

@@ -1,7 +0,0 @@
-# Documentation pour les utilisateurs YunoHost
-
-* [Qu'est-ce que YunoHost](/whatsyunohost_fr)
-* [L’interface utilisateur](user_interface)
-* [La messagerie électronique (email)](/email_fr)
-* [La messagerie instantanée et les réseaux sociaux XMPP](/XMPP_fr)
-* [Les applications](/apps_fr)