Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-25 10:28:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #936 from anoadragon453/patch-1

Browse source 
Tox.im -> Tox.chat
This commit is contained in:
Matthew Hodgson 2017-06-15 10:12:59 +01:00 committed by GitHub
parent f147533ea3 914ffa62ad
commit b4dc6fd4f6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
supporting-docs/guides/2015-08-19-faq.md
View file

@ -289,11 +289,11 @@ PSYC's views on Matrix.
##### What is the difference between Matrix and Tox?
Tox.im looks to be a very cool clone of Skype - a fully decentralised
Tox.chat looks to be a very cool clone of Skype - a fully decentralised
peer-to-peer network.  Matrix is deliberately not a 'pure' peer-to-peer
system; instead each user has a well-defined homeserver which stores
his data and that he can depend upon.  Matrix provides HTTP APIs;
Tox.im provides C APIs. As of October 2015 Tox doesn't seem to have an
Tox.chat provides C APIs. As of October 2015 Tox doesn't seem to have an
answer yet for decentralised conversation history storage.
##### How does Matrix compare with something like Trillian or Pidgin?