From 6a2c4d27fc187d6efb755705be9eca7a07dec26f Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 18 Sep 2015 17:58:44 +0100
Subject: [PATCH] Update the docs for room v1 api

---
 api/client-server/v1/rooms.yaml       | 10 +++++-----
 event-schemas/schema/v1/m.room.member |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/client-server/v1/rooms.yaml b/api/client-server/v1/rooms.yaml
index c038dba5..4902560b 100644
--- a/api/client-server/v1/rooms.yaml
+++ b/api/client-server/v1/rooms.yaml
@@ -168,7 +168,7 @@ paths:
               title: StateEvent
               type: object
               allOf:
-                - "$ref": "events/core/state_event.json"
+                - "$ref": "core-event-schema/state_event.json"
         403:
           description: You are not joined to the room.
 
@@ -344,7 +344,7 @@ paths:
                       type: object
                       title: RoomEvent
                       allOf:
-                        - "$ref": "events/core/room_event.json"
+                        - "$ref": "core-event-schema/room_event.json"
                 required: ["start", "end", "chunk"]
               state:
                 type: array
@@ -357,7 +357,7 @@ paths:
                   title: StateEvent
                   type: object
                   allOf:
-                    - "$ref": "events/core/state_event.json"
+                    - "$ref": "core-event-schema/state_event.json"
               visibility:
                 type: string
                 enum: ["private", "public"]
@@ -414,7 +414,7 @@ paths:
                     "state_key": "@bob:example.com",
                     "type": "m.room.member",
                     "user_id": "@bob:example.com"
-                  },
+                  }
                 ]
               }
           schema:
@@ -426,5 +426,5 @@ paths:
                   title: MemberEvent
                   type: object
                   allOf:
-                    - "$ref": "events/m.room.member"
+                    - "$ref": "v1-event-schema/m.room.member"
 
diff --git a/event-schemas/schema/v1/m.room.member b/event-schemas/schema/v1/m.room.member
index 48f1b034..49b9f5b8 100644
--- a/event-schemas/schema/v1/m.room.member
+++ b/event-schemas/schema/v1/m.room.member
@@ -19,7 +19,7 @@
                     "description": "The avatar URL for this user, if any. This is added by the homeserver."
                 },
                 "displayname": {
-                    "type": "string",
+                    "type": ["string", "null"],
                     "description": "The display name for this user, if any. This is added by the homeserver."
                 }
             },