Merge branch 'xmpp' into 'master'

Xmpp

See merge request arnoldjun/bluesky!75

protocols/matrix.md

@@ -2,8 +2,6 @@
 
 Matrix is a protocol for replicating a signed history of JSON objects in realtime across a set of nodes with (optional) end-to-end encryption.
 
-Matrix is designed to support multiple communication cases - Chat, VoIP, IoT, VR/AR, Social etc, but so far effort has been concentrated on providing a federated chat experience with good UX at scale.
-
 ### Data Storage/Message Persistance
 
 Matrix messages are stored in per-conversation Merkle DAG data structures, and conversations are replicated across all participating servers. Matrix is architecturally most similar to Git.
@@ -68,16 +66,18 @@ Matrix is governed by [The Matrix.org Foundation CIC](https://matrix.org/foundat
 
 Matrix can be bridged with IRC, Slack, Discord, Telegram and others.
 
-### Applications
+### Implementations & Applications
 
-The public network currently (Feb 2020) has 17.9M known addressable users (as of June 2020), with more in private federations or on servers which don't report stats.
+Matrix is designed to support multiple communication cases - Chat, VoIP, IoT, VR/AR, Social etc, but so far effort has been concentrated on providing a federated chat experience with good UX at scale.
 
 Matrix supports multiple clients (most notably [Riot](https://riot.im), the flagship app from the core team), and has bridges to many other chat systems (IRC, Slack, Discord, Telegram etc).
 
-### Scalability
+### Scalability & Metrics
 
 Scalability study: https://arxiv.org/pdf/1910.06295.pdf
 
+The public network currently (Feb 2020) has 17.9M known addressable users (as of June 2020), with more in private federations or on servers which don't report stats.
+
 ### Links
 
 - [matrix.org](https://matrix.org/)