synapse/docs
Mark Haines 984e207b59 Merge branch develop into server2server_signing
Conflicts:
	synapse/app/homeserver.py
2014-10-13 10:58:50 +01:00
..
client-server Clarify how-to some more. 2014-10-06 14:57:26 +01:00
implementation-notes Shuffle files around in /docs 2014-08-28 09:45:05 +01:00
server-server fix grammatics 2014-09-22 21:45:50 +01:00
sphinx Reference Matrix Home Server 2014-08-12 15:10:52 +01:00
definitions.rst SPEC-3: First hack at defining some of the various event related concepts 2014-10-07 11:38:02 +01:00
human-id-rules.rst More rst formatting. 2014-09-09 15:13:50 -07:00
specification-NOTHAVE.rst Continue moving content out of docs/model/presence into the main spec; delete model docs that are duplicated 2014-10-01 18:34:08 +01:00
specification.rst Clarify that room alias domain names will be server-scoped; nonlocal edits are unliekly to work but nonlocal lookups will 2014-10-07 16:23:12 +01:00
state_resolution.rst Add quick and dirty doc about state resolution 2014-10-06 17:34:44 +01:00
turn-howto.rst Just use a yaml list for turn servers 2014-09-25 19:18:32 +02:00