Merge branch 'gh-pages' into issue-10-secure-top-level

w3c · Jun 26, 2019 · a9e3c94 · a9e3c94
2 parents e486c5a + ce5317b
commit a9e3c94
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 47 deletions.
diff --git a/.pr-preview.json b/.pr-preview.json
@@ -0,0 +1,4 @@
+{
+    "src_file": "index.html",
+    "type": "respec"
+}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+All documentation, code and communication under this repository are covered by the [W3C Code of Ethics and Professional Conduct](https://www.w3.org/Consortium/cepc/).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,34 +1,32 @@
-# Device APIs Working Group
+Contributions to this repository are intended to become part of Recommendation-track documents governed by the
+[W3C Patent Policy](https://www.w3.org/Consortium/Patent-Policy/) and
+[Software and Document License](https://www.w3.org/Consortium/Legal/copyright-
+software). To make substantive contributions to specifications, you must either participate
+in the relevant W3C Working Group or make a non-member patent licensing commitment.
 
-Contributions to this repository are intended to become part of Recommendation-track documents 
-governed by the [W3C Patent Policy](http://www.w3.org/Consortium/Patent-Policy-20040205/) and
-[Document License](http://www.w3.org/Consortium/Legal/copyright-documents). To contribute, you must 
-either participate in the relevant W3C Working Group or make a non-member patent licensing
- commitment.
+If you are not the sole contributor to a contribution (pull request), please identify all
+contributors in the pull request comment.
 
-If you are not the sole contributor to a contribution (pull request), please identify all 
-contributors in the pull request's body or in subsequent comments.
+To add a contributor (other than yourself, that's automatic), mark them one per line as follows:
 
- To add a contributor (other than yourself, that's automatic), mark them one per line as follows:
+```
++@github_username
+```
 
- ```
- +@github_username
- ```
+If you added a contributor by mistake, you can remove them in a comment with:
 
- If you added a contributor by mistake, you can remove them in a comment with:
+```
+-@github_username
+```
 
- ```
- -@github_username
- ```
-
- If you are making a pull request on behalf of someone else but you had no part in designing the 
- feature, you can remove yourself with the above syntax.
+If you are making a pull request on behalf of someone else but you had no part in designing the
+feature, you can remove yourself with the above syntax.
 
 # Tests
 
 For normative changes, a corresponding
-[web-platform-tests](https://github.com/w3c/web-platform-tests) PR is highly appreciated. Typically,
+[web-platform-tests](https://github.com/web-platform-tests/wpt) PR is highly appreciated. Typically,
 both PRs will be merged at the same time. Note that a test change that contradicts the spec should
 not be merged before the corresponding spec change. If testing is not practical, please explain why
-and if appropriate [file a web-platform-tests issue](https://github.com/w3c/web-platform-tests/issues/new)
-to follow up later. Add the `type:untestable` or `type:missing-coverage` label as appropriate.
+and if appropriate [file a web-platform-tests issue](https://github.com/web-platform-tests/wpt/issues/new)
+to follow up later. Add the `type:untestable` or `type:missing-coverage` label as appropriate.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,2 +1,4 @@
-All documents in this Repository are licensed by contributors under the [W3C Document
-License](http://www.w3.org/Consortium/Legal/copyright-documents).
+All documents in this Repository are licensed by contributors
+under the
+[W3C Software and Document License](https://www.w3.org/Consortium/Legal/copyright-software).
+
diff --git a/index.html b/index.html
@@ -32,7 +32,6 @@
           testSuiteURI: "https://w3c-test.org/battery-status/",
           implementationReportURI: "https://w3c.github.io/test-results/battery-status/20160621.html",
           scheme:       "https",
-          processVersion: 2005,
           otherLinks: [{
             key: "Participate",
             data: [
@@ -135,40 +134,47 @@ <h2>
         Terminology
       </h2>
       <p>
-        The following concepts, terms, and interfaces are defined in [[!HTML]],
-        [[!HTML5]], [[!ECMASCRIPT]], [[!WEBIDL]], [[!SECURE-CONTEXTS]], and
-        [[!FEATURE-POLICY]]:
+        The following concepts, terms, and interfaces are defined in
+        [[!HTML]], [[!DOM]], [[!ECMASCRIPT]], [[!WEBIDL]], and [[!SECURE-CONTEXTS]]:
       </p>
       <ul>
         <li>
           <a href=
-          "https://html.spec.whatwg.org/#navigator"><dfn><code>Navigator</code></dfn></a>
+          "https://html.spec.whatwg.org/multipage/system-state.html#navigator"><dfn><code>Navigator</code></dfn></a>
         </li>
         <li>
           <a href=
-          "https://html.spec.whatwg.org/#eventhandler"><dfn><code>EventHandler</code></dfn></a>
+          "https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><dfn><code>
+          EventHandler</code></dfn></a>
         </li>
         <li>
-          <dfn><a href="https://html.spec.whatwg.org/#queue-a-task">queue a
+          <a href=
+          "https://dom.spec.whatwg.org/#eventtarget"><dfn><code>
+          EventTarget</code></dfn></a>
+        </li>
+        <li>
+          <dfn><a href=
+          "https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task">queue a
           task</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://www.w3.org/TR/html5/webappapis.html#firing-a-simple-event-named-e">
-          fires a simple event</a></dfn>
+          "https://dom.spec.whatwg.org/#concept-event-fire">fires
+          an event</a></dfn>
         </li>
         <li>
-          <dfn><a href="https://html.spec.whatwg.org/#event-handlers">event
+          <dfn><a href=
+          "https://html.spec.whatwg.org/multipage/webappapis.html#event-handlers">event
           handlers</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://html.spec.whatwg.org/#event-handler-event-type">event
-          handler event types</a></dfn>
+          "https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-event-type">
+          event handler event types</a></dfn>
         </li>
         <li>
           <dfn><a href=
-          "https://html.spec.whatwg.org/#browsing-context">browsing
+          "https://html.spec.whatwg.org/multipage/browsers.html#browsing-context">browsing
           context</a></dfn>
         </li>
         <li>
@@ -186,6 +192,16 @@ <h2>
           "https://html.spec.whatwg.org/#current-settings-object">current
           settings object</a></dfn>
         </li>
+        <li>
+          <dfn><a href=
+          "https://html.spec.whatwg.org/multipage/browsers.html#top-level-browsing-context">
+          top-level browsing context</a></dfn>
+        </li>
+        <li>
+          <dfn><a href=
+          "https://html.spec.whatwg.org/multipage/webappapis.html#incumbent-settings-object">
+          incumbent settings object</a></dfn>
+        </li>
         <li>
           <dfn><a href=
           "https://html.spec.whatwg.org/#concept-document-window">associated
@@ -398,7 +414,7 @@ <h2>
         state, or there is no battery attached to the system, or otherwise.
         When the battery charging state is updated, the <a>user agent</a> MUST
         <a>queue a task</a> which sets the <code>charging</code> attribute's
-        value and <a>fires a simple event</a> named
+        value and <a>fires an event</a> named
         <code><a>chargingchange</a></code> at the <a>BatteryManager</a> object.
       </p>
       <p>
@@ -408,8 +424,7 @@ <h2>
         the battery is discharging, the implementation is unable to report the
         remaining charging time, or otherwise. When the battery charging time
         is updated, the <a>user agent</a> MUST <a>queue a task</a> which sets
-        the <code>chargingTime</code> attribute's value and <a>fires a simple
-        event</a> named <code><a>chargingtimechange</a></code> at the
+        the <code>chargingTime</code> attribute's value and <a>fires an event</a> named <code><a>chargingtimechange</a></code> at the
         <a>BatteryManager</a> object.
       </p>
       <p>
@@ -420,7 +435,7 @@ <h2>
         there is no battery attached to the system, or otherwise. When the
         battery discharging time is updated, the <a>user agent</a> MUST
         <a>queue a task</a> which sets the <code>dischargingTime</code>
-        attribute's value and <a>fires a simple event</a> named
+        attribute's value and <a>fires an event</a> named
         <code><a>dischargingtimechange</a></code> at the <a>BatteryManager</a>
         object.
       </p>
@@ -431,7 +446,7 @@ <h2>
         unable to report the battery's level, or there is no battery attached
         to the system. When the battery level is updated, the <a>user agent</a>
         MUST <a>queue a task</a> which sets the <code>level</code> attribute's
-        value and <a>fires a simple event</a> named
+        value and <a>fires an event</a> named
         <code><a>levelchange</a></code> at the <a>BatteryManager</a> object.
       </p>
       <p class="note">

diff --git a/w3c.json b/w3c.json
@@ -1,5 +1,9 @@
- {
-    "group":      ["43696"]
-,   "contacts":   ["dontcallmedom"]
-,   "shortName":  "battery-status"
-}
+{
+  "group": 43696,
+  "contacts": [
+    "xfq"
+  ],
+  "shortName": "battery-status",
+  "repo-type": "rec-track",
+  "policy": "open"
+}