Merge branch 'master' into dev-doc

admin.md

@@ -7,7 +7,7 @@ Yunohost has an administrator web interface. The other way to administrate your
 You can access your administrator web interface at this address: https://example.org/yunohost/admin (replace 'example.org' with your own domain name)
 
 <div class="text-center" style="max-width:100%;border-radius: 5px;border: 1px solid rgba(0,0,0,0.15);box-shadow: 0 5px 15px rgba(0,0,0,0.35);">
-<img src="/images/manage_en.png" style="max-width:100%;">
+<img src="/images/webadmin.png" style="max-width:100%;">
 </div>
 
 

admin_es.md

@@ -7,7 +7,7 @@ Yunohost tiene una interfaz gráfica de administración. El otro método consist
 La interfaz admin está accesible desde tu instancia Yunohost en esta dirección : https://ejemplo.org/yunohost/admin (reemplaza ejemplo.org por tu nombre de dominio)
 
 <div class="text-center" style="max-width:100%;border-radius: 5px;border: 1px solid rgba(0,0,0,0.15);box-shadow: 0 5px 15px rgba(0,0,0,0.35);">
-<img src="/images/manage.png" style="max-width:100%;">
+<img src="/images/webadmin.png" style="max-width:100%;">
 </div>
 
 

admin_fr.md

@@ -7,7 +7,7 @@ YunoHost est fourni avec une interface graphique d’administration. L’autre m
 L’interface admin est accessible depuis votre instance YunoHost à l’adresse https://exemple.org/yunohost/admin (remplacez exemple.org par la bonne valeur)
 
 <div class="text-center" style="max-width:100%;border-radius: 5px;border: 1px solid rgba(0,0,0,0.15);box-shadow: 0 5px 15px rgba(0,0,0,0.35);">
-<img src="/images/manage.png" style="max-width:100%;">
+<img src="/images/webadmin_fr.png" style="max-width:100%;">
 </div>
 
 

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 -ia /home/yunohost.app/nextcloud /media/stockage
+Cas A : cp -ir /home/yunohost.app/nextcloud /media/stockage
-Cas B : cp -ia /home/yunohost.app/nextcloud /media/stockage/nextcloud_data
+Cas B : cp -ir /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,21 +133,24 @@ 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:
+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 proposent de créer une règle ayant pour effet de désactiver toutes les options reliées à la sécurité et à la vitesse de Cloudflare pour l'URL pointant sur votre instance Nextcloud. Bien que cela fonctionne, ce n'est pas la solution optimale. Je vous propose, certes de créer une règle pour l'URL pointant sur votre instance Nextcloud, mais de désactiver seulement 2 options. Voici donc comment :
 
 #### Cloudflare Page Rules
 
-Dans le panneau de controle de Cloudflare choisissez votre domaine et trouver Page Rules
+Dans le panneau de contrôle de Cloudflare, choisissez votre domaine et trouvez Page Rules
-l'url dans votre barre d'addresse ressemblera à : https://dash.cloudflare.com/*/domain.tld/page-rules
+l'URL dans votre barre d'addresse ressemblera à : https://dash.cloudflare.com/*/domain.tld/page-rules
 
 #### Ajouter une règle
 
-La règle à ajouter doit s'appliquer pour l'url de votre instance Nextcloud soit:
+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://nextcloud.domain.tld/*` si vous utilisez un sous-domaine
 - `https://domain.tld/nextcloud/*` si vous avez déployé Nextcloud dans un répertoire
+
 Les options à désactiver (Off) sont :
+
 - Rocket Loader
 - Email Obfuscation
 
