Merge branch 'master' into develop

README.rst

@@ -20,18 +20,21 @@ The overall architecture is::
 WARNING
 =======
 
-**Synapse is currently in a state of rapid development, and not all features are yet functional.
+**Synapse is currently in a state of rapid development, and not all features
-Critically, some security features are still in development, which means Synapse can *not*
+are yet functional. Critically, some security features are still in
-be considered secure or reliable at this point.**  For instance:
+development, which means Synapse can *not* be considered secure or reliable at
+this point.**  For instance:
 
 - **SSL Certificates used by server-server federation are not yet validated.**
 - **Room permissions are not yet enforced on traffic received via federation.**
-- **Homeservers do not yet cryptographically sign their events to avoid tampering**
+- **Homeservers do not yet cryptographically sign their events to avoid
+  tampering**
 - Default configuration provides open signup to the service from the internet
 
-Despite this, we believe Synapse is more than useful as a way for experimenting and
+Despite this, we believe Synapse is more than useful as a way for experimenting
-exploring Synapse, and the missing features will land shortly.  **Until then, please do *NOT*
+and exploring Synapse, and the missing features will land shortly. **Until
-use Synapse for any remotely important or secure communication.**
+then, please do *NOT* use Synapse for any remotely important or secure
+communication.**
 
 
 Quick Start
@@ -53,12 +56,13 @@ To get up and running:
   Please use a recent Chrome or Firefox for now (or Safari if you don't need
   VoIP support).
 
-    - To run a **public** homeserver and let it exchange messages with other homeservers
+- To run a **public** homeserver and let it exchange messages with other
-      and participate in the global Matrix federation, you must expose port 8448 to the
+  homeservers and participate in the global Matrix federation, you must expose
-      internet and edit homeserver.yaml to specify server_name (the public DNS entry for
+  port 8448 to the internet and edit homeserver.yaml to specify server_name
-      this server) and then run ``synctl start``. If you changed the server_name, you may
+  (the public DNS entry for this server) and then run ``synctl start``. If you
-      need to move the old database (homeserver.db) out of the way first. Then come join
+  changed the server_name, you may need to move the old database
-      ``#matrix:matrix.org`` and say hi! :)
+  (homeserver.db) out of the way first. Then come join ``#matrix:matrix.org``
+  and say hi! :)
 
 For more detailed setup instructions, please see further down this document.
 
@@ -82,8 +86,8 @@ which handle:
 - Placing 1:1 VoIP and Video calls
 
 These APIs are intended to be implemented on a wide range of servers, services
-and clients, letting developers build messaging and VoIP functionality on top of
+and clients, letting developers build messaging and VoIP functionality on top
-the entirely open Matrix ecosystem rather than using closed or proprietary
+of the entirely open Matrix ecosystem rather than using closed or proprietary
 solutions. The hope is for Matrix to act as the building blocks for a new
 generation of fully open and interoperable messaging and VoIP apps for the
 internet.
@@ -98,17 +102,17 @@ 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
+control and own your own communications and history or use one hosted by
-else (e.g. matrix.org) - there is no single point of control or mandatory
+someone else (e.g. matrix.org) - there is no single point of control or
-service provider in Matrix, unlike WhatsApp, Facebook, Hangouts, etc.
+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
 command line utility which lets you easily see what the JSON APIs are up to).
 
 We'd like to invite you to take a look at the Matrix spec, try to run a
-homeserver, and join the existing Matrix chatrooms already out there, experiment
+homeserver, and join the existing Matrix chatrooms already out there,
-with the APIs and the demo clients, and let us know your thoughts at
+experiment with the APIs and the demo clients, and let us know your thoughts at
 https://github.com/matrix-org/synapse/issues or at matrix@matrix.org.
 
 Thanks for trying Matrix!
@@ -138,20 +142,20 @@ to install by making setup.py do so, in --user mode::
     $ python setup.py develop --user
 
 You'll need a version of setuptools new enough to know about git, so you
-may need to also run:
+may need to also run::
 
     $ sudo apt-get install python-pip
     $ sudo pip install --upgrade setuptools
 
 If you don't have access to github, then you may need to install ``syutil``
-manually by checking it out and running ``python setup.py develop --user`` on it
+manually by checking it out and running ``python setup.py develop --user`` on
-too.
+it too.
 
 If you get errors about ``sodium.h`` being missing, you may also need to
 manually install a newer PyNaCl via pip as setuptools installs an old one. Or
 you can check PyNaCl out of git directly (https://github.com/pyca/pynacl) and
-installing it. Installing PyNaCl using pip may also work (remember to remove any
+installing it. Installing PyNaCl using pip may also work (remember to remove
-other versions installed by setuputils in, for example, ~/.local/lib).
+any other versions installed by setuputils in, for example, ~/.local/lib).
 
 On OSX, if you encounter ``clang: error: unknown argument: '-mno-fused-madd'``
 you will need to ``export CFLAGS=-Qunused-arguments``.
@@ -187,9 +191,9 @@ be publicly visible on the internet, and they will need to know its host name.
 You have two choices here, which will influence the form of your Matrix user
 IDs:
 
- 1) Use the machine's own hostname as available on public DNS in the form of its
+1) Use the machine's own hostname as available on public DNS in the form of
-    A or AAAA records. This is easier to set up initially, perhaps for testing,
+   its A or AAAA records. This is easier to set up initially, perhaps for
-    but lacks the flexibility of SRV.
+   testing, but lacks the flexibility of SRV.
 
 2) Set up a SRV record for your domain name. This requires you create a SRV
    record in DNS, but gives the flexibility to run the server on your own
@@ -269,8 +273,8 @@ account. Your name will take the form of::
 
 Specify your desired localpart in the topmost box of the "Register for an
 account" form, and click the "Register" button. Hostnames can contain ports if
-required due to lack of SRV records (e.g. @matthew:localhost:8080 on an internal
+required due to lack of SRV records (e.g. @matthew:localhost:8080 on an
-synapse sandbox running on localhost)
+internal synapse sandbox running on localhost)
 
 
 Logging In To An Existing Account
@@ -285,9 +289,9 @@ Identity Servers
 
 The job of authenticating 3PIDs and tracking which 3PIDs are associated with a
 given Matrix user is very security-sensitive, as there is obvious risk of spam
-if it is too easy to sign up for Matrix accounts or harvest 3PID data. Meanwhile
+if it is too easy to sign up for Matrix accounts or harvest 3PID data.
-the job of publishing the end-to-end encryption public keys for Matrix users is
+Meanwhile the job of publishing the end-to-end encryption public keys for
-also very security-sensitive for similar reasons.
+Matrix users is also very security-sensitive for similar reasons.
 
 Therefore the role of managing trusted identity in the Matrix ecosystem is
 farmed out to a cluster of known trusted ecosystem partners, who run 'Matrix