From b3d1ed818d09f0d2e387bdff13348d9dbf84da3c Mon Sep 17 00:00:00 2001
From: Brandon Jones <bajones@chromium.org>
Date: Mon, 31 Oct 2016 23:46:46 -0700
Subject: [PATCH] Addressed multiple pieces of feedback

---
 index.bs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/index.bs b/index.bs
index 58139249..8d247205 100644
--- a/index.bs
+++ b/index.bs
@@ -223,7 +223,7 @@ Captures the current state of the {{VRLayer}} currently being presented and disp
 
 ### Events ### {#vrdisplay-events}
 
-User agents implementing this specification MUST provide the following new DOM events. The corresponding events must be of type {{VRDisplayEvent}} and must fire on a {{VRDisplay}} object. Registration for and firing of the events must follow the usual behavior of DOM4 Events.
+The UA MUST provide the following new events. The corresponding events must be of type {{VRDisplayEvent}} and must fire on a {{VRDisplay}} object. Registration for and firing of the events must follow the usual behavior of DOM4 Events.
 
 <dfn event for="VRDisplay" id="vrdisplay-onactivate-event">onactivate</dfn>
 A user agent MAY dispatch this event type to indicate that something has occured which suggests the {{VRDisplay}} should be presented to. For example, if the {{VRDisplay}} is capable of detecting when the user has put it on, this event SHOULD fire when they do so with the reason "mounted".
@@ -604,27 +604,18 @@ Return a Promise which resolves to a list of available {{VRDisplay}}s.
 <dfn attribute for="VR" id="vr-activedisplays-attribute">activeDisplays</dfn>
 {{activeDisplays}} includes every {{VRDisplay}} that is currently presenting.
 
-<dfn event for="VR" id="vr-displayconnect-event">ondisplayconnect</dfn>
-A user agent MAY dispatch this event type to indicate that a {{VRDisplay}} has been connected. The event MUST be of type {{VRDisplayEvent}}.
-
-<dfn event for="VR" id="vr-displaydisconnect-event">ondisplaydisconnect</dfn>
-A user agent MAY dispatch this event type to indicate that a {{VRDisplay}} has been disconnected. The event MUST be of type {{VRDisplayEvent}}.
-
-<dfn event for="VR" id="vr-displaynavigate-event">onnavigate</dfn>
-A user agent MAY dispatch this event type to indicate that the current page has been navigated to from a page that was actively presenting VR content. The current page can call {{requestPresent()}} in response to this event in order to stay in VR presentation mode. The event MUST be of type {{VRDisplayEvent}}.
-
 ### Events ### {#vr-events}
 
-User agents implementing this specification MUST provide the following new DOM events. The corresponding events must be of type {{VRDisplayEvent}} and must fire on the {{vr}} object. Registration for and firing of the events must follow the usual behavior of DOM4 Events.
+The UA MUST provide the following new events. The corresponding events must be of type {{VRDisplayEvent}} and must fire on the {{VR}} object. Registration for and firing of the events must follow the usual behavior of DOM4 Events.
 
-<dfn event for="VR" id="vrdisplayconnect-event">vrdisplayconnect</dfn>
+<dfn event for="VR" id="vr-ondisplayconnect-event">ondisplayconnect</dfn>
 A user agent MAY dispatch this event type to indicate that a {{VRDisplay}} has been connected.
 
-<dfn event for="VR" id="vrdisplaydisconnect-event">vrdisplaydisconnect</dfn>
+<dfn event for="VR" id="vr-ondisplaydisconnect-event">ondisplaydisconnect</dfn>
 A user agent MAY dispatch this event type to indicate that a {{VRDisplay}} has been disconnected.
 
-<dfn event for="VR" id="vrdisplaynavigate-event">vrdisplaynavigate</dfn>
-A user agent MAY dispatch this event type to indicate that the current page has been navigated to from a page that was actively presenting VR content to the {{VRDisplay}}. The current page can call {{requestPresent()}} in response to this event in order to stay in VR presentation mode.
+<dfn event for="VR" id="vr-ondisplaynavigate-event">onnavigate</dfn>
+A user agent MAY dispatch this event type to indicate that the current page has been navigated to from a page that was actively presenting VR content. The current page can call {{requestPresent()}} in response to this event in order to stay in VR presentation mode.
 
 
 ## Navigator Interface extension ## {#interface-navigator}