From d279fdafa6e649f4dd8ea2dd4a89e559c633a3f3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 15:49:16 -0600
Subject: [PATCH] Document the server_name query parameter on
 /join/{roomIdOrAlias}

Fixes https://github.com/matrix-org/matrix-doc/issues/904
---
 api/client-server/joining.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/client-server/joining.yaml b/api/client-server/joining.yaml
index da4e43371ce..bd3e6885f6b 100644
--- a/api/client-server/joining.yaml
+++ b/api/client-server/joining.yaml
@@ -143,6 +143,16 @@ paths:
           description: The room identifier or alias to join.
           required: true
           x-example: "#monkeys:matrix.org"
+        - in: query
+          type: array
+          items:
+            type: string
+          explode: true
+          name: server_name
+          description: |-
+            The servers to attempt to join the room through. One of the servers
+            must be participating in the room.
+          x-example: ["matrix.org", "elsewhere.ca"]
         - in: body
           name: third_party_signed
           schema: