From 0db3abd6da5abd7e538217ade006326ed6ad5634 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Sun, 28 Jun 2020 21:41:51 +0200 Subject: [PATCH] added and updated matrix description --- sites/de/services/matrix.md | 4 ---- sites/en/services/matrix.md | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sites/de/services/matrix.md b/sites/de/services/matrix.md index e81c8a8..1c6c1ec 100644 --- a/sites/de/services/matrix.md +++ b/sites/de/services/matrix.md @@ -13,10 +13,6 @@ __Seit Anfang 2020 betreibe ich einen öffentlichen Matrix-Server: [matrix.sp-co Melde dich gerne auf meinem Server an oder suche dir einen aus der unten verlinkten Liste aus. Ich freue mich auf deine Nachricht an [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de). -## Server Details - -Der Matrix-Homeserver läuft auf einem vServer von [Netcup](https://netcup.de/). - ## Weitere nützliche Links * [Verschiedene Apps](https://matrix.org/clients) diff --git a/sites/en/services/matrix.md b/sites/en/services/matrix.md index 02b2cee..0da7e93 100644 --- a/sites/en/services/matrix.md +++ b/sites/en/services/matrix.md @@ -5,4 +5,17 @@ title: Matrix --- # Matrix -The description for Matrix is coming soon. +Matrix is a modern, open source software for decentralized communication (like e-mail). Matrix offers end-to-end encryption, voice and video calls and much more. However, the most important thing is that there is not one Matrix server that all users have to use, like WhatsApp, Telegram and many other popular messengers. + +Users can choose a public server or create their own and still communicate with all Matrix users, not just those on their own server. The messages sent are only stored on the participating servers. Calls also go only through the participating servers. + +__Since the beginning of 2020 I run a public Matrix server: [matrix.sp-codes.de](https://matrix.sp-codes.de/) And a public Riot-Web instance: [chat.sp-codes.de](https://chat.sp-codes.de/)__ + +Feel free to create an account on my server or choose one from the list linked below. I look forward to your message to [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de). + +## More useful links + +* [Various Apps](https://matrix.org/clients) +* [List of public rooms](https://view.matrix.org/) +* [List of public matrix servers](https://www.hello-matrix.net/public_servers.php) +* [Matrix FAQ](https://matrix.org/faq/)