summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2016-05-29 10:37:04 +0100
committerMatthew Hodgson <matthew@arasphere.net>2016-05-29 10:37:04 +0100
commit42a9ea37e4c6ff9d91b530c40d366446b9fc2234 (patch)
tree8d61e3b83c63203bb1f39acfe5fab2d9dc3f9e5c /README.rst
parentMerge pull request #766 from sbts/patch-1 (diff)
parentAlter phrasing to clarify where info is stored. (diff)
downloadsynapse-42a9ea37e4c6ff9d91b530c40d366446b9fc2234.tar.xz
Merge pull request #801 from ruma/readme-history-storage
Alter phrasing to clarify where info is stored.
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/README.rst b/README.rst
index 95e7257115..722ff9f11f 100644
--- a/README.rst
+++ b/README.rst
@@ -58,12 +58,13 @@ the spec in the context of a codebase and let you run your own homeserver and
 generally help bootstrap the ecosystem.
 
 In Matrix, every user runs one or more Matrix clients, which connect through to
-a Matrix homeserver which stores all their personal chat history and user
-account information - much as a mail client connects through to an IMAP/SMTP
-server. Just like email, you can either run your own Matrix homeserver and
-control and own your own communications and history or use one hosted by
-someone else (e.g. matrix.org) - there is no single point of control or
-mandatory service provider in Matrix, unlike WhatsApp, Facebook, Hangouts, etc.
+a Matrix homeserver. The homeserver stores all their personal chat history and
+user account information - much as a mail client connects through to an
+IMAP/SMTP server. Just like email, you can either run your own Matrix
+homeserver and control and own your own communications and history or use one
+hosted by someone else (e.g. matrix.org) - there is no single point of control
+or mandatory service provider in Matrix, unlike WhatsApp, Facebook, Hangouts,
+etc.
 
 Synapse ships with two basic demo Matrix clients: webclient (a basic group chat
 web client demo implemented in AngularJS) and cmdclient (a basic Python