summary refs log tree commit diff
path: root/docs/specification.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-02 14:26:58 +0100
committerErik Johnston <erik@matrix.org>2014-10-02 14:26:58 +0100
commitff553cc9dd4fe7c9203a7c4c414e5fa27348180a (patch)
treeb46a6247c61c1144964e751b9a0037f8801dedda /docs/specification.rst
parentAll room state is currently shared. (diff)
downloadsynapse-ff553cc9dd4fe7c9203a7c4c414e5fa27348180a.tar.xz
Alias lookups return a server list.
Diffstat (limited to '')
-rw-r--r--docs/specification.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/specification.rst b/docs/specification.rst
index f45c75fca9..e0609f7074 100644
--- a/docs/specification.rst
+++ b/docs/specification.rst
@@ -190,7 +190,7 @@ Each room can also have multiple "Room Aliases", which looks like::
   #room_alias:domain
 
   .. TODO
-      - Need to specify precise grammar for Room IDs
+      - Need to specify precise grammar for Room Aliases
 
 A room alias "points" to a room ID and is the human-readable label by which
 rooms are publicised and discovered.  The room ID the alias is pointing to can
@@ -200,6 +200,9 @@ over time to point to a different room ID. For this reason, Clients SHOULD
 resolve the room alias to a room ID once and then use that ID on subsequent
 requests.
 
+When resolving a room alias the server will also respond with a list of servers
+that are in the room that can be used to join via.
+
 ::
 
           GET