Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc

api/client-server/old_sync.yaml

@@ -394,7 +394,7 @@ paths:
                   "body": "Hello world!",
                   "msgtype": "m.text"
                 },
-                "room_id:": "!wfgy43Sg4a:matrix.org",
+                "room_id": "!wfgy43Sg4a:matrix.org",
                 "sender": "@bob:matrix.org",
                 "event_id": "$asfDuShaf7Gafaw:matrix.org",
                 "type": "m.room.message"

api/client-server/search.yaml

@@ -157,7 +157,7 @@ paths:
                     properties:
                       count:
                         type: number
-                        description: Total number of results found
+                        description: An approximate count of the total number of results found.
                       results:
                         type: array
                         title: Results
@@ -298,7 +298,7 @@ paths:
                         }
                       },
                       "next_batch": "5FdgFsd234dfgsdfFD",
-                      "count": 24,
+                      "count": 1224,
                       "results": [
                         {
                           "rank": 0.00424866,