From dc27323d8b3050cb30e123754dab538e51980fb9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 Jan 2018 14:29:59 +0000
Subject: [PATCH 1/2] Document the defaults for the /search API

---
 api/client-server/search.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/api/client-server/search.yaml b/api/client-server/search.yaml
index 946d1ba7..c4f38fa1 100644
--- a/api/client-server/search.yaml
+++ b/api/client-server/search.yaml
@@ -99,7 +99,9 @@ paths:
                         title: "Ordering"
                         type: string
                         enum: ["recent", "rank"]
-                        description: "The order in which to search for results."
+                        description: |-
+                          The order in which to search for results.
+                          By default, this is ``"rank"``.
                       event_context:
                         title: "Event Context"
                         type: object
@@ -112,13 +114,13 @@ paths:
                                 title: "Before limit"
                                 description: |-
                                   How many events before the result are
-                                  returned.
+                                  returned. By default, this is ``5``.
                             after_limit:
                                 type: integer
                                 title: "After limit"
                                 description: |-
                                   How many events after the result are
-                                  returned.
+                                  returned. By default, this is ``5``.
                             include_profile:
                                 type: boolean
                                 title: "Return profile information"
@@ -126,6 +128,7 @@ paths:
                                   Requests that the server returns the
                                   historic profile information for the users
                                   that sent the events that were returned.
+                                  By default, this is ``false``.
                       include_state:
                         type: boolean
                         title: Include current state

From 436e2cd318e8619986170e23a1242ae719d533fe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 Jan 2018 21:30:02 +0000
Subject: [PATCH 2/2] Add changelog entry for /search API default value
 clarifications

---
 changelogs/client_server.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 1e930e77..233f7480 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -14,7 +14,9 @@ Unreleased changes
     endpoints as deprecated
     (`#1097 <https://github.com/matrix-org/matrix-doc/pull/1097>`_).
   - Fix response format of ``/keys/changes`` endpoint
-    (`#1106 <https://github.com/matrix-org/matrix-doc/pull/1106>`_)
+    (`#1106 <https://github.com/matrix-org/matrix-doc/pull/1106>`_).
+  - Clarify default values for some fields on the /search API
+    (`#1109 <https://github.com/matrix-org/matrix-doc/pull/1109>`_).
 
 - Changes to the API which will be backwards-compatible for clients: