From e60b44e27fe9e83e5c6edca9e4c778fd244da0fa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 26 Aug 2018 22:27:34 -0600
Subject: [PATCH 1/2] Clean up PUT /directory/room

Fixes https://github.com/matrix-org/matrix-doc/issues/933

The issue references two problems: a `roomInfo` and lack of a `room_id`. It appears the `room_id` has been fixed since reporting, however the `roomInfo` remained (and is now fixed).
---
 api/client-server/directory.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/client-server/directory.yaml b/api/client-server/directory.yaml
index ee42cf845..78ddfa291 100644
--- a/api/client-server/directory.yaml
+++ b/api/client-server/directory.yaml
@@ -41,7 +41,7 @@ paths:
           required: true
           x-example: "#monkeys:matrix.org"
         - in: body
-          name: roomInfo
+          name: body
           description: Information about this room alias.
           required: true
           schema:
@@ -50,24 +50,24 @@ paths:
               room_id:
                 type: string
                 description: The room ID to set.
+            required: ['room_id']
             example: {
-                "room_id": "!abnjk1jdasj98:capuchins.com"
-              }
+              "room_id": "!abnjk1jdasj98:capuchins.com"
+            }
       responses:
         200:
           description: The mapping was created.
           examples:
-            application/json: {
-              }
+            application/json: {}
           schema:
             type: object
         409:
           description: A room alias with that name already exists.
           examples:
             application/json: {
-                "errcode": "M_UNKNOWN",
-                "error": "Room alias #monkeys:matrix.org already exists."
-              }
+              "errcode": "M_UNKNOWN",
+              "error": "Room alias #monkeys:matrix.org already exists."
+            }
           schema:
             "$ref": "definitions/errors/error.yaml"
       tags:

From ce0befd7d059e1b91389bfa4692cbb4c6dfd2d84 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 26 Aug 2018 22:28:52 -0600
Subject: [PATCH 2/2] Changelog

---
 changelogs/client_server/newsfragments/1574.clarification | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/client_server/newsfragments/1574.clarification

diff --git a/changelogs/client_server/newsfragments/1574.clarification b/changelogs/client_server/newsfragments/1574.clarification
new file mode 100644
index 000000000..8d07ef56f
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1574.clarification
@@ -0,0 +1 @@
+Fix naming of the body field in ``PUT /directory/room``.