Merge pull request #1855 from matrix-org/travis/fix-wk-fallback

Fix contradiction in wellknown discovery for servers

api/server-server/wellknown.yaml

@@ -35,9 +35,8 @@ paths:
             The delegated server information. The ``Content-Type`` for this response SHOULD
             be ``application/json``, however servers parsing the response should assume that
             the body is JSON regardless of type. Failures parsing the JSON or invalid data
-            provided in the resulting parsed JSON must result in server discovery failure (no
+            provided in the resulting parsed JSON should not result in discovery failure -
-            attempts should be made to continue finding an IP address/port number to connect
+            consult the server discovery process for information on how to continue.
-            to).
           examples:
             application/json: {
               "m.server": "delegated.example.com:1234"

changelogs/server_server/newsfragments/1855.clarification

@@ -0,0 +1 @@
+Clarify that servers should not fail to contact servers if ``/.well-known`` fails.