Merge branch 'master' into nocombine

w3c · Nov 8, 2018 · 0da55af · 0da55af
2 parents 5a258bd + d91b8a4
commit 0da55af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/getusermedia.html b/getusermedia.html
@@ -3481,15 +3481,6 @@ <h2>Methods</h2>
                   <code><a>name</a></code> attribute has the value
                   <code>InvalidStateError</code>.</p>
                 </li>
-                <li>
-                  <p>If the <a>current settings object</a>'s <a>responsible
-                  document</a> is NOT <a>allowed to use</a> the feature
-                  indicated by attribute name <code>allowusermedia</code>,
-                  return a promise <a>rejected</a> with a
-                  <code><a>DOMException</a></code> object whose
-                  <code><a>name</a></code> attribute has the value
-                  <code>SecurityError</code>.</p>
-                </li>
                 <li>
                   <p>Let <var>p</var> be a new promise.</p>
                 </li>

diff --git a/w3c.json b/w3c.json
@@ -1,5 +1,6 @@
  {
-    "group":      ["47318"]
-,   "contacts":   ["dontcallmedom", "vivienlacourba"]
+    "group":      47318
+,   "contacts":   ["dontcallmedom", "caribouW3"]
 ,   "shortName":  "mediacapture-streams"
+,   "repo-type":  "rec-track"
 }