From dfdc5f9bef899c356695c9cc0c5b7f9e8c45b2d5 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 3 May 2018 23:19:55 +0900
Subject: [PATCH 1/3] search.yaml: Rename some titles to avoid confusion
 between request and response schemas

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
---
 api/client-server/search.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/client-server/search.yaml b/api/client-server/search.yaml
index e5f6a872..f7c96180 100644
--- a/api/client-server/search.yaml
+++ b/api/client-server/search.yaml
@@ -74,7 +74,7 @@ paths:
                 properties:
                   room_events:
                     type: object
-                    title: "Room Events"
+                    title: Room Events Criteria
                     description: Mapping of category name to search criteria.
                     properties:
                       search_term:
@@ -103,7 +103,7 @@ paths:
                           The order in which to search for results.
                           By default, this is ``"rank"``.
                       event_context:
-                        title: "Event Context"
+                        title: "Include Event Context"
                         type: object
                         description: |-
                           Configures whether any context for the events
@@ -169,13 +169,13 @@ paths:
             properties:
               search_categories:
                 type: object
-                title: Categories
+                title: Result Categories
                 description: Describes which categories to search in and
                   their criteria.
                 properties:
                   room_events:
                     type: object
-                    title: Room Event Results
+                    title: Result Room Events
                     description: Mapping of category name to search criteria.
                     properties:
                       count:

From 0867ab2365e403241343d45bc06c966d73442ea3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Jul 2018 20:14:19 -0600
Subject: [PATCH 2/3] Add to changelog

---
 changelogs/client_server.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 44d41f4e..f732a6d8 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -41,6 +41,8 @@ Unreleased changes
     (`#1245 <https://github.com/matrix-org/matrix-doc/pull/1244>`_).
   - Describe ``StateEvent`` for ``/createRoom``
     (`#1329 <https://github.com/matrix-org/matrix-doc/pull/1329>`_).
+  - Clarify the request and result types on ``/search``
+    (`#1381 <https://github.com/matrix-org/matrix-doc/pull/1381>`_).
 
 - Changes to the API which will be backwards-compatible for clients:
 

From 16860ddd22b8364ea501bbcf0034c5ae189b3bf3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 5 Jul 2018 10:46:53 -0600
Subject: [PATCH 3/3] De-quote

---
 api/client-server/search.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/client-server/search.yaml b/api/client-server/search.yaml
index f7c96180..687140b3 100644
--- a/api/client-server/search.yaml
+++ b/api/client-server/search.yaml
@@ -103,7 +103,7 @@ paths:
                           The order in which to search for results.
                           By default, this is ``"rank"``.
                       event_context:
-                        title: "Include Event Context"
+                        title: Include Event Context
                         type: object
                         description: |-
                           Configures whether any context for the events