merge

XMPP.md

@@ -10,3 +10,6 @@ YunoHost provide:
 You can use an heavy XMPP client such as [Pidgin](http://pidgin.im/), [Gajim](http://gajim.org/index.fr.html), [Jitsi](http://jitsi.org/) or [Adium](https://adium.im/).
 
 You will need to put your main e-mail address and your password.
+
+
+<img src="https://yunohost.org/images/Pidgin-add-acount.png" width=500>

XMPP_fr.md

@@ -13,3 +13,5 @@ Vous pouvez utiliser un client XMPP lourd comme [Pidgin](http://pidgin.im/), [Ga
 Voici la liste des clients XMPP : https://fr.wikipedia.org/wiki/Liste_de_clients_XMPP
 
 Vous aurez besoin de votre JID (correspondant à votre adresse mail principale) et de votre mot de passe.
+
+<img src="https://yunohost.org/images/Pidgin-add-acount.png" width=500>

admindoc_fr.md

@@ -23,6 +23,7 @@
 * [DNS - Système de nom de domaine](/dns_fr)
     * [Configuration du DNS chez son registar](/dns_config_fr)
     * [Avec OVH](/OVH_fr)
+    * [Accéder à son domaine depuis le réseau local](/dns_reseau_local_fr)
 * [Administration web](/admin_fr)
     * [Connexion à son serveur en ligne de commande avec SSH](/ssh_fr)
     * [Administration en ligne de commande avec la Moulinette](/moulinette_fr)

app_jappix_fr.md

@@ -1,3 +1,3 @@
 #<img src="https://yunohost.org/images/jappix.png">Jappix
 
-Jappix est un client web XMPP.
+Jappix est un client web [XMPP](/XMPP_fr).

apps.md

@@ -91,11 +91,8 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | Zomburl | courgette | <div class="inprogress"/> | https://github.com/courgette/zomburl_ynh |
 | proFTPd | beudbeud | <div class="inprogress"/> | https://github.com/abeudin/proftpd_ynh.git |
 | Lychee | titoko | <div class="inprogress"/> | https://github.com/titoko/lychee_ynh.git |
-| Baïkal | julien | <div class="inprogress"/> | https://github.com/julienmalik/baikal_ynh |
 | FreshRSS | plopoyop | <div class="ready"/> | https://github.com/plopoyop/freshrss_ynh |
 | Yourls | courgette | <div class="ready"/> | https://github.com/courgette/yourls_ynh |
-| OpenSondage | zamentur | <div class="ready"/> | https://github.com/zamentur/opensondage_ynh |
-| Strut | zamentur | <div class="ready"/> | https://github.com/zamentur/strut_ynh |
 | MyCryptoChat | mrtino | <div class="ready"/> | https://github.com/mrtino/mycryptochat_ynh |
 | MediaWiki | kload | <div class="ready"/> | https://github.com/kloadut/mediawiki_ynh |
 | Linux Dash | opi | <div class="ready"/> | https://github.com/opi/linuxdash_ynh |
@@ -104,7 +101,6 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | Etherpad-Lite | beudbeud | <div class="ready"/> | https://github.com/abeudin/etherpadlite_ynh |
 | Webmin | tifred | <div class="inprogress"/> | https://github.com/drfred1981/webmin_ynh |
 | Ghost | julien | <div class="ready"/> | https://github.com/julienmalik/ghost_ynh |
-| Sick Beard | julien | <div class="inprogress"/> |  |
 | Subsonic | tifred | <div class="inprogress"/> | https://github.com/drfred1981/subsonic_ynh |
 |Leed | Maniack Crudelis | <div class="ready"/> | https://github.com/maniackcrudelis/leed_ynh |
 | Custom Webapp (Multi instance) | Maniack Crudelis | <div class="ready"/> | https://github.com/maniackcrudelis/my_webapp_ynh |
@@ -114,9 +110,10 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | OpenWRT | lunarok | <div class="ready"/> | https://github.com/lunarok/openwrt_ynh |
 | PHPSysinfo | lunarok | <div class="ready"/> | https://github.com/lunarok/phpsysinfo_ynh |
 | HTPC Manager | lunarok | <div class="ready"/> | https://github.com/lunarok/htpc_ynh |
-| Hextris | opi | <div class="ready"/> | https://github.com/opi/hextris_ynh |
 | Piwik | Maniack Crudelis | <div class="ready"/> | https://github.com/maniackcrudelis/piwik_ynh |
+| KiwiIRC | julien | <div class="ready"/> | https://github.com/julienmalik/kiwiirc_ynh |
 | FileBin | IsserTerrus | <div class="ready"/> | https://github.com/isserterrus/filebin_ynh |
+| Pydio | julienmalik | <div class="inprogress"/> | https://github.com/julienmalik/pydio_ynh |
 
 ### Wishlist
 
@@ -131,7 +128,6 @@ The following list is a compiled wishlist of applications that would be nice-to-
 * [PluXML](http://www.pluxml.org/)
 * [Autoblog](https://github.com/mitsukarenai/Projet-Autoblog)
 * [Movim](http://www.movim.eu/)
-* [KiwiIRC](http://kiwiirc.com/)
 * [GitLab](http://gitlab.org/)
 * [FileTea](https://filetea.me)
 * [10er10](https://github.com/dready92/10er10)
@@ -140,6 +136,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 * [Sympa](http://www.sympa.org/)
 * [Mailman](https://www.gnu.org/software/mailman/)
 * [PHPList](http://www.phplist.com/)
+* [Shleuder](http://schleuder2.nadir.org/)
 * [Diaspora](https://diasporafoundation.org/)
 * [MediaGoblin](http://mediagoblin.org/)
 * [CumulusClips](http://cumulusclips.org/)
@@ -148,3 +145,9 @@ The following list is a compiled wishlist of applications that would be nice-to-
 * [ZNC](http://wiki.znc.in/ZNC)
 * [Tor relay](https://www.torproject.org/docs/tor-doc-relay.html.en)
 * [uMap](https://umap.openstreetmap.fr/en/)
+* [Sickbeard](http://sickbeard.com/)
+* [CouchPotato](https://couchpota.to/)
+* [Headphones](https://github.com/rembo10/headphones)
+* [Sabnzbd](http://sabnzbd.org/)
+* [MediaCrush](https://mediacru.sh/)
+

email.md

@@ -21,7 +21,7 @@ You will need your email address and your password.
 
 The automatic detection tool of Thunderbird does not work with YunoHost. You will need to setup it manually. To do so, add the account information, then select SSL/TLS for IMAP and SMTP. Afterwards select 'Normal Password' for Authentication and click on 'Advanced Config'. You will need to accept the certificate exceptions for fetching mails and after you send your first mail.
 
-(Screenshot needed)
+<img src="https://yunohost.org/images/Thunderbird-conf.png" width=900>
 
 ### Migration
 

email_fr.md

@@ -20,6 +20,8 @@ Tu auras besoin de ta principale adresse mail et de ton mot de passe.
 ####Thunderbird
 L'utilitaire de détection automatique de Thunderbird ne marche pas correctement avec YunoHost. Il faut donc passer en configuration manuelle.
 
+<img src="https://yunohost.org/images/Thunderbird-conf.png" width=900>
+
 ###Migration
 
 Tes courriels sont enregistrés dans le fichier /var/mail/.

install_on_raspberry.md

@@ -7,14 +7,14 @@
 <img src="https://yunohost.org/images/raspberry-pi-model-b.jpg">
 <img src="https://yunohost.org/images/sdcard.jpg">
 
-* A Raspberry Pi model B *-- Model A should work, but remains untested*
+* A Raspberry Pi model B or B+
 * An SD card: **4GB** capacity (or more) and **class10** speed rate are highly recommended
 * Another computer to read this guide and access to your Raspberry Pi
 * A screen and a keyboard are recommended to control your Raspberry Pi if a problem occurs.
 * A [reasonable ISP](/isp), preferably with a good and unlimited upstream bandwidth
 * The **YunoHost Raspberry image**, available here (to **unzip**):
 
-    [http://build.yunohost.org/yunohost-raspberrypi-2014-06-12.zip](http://build.yunohost.org/yunohost-raspberrypi-2014-06-12.zip)
+    [http://build.yunohost.org/yunohost-raspberrypi-2014-09-17.zip](http://build.yunohost.org/yunohost-raspberrypi-2014-09-17.zip)
 
 ---
 
@@ -28,10 +28,11 @@
 
 ---
 
-To connect with SSH : root@my-server.org / password : yunohost
+### Recommended after post-installation
 
-
+* Connect via SSH: **root@yunohost.local** (password : **yunohost**)
-Upgrade exlorating system: ```apt-get update && apt-get dist-upgrade```
+* Change root password: `passwd root`
+* Upgrade system: `apt-get update && apt-get dist-upgrade && rpi-update`
 
 ---
 

install_on_raspberry_fr.md

@@ -14,7 +14,7 @@
 * Un [fournisseur d'accès correct](/isp_fr), de préférence avec une bonne vitesse d'upload
 * L’**image YunoHost pour Raspberry Pi**, disponible ici (à **dézipper**) :
 
-    [http://build.yunohost.org/yunohost-raspberrypi-2014-06-12.zip](http://build.yunohost.org/yunohost-raspberrypi-2014-06-12.zip)
+    [http://build.yunohost.org/yunohost-raspberrypi-2014-09-17.zip](http://build.yunohost.org/yunohost-raspberrypi-2014-09-17.zip)
 
 
 ---
@@ -31,7 +31,7 @@
 
 ### Recommandé après la post-installation
 
-* Se connecter en ssh : **root@mon-serveur.org** (mot de passe : **yunohost**)
+* Se connecter en ssh : **root@yunohost.local** (mot de passe : **yunohost**)
 * Changer le mot de passe root : ```passwd root```
 * Mettre à jour le système d’exploitation : ```apt-get update && apt-get dist-upgrade```
 

roadmap_fr.md

@@ -1,4 +1,3 @@
 #Feuille de route
 
-<span class="glyphicon glyphicon-arrow-down"></span>
+Disponible en [anglais](/roadmap_en).
-Disponible en anglais

sitemap_fr.md

@@ -34,11 +34,13 @@
         * [DNS - Système de nom de domaine](/dns_fr)
             * [Configuration du DNS chez son registar](/dns_config_fr)
             * [Avec OVH](/OVH_fr)
+            * [Accéder à son domaine depuis le réseau local](/dns_reseau_local_fr)
         * [Applications](/apps_fr)
         * [Fournisseurs d’accès à Internet](/isp_fr)
             * [Configuration générale box](/isp_box_config_fr)
             * [SFR](/isp_sfr_fr)
             * [Orange](/isp_orange_fr)
+            * [Free](/isp_free_fr)
         * [Administration web](/admin_fr)
         * [Connexion à son serveur en ligne de commande avec SSH](/ssh_fr)
         * [Administration en ligne de commande avec la Moulinette](/moulinette_fr)