diff --git a/XMPP.md b/XMPP.md
index 3b6ccc68..79027d84 100644
--- a/XMPP.md
+++ b/XMPP.md
@@ -2,7 +2,7 @@
XMPP is a communication protocol of instant messaging, VoIP (Voice over IP), videoconferencing.
YunoHost provide:
-* [Metronome](http://www.lightwitch.org/metronome): a XMPP server
+* [Metronome](https://metronome.im/): a XMPP server
* [Jappix](/apps): a web XMPP client
## Desktop XMPP client
diff --git a/app_netdata.md b/app_netdata.md
new file mode 100644
index 00000000..f3831882
--- /dev/null
+++ b/app_netdata.md
@@ -0,0 +1,262 @@
+## NetData
+
+[NetData](http://my-netdata.io/) is a system for **distributed real-time performance and health monitoring**.
+It provides **unparalleled insights, in real-time**, of everything happening on the
+system it runs (including applications such as web and database servers), using
+**modern interactive web dashboards**.
+
+_netdata is **fast** and **efficient**, designed to permanently run on all systems
+(**physical** & **virtual** servers, **containers**, **IoT** devices), without
+disrupting their core function._
+
+[](https://install-app.yunohost.org/?app=piwigo)
+
+**Customization brought by the package:**
+
+* grant MySQL statistics access via a `netdata` user
+* nginx root log statistics via putting `netdata` user in the `adm` group
+* Dovecot statistics via giving access to Dovecot stats stocket to `netdata` user (works only with Dovecot 2.2.16+)
+
+**Further recommendations:**
+We don't allow YunoHost packages to make sensible changes to system files. So here are further customizations you can make to allow more monitoring:
+
+* Nginx:
+ * requests/connections: follow [these recommandations](https://github.com/firehol/netdata/tree/master/python.d#nginx) to enable `/stab_status` (for example by putting the `location` section in `/etc/nginx/conf.d/yunohost_admin.conf`
+ * weblogs: you can monitor all your nginx weblogs for errors; follow [these recommendations](https://github.com/firehol/netdata/tree/master/python.d#nginx_log)
+* phpfpm: follow [these recommandations](https://github.com/firehol/netdata/tree/master/python.d#phpfpm)
+
+## Features
+
+
+
+
+
+ - **Stunning interactive bootstrap dashboards**
+ mouse and touch friendly, in 2 themes: dark, light
+
+ - **Amazingly fast**
+ responds to all queries in less than 0.5 ms per metric,
+ even on low-end hardware
+
+ - **Highly efficient**
+ collects thousands of metrics per server per second,
+ with just 1% CPU utilization of a single core, a few MB of RAM and no disk I/O at all
+
+ - **Sophisticated alarming**
+ hundreds of alarms, **out of the box**!
+ supports dynamic thresholds, hysteresis, alarm templates,
+ multiple role-based notification methods (such as email, slack.com,
+ pushover.net, pushbullet.com, telegram.org, twilio.com, messagebird.com)
+
+ - **Extensible**
+ you can monitor anything you can get a metric for,
+ using its Plugin API (anything can be a netdata plugin,
+ BASH, python, perl, node.js, java, Go, ruby, etc)
+
+ - **Embeddable**
+ it can run anywhere a Linux kernel runs (even IoT)
+ and its charts can be embedded on your web pages too
+
+ - **Customizable**
+ custom dashboards can be built using simple HTML (no javascript necessary)
+
+ - **Zero configuration**
+ auto-detects everything, it can collect up to 5000 metrics
+ per server out of the box
+
+ - **Zero dependencies**
+ it is even its own web server, for its static web files and its web API
+
+ - **Zero maintenance**
+ you just run it, it does the rest
+
+ - **scales to infinity**
+ requiring minimal central resources
+
+ - **several operating modes**
+ autonomous host monitoring, headless data collector, forwarding proxy, store and forward proxy, central multi-host monitoring, in all possible configurations.
+ Each node may have different metrics retention policy and run with or without health monitoring.
+
+ - **time-series back-ends supported**
+ can archive its metrics on `graphite`, `opentsdb`, `prometheus`, json document DBs, in the same or lower detail
+ (lower: to prevent it from congesting these servers due to the amount of data collected)
+
+
+
+---
+
+## What does it monitor?
+
+netdata collects several thousands of metrics per device.
+All these metrics are collected and visualized in real-time.
+
+> _Almost all metrics are auto-detected, without any configuration._
+
+This is a list of what it currently monitors:
+
+- **CPU**
+ usage, interrupts, softirqs, frequency, total and per core, CPU states
+
+- **Memory**
+ RAM, swap and kernel memory usage, KSM (Kernel Samepage Merging), NUMA
+
+- **Disks**
+ per disk: I/O, operations, backlog, utilization, space, software RAID (md)
+
+ 
+
+- **Network interfaces**
+ per interface: bandwidth, packets, errors, drops
+
+ 
+
+- **IPv4 networking**
+ bandwidth, packets, errors, fragments,
+ tcp: connections, packets, errors, handshake,
+ udp: packets, errors,
+ broadcast: bandwidth, packets,
+ multicast: bandwidth, packets
+
+- **IPv6 networking**
+ bandwidth, packets, errors, fragments, ECT,
+ udp: packets, errors,
+ udplite: packets, errors,
+ broadcast: bandwidth,
+ multicast: bandwidth, packets,
+ icmp: messages, errors, echos, router, neighbor, MLDv2, group membership,
+ break down by type
+
+- **Interprocess Communication - IPC**
+ such as semaphores and semaphores arrays
+
+- **netfilter / iptables Linux firewall**
+ connections, connection tracker events, errors
+
+- **Linux DDoS protection**
+ SYNPROXY metrics
+
+- **fping** latencies
+ for any number of hosts, showing latency, packets and packet loss
+
+ 
+
+
+- **Processes**
+ running, blocked, forks, active
+
+- **Entropy**
+ random numbers pool, using in cryptography
+
+- **NFS file servers and clients**
+ NFS v2, v3, v4: I/O, cache, read ahead, RPC calls
+
+- **Network QoS**
+ the only tool that visualizes network `tc` classes in realtime
+
+ 
+
+- **Linux Control Groups**
+ containers: systemd, lxc, docker
+
+- **Applications**
+ by grouping the process tree and reporting CPU, memory, disk reads,
+ disk writes, swap, threads, pipes, sockets - per group
+
+ 
+
+- **Users and User Groups resource usage**
+ by summarizing the process tree per user and group,
+ reporting: CPU, memory, disk reads, disk writes, swap, threads, pipes, sockets
+
+- **Apache and lighttpd web servers**
+ `mod-status` (v2.2, v2.4) and cache log statistics, for multiple servers
+
+- **Nginx web servers**
+ `stub-status`, for multiple servers
+
+- **Tomcat**
+ accesses, threads, free memory, volume
+
+- **web server log files**
+ extracting in real-time, web server performance metrics and applying several health checks
+
+- **mySQL databases**
+ multiple servers, each showing: bandwidth, queries/s, handlers, locks, issues,
+ tmp operations, connections, binlog metrics, threads, innodb metrics, and more
+
+- **Postgres databases**
+ multiple servers, each showing: per database statistics (connections, tuples
+ read - written - returned, transactions, locks), backend processes, indexes,
+ tables, write ahead, background writer and more
+
+- **Redis databases**
+ multiple servers, each showing: operations, hit rate, memory, keys, clients, slaves
+
+- **mongodb**
+ operations, clients, transactions, cursors, connections, asserts, locks, etc
+
+- **memcached databases**
+ multiple servers, each showing: bandwidth, connections, items
+
+- **elasticsearch**
+ search and index performance, latency, timings, cluster statistics, threads statistics, etc
+
+- **ISC Bind name servers**
+ multiple servers, each showing: clients, requests, queries, updates, failures and several per view metrics
+
+- **NSD name servers**
+ queries, zones, protocols, query types, transfers, etc.
+
+- **Postfix email servers**
+ message queue (entries, size)
+
+- **exim email servers**
+ message queue (emails queued)
+
+- **Dovecot** POP3/IMAP servers
+
+- **ISC dhcpd**
+ pools utilization, leases, etc.
+
+- **IPFS**
+ bandwidth, peers
+
+- **Squid proxy servers**
+ multiple servers, each showing: clients bandwidth and requests, servers bandwidth and requests
+
+- **HAproxy**
+ bandwidth, sessions, backends, etc
+
+- **varnish**
+ threads, sessions, hits, objects, backends, etc
+
+- **OpenVPN**
+ status per tunnel
+
+- **Hardware sensors**
+ `lm_sensors` and `IPMI`: temperature, voltage, fans, power, humidity
+
+- **NUT and APC UPSes**
+ load, charge, battery voltage, temperature, utility metrics, output metrics
+
+- **PHP-FPM**
+ multiple instances, each reporting connections, requests, performance
+
+- **hddtemp**
+ disk temperatures
+
+- **smartd**
+ disk S.M.A.R.T. values
+
+- **SNMP devices**
+ can be monitored too (although you will need to configure these)
+
+- **statsd**
+ [netdata is a fully featured statsd server](https://github.com/firehol/netdata/wiki/statsd)
+
+And you can extend it, by writing plugins that collect data from any source, using any computer language.
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/netdata_ynh/issues
+ * NetData website: http://my-netdata.io/
\ No newline at end of file
diff --git a/apps_wishlist.md b/apps_wishlist.md
index e4a959d9..299f3680 100644
--- a/apps_wishlist.md
+++ b/apps_wishlist.md
@@ -96,6 +96,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
- [Modoboa](http://modoboa.org)
- [MotionEye](https://github.com/ccrisan/motioneye)
- [MPD](http://www.musicpd.org)
+- [Museek+](https://github.com/eLvErDe/museek-plus)
- [Nibbleblog](http://www.nibbleblog.com)
- [Nuage](https://nuage.kerjean.me/login)
- [ONLYOFFICE](http://onlyoffice.org)
@@ -118,6 +119,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
- [ProcessMaker](http://www.processmaker.com)
- [Pulse](https://ind.ie/pulse)
- [Pump.io](http://pump.io)
+- [qBittorrent](https://github.com/qbittorrent/qBittorrent)
- [racktables](http://racktables.org)
- [remotestorage-server](http://remotestorage.io/provide)
- [Request Tracker](https://bestpractical.com)
@@ -139,6 +141,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
- [TorChat](https://github.com/prof7bit/TorChat)
- [Torrent Tunes](https://github.com/tchoulihan/torrenttunes-client)
- [Total Respawn](https://github.com/broncowdd/TotalRespawn)
+- [TwitRSS.me](http://twitrss.me/) ([Github](https://github.com/ciderpunx/twitrssme)) Scrapes Twitter to create RSS feeds.
- [Twister](http://twister.net.co)
- [Unvis](https://github.com/lodjuret/unvis.it)
- [Unsee](https://github.com/unsee-cc)
diff --git a/dkim_fr.md b/dkim_fr.md
index c7c95c6f..e85066c2 100644
--- a/dkim_fr.md
+++ b/dkim_fr.md
@@ -2,7 +2,7 @@
DKIM est maintenant intégré de base dans YunoHost grâce à [Rspamd](https://rspamd.com)/rmilter.
-Il vous suffit d'ajouter l'enregistrement DNS de type TXT recommendé pour
+Il vous suffit d'ajouter l'enregistrement DNS de type TXT recommandé pour
mail._domainkey tel que donné par [la configuration DNS recommandée](dns_config_fr)
pour que les signatures DKIM soient pleinement fonctionelles.
diff --git a/install_iso_fr.md b/install_iso_fr.md
index 832448b3..699f9e7a 100644
--- a/install_iso_fr.md
+++ b/install_iso_fr.md
@@ -31,3 +31,7 @@ Pour se connecter directement sur l’ordinateur (uniquement en local) :
* Utilisateur : **root**
* Mot de passe : **yunohost**
+
+## Cas spécifiques / avancés
+
+Si l'ordinateur n'a pas de carte graphique mais a un port série : il faut modifier l'ISO pour démarrer avec la console série. Une solution est d'utiliser [un script qui modifie les options de démarrage](https://github.com/luffah/debian-mkserialiso).
diff --git a/security_fr.md b/security_fr.md
index e48372c0..91d0c980 100644
--- a/security_fr.md
+++ b/security_fr.md
@@ -72,7 +72,7 @@ Ensuite redémarrez le firewall iptables et fermez l’ancien port dans iptables
```bash
yunohost firewall reload
-yunohost firewall disallow # port par défaut 22
+yunohost firewall disallow TCP # port par défaut 22
yunohost firewall disallow --ipv6 TCP # pour ipv6
```
diff --git a/troubleshooting_guide.md b/troubleshooting_guide.md
index c6ada8fc..f3179ba4 100644
--- a/troubleshooting_guide.md
+++ b/troubleshooting_guide.md
@@ -15,15 +15,15 @@ Keep in mind that when you install an app, you execute code on your server with
From my experience, some packaging are excellent and others can break some part of your YunoHost instance. Some packages are unmaintained. So before install check package issues, the [Forum](http://forum.yunohost.org/) and the [YunoHost support room](support_en) to see if other have problem with the app.
### Check the official documentation
-Answer to your question may be already in [the documentatioon](https://yunohost.org/#/sitemap_en).
+Answer to your question may be already in [the documentation](https://yunohost.org/#/sitemap_en).
### Check the command line help
Learn how to use the [YunoHost commands](https://yunohost.org/#/moulinette_en) like a pro.
## Upgrade
-Problems oftenly occurs after an upgrade. After a YunoHost upgrade you may want to [update your apps](https://yunohost.org/#/app_update_en).
+Problems often occur after an upgrade. After a YunoHost upgrade you may want to [update your apps](https://yunohost.org/#/app_update_en).
-**Check if some processes are using old librairies**
+**Check if some processes are using old libraries**
You are probably familiar with:
```bash