From de07586ab786d8cc8431dfc1b23030e9a77d6b57 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 25 Sep 2015 19:34:55 +0100
Subject: [PATCH] Rename 'events' to 'timeline' in the sync filter

---
 api/client-server/v2_alpha/definitions/sync_filter.json | 2 +-
 api/client-server/v2_alpha/filter.yaml                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/client-server/v2_alpha/definitions/sync_filter.json b/api/client-server/v2_alpha/definitions/sync_filter.json
index c9c47646..bfc8b51d 100644
--- a/api/client-server/v2_alpha/definitions/sync_filter.json
+++ b/api/client-server/v2_alpha/definitions/sync_filter.json
@@ -9,7 +9,7 @@
             "The state events to include for rooms.",
           "allOf": [{"$ref": "definitions/event_filter.json"}]
         },
-        "events": {
+        "timeline": {
           "description":
             "The message and state update events to include for rooms.",
           "allOf": [{"$ref": "definitions/event_filter.json"}]
diff --git a/api/client-server/v2_alpha/filter.yaml b/api/client-server/v2_alpha/filter.yaml
index 5296f11a..3e564f4b 100644
--- a/api/client-server/v2_alpha/filter.yaml
+++ b/api/client-server/v2_alpha/filter.yaml
@@ -50,7 +50,7 @@ paths:
                     "types": ["m.room.*"],
                     "not_rooms": ["!726s6s6q:example.com"]
                   },
-                  "events": {
+                  "timeline": {
                     "types": ["m.room.message"],
                     "not_rooms": ["!726s6s6q:example.com"],
                     "not_senders": ["@spam:example.com"]
@@ -118,7 +118,7 @@ paths:
                     "types": ["m.room.*"],
                     "not_rooms": ["!726s6s6q:example.com"]
                   },
-                  "events": {
+                  "timeline": {
                     "types": ["m.room.message"],
                     "not_rooms": ["!726s6s6q:example.com"],
                     "not_senders": ["@spam:example.com"]