@@ -164,4 +167,4 @@ Sauvegarder et nettoyer vos caches (Cloudflare, navigateur, ...) et le tour est
 
 + Site officiel : [nextcloud.com (en)](https://nextcloud.com/)
 + Catalogue d'application pour nextcloud : [apps.nextcloud.com](https://apps.nextcloud.com/)
-+ Trouver de l'aide et poser toutes vos questions : [forum.yunohost.org](https://forum.yunohost.org/c/support)
++ Trouver de l'aide et poser toutes vos questions : [forum.yunohost.org](https://forum.yunohost.org/c/support)

apps_wishlist.md

@@ -11,197 +11,126 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [List of awesome Node.js projects](https://github.com/sqreen/awesome-nodejs-projects)
 - [List of SIP softwares/applications](https://en.wikipedia.org/wiki/List_of_SIP_software#Free_and_open-source_license)
 - [10er10](https://github.com/dready92/10er10)
-- [Airtime](https://www.sourcefabric.org/en/airtime/)
+- [Ajenti](http://ajenti.org) / [github](https://github.com/ajenti/ajenti/)
-- [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. / [github](https://github.com/akaunting/akaunting)
-- [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) / [github](https://github.com/Bitmessage/PyBitmessage)
-- [Bitmessage](https://bitmessage.org/wiki/Compiling_instructions)
-- [Bitwarden](https://bitwarden.com/)
 - [Beehive](https://github.com/muesli/beehive)
-- [Bludit](https://www.bludit.com)
+- [Bludit](https://www.bludit.com) / [github](https://github.com/bludit/bludit)
 - [Blynk](https://github.com/blynkkk/blynk-library)
-- [Bookstack](https://www.bookstackapp.com/)
+- [Bookstack](https://www.bookstackapp.com/) / [github](https://github.com/BookStackApp/BookStack)
-- [Browsepass](http://techualization.blogspot.de/2013/09/introducing-browsepass-keepass-on-web.html)
 - [btcpayserver](https://github.com/btcpayserver/btcpayserver)
-- [Candy](https://candy-chat.github.io/candy)
-- [CardDavMate](https://www.inf-it.com/open-source/clients/carddavmate)
 - [cgit](http://git.zx2c4.com/cgit/about)
-- [CheckUp](https://sourcegraph.github.io/checkup)
+- [CheckUp](https://sourcegraph.github.io/checkup) / [github](https://github.com/sourcegraph/checkup)
-- [Cloud torrent](https://github.com/jpillora/cloud-torrent)
 - [Cockpit](http://cockpit-project.org/)
 - [Commafeed](https://github.com/Athou/commafeed)
-- [Converse.js](https://conversejs.org)
+- [Converse.js](https://conversejs.org) / [github](https://github.com/jcbrand/converse.js)
 - [Cozy](https://github.com/cozy)
-- [Cronkeep](https://github.com/cronkeep/cronkeep)
 - [Croodle](https://github.com/jelhan/croodle) Schedule a date or to do a poll on a general topics, with client-side encryption.
-- [CumulusClips](http://cumulusclips.org)
-- [Cyclos](https://www.cyclos.org)
 - [Darkwire.io](https://github.com/seripap/darkwire.io)
-- [Deluge](http://deluge-torrent.org) (with WebUI)
 - [DirectoryLister](https://github.com/DirectoryLister/DirectoryLister)
-- [DNSchain](https://github.com/okTurtles/dnschain)
+- [eLabFTW](https://www.elabftw.net/) electronic lab notebook / [github](https://github.com/elabftw/elabftw)
-- [eLabFTW](https://www.elabftw.net/) electronic lab notebook
 - [Emoncms](https://github.com/emoncms/emoncms)
-- [ERPnext](https://erpnext.com/download)
+- [ERPnext](https://erpnext.com/download) / [github](https://github.com/frappe/erpnext)
-- [EteSync](https://www.etesync.com/)
+- [EteSync](https://www.etesync.com/) / [github](https://github.com/etesync)
-- [Ethersheet](https://github.com/ethersheet-collective/EtherSheet)
-- [Fail2web](https://github.com/Sean-Der/fail2web)
-- [Ferment](https://github.com/mmckegg/ferment)
 - [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/)
+- [WebThings Gateway](https://iot.mozilla.org/gateway/) [github](https://github.com/mozilla-iot/)
-- [Gateway](https://iot.mozilla.org/gateway/)
+- [Geneweb](https://geneweb.tuxfamily.org) / [github](https://github.com/geneweb/geneweb)
-- [Geneweb](https://geneweb.tuxfamily.org)
+- [GetSimple CMS](http://get-simple.info) / [github](https://github.com/GetSimpleCMS/GetSimpleCMS)
-- [GetSimple CMS](http://get-simple.info)
+- [Goaccess](https://goaccess.io) Web log analyser (replaces piwik without js tracking scripts) / [github](https://github.com/allinurl/goaccess)
-- [Git-annex](http://git-annex.branchable.com)
-- [Gitit](https://github.com/jgm/gitit)
-- [Goaccess](https://goaccess.io) Web log analyser (replaces piwik without js tracking scripts)
 - [Gollum](https://github.com/gollum/gollum)
 - [Goploader](https://github.com/Depado/goploader)
 - [Granary](https://github.com/snarfed/granary)
 - [Guacamole](http://guac-dev.org)
-- [Habitica](https://habitica.com/)
+- [Habitica](https://habitica.com/) / [github](https://github.com/HabitRPG/habitica)
 - [HackMD CE](https://github.com/hackmdio/hackmd)
-- [Hackpad](https://github.com/dropbox/hackpad)
 - [Helpy](https://github.com/helpyio/helpy)
-- [Hexo](https://hexo.io/)
+- [Hexo](https://hexo.io/) / [github](https://github.com/hexojs/hexo)
-- [Hi Buddy](https://github.com/tOkeshu/hibuddy) (/!\ last update: 17 Feb 2015)
+- [Icecast 2](http://www.icecast.org) / [gitlab](https://gitlab.xiph.org/xiph/icecast-server/)
-- [Huginn](https://github.com/cantino/huginn)
-- [Hugo](http://gohugo.io)
-- [Icecast 2](http://www.icecast.org)
 - [ikiwiki](http://ikiwiki.info)
-- [img.bi](https://github.com/imgbi/img.bi)
-- [InfCloud](https://www.inf-it.com/open-source/clients/infcloud)
 - [Invidious](https://github.com/omarroth/invidious)
-- [Invoice Ninja](https://www.invoiceninja.com)
+- [Invoice Ninja](https://www.invoiceninja.com) / [github](https://github.com/invoiceninja/invoiceninja)
-- [InvoicePlane](https://invoiceplane.com)
+- [InvoicePlane](https://invoiceplane.com) / [github](https://github.com/InvoicePlane/InvoicePlane)
-- [IPFS](https://ipfs.io)
+- [IPFS](https://ipfs.io) / [github](https://github.com/ipfs/ipfs)
-- [Joplin](http://joplin.cozic.net/)
+- [Joplin](http://joplin.cozic.net/) / [github](https://github.com/laurent22/joplin)
 - [Jellyfin](https://github.com/jellyfin)
-- [JS Bin](http://jsbin.com/help/2-second-setup)
+- [JS Bin](http://jsbin.com/help/2-second-setup) / [github](https://github.com/jsbin/)
-- [Kaiwa](http://getkaiwa.com)
+- [Kiwix](http://www.kiwix.org/) Offline wikipedia / [github](https://github.com/kiwix/)
-- [Kin calendar](https://github.com/KinToday)
+- [Known](https://withknown.com) / [github](https://github.com/idno/known)
-- [Kinto](https://github.com/Kinto/formbuilder)
+- [Koel](http://koel.phanan.net) / [github](https://github.com/phanan/koel)
-- [Kiwix](http://www.kiwix.org/) Offline wikipedia
+- [Kontalk](https://kontalk.org) / [github](https://github.com/kontalk)
-- [Known](https://withknown.com)
+- [Koozip](http://koozic.net) / [github](https://github.com/DocMarty84/koozic)
-- [Koel](http://koel.phanan.net)
-- [Kontalk](https://kontalk.org)
-- [Koozip](http://koozic.net)
-- [KrISS feed](https://github.com/tontof/kriss_feed)
-- [Koken](http://koken.me)
-- [Kune](https://en.wikipedia.org/wiki/Kune_%28software%29)
 - [L'atelier](https://github.com/jbl2024/latelier)
-- [Lessy](https://lessy.io)
+- [Lessy](https://lessy.io) / [github](https://github.com/lessy-community/lessy)
-- [LibreNews-Server](https://librenews.io)
 - [LibreOffice Online](https://wiki.documentfoundation.org/ReleaseNotes/5.3/fr#LibreOffice_Online)
-- [LiquidSoap](http://savonet.sourceforge.net/)
+- [LiquidSoap](http://savonet.sourceforge.net/) / [github](https://github.com/savonet/liquidsoap)
 - [LocomotiveCMS](https://github.com/locomotivecms/engine)
-- [Logstalgia](http://logstalgia.io)
+- [Loomio](https://www.loomio.org) / [github](https://github.com/loomio/loomio/)
-- [Loomio](https://www.loomio.org)
+- [MaidSafe](http://maidsafe.net) / [github](https://github.com/maidsafe)
-- [MagicMirror²](https://github.com/MichMich/MagicMirror)
+- [Mailpile](https://www.mailpile.is) / [github](https://github.com/mailpile/Mailpile)
-- [MaidSafe](http://maidsafe.net)
+- [Mailtrain](https://mailtrain.org/) / [github](https://github.com/Mailtrain-org/mailtrain)
-- [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) / [github](https://github.com/tsileo/microblog.pub)
-- [microblog.pub](https://microblog.pub)
+- [Mirakel](http://mirakel.azapps.de/taskwarrior.html) / [github](https://github.com/GothenburgBitFactory/taskwarrior) (/!\ SSL-Warning)
-- [MinigalNano](https://github.com/sebsauvage/MinigalNano) (/!\ last update: Jun 24, 2016)
+- [Modoboa](http://modoboa.org) / [github](https://github.com/modoboa/)
-- [Mirakel](http://mirakel.azapps.de/taskwarrior.html) (/!\ SSL-Warning)
-- [Modoboa](http://modoboa.org)
 - [MotionEye](https://github.com/ccrisan/motioneye)
 - [MPD](http://www.musicpd.org)
-- [MyBB](https://mybb.com/)
+- [MyBB](https://mybb.com/) / [github](https://github.com/mybb)
 - [Museek+](https://github.com/eLvErDe/museek-plus)
 - [Netrunner](https://github.com/mtgred/netrunner)
-- [Nibbleblog](http://www.nibbleblog.com)
+- [Nibbleblog](http://www.nibbleblog.com)/ [github](https://github.com/dignajar/nibbleblog)
-- [Nitter](https://github.com/zedeus/nitter) (Twitter front-end focused on privacy)
+- [Nuage](https://nuage.kerjean.me/login) / [github](https://github.com/mickael-kerjean/filestash)
-- [Nuage](https://nuage.kerjean.me/login)
 - [Ombi](https://github.com/tidusjar/Ombi)
-- [OpenBazaar](https://openbazaar.org)
+- [OpenBazaar](https://openbazaar.org) / [github](https://github.com/openbazaar)
-- [openHAB](https://www.openhab.org/) - Smart home platform.
+- [openHAB](https://www.openhab.org/) - Smart home platform. / [github](https://github.com/openhab)
-- [OpenJabNab](https://github.com/OpenJabNab/OpenJabNab) (/!\ last update: Apr 30, 2016)
 - [OpenProject](https://github.com/opf/openproject)
 - [OpenSourceBilling](https://github.com/vteams/open-source-billing)
-- [OX Open-Xchange](https://www.open-xchange.com) Linux groupware solution
+- [OX Open-Xchange](https://www.open-xchange.com) Linux groupware solution / [github](https://github.com/open-xchange/)
 - [Paperless](https://github.com/danielquinn/paperless)
 - [Paperwork](http://paperwork.rocks)
-- [Passbolt](https://www.passbolt.com) Passwords manager
+- [Passbolt](https://www.passbolt.com) Passwords manager / [github](https://github.com/passbolt)
-- [pdfy](https://github.com/joepie91/pdfy) (/!\ last update: Aug 5, 2014)
+- [Pelias](https://github.com/pelias/pelias))
-- [Pelias](https://github.com/pelias/pelias)
+- [PHPList](http://www.phplist.com) / [github](https://github.com/phpList)
-- [Peps](https://github.com/MLstate/PEPS)
+- [Phraseanet](https://docs.phraseanet.com/3.8/fr/index.html#) / [github](https://github.com/alchemy-fr/Phraseanet-Docs)
-- [PHPList](http://www.phplist.com)
+- [Pico](http://picocms.org) / [github](https://github.com/picocms/Pico)
-- [PHProxy](http://sourceforge.net/projects/poxy)
-- [Phraseanet](https://docs.phraseanet.com/3.8/fr/index.html#)
-- [Pico](http://picocms.org)
-- [Pix](http://pix.toile-libre.org)
 - [Playmaker](https://github.com/NoMore201/playmaker)
 - [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) / [github](https://github.com/pump-io/pump.io)
-- [Pump.io](http://pump.io)
 - [qBittorrent](https://github.com/qbittorrent/qBittorrent)
-- [racktables](http://racktables.org)
+- [racktables](http://racktables.org) / [github](https://github.com/RackTables/racktables)
-- [Race for the Galaxy](https://github.com/bnordli/rftg)
 - [Radarr](https://github.com/Radarr/Radarr)
-- [Redmine](https://www.redmine.org)
+- [Request Tracker](https://bestpractical.com) / [github](https://github.com/bestpractical/rt)
-- [Request Tracker](https://bestpractical.com)
+- [Restya](http://restya.com) / [github](https://github.com/RestyaPlatform/board/)
-- [Respawn 2.0](https://github.com/broncowdd/respawn) ( /!\ last update: 2015)
+- [Retroshare](https://retroshare.cc/) / [github](https://github.com/RetroShare/RetroShare)
-- [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)
 - [Scuttlebutt Pub](https://www.scuttlebutt.nz/contributing)
-- [ShareLatex](https://www.sharelatex.com)
+- [ShareLatex](https://www.sharelatex.com) / [github](https://github.com/overleaf/overleaf)
-- [Shleuder](http://schleuder2.nadir.org)
+- [Shleuder](https://schleuder.org/)
-- [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)
+- [smokeping](https://packages.debian.org/buster/smokeping)   / [github](https://github.com/oetiker/SmokePing)
-- [SpamGourmet](https://sourceforge.net/projects/spamgourmet/)
+- [Sonarr](https://sonarr.tv) / [github](https://github.com/Sonarr/Sonarr)
-- [Stackedit](https://stackedit.io)
+- [Stackedit](https://stackedit.io) / [github](https://github.com/benweet/stackedit)
-- [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion.
+- [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion / [github](https://github.com/standardnotes/web)
-- [Streama](https://github.com/dularion/streama)
 - [Streisand](https://github.com/jlund/streisand)
 - [Subspace](https://github.com/subspacecloud/subspace) (A simple WireGuard VPN server GUI)
-- [Syspass](http://www.syspass.org/)
+- [Syspass](http://www.syspass.org/) / [github](https://github.com/nuxsmin/sysPass)
-- [Taiga](https://taiga.io)
+- [Taiga](https://taiga.io) / [github](https://github.com/taigaio/)
-- [Tania](http://gettania.org/)
+- [Taskwarrior](https://taskwarrior.org) / [github](https://github.com/GothenburgBitFactory/taskwarrior)
-- [Taskwarrior](https://taskwarrior.org)
+- [TMate](https://tmate.io/) / [github](https://github.com/tmate-io/tmate)
-- [TMate](https://tmate.io/)
-- [TorChat](https://github.com/prof7bit/TorChat)
-- [Torrent Tunes](https://github.com/tchoulihan/torrenttunes-client)
-- [Total Respawn](https://github.com/broncowdd/TotalRespawn)
 - [Tracim](https://github.com/tracim/tracim)
-- [Twister](http://twister.net.co)
+- [Twister](http://twister.net.co) / [github](https://github.com/miguelfreitas/twister-core/)
-- [TwitRSS.me](http://twitrss.me/) ([Github](https://github.com/ciderpunx/twitrssme)) Scrapes Twitter to create RSS feeds.
+- [TwitRSS.me](http://twitrss.me/) / [Github](https://github.com/ciderpunx/twitrssme) Scrapes Twitter to create RSS feeds.
-- [Unvis](https://unv.is/) ([Github](https://github.com/lodjuret/unvis.it))
+- [Volumio](https://volumio.org) / [github](https://github.com/volumio)
-- [Vaultier](http://www.vaultier.org)
+- [WebODF](http://webodf.org) / [github](https://github.com/webodf/WebODF)
-- [Volumio](https://volumio.org)
+- [Wireguard](https://www.wireguard.com/) / [git](https://git.zx2c4.com/WireGuard/)
-- [Webmpc](https://github.com/ushis/webmpc)
+- [Xonotic](http://xonotic.org) / [gitlab](https://gitlab.com/xonotic)
-- [WebODF](http://webodf.org)
+- [YesWiki](https://yeswiki.net) / [github](https://github.com/YesWiki/yeswiki)
-- [webSync](http://furier.github.io/websync)
-- [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)
 - [ZeroTier](https://github.com/zerotier/ZeroTierOne)
-- [ZNC](http://wiki.znc.in/ZNC)
-- [Zone-project](https://github.com/descl/ZONE)
 - [Zoneminder](https://github.com/ZoneMinder/zoneminder)
-- [Zulip](https://zulipchat.com/)
+- [Zulip](https://zulipchat.com/) / [github](https://github.com/zulip/zulip)

images/images.list

@@ -28,8 +28,8 @@ logo-jirafeau.jpeg
 logo.png
 Logo-wallabag-svg.svg
 mailview.jpg
-manage_en.png
+webadmin.png
-manage.png
+webadmin_fr.png
 micro-sd-card.jpg
 nettop.jpg
 networks.png

index.md

@@ -23,14 +23,15 @@
   <div class="main-links hidden-xs">
     <a href="/whatsyunohost">About</a> <span class="colored-bar">•</span> 
     <a href="https://forum.yunohost.org/c/announcement" target="_blank">Latest news</a> <span class="colored-bar">•</span> 
-    <a href="/docs">Documentation</a>
+    <a href="/docs">Documentation</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">Donate</a>
   </div>
 
 </div><!-- teasing-part -->
 
 <div class="boring-part" markdown="1">
 
-  <h1>YunoHost <small>is a server operating system aiming to make self-hosting accessible to everyone.</small></h1>
+  <h1><small>With</small> YunoHost<small>, you can easily manage a server for your friends, association or enterprise.</small> <a href="/whatsyunohost" style="font-size:0.6em;">Learn more</a></small></h1>
 
   <div class="home-panel">
     <img src="/images/home_panel.jpg" />
@@ -39,12 +40,13 @@
   <div class="call-to-action">
     <a class="btn btn-primary btn-lg" href="/try">Try it</a>
     <a class="btn btn-success btn-lg" href="/install">Get started</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>
+    <h2 style="margin-top: 0"><small><a href="https://forum.yunohost.org/c/announcement">Latest news</a></small></h2>
   </div>
 
+
   <div class="row cf">
-    <div class="col-md-7">
+    <div class="col-md-7 text-right">
-      <h1>Install <small>your server with ease, you already have everything at home</small></h1>
+      <h1>Setup <small>your server with ease, you already have everything at home</small></h1>
       <p><br /><a href="/hardware">See the requirements</a></p>
     </div>
     <div class="col-md-4">
@@ -59,25 +61,25 @@
   <div class="row cf">
     <div class="col-md-4">
       <div class="feature-pic">
-        <img src="/images/home_enjoy.jpg" />
+        <img src="/images/webadmin.png" />
       </div>
     </div>
-    <div class="col-md-7 text-right">
+    <div class="col-md-7">
-      <h1>Enjoy <small>your apps and make your little corner of Internet</small></h1>
+      <h1>Manage <small>your server from a clean and simple web interface</small></h1>
-      <p><br /><a href="/apps">List of available apps</a></p>
+      <p><br /><a href="/try">Try the administration</a></p>
     </div>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-7">
+    <div class="col-md-7 text-right">
-      <h1>Manage <small>your server the way you like: via Web, mobile or command-line</small></h1>
+      <h1>Install <small>applications to build your little corner of Internet</small></h1>
-      <p><br /><a href="/try">Try the administration</a></p>
+      <p><br /><a href="/apps">Browse available apps</a></p>
     </div>
     <div class="col-md-4">
       <div class="feature-pic">
-        <img src="/images/home_manage.jpg" />
+        <img src="/images/home_enjoy.jpg" />
       </div>
     </div>
   </div>
@@ -85,31 +87,17 @@
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4 button-list">
+    <div class="text-center">
-      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost">About YunoHost</a>
+    <h1>Hey! We are humans!<br />
-      <a class="btn btn-lg btn-block btn-info" href="/docs">Documentation</a>
+    <small>If you have questions, issues or if you are just an enthusiast, come and leave a message on our forum or chatroom!</small></h1>
-      <a class="btn btn-lg btn-block btn-success" href="/contribute">Get involved</a>
+
-      <a class="btn btn-lg btn-block btn-warning" href="https://forum.yunohost.org/" target="_blank">Forum</a>
+    <div class="col-md-4 col-md-offset-4 button-list">
-      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_en" target="_blank">Chat rooms</a>
+      <a class="btn btn-lg btn-block btn-info" href="/docs"><span class="glyphicon glyphicon-book"></span> Documentation</a>
-      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Latest news</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr"><span class="glyphicon glyphicon-comment"></span> Forum and chat</a>
-      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr">Support</a>
+      <a class="btn btn-lg btn-block btn-success" href="/contribute"><span class="glyphicon glyphicon-heart"></span> Get involved</a>
+      <a class="btn btn-lg btn-block btn-primary" href="https://donate.yunohost.org/" style="background-color: #ffd236; border-color: #ffd236;"><span class="glyphicon glyphicon-usd"></span> Donate</a>
     </div>
-    <div class="col-md-7 text-right">
+ </div>
-      <h1>Explore <small>what you can do with a server, and why it is important</small></h1>
-      <p><br /><a href="/docs">Read the documentation</a></p>
-    </div>
-  </div>
-
-  <hr />
-
-  <div class="text-center">
-    <h1>Hey! We are humans!<br /><small> If you have questions, problems or if you are just an enthusiast, leave a message on our chatroom by clicking on the button below &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 -->
 
@@ -146,4 +134,3 @@
     });
 
 </script>
-

index_ar.md

@@ -20,7 +20,8 @@
   <div dir="auto" class="main-links hidden-xs">
     <a href="/whatsyunohost">عن واي يونوهوست</a> <span class="colored-bar">•</span> 
     <a href="https://forum.yunohost.org/c/announcement" target="_blank">آخر المستجدات</a> <span class="colored-bar">•</span> 
-    <a href="/docs_ar">المستندات</a>
+    <a href="/docs_ar">المستندات</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">تبرع/a>
   </div>
 
 </div><!-- teasing-part -->

index_de.md

@@ -24,7 +24,8 @@
   <div class="main-links hidden-xs">
     <a href="/whatsyunohost">Über Yunohost</a> <span class="colored-bar">•</span> 
     <a href="https://forum.yunohost.org/c/announcement" target="_blank">Letzte Nachrichten</a> <span class="colored-bar">•</span> 
-    <a href="/docs">Dokumentation</a>
+    <a href="/docs">Dokumentation</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">Spenden</a>
   </div>
   </div><!-- teasing-part -->
 

index_es.md

@@ -23,7 +23,8 @@
   <div class="main-links hidden-xs">
     <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="/docs">Documentación</a>
+    <a href="/docs">Documentación</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">Donar</a>
   </div>
 
 </div><!-- teasing-part -->

index_fr.md

@@ -19,14 +19,15 @@
   <div class="main-links hidden-xs">
     <a href="/whatsyunohost_fr">À propos</a> <span class="colored-bar">•</span> 
     <a href="https://forum.yunohost.org/c/announcement" target="_blank">Dernières nouvelles</a> <span class="colored-bar">•</span> 
-    <a href="/docs_fr">Documentation</a>
+    <a href="/docs_fr">Documentation</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">Faire un don</a>
   </div>
 
 </div><!-- teasing-part -->
 
 <div class="boring-part" markdown="1">
 
-  <h1>YunoHost <small>est un outil qui vous permet d’installer et d’utiliser facilement votre propre serveur.</small></h1>
+  <h1><small>Avec</small> YunoHost<small>, gères facilement un serveur pour tes amis, ton asso, ton entreprise.</small> <a href="/whatsyunohost" style="font-size:0.6em;">En savoir plus</a></small></h1>
 
   <div class="home-panel">
     <img src="/images/home_panel.jpg" />
@@ -35,13 +36,13 @@
   <div class="call-to-action">
     <a class="btn btn-primary btn-lg" href="/try_fr">Essayer</a>
     <a class="btn btn-success btn-lg" href="/install_fr">Installer</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>
+    <h2 style="margin-top: 0"><small><a href="https://forum.yunohost.org/c/announcement">Dernières nouvelles</a></small></h2>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-7">
+    <div class="col-md-7 text-right">
       <h1>Installez <small>votre serveur simplement, vous avez déjà tout ce qu’il faut à la maison</small></h1>
       <p><a href="/hardware_fr">Voir les prérequis</a></p>
     </div>
@@ -57,25 +58,25 @@
   <div class="row cf">
     <div class="col-md-4">
       <div class="feature-pic">
-        <img src="/images/home_enjoy.jpg" />
+        <img src="/images/webadmin_fr.png" />
       </div>
     </div>
-    <div class="col-md-7 text-right">
+    <div class="col-md-7">
-      <h1>Profitez <small>de vos applications web, et fabriquez votre coin d’Internet</small></h1>
+      <h1>Gérez <small>votre serveur depuis une interface web simple et propre</small></h1>
-      <p><br /><a href="/apps_fr">Liste des applications disponibles</a></p>
+      <p><br /><a href="/try_fr">Essayez l’interface d’administration</a></p>
     </div>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-7">
+    <div class="col-md-7 text-right">
-      <h1>Gérez <small>votre serveur comme vous le voulez : via web, mobile ou ligne de commande</small></h1>
+      <h1>Construisez <small>votre petit bout d'Internet en ajoutant des applications en quelques clics</small></h1>
-      <p><br /><a href="/try_fr">Essayez l’interface d’administration</a></p>
+      <p><br /><a href="/apps">Parcourir les applications disponibles</a></p>
     </div>
     <div class="col-md-4">
       <div class="feature-pic">
-        <img src="/images/home_manage.jpg" />
+        <img src="/images/home_enjoy.jpg" />
       </div>
     </div>
   </div>
@@ -83,32 +84,16 @@
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4 button-list">
+    <div class="text-center">
+    <h1>Hey ! Nous sommes humains !<br />
+    <small>Si vous avez une question, un problème, ou que vous êtes tout simplement intéressé, passez dire « Bonjour » sur notre forum ou le chat!</small></h1>
 
-      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost_fr">Qu’est-ce que YunoHost ?</a>
+    <div class="col-md-4 col-md-offset-4 button-list">
-      <a class="btn btn-lg btn-block btn-info" href="/docs_fr">Documentation</a>
+      <a class="btn btn-lg btn-block btn-info" href="/docs"><span class="glyphicon glyphicon-book"></span> Documentation</a>
-      <a class="btn btn-lg btn-block btn-success" href="/contribute_fr">Comment contribuer</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr"><span class="glyphicon glyphicon-comment"></span> Forum et chat</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-success" href="/contribute"><span class="glyphicon glyphicon-heart"></span> Contribuer</a>
-      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_fr" target="_blank">Salons de discussions</a>
+      <a class="btn btn-lg btn-block btn-primary" href="https://donate.yunohost.org/" style="background-color: #ffd236; border-color: #ffd236;"><span class="glyphicon glyphicon-usd"></span> Faire un don</a>
-      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Dernières nouvelles</a>
+     </div>
-      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr">Support</a>
-
-    </div>
-    <div class="col-md-7 text-right">
-      <h1>Explorez <small>les possibilités de votre serveur, et apprenez pourquoi c’est important</small></h1>
-      <p><br /><a href="/docs_fr">Lire la documentation</a></p>
-    </div>
-  </div>
-
-  <hr />
-
-  <div class="text-center">
-    <h1>Hey ! Nous sommes humains !<br /><small> Si vous avez une question, un problème, ou que vous êtes tout simplement intéressé, passez dire « Bonjour » sur notre salon de discussion en cliquant sur le bouton en bas &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 -->

index_it.md

@@ -24,7 +24,8 @@
   <div class="main-links hidden-xs">
     <a href="/whatsyunohost">A proposito</a> <span class="colored-bar">•</span> 
     <a href="https://forum.yunohost.org/c/announcement" target="_blank">Ultime notizie</a> <span class="colored-bar">•</span> 
-    <a href="/docs">Documentazione</a>
+    <a href="/docs">Documentazione</a> <span class="colored-bar">•</span> 
+    <a href="https://donate.yunohost.org/">Donare</a>
   </div>
 
 </div><!-- teasing-part -->

project_budget.md

@@ -0,0 +1,28 @@
+# Project budget
+
+# Estimated budget for 2019/2020
+
+## Expected revenues
+
+* Donations via Liberapay: current is about 45€/week, so about 2340€/year
+* Grant from NLNet: 20K€, to be used for R&D (TODO: publish the project plan once validated with NLnet)
+
+## Expected expenses
+
+* Server renting: ~1000€
+   * Forum: 14.4€/month: 172.80€/year
+   * CI: 20€/month (to be confirmed): 240€/year
+   * Bearnaise server migration to a new machine: 587.2€
+* Domain names: ~150€
+   * nohost.me: 11.99€HT/year
+   * ynh.fr: 6.99€HT/year (to be confirmed with frju?)
+   * noho.st: ~35€ TTC/year
+   * YunoHost.org: 13.99€HT/year
+   * YunoHost.com: 9.99€HT/year
+   * labriqueinter.net: 12.49€Ht/year
+   * internetcu.be: 17.99€HT/year
+* Communication: ~200€
+* Travel (e.g. to go to conferences): ~500€
+* Bank account fees: 7x12€ => ~100€
+
+**Total**: about 2000€

whatsyunohost.md

@@ -3,24 +3,21 @@ What is YunoHost?
 
 <img src="/images/YunoHost_logo_vertical.png" width=400>
 
-Goal
+YunoHost is an **operating system** aiming to simplify as much as possibly the administration of a **server** and therefore democratize [self-hosting](selfhosting), while making sure it stays reliable, secure, ethical and lightweight. It is a free software project maintained exclusively by volunteers. Technically, it can be seen as a distribution based on [Debian GNU/Linux](https://debian.org) and can be installed on [many kinds of hardware](install).
-----
-
-YunoHost is a **server operating system** aiming to make [self-hosting](selfhosting) accessible to as many people as possible, without taking away from the quality and reliability of the software. YunoHost supports [several kinds of hardware](install). It is based on and fully compatible with [Debian GNU/Linux](https://debian.org).
 
 Features
 --------
 
 - <img src="/images/icon-debian.png" width=32 style="margin-right:5px"> based on Debian ;
-- <img src="/images/icon-tools.png" width=32 style="margin-right:5px" width=64> administrate your server through a **friendly web admin** ;
+- <img src="/images/icon-tools.png" width=32 style="margin-right:5px" width=64> administrate your server through a **friendly web interface** ;
-- <img src="/images/icon-package.png" width=32 style="margin-right:5px"> easily **install applications** on your server ;
+- <img src="/images/icon-package.png" width=32 style="margin-right:5px"> deploy **applications in just a few clicks** ;
 - <img src="/images/icon-users.png" width=32 style="margin-right:5px"> manage **users** <small>(based on LDAP)</small>;
-- <img src="/images/icon-globe.png" width=32 style="margin-right:5px"> manage **domains** ;
+- <img src="/images/icon-globe.png" width=32 style="margin-right:5px"> manage **domain names** ;
 - <img src="/images/icon-medic.png" width=32 style="margin-right:5px"> create and restore **backups** ;
 - <img src="/images/icon-door.png" width=32 style="margin-right:5px"> connect to all apps simultaneously through the **user portal** <small>(nginx, SSOwat)</small> ;
 - <img src="/images/icon-mail.png" width=32 style="margin-right:5px"> includes a **full email stack** <small>(Postfix, Dovecot, Rspamd, DKIM)</small> ;
 - <img src="/images/icon-messaging.png" width=32 style="margin-right:5px"> ... as well as **an instant messaging server** <small>(XMPP)</small> ;
-- <img src="/images/icon-lock.png" width=32 style="margin-right:5px"> ... a **SSL certificate** management system <small>(intergrated with Let's Encrypt)</small> ;
+- <img src="/images/icon-lock.png" width=32 style="margin-right:5px"> manages **SSL certificates** <small>(based on Let's Encrypt)</small> ;
 - <img src="/images/icon-shield.png" width=32 style="margin-right:5px"> ... and **security systems** <small>(fail2ban, yunohost-firewall)</small> ;
 
 Origin
@@ -35,27 +32,9 @@ All that was needed was an administration interface for Beudbeud's server to mak
 
 Noting the growing enthusiasm around YunoHost and around self-hosting in general, the original developers along with new contributors decided to start work on version 2, more extensible, more powerful, more easy-to-use, and one that makes a nice cup of fair-trade coffee for the elves of Lapland.
 
-Name
+The name **YunoHost** comes from the jargon "Y U NO Host". The [Internet meme](https://en.wikipedia.org/wiki/Internet_meme) should illustrate it:
-----
-
-**YunoHost** comes from the jargon "Y U NO Host". The [Internet meme](https://en.wikipedia.org/wiki/Internet_meme) should illustrate it:
 <div class="text-center"><img style="border-radius: 5px; box-shadow: 0 5px 15px rgba(0,0,0,0.15);" src="/images/dude_yunohost.jpg"></div>
 
-Development
------------
-
-YunoHost is developed to be as **simple** and minimally-intrusive as possible, to retain compatibility with Debian. It merely proposes a package of automatic configurations for existing software, and is configurable via simple interfaces.
-
-YunoHost is **entirely** a free software project. The philosophy of self-hosting is, to us, incompatible with any other model of software development.
-
-Do not hesitate to visit the ["contribute" page](/contribute).
-
-Security
---------
-
-The utmost effort is made to keep YunoHost secure, and **communications encrypted**. You can read more about this subject on the related page:
-[https://yunohost.org/security](/security)
-
 What YunoHost is not?
 ---------------------
 

whatsyunohost_fr.md

@@ -3,24 +3,21 @@ Qu'est-ce que YunoHost ?
 
 <img src="/images/YunoHost_logo_vertical.png" width=400>
 
-Objectif
+YunoHost est un **système d’exploitation** qui vise à simplifier autant que possible l'administration d'un **serveur** pour ainsi démocratiser [l’auto-hébergement](selfhosting_fr) tout en restant fiable, sécurisé, éthique et léger. C'est un projet de logiciel libre maintenu exclusivement par des bénévoles. Techniquement, il peut être vu comme une distribution basé sur [Debian GNU/Linux](https://debian.org) et peut s'installer sur [de nombreux types de matériel](install_fr).
---------
-
-YunoHost est un **système d’exploitation serveur** visant à rendre accessible [l’auto-hébergement](selfhosting_fr) à autant de personne que possible, sans délaisser la qualité et la fiabilité du logiciel. YunoHost supporte [plusieurs types de matériel](install_fr) et est basé et compatible avec [Debian GNU/Linux](https://debian.org).
 
 Fonctionnalités
 ---------------
 
 - <img src="/images/icon-debian.png" width=32 style="margin-right:5px"> basé sur Debian ;
-- <img src="/images/icon-tools.png" width=32 style="margin-right:5px"> administration via une **gentille interface web** ;
+- <img src="/images/icon-tools.png" width=32 style="margin-right:5px"> administration via une **interface web simple et claire** ;
-- <img src="/images/icon-package.png" width=32 style="margin-right:5px"> déployez facilement des **applications** ;
+- <img src="/images/icon-package.png" width=32 style="margin-right:5px"> déployez des **applications en quelques clics** ;
-- <img src="/images/icon-users.png" width=32 style="margin-right:5px"> gérez des **utilisateurs** <small>(gérés via LDAP)</small> ;
+- <img src="/images/icon-users.png" width=32 style="margin-right:5px"> ajoutez des **utilisateurs** <small>(gérés via un annuaire LDAP)</small> ;
-- <img src="/images/icon-globe.png" width=32 style="margin-right:5px"> gérez des **domaines** ;
+- <img src="/images/icon-globe.png" width=32 style="margin-right:5px"> gérez des **noms de domaine** ;
 - <img src="/images/icon-medic.png" width=32 style="margin-right:5px"> créez et restaurez des **sauvegardes** ;
 - <img src="/images/icon-door.png" width=32 style="margin-right:5px"> connexion simultanée à toutes les apps via un **portail utilisateur** <small>(nginx, SSOwat)</small> ;
 - <img src="/images/icon-mail.png" width=32 style="margin-right:5px"> fourni avec un **serveur mail complet** <small>(Postfix, Dovecot, Rspamd, DKIM)</small> ;
 - <img src="/images/icon-messaging.png" width=32 style="margin-right:5px"> ... ainsi qu'un **serveur de messagerie instantanée** <small>(XMPP)</small> ;
-- <img src="/images/icon-lock.png" width=32 style="margin-right:5px"> ... un système de gestion de **certificats SSL** <small>(integration de Let's Encrypt)</small> ;
+- <img src="/images/icon-lock.png" width=32 style="margin-right:5px"> gères les **certificats SSL** <small>(basé sur Let's Encrypt)</small> ;
 - <img src="/images/icon-shield.png" width=32 style="margin-right:5px"> ... et des **systèmes de sécurité** <small>(fail2ban, yunohost-firewall)</small> ;
 
 Origine
@@ -35,33 +32,9 @@ Il ne manquait en fait qu’une interface d’administration au serveur de Beudb
 
 Constatant l’engouement croissant autour de YunoHost et de l’auto-hébergement en général, les développeurs et les nouveaux contributeurs ont alors décidé de prendre le cap d’une version 2, plus accessible, plus extensible, plus puissante, et qui prépare du bon café commerce équitable pour les lutins de Laponie.
 
-But
+Le nom **YunoHost** vient de l’argot Internet anglais « Y U NO Host » signifiant approximativement « Pourquoi toi ne pas héberger ». Le [mème Internet](http://fr.wikipedia.org/wiki/M%C3%A8me_Internet) qui l’illustre est à peu près celui-ci :
----
-
-Le but de YunoHost est de rendre accessibles au plus grand nombre l’installation et l’administration d’un serveur, sans délaisser la qualité et la fiabilité du logiciel. 
-
-Tous les efforts sont faits pour simplifier le déploiement sur le plus d’appareils possible et dans toutes les conditions (chez soi, sur son serveur dédié ou sur un VPS).
-
-Nom
----
-
-**YunoHost** vient de l’argot Internet anglais « Y U NO Host » signifiant approximativement « Pourquoi toi ne pas héberger ». Le [mème Internet](http://fr.wikipedia.org/wiki/M%C3%A8me_Internet) qui l’illustre est à peu près celui-ci :
 <div class="text-center"><img style="border-radius: 5px; box-shadow: 0 5px 15px rgba(0,0,0,0.15);" src="/images/dude_yunohost.jpg"></div>
 
-Développement
--------------
-
-YunoHost est développé pour être le plus **simple** et le moins intrusif possible pour garder la compatibilité avec Debian. Il propose uniquement un ensemble de configurations automatiques et opère via des interfaces accessibles.
-
-Le tout est bien entendu **entièrement libre**. La philosophie de l’[auto-hébergement](selfhosting_fr) étant à nos yeux incompatible avec tout autre modèle de développement logiciel.
-
-N’hésitez pas à visiter la page « [contribuez](/contribute_fr) ».
-
-Sécurité
---------
-
-Tous les efforts ont été déployés pour sécuriser YunoHost, et **chiffrer tous les protocoles**. Une explication plus détaillée est disponible [ici](/security_fr).
-
 Qu’est-ce que YunoHost n’est pas ?
 ----------------------------------