From 2dcc42c8e774e94e94585b2d1d867d664e282284 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 19 Sep 2017 16:52:44 +0200
Subject: [PATCH 1/9] Add IDL section and define IDL for all the members

---
 index.html | 402 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 233 insertions(+), 169 deletions(-)

diff --git a/index.html b/index.html
index 14a521924..962c351c2 100644
--- a/index.html
+++ b/index.html
@@ -295,34 +295,33 @@ <h3>
           <code>short_name</code>).
         </p>
       </section>
-      <section>
+      <section data-link-for="webappmanifest">
         <h3>
           Application's name
         </h3>
         <p>
           The <dfn>application's name</dfn> is derived from either the
-          <a><code>name</code> member</a> or <a><code>short_name</code>
-          member</a> (if either is present) - otherwise, it is generated by the
+          <a><code>name</code></a> member or <a><code>short_name</code></a>
+          member (if either is present) - otherwise, it is generated by the
           user agent or provided by the end-user.
         </p>
         <p>
           When either member is missing from the manifest, a user agent MAY use
-          the <a><code>name</code> member</a> as a fallback for the
-          <a><code>short_name</code> member</a> or vice versa.
+          the <a><code>name</code></a> member as a fallback for the
+          <a><code>short_name</code></a> member or vice versa.
         </p>
         <p>
-          If the <a data-lt="name member"><code>name</code></a> and <a data-lt=
-          "short_name member"><code>short_name</code></a> members are
+          If the <a><code>name</code></a> and <a><code>short_name</code></a> members are
           undefined, the user agent SHOULD assign a default name (e.g.,
           "Untitled"). Alternatively, a user agent MAY allow the end-user to
           input some text that can serve as the <a>application's name</a>.
         </p>
         <p>
-          When both the <a data-lt="name member"><code>name</code></a> and
-          <a data-lt="short_name member"><code>short_name</code></a> members
+          When both the <a><code>name</code></a> and
+          <a><code>short_name</code></a> members
           are present, it is left up to implementations to decide which member
           is best suited for the space available (e.g., the
-          <a><code>short_name</code> member</a> might be better suited for the
+          <a><code>short_name</code></a> member might be better suited for the
           space available underneath an icon).
         </p>
       </section>
@@ -826,10 +825,9 @@ <h2>
         URL is not <a>within scope</a>, abort HTML's navigation algorithm with
         a <code>SecurityError</code>.
       </p>
-      <p>
-        A developer specifies the navigation scope via the <a data-lt=
-        "member-scope"><code>scope</code> member</a>. In the case where the
-        <a data-lt="member-scope"><code>scope</code> member</a> is missing or
+      <p data-link-for="WebAppManifest">
+        A developer specifies the navigation scope via the <a><code>scope</code></a>
+        member. In the case where the <a><code>scope</code></a> member is missing or
         in error, the navigation scope is treated as <dfn>unbounded</dfn>
         (represented as the value <code>undefined</code>). In such a case, the
         manifest is applied to all URLs the application context is
@@ -837,7 +835,7 @@ <h2>
         "#navigation-scope-security-considerations">security
         considerations</a>).
       </p>
-      <section>
+      <section data-link-for="DisplayModeType">
         <h3 id="navigation-scope-security-considerations">
           Security considerations
         </h3>
@@ -905,7 +903,7 @@ <h3>
         </div>
       </section>
     </section>
-    <section>
+    <section data-dfn-for="DisplayModeType" data-link-for="DisplayModeType">
       <h2>
         Display modes
       </h2>
@@ -956,12 +954,12 @@ <h2>
         </p>
       </div>
       <p>
-        The <dfn>display modes values</dfn> and their corresponding <a>fallback
-        display modes</a> are as follows:
+        The <dfn>display modes values</dfn> defined by <dfn>DisplayModeType</dfn>,
+        and their corresponding <a>fallback display modes</a> are as follows:
       </p>
       <dl>
         <dt>
-          <dfn id="dm-fullscreen">fullscreen</dfn>
+          <dfn>fullscreen</dfn>
         </dt>
         <dd>
           Opens the web application without any user agent chrome and takes up
@@ -972,7 +970,7 @@ <h2>
           <code>standalone</code>.
         </dd>
         <dt>
-          <dfn id="dm-standalone">standalone</dfn>
+          <dfn>standalone</dfn>
         </dt>
         <dd>
           Opens the web application to look and feel like a standalone native
@@ -987,7 +985,7 @@ <h2>
           <code>minimal-ui</code>.
         </dd>
         <dt>
-          <dfn id="dm-minimal-ui">minimal-ui</dfn>
+          <dfn>minimal-ui</dfn>
         </dt>
         <dd>
           This mode is similar to <a>fullscreen</a>, but provides the end-user
@@ -1002,7 +1000,7 @@ <h2>
           <code>browser</code>.
         </dd>
         <dt>
-          <dfn id="dm-browser">browser</dfn>
+          <dfn>browser</dfn>
         </dt>
         <dd>
           Opens the web application using the platform-specific convention for
@@ -1049,7 +1047,7 @@ <h3>
           transition, or speaking the text "Launching application X".
         </p>
       </section>
-      <section>
+      <section data-link-for="DisplayModeType">
         <h3>
           The <code>'display-mode'</code> media feature
         </h3>
@@ -1500,8 +1498,8 @@ <h3>
           argument.
           </li>
           <li>Let <var>icons</var> of <var>parsed manifest</var> be the result
-          of running the <a>steps for processing an array of images</a> with
-          <var>manifest</var>, <var>manifest URL</var>, and "icons" as
+          of running the <a>steps for processing an array of image resources</a>
+          with <var>manifest</var>, <var>manifest URL</var>, and "icons" as
           arguments.
           </li>
           <li>Let <var>scope</var> of <var>parsed manifest</var> be the result
@@ -1540,7 +1538,7 @@ <h3>
           argument.
           </li>
           <li>Let <var>screenshots</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing an array of images</a>
+          result of running the <a>steps for processing an array of image resources</a>
           with <var>manifest</var>, <var>manifest URL</var>, and "screenshots"
           as arguments.
           </li>
@@ -1574,7 +1572,7 @@ <h3 id="applying">
         <div>
           <p>
             Please note that the <a>start URL</a> is not necessarily the value
-            of the <a><code>start_url</code> member</a>: the user or user agent
+            of the <a data-link-for="WebAppManifest"><code>start_url</code></a> member: the user or user agent
             could have changed it when the application was added to home-screen
             or otherwise bookmarked.
           </p>
@@ -1592,17 +1590,40 @@ <h3>
         <div class="issue" data-number="446"></div>
       </section>
     </section>
-    <section>
+    <section data-dfn-for="webappmanifest" data-link-for="webappmanifest">
       <h2>
         Manifest and its members
       </h2>
       <p>
         A <dfn>manifest</dfn> is a JSON document that contains startup
         parameters and application defaults for when a web application is
-        launched. A manifest consists of a top-level <a>object</a> that
-        contains zero or more members. Each of the members are defined below,
-        as well as how their values are processed.
+        launched. A manifest consists of a top-level <dfn>WebAppManifest</dfn>
+        <a>object</a> that contains zero or more members.
+        Each of the members are defined below, as well as how their values are processed.
       </p>
+      <pre class="idl">
+          [NoInterfaceObject]
+          dictionary WebAppManifest {
+             TextDirectionType? dir;
+             USVString? lang;
+             USVString? name;
+             USVString? short_name;
+             USVString? description;
+             sequence&lt;ImageResource&gt;? icons;
+             sequence&lt;ImageResource&gt;? screenshots;
+             sequence&lt;CategoryType&gt;? categories;
+             USVString? iarc_rating_id;
+             USVString? start_url;
+             DisplayModeType? display;
+             OrientationLockType? orientation;
+             USVString? theme_color;
+             USVString? background_color;
+             USVString? scope;
+             ServiceWorkerRegistration? serviceworker;
+             sequence&lt;ExternalApplicationResource&gt;? related_applications;
+             boolean? prefer_related_applications;
+          };
+      </pre>
       <p>
         Every manifest has an associated <dfn>manifest URL</dfn>, which is the
         [[!URL]] from which the <a>manifest</a> was fetched.
@@ -1612,45 +1633,49 @@ <h3>
           <code>dir</code> member
         </h3>
         <p>
-          The <dfn><code>dir</code> member</dfn> specifies the <dfn>base
+          The <code><dfn>dir</dfn></code> member specifies the <dfn>base
           direction</dfn> for the <a>directionality-capable members</a> of the
           <a>manifest</a>. The <code>dir</code> member's value can be set to
           one of the <a>text-direction values</a>.
         </p>
+        <pre class="idl">
+            [NoInterfaceObject]
+            enum TextDirectionType { "ltr", "rtl", "auto" };
+        </pre>
         <p>
           The <dfn>directionality-capable members</dfn> are:
         </p>
         <ul>
           <li>
-            <a><code>description</code> member</a>.
+            <a><code>description</code></a> member.
           </li>
           <li>
-            <a><code>name</code> member</a>.
+            <a><code>name</code></a> member.
           </li>
           <li>
-            <a><code>short_name</code> member</a>.
+            <a><code>short_name</code></a> member.
           </li>
         </ul>
         <p>
-          The <dfn data-lt="text-direction value">text-direction values</dfn>
-          are the following, implying that the value of the
+          The <dfn data-lt="text-direction value">text-direction values</dfn> defined by
+          <dfn>TextDirectionType</dfn>, are the following, implying that the value of the
           <a>directionality-capable members</a> is by default:
         </p>
-        <dl>
+        <dl data-dfn-for="TextDirectionType">
           <dt>
-            <dfn data-lt="direction ltr">ltr</dfn>
+            <dfn>ltr</dfn>
           </dt>
           <dd>
             left-to-right text.
           </dd>
           <dt>
-            <dfn data-lt="direction rtl">rtl</dfn>
+            <dfn>rtl</dfn>
           </dt>
           <dd>
             right-to-left text.
           </dd>
           <dt>
-            <dfn data-lt="direction auto">auto</dfn>
+            <dfn>auto</dfn>
           </dt>
           <dd>
             <a data-lt=
@@ -1663,7 +1688,7 @@ <h3>
           end-user, the user agent MUST use the <a>base direction</a> to
           compute directional runs and layout or position text correctly in
           text containing mixed-direction sequences [[!BIDI]]. When the <a>base
-          direction</a> is "<a data-lt="direction auto">auto</a>" the user
+          direction</a> is "<a data-link-for="TextDirectionType">auto</a>" the user
           agent MUST run the <a>steps to programmatically determine the
           directionality of a member</a> - and use the resulting
           <a>text-direction value</a> to assist in displaying the value of the
@@ -1729,7 +1754,7 @@ <h3>
           <code>lang</code> member
         </h3>
         <p>
-          The <dfn id="member-lang"><code>lang</code> member</dfn> is a
+          The <code><dfn>lang</dfn></code> member is a
           <a>language tag</a> (string) that specifies the primary language for
           the values of the manifest's <a>directionality-capable members</a>
           (as knowing the language can also help with directionality).
@@ -1794,7 +1819,7 @@ <h3>
           <code title="">name</code> member
         </h3>
         <p>
-          The <dfn id="member-name"><code>name</code> member</dfn> is a
+          The <code><dfn>name</dfn></code> member is a
           <a>string</a> that represents the name of the web application as it
           is usually displayed to the user (e.g., amongst a list of other
           applications, or as a label for an icon).
@@ -1828,7 +1853,7 @@ <h3>
           <code title="">short_name</code> member
         </h3>
         <p>
-          The <dfn id="member-short_name"><code>short_name</code> member</dfn>
+          The <dfn><code>short_name</code></dfn> member
           is a <a>string</a> that represents a short version of the name of the
           web application. It is intended to be used where there is
           insufficient space to display the full name of the web application.
@@ -1862,8 +1887,8 @@ <h3>
           <code title="">description</code> member
         </h3>
         <p>
-          The <dfn id="member-description"><code>description</code>
-          member</dfn> allows the developer to describe the purpose of the web
+          The <dfn><code>description</code></dfn>
+          member allows the developer to describe the purpose of the web
           application.
         </p>
         <p>
@@ -1896,7 +1921,7 @@ <h3>
         </h3>
         <div class="issue" data-number="380"></div>
         <p>
-          The <dfn id="member-scope"><code>scope</code> member</dfn> is a
+          The <dfn><code>scope</code></dfn> member is a
           string that represents the navigation scope of this web application's
           <a>application context</a>.
         </p>
@@ -1972,8 +1997,8 @@ <h3>
           <code title="">icons</code> member
         </h3>
         <p>
-          The <dfn id="member-icons"><code>icons</code> member</dfn> is an
-          <a>array</a> of <a>image objects</a> that can serve as iconic
+          The <dfn><code>icons</code></dfn> member is an
+          <a>array</a> of <a>ImageResource</a>s that can serve as iconic
           representations of the web application in various contexts. For
           example, they can be used to represent the web application amongst a
           list of other applications, or to integrate the web application with
@@ -1982,7 +2007,7 @@ <h3>
         </p>
         <p class="note">
           The <code>icons</code> member is processed using the <a>steps for
-          processing an array of images</a>.
+          processing an array of image resources</a>.
         </p>
         <p>
           If there are multiple equally appropriate icons in <var>icons</var>,
@@ -1991,8 +2016,8 @@ <h3>
           agent tries to use an icon but that icon is determined, upon closer
           examination, to in fact be inappropriate (e.g. because its content
           type is unsupported), then the user agent MUST try the
-          next-most-appropriate icon as determined by examining the <a>image
-          object's</a> members.
+          next-most-appropriate icon as determined by examining the
+          <a>ImageResource</a>'s members.
         </p>
         <div class="example">
           <p>
@@ -2042,9 +2067,18 @@ <h3>
         <h3>
           <code>display</code> member
         </h3>
+        <pre class="idl">
+          [NoInterfaceObject]
+          enum DisplayModeType {
+            "fullscreen",
+            "standalone",
+            "minimal-ui",
+            "browser"
+          };
+        </pre>
         <p>
-          The <dfn id="member-display"><code>display</code> member</dfn> is a
-          <a>string</a>, whose value is one of <a>display modes values</a>. The
+          The <dfn><code>display</code></dfn> member is a <a>DisplayModeType</a>,
+          whose value is one of <a>display modes values</a>. The
           item represents the developer's preferred <a>display mode</a> for the
           web application. When the member is missing or erroneous, the user
           agent MUST use the <a>fallback display mode</a>.
@@ -2090,8 +2124,8 @@ <h3>
           <code>orientation</code> member
         </h3>
         <p>
-          The <dfn id="member-orientation"><code>orientation</code>
-          member</dfn> is a <a>string</a> that serves as the <a>default
+          The <dfn><code>orientation</code></dfn>
+          member is a <a>string</a> that serves as the <a>default
           orientation</a> for all <a>top-level browsing contexts</a> of the web
           application. The possible values are those of the
           <a><code>OrientationLockType</code></a> enum defined in
@@ -2172,14 +2206,14 @@ <h3>
           <code>start_url</code> member
         </h3>
         <p>
-          The <dfn><code>start_url</code> member</dfn> is a <a>string</a> that
+          The <dfn><code>start_url</code></dfn> member is a <a>string</a> that
           represents the <dfn>start URL</dfn> , which is <a>URL</a> that the
           developer would prefer the user agent load when the user launches the
           web application (e.g., when the user clicks on the icon of the web
           application from a device's application menu or homescreen).
         </p>
         <p>
-          The <a><code>start_url</code> member</a> is purely advisory, and a
+          The <a><code>start_url</code></a> member is purely advisory, and a
           user agent MAY <a>ignore</a> it or provide the end-user the choice
           not to make use of it. A user agent MAY also allow the end-user to
           modify the URL when, for instance, a bookmark for the web application
@@ -2275,11 +2309,11 @@ <h3>
           <code>serviceworker</code> member
         </h3>
         <p>
-          The <dfn><code>serviceworker</code> member</dfn> describes a service
+          The <dfn><code>serviceworker</code></dfn> member describes a service
           worker as defined in [[!SERVICE-WORKERS-1]].
         </p>
         <p>
-          The <a><code>serviceworker</code> member</a> represents an intented
+          The <a><code>serviceworker</code></a> member represents an intented
           <a href=
           "https://w3c.github.io/ServiceWorker/#service-worker-registration-concept">
           service worker registration</a> in form of a <dfn>registration
@@ -2374,8 +2408,8 @@ <h3>
           <code title="">theme_color</code> member
         </h3>
         <p>
-          The <dfn id="member-theme_color"><code>theme_color</code>
-          member</dfn> serves as the <dfn>default theme color</dfn> for an
+          The <dfn><code>theme_color</code></dfn>
+          member serves as the <dfn>default theme color</dfn> for an
           application context. What constitutes a <dfn>theme color</dfn> is
           defined in [[!HTML]].
         </p>
@@ -2439,7 +2473,7 @@ <h3>
           manifest</a>.
         </p>
         <p>
-          The <dfn><code>related_applications</code> member</dfn> lists
+          The <dfn><code>related_applications</code></dfn> member lists
           <a>related applications</a> and serves as an indication of such a
           relationship between web application and <a>related applications</a>.
           This relationship is unidirectional and unless a listed application
@@ -2457,7 +2491,7 @@ <h3>
           The <dfn>steps for processing the <code>related_applications</code>
           member</dfn> are given by the following algorithm. The algorithm
           takes a manifest as an argument. This algorithm returns a list of
-          application objects <var>applications</var>, which can be empty.
+          <a>ExternalApplicationResource</a>s <var>applications</var>, which can be empty.
         </p>
         <ol>
           <li>Let <var>applications</var> be an empty list.
@@ -2529,7 +2563,7 @@ <h3>
         </h3>
         <div class="issue" data-number="365"></div>
         <p>
-          The <dfn><code>prefer_related_applications</code> member</dfn> is a
+          The <dfn><code>prefer_related_applications</code></dfn> member is a
           boolean value that is used as a hint for the user agent to say that
           <a>related applications</a> should be preferred over the web
           application. The user agent MUST consider the missing value as
@@ -2568,8 +2602,8 @@ <h3>
           <code title="">background_color</code> member
         </h3>
         <p>
-          The <dfn id="member-background_color"><code>background_color</code>
-          member</dfn> describes the expected background color of the web
+          The <dfn><code>background_color</code></dfn>
+          member describes the expected background color of the web
           application. It repeats what is already available in the application
           stylesheet but can be used by the <a>user agent</a> to draw the
           background color of a web application for which the manifest is known
@@ -2627,7 +2661,7 @@ <h3>
           <code title="">categories</code> member
         </h3>
         <p>
-          The <dfn id="member-categories"><code>categories</code> member</dfn>
+          The <dfn><code>categories</code></dfn> member
           describes the expected application categories to which the web
           application belongs.
         </p>
@@ -2689,11 +2723,11 @@ <h3>
           Manifest authors are encouraged to use lower-case.
         </p>
         <p class="note">
-          This specification does not define the particular values for a the
-          <a><code>categories</code> member</a>. However, the working group
+          This specification does not define the particular <dfn>CategoryType</dfn>s
+          for a the <a><code>categories</code></a> member. However, the working group
           maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Categories">list of known
-          category values</a> in our wiki.
+          values</a> in our wiki.
         </p>
       </section>
       <section>
@@ -2701,8 +2735,8 @@ <h3>
           <code title="">screenshots</code> member
         </h3>
         <p>
-          The <dfn id="member-screenshots"><code>screenshots</code>
-          member</dfn> is an <a>array</a> of <a>image objects</a> represent the
+          The <dfn><code>screenshots</code></dfn>
+          member is an <a>array</a> of <a>ImageResource</a>s, representing the
           web application in common usage scenarios.
         </p>
       </section>
@@ -2711,8 +2745,8 @@ <h3>
           <code title="">iarc_rating_id</code> member
         </h3>
         <p>
-          The <dfn id="member-iarc_rating_id"><code>iarc_rating_id</code>
-          member</dfn> is a <a>string</a> that represents an ID value of the
+          The <dfn><code>iarc_rating_id</code></dfn>
+          member is a <a>string</a> that represents an ID value of the
           IARC rating of the web application. It is intended to be used to
           determine which ages the web application is appropriate for.
         </p>
@@ -2769,15 +2803,25 @@ <h3>
     </section>
     <section>
       <h2>
-        Image object and its members
+        ImageResource and its members
       </h2>
       <div class="issue" data-number="361"></div>
+      <pre class="idl">
+        [NoInterfaceObject]
+        dictionary ImageResource {
+          USVString src;
+          DOMString sizes;
+          USVString type;
+          USVString purpose;
+          USVString platform;
+        };
+      </pre>
       <p>
-        Each <dfn data-lt="image objects|image object's">image object</dfn>
+        Each <dfn>ImageResource</dfn>
         represents an image that is used as part of a web application, suitable
         to use in various contexts depending on the semantics of the member
         that is using the object (e.g., an icon that is part of an application
-        menu, etc.). For an image object, this specification provides
+        menu, etc.). For an image resource, this specification provides
         developers with a means of specifying the dimensions, and media type of
         an image (i.e., a "responsive image" solution [[RESPIMG-USECASES]]). A
         user agent can use these values to select an image that is best suited
@@ -2785,23 +2829,24 @@ <h2>
         end-user's preferences.
       </p>
       <p>
-        User agents may modify an <a>image object</a> to better match the
-        platform’s visual style before displaying it to the user, for example
-        by rounding the corners or painting it in a specific color. It is
-        recommended that developers prepare their image objects for such
+        User agents may modify the images associated with an <a>ImageResource</a>
+        to better match the platform’s visual style before displaying it to the
+        user, for example by rounding the corners or painting it in a specific color.
+        It is recommended that developers prepare their image resources for such
         scenarios to avoid losing important information through, e.g., change
         of color or clipped corners.
       </p>
       <section>
         <h3>
-          Fetching image objects
+          Fetching image resources
         </h3>
         <p>
-          To <a>fetch</a> an <a>image object</a>, the user agent MUST run the
-          <dfn>steps to fetch an image object</dfn>. The algorithm takes an
-          <a>image object</a>, the <var>manifest URL</var>, and the
-          <var>document</var> (<code>Document</code>) from which the manifest
-          was linked. It returns a <a>Response</a>:
+          To <a>fetch</a> the image associated with an <a>ImageResource</a>,
+          the user agent MUST run the <dfn>steps to fetch an image resource</dfn>.
+
+          The algorithm takes an <var>image URL</var> (<a>ImageResource.src</a>),
+          the <var>manifest URL</var>, and the <var>document</var> (<code>Document</code>)
+          from which the manifest was linked. It returns a <a>Response</a>:
         </p>
         <ol>
           <li>Let <var>request</var> be a new <a>Request</a>.
@@ -2809,7 +2854,7 @@ <h3>
           <li>Set the following properties of <var>request</var>:
             <ol>
               <li>
-                <var>url</var> is set to image object's URL.
+                <var>url</var> is set to <var>image URL</var>.
               </li>
               <li>
                 <var>initiator</var> is "<code>manifest</code>".
@@ -2835,7 +2880,7 @@ <h3>
       </section>
       <section>
         <h3>
-          Content security policy of image objects
+          Content security policy of image resources
         </h3>
         <p>
           The security policy that governs whether a <a>user agent</a> can
@@ -2881,28 +2926,27 @@ <h3>
           </p>
         </div>
       </section>
-      <section>
+      <section data-dfn-for="ImageResource" data-link-for="ImageResource">
         <h3>
           <code>purpose</code> member
         </h3>
         <p>
-          The <dfn><code>purpose member</code></dfn> is an <a>unordered set of
+          The <dfn><code>purpose</code></dfn> member is an <a>unordered set of
           unique space-separated tokens</a> that are <a>ASCII
           case-insensitive</a>. The allowed values are the <a>icon
           purposes</a>.
         </p>
         <p>
-          When an <a>image object</a> is used as an <dfn>icon</dfn>, a
+          When an <a>ImageResource</a> is used as an <dfn>icon</dfn>, a
           developer can hint that the image is intended to serve some special
-          <dfn>purpose</dfn> in the context of the host OS (i.e., for better
-          integration).
+          purpose in the context of the host OS (i.e., for better integration).
         </p>
         <p>
           For example, as a <a data-lt="badge purpose">badge</a> or "pinned"
           icon that is visually distinct, in color or form, from an
           application's launch icon. The user agent uses the value of the
-          <a><code>purpose</code> member</a> as a hint to determine where and
-          how an <a>image object</a> is displayed. Unless declared otherwise by
+          <a><code>purpose</code></a> member as a hint to determine where and
+          how an <a>ImageResource</a> is displayed. Unless declared otherwise by
           the developer, a user agent can use an icon for <a>any purpose</a>.
         </p>
         <p>
@@ -2926,7 +2970,7 @@ <h3>
         <p>
           The <dfn>steps for processing a <code>purpose</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>image object</a> <var>image</var>. This algorithm will return a
+          an <a>ImageResource</a> <var>image</var>. This algorithm will return a
           set.
         </p>
         <ol>
@@ -2995,13 +3039,13 @@ <h3>
           </pre>
         </div>
       </section>
-      <section>
+      <section data-dfn-for="imageresource">
         <h3>
           <code>sizes</code> member
         </h3>
         <p>
-          The <dfn><code>sizes</code> member</dfn> of an image object is a
-          <a>string</a> consisting of an <a>unordered set of unique
+          The <dfn><code>sizes</code></dfn> member of an <a>ImageResource</a>
+          is a <a>string</a> consisting of an <a>unordered set of unique
           space-separated tokens</a> which are <a>ASCII case-insensitive</a>
           that represents the dimensions of an image. Each keyword is either an
           <a>ASCII case-insensitive</a> match for the string "<a data-lt=
@@ -3010,14 +3054,14 @@ <h3>
           ZERO (0) character and that are separated by a single U+0078 LATIN
           SMALL LETTER X or U+0058 LATIN CAPITAL LETTER X character. The
           keywords represent icon sizes in raw pixels (as opposed to CSS
-          pixels). When multiple <a>image objects</a> are available, a user
+          pixels). When multiple <a>ImageResource</a>s are available, a user
           agent MAY use the value to decide which icon is most suitable for a
           display context (and ignore any that are inappropriate).
         </p>
         <p>
           The <dfn>steps for processing a <code>sizes</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>image object</a> <var>image</var>. This algorithm will return a
+          an <a>ImageResource</a> <var>image</var>. This algorithm will return a
           set.
         </p>
         <ol>
@@ -3053,19 +3097,19 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="imageresource">
         <h3>
           <code>src</code> member
         </h3>
         <p>
-          The <dfn data-lt="icon-src"><code>src</code> member</dfn> of an
-          <a>image object</a> is a <a>URL</a> from which a user agent can fetch
+          The <dfn><code>src</code></dfn> member of an
+          <a>ImageResource</a> is a <a>URL</a> from which a user agent can fetch
           the image's data.
         </p>
         <p>
           The <dfn>steps for processing the <code>src</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          a <a>image object</a> <var>icon</var>, and a <a>URL</a> <var>manifest
+          a <a>ImageResource</a> <var>icon</var>, and a <a>URL</a> <var>manifest
           URL</var> , which is the <a>URL</a> from which the
           <var>manifest</var> was fetched. This algorithm will return a
           <a>URL</a> or <code>undefined</code>.
@@ -3094,18 +3138,18 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="imageresource">
         <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn><code>type</code> member</dfn> of an <a>image object</a> is
+          The <dfn><code>type</code></dfn> member of an <a>ImageResource</a> is
           a hint as to the media type of the image. The purpose of this member
           is to allow a user agent to ignore images of media types it does not
           support.
         </p>
         <p>
-          There is no default MIME type for image objects. However, for the
+          There is no default MIME type for image resources. However, for the
           purposes of <a>determining the type of the resource</a>, user agents
           must expect the resource to be an image.
         </p>
@@ -3144,19 +3188,19 @@ <h3>
       </section>
       <section>
         <h3>
-          Processing an array of images
+          Processing an array of image resources
         </h3>
         <p>
-          The <dfn>steps for processing an array of images</dfn> are given by
+          The <dfn>steps for processing an array of image resources</dfn> are given by
           the following algorithm. The algorithm takes a manifest, a <a>URL</a>
           <var>manifest URL</var>, which is the URL from which the
           <var>manifest</var> was fetched, and a string that represents the
           <var>member name</var> of the member which contains the array of
-          <a>image objects</a>. This algorithm returns a list of <a>image
-          objects</a>, which can be empty.
+          <a>ImageResource</a>s. This algorithm returns a sequence of <a>ImageResource</a>s,
+          which can be empty.
         </p>
         <ol>
-          <li>Let <var>images</var> be an empty list.
+          <li>Let <var>images</var> be an empty sequence.
           </li>
           <li>Let <var>unprocessed images</var> be the result of calling the
           <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
@@ -3165,7 +3209,7 @@ <h3>
           <li>If <var>unprocessed images</var> is an <a>array</a>, then:
             <ol>
               <li>From unprocessed images, filter out any <var>item</var> where
-              <a>HasOwnProperty</a>(item,"src") returns <code>false</code>.
+              <a>HasOwnProperty</a>(item, "src") returns <code>false</code>.
               </li>
               <li>For each <var>potential image</var> in the array:
                 <ol>
@@ -3234,33 +3278,32 @@ <h2>
         Each member specifies which object a multi-purpose member can be used
         with.
       </p>
-      <section>
+      <section data-dfn-for="ExternalApplicationResource" data-link-for="ExternalApplicationResource">
         <h3>
           <code>platform</code> member
         </h3>
         <p>
-          The <dfn data-lt="application-platform"><code>platform</code>
-          member</dfn> represents the <a>platform</a> to which a containing
-          object applies.
+          The <dfn><code>platform</code></dfn> member represents the
+          <a>platform</a> to which a containing object applies.
         </p>
         <p>
           The following object types can make use of this member:
         </p>
         <ul>
           <li>
-            <a>Application object</a>
+            <a>ExternalApplicationResource</a>
           </li>
           <li>
-            <a>Image object</a>
+            <a>ImageResource</a>
           </li>
         </ul>
         <p>
-          A <dfn>platform</dfn> represents a software distribution ecosystem or
+          A <a>platform</a> represents a software distribution ecosystem or
           possibly an operating system.
         </p>
         <p class="note">
           This specification does not define the particular values for a the
-          <a><code>platform</code> member</a>. However, the working group
+          <a><code>platform</code></a> member. However, the working group
           maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Platforms">list of known
           platform values</a> in our wiki.
@@ -3268,7 +3311,7 @@ <h3>
         <p>
           The <dfn>steps for processing the <code>platform</code> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>application object</a> <var>application</var>. This
+          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
           algorithm will return a string or <code>undefined</code>.
         </p>
         <ol>
@@ -3292,25 +3335,33 @@ <h3>
     </section>
     <section>
       <h2>
-        The serviceworker object and its members
+        The ServiceWorkerRegistration object and its members
       </h2>
       <p>
-        A <dfn>serviceworker object</dfn> represents a service worker
+        A <dfn>ServiceWorkerRegistration</dfn> object represents a service worker
         registration for the web application.
       </p>
-      <section>
+      <pre class="idl">
+        [NoInterfaceObject]
+        dictionary ServiceWorkerRegistration {
+          USVString src;
+          USVString scope;
+          USVString type;
+          boolean use_cache;
+        };
+      </pre>
+      <section data-dfn-for="serviceworkerregistration">
         <h3>
           <code>src</code> member
         </h3>
         <p>
-          The <dfn data-lt="serviceworker-src">service worker <code>src</code>
-          member</dfn> of a <a>serviceworker object</a> is a <a>URL</a>
-          representing a service worker.
+          The <dfn><code>src</code></dfn> member of a <a>ServiceWorkerRegistration</a>
+          object is a <a>URL</a> representing a service worker.
         </p>
         <p>
           The <dfn>steps for processing the <code>src</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>serviceworker object</a>
+          algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
           which is the <a>URL</a> from which the <var>manifest</var> was
           fetched. This algorithm will return a <a>URL</a> or
@@ -3340,19 +3391,18 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="serviceworkerregistration">
         <h3>
           <code>scope</code> member
         </h3>
         <p>
-          The <dfn data-lt="serviceworker-scope">service worker
-          <code>scope</code> member</dfn> of a <a>serviceworker object</a> is
-          the service worker's associated <a>scope URL</a>.
+          The <dfn><code>scope</code></dfn> member of a <a>ServiceWorkerRegistration</a>
+          object is the service worker's associated <a>scope URL</a>.
         </p>
         <p>
           The <dfn>steps for processing the <code>scope</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>serviceworker object</a>
+          algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
           which is the <a>URL</a> from which the <var>manifest</var> was
           fetched. This algorithm will return a <a>URL</a> or
@@ -3383,20 +3433,20 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="serviceworkerregistration">
         <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn>service worker <code>type</code> member</dfn> of a
-          <a>serviceworker object</a> is the service worker's <a href=
+          The <dfn><code>type</code></dfn> member of a
+          <a>ServiceWorkerRegistration</a> object is the service worker's <a href=
           "https://html.spec.whatwg.org/multipage/workers.html#workertype">worker
           type</a>.
         </p>
         <p>
           The <dfn>steps for processing the <code>type</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>serviceworker object</a>
+          algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
           which is the <a>URL</a> from which the <var>manifest</var> was
           fetched. This algorithm will return a string.
@@ -3430,20 +3480,20 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="ServiceWorkerRegistration">
         <h3>
           <code>use_cache</code> member
         </h3>
         <p>
-          The <dfn>service worker <code>use_cache</code> member</dfn> of a
-          <a>serviceworker object</a> determines whether the user agent
+          The <dfn><code>use_cache</code></dfn> member of a
+          <a>ServiceWorkerRegistration</a> object determines whether the user agent
           <a href="https://w3c.github.io/ServiceWorker/#dfn-use-cache">cache</a>
           should be used when fetching the service worker.
         </p>
         <p>
           The <dfn>steps for processing the <code>use_cache</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>serviceworker object</a>
+          algorithm takes a <a>serviceworkerregistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
           which is the <a>URL</a> from which the <var>manifest</var> was
           fetched. This algorithm will return a boolean.
@@ -3472,11 +3522,21 @@ <h3>
     </section>
     <section>
       <h2>
-        Application object and its members
+        ExternalApplicationResource and its members
       </h2>
+      <pre class="idl">
+        [NoInterfaceObject]
+        dictionary ExternalApplicationResource {
+          USVString platform;
+          USVString url;
+          USVString id;
+          USVString min_version;
+          USVString fingerprints;
+        };
+      </pre>
       <p>
-        Each <dfn>application object</dfn> represents an application related to
-        the web application. An application object has the following
+        Each <dfn>ExternalApplicationResource</dfn>s represents an application related to
+        the web application. An application resource has the following
         properties:
       </p>
       <dl>
@@ -3515,8 +3575,9 @@ <h2>
         </dd>
       </dl>
       <p>
-        A valid <a>application object</a> MUST have <code>platform</code> and
-        either an <code>url</code> or an <code>id</code> (or both).
+        A valid <a>ExternalApplicationResource</a> object MUST have
+        <code>platform</code> and either an <code>url</code> or an
+        <code>id</code> (or both).
       </p>
       <div class="example">
         <p>
@@ -3553,19 +3614,19 @@ <h2>
       <p class="issue">
         Where should the <code>platform</code> expected value be listed?
       </p>
-      <section>
+      <section data-dfn-for="externalapplicationresource">
         <h3>
           <code>url</code> member
         </h3>
         <p>
-          The <dfn data-lt="application-url">url member</dfn> of an application
+          The <dfn><code>url</code></dfn> member of an <a>ExternalApplicationResource</a>
           object represents the <a>URL</a> at which the application can be
           found.
         </p>
         <p>
           The <dfn>steps for processing the <code>url</code> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>application object</a> <var>application</var>. This
+          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
           algorithm will return an <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
@@ -3590,19 +3651,19 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="externalapplicationresource">
         <h3>
           <code>id</code> member
         </h3>
         <p>
-          The <dfn data-lt="application-id">id</dfn> member of an application
+          The <dfn><code>id</code></dfn> member of an <a>ExternalApplicationResource</a>
           object represents the id which is used to represent the application
           on the platform.
         </p>
         <p>
           The <dfn>steps for processing the <code>id</code> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>application object</a> <var>application</var>. This
+          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
           algorithm will return a string or <code>undefined</code>.
         </p>
         <ol>
@@ -3623,20 +3684,20 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="externalapplicationresource">
         <h3>
           <code>min_version</code> member
         </h3>
         <p>
-          The <dfn data-lt="application-min-version">min_version</dfn> member
-          of an application object represents the minimum version of the
-          application that is considered related to this web app. This version
-          is a string with platform-specific syntax and semantics.
+          The <dfn><code>min_version</code></dfn> member of an
+          <a>ExternalApplicationResource</a> object represents the minimum
+          version of the application that is considered related to this web app.
+          This version is a string with platform-specific syntax and semantics.
         </p>
         <p>
           The <dfn>steps for processing the <code>min_version</code> member of
           an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>application object</a> <var>application</var>.
+          algorithm takes an <a>ExternalApplicationResource</a> <var>application</var>.
           This algorithm will return a string or <code>undefined</code>.
         </p>
         <ol>
@@ -3657,15 +3718,15 @@ <h3>
           </li>
         </ol>
       </section>
-      <section>
+      <section data-dfn-for="externalapplicationresource">
         <h3>
           <code>fingerprints</code> member
         </h3>
         <p>
-          The <dfn data-lt="application-fingerprints">fingerprints</dfn> member
-          of an application object represents a set of cryptographic
-          fingerprints used for verifying the application. It is given as an
-          array of <a data-lt="fingerprint object">fingerprint objects</a>.
+          The <dfn><code>fingerprints</code></dfn> member
+          of an <a>ExternalApplicationResource</a> object represents a set
+          of cryptographic fingerprints used for verifying the application.
+          It is given as an array of <a data-lt="fingerprint object">fingerprint objects</a>.
         </p>
         <p>
           A <dfn>fingerprint object</dfn> has two properties: <code>type</code>
@@ -3675,7 +3736,7 @@ <h3>
         <p>
           The <dfn>steps for processing the <code>fingerprints</code> member of
           an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>application object</a> <var>application</var>.
+          algorithm takes an <a>ExternalApplicationResource</a> <var>application</var>.
           This algorithm will return a list of <a data-lt=
           "fingerprint object">fingerprint objects</a>, possibly empty.
         </p>
@@ -4454,6 +4515,9 @@ <h2>
         proprietary tags/metadata, if they are present in a document).
       </p>
     </section>
+    <section id="idl-index" class="appendix">
+        <!-- All the Web IDL will magically appear here -->
+    </section>
     <section class="appendix">
       <h2>
         JSON Schema

From 44128404f552c93800df188fe35d91730e7757fd Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Thu, 21 Sep 2017 12:28:04 +0200
Subject: [PATCH 2/9] Review comments

---
 index.html | 204 ++++++++++++++++++++++++++---------------------------
 1 file changed, 99 insertions(+), 105 deletions(-)

diff --git a/index.html b/index.html
index 962c351c2..cf1dcb5b8 100644
--- a/index.html
+++ b/index.html
@@ -295,33 +295,33 @@ <h3>
           <code>short_name</code>).
         </p>
       </section>
-      <section data-link-for="webappmanifest">
+      <section data-link-for="WebAppManifest">
         <h3>
           Application's name
         </h3>
         <p>
           The <dfn>application's name</dfn> is derived from either the
-          <a><code>name</code></a> member or <a><code>short_name</code></a>
+          <a>name</a> member or <a>short_name</a>
           member (if either is present) - otherwise, it is generated by the
           user agent or provided by the end-user.
         </p>
         <p>
           When either member is missing from the manifest, a user agent MAY use
-          the <a><code>name</code></a> member as a fallback for the
-          <a><code>short_name</code></a> member or vice versa.
+          the <a>name</a> member as a fallback for the
+          <a>short_name</a> member or vice versa.
         </p>
         <p>
-          If the <a><code>name</code></a> and <a><code>short_name</code></a> members are
+          If the <a>name</a> and <a>short_name</a> members are
           undefined, the user agent SHOULD assign a default name (e.g.,
           "Untitled"). Alternatively, a user agent MAY allow the end-user to
           input some text that can serve as the <a>application's name</a>.
         </p>
         <p>
-          When both the <a><code>name</code></a> and
-          <a><code>short_name</code></a> members
+          When both the <a>name</a> and
+          <a>short_name</a> members
           are present, it is left up to implementations to decide which member
           is best suited for the space available (e.g., the
-          <a><code>short_name</code></a> member might be better suited for the
+          <a>short_name</a> member might be better suited for the
           space available underneath an icon).
         </p>
       </section>
@@ -826,8 +826,8 @@ <h2>
         a <code>SecurityError</code>.
       </p>
       <p data-link-for="WebAppManifest">
-        A developer specifies the navigation scope via the <a><code>scope</code></a>
-        member. In the case where the <a><code>scope</code></a> member is missing or
+        A developer specifies the navigation scope via the <a>scope</a>
+        member. In the case where the <a>scope</a> member is missing or
         in error, the navigation scope is treated as <dfn>unbounded</dfn>
         (represented as the value <code>undefined</code>). In such a case, the
         manifest is applied to all URLs the application context is
@@ -1016,11 +1016,11 @@ <h2>
       <p class="note">
         The <a>fullscreen</a> <a>display mode</a> is orthogonal to, and works
         independently of, the [[WHATWG-FULLSCREEN]] API. The
-        <a><code>fullscreen</code></a> <a>display mode</a> affects the
+        <a>fullscreen</a> <a>display mode</a> affects the
         fullscreen state of the browser window, while the [[WHATWG-FULLSCREEN]]
         API operates on an element contained within the viewport. As such, a
         web application can have its <a>display mode</a> set to
-        <a><code>fullscreen</code></a>, while
+        <a>fullscreen</a>, while
         <code>document.fullScreenElement</code> returns <code>null</code>, and
         <code>fullscreenEnabled</code> returns <code>false</code>.
       </p>
@@ -1259,7 +1259,7 @@ <h3>
         </p>
         <p>
           A <a>manifest</a> is obtained and applied regardless of the
-          <a><code>media</code></a> attribute of the <a><code>link</code>
+          <a>media</a> attribute of the <a><code>link</code>
           element</a> matches the environment or not.
         </p>
       </section>
@@ -1358,10 +1358,10 @@ <h4>
           </p>
           <div class="example">
             <p>
-              The <a><code>manifest-src</code></a> and
-              <a><code>default-src</code></a> directives govern the origins
+              The <a>manifest-src</a> and
+              <a>default-src</a> directives govern the origins
               from which a <a>user agent</a> can fetch a manifest. As with
-              other directives, by default the <a><code>manifest-src</code></a>
+              other directives, by default the <a>manifest-src</a>
               directive is <code>*</code>, meaning that a user agent can,
               [[!FETCH]]'s <abbr>CORS</abbr> permitting, fetch the manifest
               cross-domain. Remote origins (e.g., a <abbr title=
@@ -1375,7 +1375,7 @@ <h4>
               "342" alt="manifest-src directive example illustrated">
               <figcaption>
                 For a [[!HTML]] document, [[!CSP3]]'s
-                <a><code>manifest-src</code></a> directive controls the sources
+                <a>manifest-src</a> directive controls the sources
                 from which a [[!HTML]] document can load a manifest from. The
                 same CSP policy's <code>img-src</code> directive controls where
                 the icon's images can be fetched from.
@@ -1590,7 +1590,7 @@ <h3>
         <div class="issue" data-number="446"></div>
       </section>
     </section>
-    <section data-dfn-for="webappmanifest" data-link-for="webappmanifest">
+    <section data-dfn-for="WebAppManifest" data-link-for="WebAppManifest">
       <h2>
         Manifest and its members
       </h2>
@@ -1598,21 +1598,20 @@ <h2>
         A <dfn>manifest</dfn> is a JSON document that contains startup
         parameters and application defaults for when a web application is
         launched. A manifest consists of a top-level <dfn>WebAppManifest</dfn>
-        <a>object</a> that contains zero or more members.
+        <a>dictionary</a> that contains zero or more members.
         Each of the members are defined below, as well as how their values are processed.
       </p>
       <pre class="idl">
-          [NoInterfaceObject]
           dictionary WebAppManifest {
              TextDirectionType? dir;
-             USVString? lang;
+             DOMString? lang;
              USVString? name;
              USVString? short_name;
              USVString? description;
              sequence&lt;ImageResource&gt;? icons;
              sequence&lt;ImageResource&gt;? screenshots;
              sequence&lt;CategoryType&gt;? categories;
-             USVString? iarc_rating_id;
+             DOMString? iarc_rating_id;
              USVString? start_url;
              DisplayModeType? display;
              OrientationLockType? orientation;
@@ -1633,13 +1632,12 @@ <h3>
           <code>dir</code> member
         </h3>
         <p>
-          The <code><dfn>dir</dfn></code> member specifies the <dfn>base
+          The <dfn>dir</dfn> member specifies the <dfn>base
           direction</dfn> for the <a>directionality-capable members</a> of the
-          <a>manifest</a>. The <code>dir</code> member's value can be set to
+          <a>manifest</a>. The <a>dir</a> member's value can be set to
           one of the <a>text-direction values</a>.
         </p>
         <pre class="idl">
-            [NoInterfaceObject]
             enum TextDirectionType { "ltr", "rtl", "auto" };
         </pre>
         <p>
@@ -1647,13 +1645,13 @@ <h3>
         </p>
         <ul>
           <li>
-            <a><code>description</code></a> member.
+            <a>description</a> member.
           </li>
           <li>
-            <a><code>name</code></a> member.
+            <a>name</a> member.
           </li>
           <li>
-            <a><code>short_name</code></a> member.
+            <a>short_name</a> member.
           </li>
         </ul>
         <p>
@@ -1754,7 +1752,7 @@ <h3>
           <code>lang</code> member
         </h3>
         <p>
-          The <code><dfn>lang</dfn></code> member is a
+          The <dfn>lang</dfn> member is a
           <a>language tag</a> (string) that specifies the primary language for
           the values of the manifest's <a>directionality-capable members</a>
           (as knowing the language can also help with directionality).
@@ -1819,7 +1817,7 @@ <h3>
           <code title="">name</code> member
         </h3>
         <p>
-          The <code><dfn>name</dfn></code> member is a
+          The <dfn>name</dfn> member is a
           <a>string</a> that represents the name of the web application as it
           is usually displayed to the user (e.g., amongst a list of other
           applications, or as a label for an icon).
@@ -1853,7 +1851,7 @@ <h3>
           <code title="">short_name</code> member
         </h3>
         <p>
-          The <dfn><code>short_name</code></dfn> member
+          The <dfn>short_name</dfn> member
           is a <a>string</a> that represents a short version of the name of the
           web application. It is intended to be used where there is
           insufficient space to display the full name of the web application.
@@ -1887,7 +1885,7 @@ <h3>
           <code title="">description</code> member
         </h3>
         <p>
-          The <dfn><code>description</code></dfn>
+          The <dfn>description</dfn>
           member allows the developer to describe the purpose of the web
           application.
         </p>
@@ -1921,7 +1919,7 @@ <h3>
         </h3>
         <div class="issue" data-number="380"></div>
         <p>
-          The <dfn><code>scope</code></dfn> member is a
+          The <dfn>scope</dfn> member is a
           string that represents the navigation scope of this web application's
           <a>application context</a>.
         </p>
@@ -1929,7 +1927,7 @@ <h3>
           The <dfn>steps for processing the <code>scope</code> member</dfn> is
           given by the following algorithm. The algorithm takes a
           <a>manifest</a> <var>manifest</var>, a <a>URL</a> <var>manifest
-          URL</var> , a <a>URL</a> <var>document URL</var>, and a URL
+          URL</var>, a <a>URL</a> <var>document URL</var>, and a URL
           <var>start URL</var> . This algorithm returns a <a>URL</a> or
           <code>undefined</code>.
         </p>
@@ -1997,7 +1995,7 @@ <h3>
           <code title="">icons</code> member
         </h3>
         <p>
-          The <dfn><code>icons</code></dfn> member is an
+          The <dfn>icons</dfn> member is an
           <a>array</a> of <a>ImageResource</a>s that can serve as iconic
           representations of the web application in various contexts. For
           example, they can be used to represent the web application amongst a
@@ -2006,7 +2004,7 @@ <h3>
           system preferences.
         </p>
         <p class="note">
-          The <code>icons</code> member is processed using the <a>steps for
+          The <a>icons</a> member is processed using the <a>steps for
           processing an array of image resources</a>.
         </p>
         <p>
@@ -2068,7 +2066,6 @@ <h3>
           <code>display</code> member
         </h3>
         <pre class="idl">
-          [NoInterfaceObject]
           enum DisplayModeType {
             "fullscreen",
             "standalone",
@@ -2077,7 +2074,7 @@ <h3>
           };
         </pre>
         <p>
-          The <dfn><code>display</code></dfn> member is a <a>DisplayModeType</a>,
+          The <dfn>display</dfn> member is a <a>DisplayModeType</a>,
           whose value is one of <a>display modes values</a>. The
           item represents the developer's preferred <a>display mode</a> for the
           web application. When the member is missing or erroneous, the user
@@ -2124,15 +2121,15 @@ <h3>
           <code>orientation</code> member
         </h3>
         <p>
-          The <dfn><code>orientation</code></dfn>
+          The <dfn>orientation</dfn>
           member is a <a>string</a> that serves as the <a>default
           orientation</a> for all <a>top-level browsing contexts</a> of the web
           application. The possible values are those of the
-          <a><code>OrientationLockType</code></a> enum defined in
+          <a>OrientationLockType</a> enum defined in
           [[!SCREEN-ORIENTATION]].
         </p>
         <p>
-          If the user agent honors the value of the <code>orientation</code>
+          If the user agent honors the value of the <a>orientation</a>
           member as the <a>default orientation</a>, then that serves as the
           <a>default orientation</a> for the life of the web application
           (unless overridden by some other means at runtime). This means that
@@ -2143,7 +2140,7 @@ <h3>
         </p>
         <p>
           Although the specification relies on the [[!SCREEN-ORIENTATION]]'s
-          <a><code>OrientationLockType</code></a>, it is OPTIONAL for a user
+          <a>OrientationLockType</a>, it is OPTIONAL for a user
           agent to implement the [[!SCREEN-ORIENTATION]] API. Supporting the
           [[!SCREEN-ORIENTATION]] API is, of course, RECOMMENDED.
         </p>
@@ -2185,7 +2182,7 @@ <h3>
           and set <var>value</var> to be the result.
           </li>
           <li>If <var>value</var> is not one of the
-          <a><code>OrientationLockType</code></a> enum values, or
+          <a>OrientationLockType</a> enum values, or
           <var>value</var> is unsupported by the user agent, or the
           <var>value</var> <a>cannot be used together</a> with <var>display
           mode:</var>
@@ -2206,14 +2203,14 @@ <h3>
           <code>start_url</code> member
         </h3>
         <p>
-          The <dfn><code>start_url</code></dfn> member is a <a>string</a> that
+          The <dfn>start_url</dfn> member is a <a>string</a> that
           represents the <dfn>start URL</dfn> , which is <a>URL</a> that the
           developer would prefer the user agent load when the user launches the
           web application (e.g., when the user clicks on the icon of the web
           application from a device's application menu or homescreen).
         </p>
         <p>
-          The <a><code>start_url</code></a> member is purely advisory, and a
+          The <a>start_url</a> member is purely advisory, and a
           user agent MAY <a>ignore</a> it or provide the end-user the choice
           not to make use of it. A user agent MAY also allow the end-user to
           modify the URL when, for instance, a bookmark for the web application
@@ -2262,7 +2259,7 @@ <h3>
             <ol>
               <li>
                 <a>Issue a developer warning</a> that the
-                <code>start_url</code> needs to be <a>same-origin</a> as
+                <a>start_url</a> needs to be <a>same-origin</a> as
                 <code>Document</code> of the <a>top-level browsing context</a>.
               </li>
               <li>Return a new <a>URL</a> whose <var>input</var> is
@@ -2275,7 +2272,7 @@ <h3>
         </ol>
         <div class="example">
           <p>
-            For example, if the <var>value</var> of <code>start_url</code> is
+            For example, if the <var>value</var> of <a>start_url</a> is
             <samp>../start_point.html</samp>, and the manifest's URL is
             <samp>https://example.com/resources/manifest.webmanifest</samp>,
             then the result of <a>URL parsing</a> would be
@@ -2284,10 +2281,10 @@ <h3>
         </div>
         <section>
           <h3>
-            Privacy consideration: <code>start_url</code> tracking
+            Privacy consideration: <a>start_url</a> tracking
           </h3>
           <p>
-            It's conceivable that the <code>start_url</code> could be crafted
+            It's conceivable that the <a>start_url</a> could be crafted
             to indicate that the application was launched from outside the
             browser (e.g., <code>"start_url":
             "index.html?launcher=homescreen"</code>). This can be useful for
@@ -2309,11 +2306,11 @@ <h3>
           <code>serviceworker</code> member
         </h3>
         <p>
-          The <dfn><code>serviceworker</code></dfn> member describes a service
+          The <dfn>serviceworker</dfn> member describes a service
           worker as defined in [[!SERVICE-WORKERS-1]].
         </p>
         <p>
-          The <a><code>serviceworker</code></a> member represents an intented
+          The <a>serviceworker</a> member represents an intented
           <a href=
           "https://w3c.github.io/ServiceWorker/#service-worker-registration-concept">
           service worker registration</a> in form of a <dfn>registration
@@ -2408,7 +2405,7 @@ <h3>
           <code title="">theme_color</code> member
         </h3>
         <p>
-          The <dfn><code>theme_color</code></dfn>
+          The <dfn>theme_color</dfn>
           member serves as the <dfn>default theme color</dfn> for an
           application context. What constitutes a <dfn>theme color</dfn> is
           defined in [[!HTML]].
@@ -2473,7 +2470,7 @@ <h3>
           manifest</a>.
         </p>
         <p>
-          The <dfn><code>related_applications</code></dfn> member lists
+          The <dfn>related_applications</dfn> member lists
           <a>related applications</a> and serves as an indication of such a
           relationship between web application and <a>related applications</a>.
           This relationship is unidirectional and unless a listed application
@@ -2563,7 +2560,7 @@ <h3>
         </h3>
         <div class="issue" data-number="365"></div>
         <p>
-          The <dfn><code>prefer_related_applications</code></dfn> member is a
+          The <dfn>prefer_related_applications</dfn> member is a
           boolean value that is used as a hint for the user agent to say that
           <a>related applications</a> should be preferred over the web
           application. The user agent MUST consider the missing value as
@@ -2602,7 +2599,7 @@ <h3>
           <code title="">background_color</code> member
         </h3>
         <p>
-          The <dfn><code>background_color</code></dfn>
+          The <dfn>background_color</dfn>
           member describes the expected background color of the web
           application. It repeats what is already available in the application
           stylesheet but can be used by the <a>user agent</a> to draw the
@@ -2611,13 +2608,13 @@ <h3>
           from the network or retrieved from disk.
         </p>
         <p>
-          The <code>background_color</code> member is only meant to improve the
+          The <a>background_color</a> member is only meant to improve the
           user experience while a web application is loading and MUST NOT be
           used by the <a>user agent</a> as the background color when the web
           application's stylesheet is available.
         </p>
         <p>
-          The <dfn>steps for processing the <code>background_color</code>
+          The <dfn>steps for processing the <a>background_color</a>
           member</dfn> are given by the following algorithm. The algorithm
           takes a <var>manifest</var> as an argument. This algorithm returns a
           string or <code>undefined</code>.
@@ -2661,12 +2658,12 @@ <h3>
           <code title="">categories</code> member
         </h3>
         <p>
-          The <dfn><code>categories</code></dfn> member
+          The <dfn>categories</dfn> member
           describes the expected application categories to which the web
           application belongs.
         </p>
         <p>
-          The <code>categories</code> member is only meant as a hint to
+          The <a>categories</a> member is only meant as a hint to
           catalogs or stores listing web applications and it is expected that
           these will make a best effort to find appropriate categories (or
           category) under which to list the web application. Like search
@@ -2724,7 +2721,7 @@ <h3>
         </p>
         <p class="note">
           This specification does not define the particular <dfn>CategoryType</dfn>s
-          for a the <a><code>categories</code></a> member. However, the working group
+          for a the <a>categories</a> member. However, the working group
           maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Categories">list of known
           values</a> in our wiki.
@@ -2735,7 +2732,7 @@ <h3>
           <code title="">screenshots</code> member
         </h3>
         <p>
-          The <dfn><code>screenshots</code></dfn>
+          The <dfn>screenshots</dfn>
           member is an <a>array</a> of <a>ImageResource</a>s, representing the
           web application in common usage scenarios.
         </p>
@@ -2745,13 +2742,13 @@ <h3>
           <code title="">iarc_rating_id</code> member
         </h3>
         <p>
-          The <dfn><code>iarc_rating_id</code></dfn>
+          The <dfn>iarc_rating_id</dfn>
           member is a <a>string</a> that represents an ID value of the
           IARC rating of the web application. It is intended to be used to
           determine which ages the web application is appropriate for.
         </p>
         <p>
-          The <dfn>steps for processing the <code>iarc_rating_id</code>
+          The <dfn>steps for processing the <a>iarc_rating_id</a>
           member</dfn> is given by the following algorithm. The algorithm takes
           a <var>manifest</var> as an argument. This algorithm returns a string
           or <code>undefined</code>.
@@ -2807,9 +2804,8 @@ <h2>
       </h2>
       <div class="issue" data-number="361"></div>
       <pre class="idl">
-        [NoInterfaceObject]
         dictionary ImageResource {
-          USVString src;
+          required USVString src;
           DOMString sizes;
           USVString type;
           USVString purpose;
@@ -2931,7 +2927,7 @@ <h3>
           <code>purpose</code> member
         </h3>
         <p>
-          The <dfn><code>purpose</code></dfn> member is an <a>unordered set of
+          The <dfn>purpose</dfn> member is an <a>unordered set of
           unique space-separated tokens</a> that are <a>ASCII
           case-insensitive</a>. The allowed values are the <a>icon
           purposes</a>.
@@ -2945,7 +2941,7 @@ <h3>
           For example, as a <a data-lt="badge purpose">badge</a> or "pinned"
           icon that is visually distinct, in color or form, from an
           application's launch icon. The user agent uses the value of the
-          <a><code>purpose</code></a> member as a hint to determine where and
+          <a>purpose</a> member as a hint to determine where and
           how an <a>ImageResource</a> is displayed. Unless declared otherwise by
           the developer, a user agent can use an icon for <a>any purpose</a>.
         </p>
@@ -3044,7 +3040,7 @@ <h3>
           <code>sizes</code> member
         </h3>
         <p>
-          The <dfn><code>sizes</code></dfn> member of an <a>ImageResource</a>
+          The <dfn>sizes</dfn> member of an <a>ImageResource</a>
           is a <a>string</a> consisting of an <a>unordered set of unique
           space-separated tokens</a> which are <a>ASCII case-insensitive</a>
           that represents the dimensions of an image. Each keyword is either an
@@ -3102,7 +3098,7 @@ <h3>
           <code>src</code> member
         </h3>
         <p>
-          The <dfn><code>src</code></dfn> member of an
+          The <dfn>src</dfn> member of an
           <a>ImageResource</a> is a <a>URL</a> from which a user agent can fetch
           the image's data.
         </p>
@@ -3143,7 +3139,7 @@ <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn><code>type</code></dfn> member of an <a>ImageResource</a> is
+          The <dfn>type</dfn> member of an <a>ImageResource</a> is
           a hint as to the media type of the image. The purpose of this member
           is to allow a user agent to ignore images of media types it does not
           support.
@@ -3283,7 +3279,7 @@ <h3>
           <code>platform</code> member
         </h3>
         <p>
-          The <dfn><code>platform</code></dfn> member represents the
+          The <dfn>platform</dfn> member represents the
           <a>platform</a> to which a containing object applies.
         </p>
         <p>
@@ -3303,7 +3299,7 @@ <h3>
         </p>
         <p class="note">
           This specification does not define the particular values for a the
-          <a><code>platform</code></a> member. However, the working group
+          <a>platform</a> member. However, the working group
           maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Platforms">list of known
           platform values</a> in our wiki.
@@ -3335,16 +3331,15 @@ <h3>
     </section>
     <section>
       <h2>
-        The ServiceWorkerRegistration object and its members
+        The ServiceWorkerRegistration dictionary and its members
       </h2>
       <p>
-        A <dfn>ServiceWorkerRegistration</dfn> object represents a service worker
+        A <dfn>ServiceWorkerRegistration</dfn> dictionary represents a service worker
         registration for the web application.
       </p>
       <pre class="idl">
-        [NoInterfaceObject]
         dictionary ServiceWorkerRegistration {
-          USVString src;
+          required USVString src;
           USVString scope;
           USVString type;
           boolean use_cache;
@@ -3355,8 +3350,8 @@ <h3>
           <code>src</code> member
         </h3>
         <p>
-          The <dfn><code>src</code></dfn> member of a <a>ServiceWorkerRegistration</a>
-          object is a <a>URL</a> representing a service worker.
+          The <dfn>src</dfn> member of a <a>ServiceWorkerRegistration</a>
+          dictionary is a <a>URL</a> representing a service worker.
         </p>
         <p>
           The <dfn>steps for processing the <code>src</code> member of a
@@ -3396,8 +3391,8 @@ <h3>
           <code>scope</code> member
         </h3>
         <p>
-          The <dfn><code>scope</code></dfn> member of a <a>ServiceWorkerRegistration</a>
-          object is the service worker's associated <a>scope URL</a>.
+          The <dfn>scope</dfn> member of a <a>ServiceWorkerRegistration</a>
+          dictionary is the service worker's associated <a>scope URL</a>.
         </p>
         <p>
           The <dfn>steps for processing the <code>scope</code> member of a
@@ -3438,8 +3433,8 @@ <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn><code>type</code></dfn> member of a
-          <a>ServiceWorkerRegistration</a> object is the service worker's <a href=
+          The <dfn>type</dfn> member of a
+          <a>ServiceWorkerRegistration</a> dictionary is the service worker's <a href=
           "https://html.spec.whatwg.org/multipage/workers.html#workertype">worker
           type</a>.
         </p>
@@ -3485,8 +3480,8 @@ <h3>
           <code>use_cache</code> member
         </h3>
         <p>
-          The <dfn><code>use_cache</code></dfn> member of a
-          <a>ServiceWorkerRegistration</a> object determines whether the user agent
+          The <dfn>use_cache</dfn> member of a
+          <a>ServiceWorkerRegistration</a> dictionary determines whether the user agent
           <a href="https://w3c.github.io/ServiceWorker/#dfn-use-cache">cache</a>
           should be used when fetching the service worker.
         </p>
@@ -3525,11 +3520,10 @@ <h2>
         ExternalApplicationResource and its members
       </h2>
       <pre class="idl">
-        [NoInterfaceObject]
         dictionary ExternalApplicationResource {
-          USVString platform;
+          required USVString platform;
           USVString url;
-          USVString id;
+          DOMString id;
           USVString min_version;
           USVString fingerprints;
         };
@@ -3575,7 +3569,7 @@ <h2>
         </dd>
       </dl>
       <p>
-        A valid <a>ExternalApplicationResource</a> object MUST have
+        A valid <a>ExternalApplicationResource</a> dictionary MUST have
         <code>platform</code> and either an <code>url</code> or an
         <code>id</code> (or both).
       </p>
@@ -3614,17 +3608,17 @@ <h2>
       <p class="issue">
         Where should the <code>platform</code> expected value be listed?
       </p>
-      <section data-dfn-for="externalapplicationresource">
+      <section data-dfn-for="ExternalApplicationResource">
         <h3>
           <code>url</code> member
         </h3>
         <p>
-          The <dfn><code>url</code></dfn> member of an <a>ExternalApplicationResource</a>
-          object represents the <a>URL</a> at which the application can be
+          The <dfn>url</dfn> member of an <a>ExternalApplicationResource</a>
+          dictionary represents the <a>URL</a> at which the application can be
           found.
         </p>
         <p>
-          The <dfn>steps for processing the <code>url</code> member of an
+          The <dfn>steps for processing the <a>url</a> member of an
           application</dfn> are given by the following algorithm. The algorithm
           takes an <a>ExternalApplicationResource</a> <var>application</var>. This
           algorithm will return an <a>URL</a> or <code>undefined</code>.
@@ -3651,13 +3645,13 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="externalapplicationresource">
+      <section data-dfn-for="ExternalApplicationResource">
         <h3>
           <code>id</code> member
         </h3>
         <p>
-          The <dfn><code>id</code></dfn> member of an <a>ExternalApplicationResource</a>
-          object represents the id which is used to represent the application
+          The <dfn>id</dfn> member of an <a>ExternalApplicationResource</a>
+          dictionary represents the id which is used to represent the application
           on the platform.
         </p>
         <p>
@@ -3684,13 +3678,13 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="externalapplicationresource">
+      <section data-dfn-for="ExternalApplicationResource">
         <h3>
           <code>min_version</code> member
         </h3>
         <p>
-          The <dfn><code>min_version</code></dfn> member of an
-          <a>ExternalApplicationResource</a> object represents the minimum
+          The <dfn>min_version</dfn> member of an
+          <a>ExternalApplicationResource</a> dictionary represents the minimum
           version of the application that is considered related to this web app.
           This version is a string with platform-specific syntax and semantics.
         </p>
@@ -3718,13 +3712,13 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="externalapplicationresource">
+      <section data-dfn-for="ExternalApplicationResource">
         <h3>
           <code>fingerprints</code> member
         </h3>
         <p>
-          The <dfn><code>fingerprints</code></dfn> member
-          of an <a>ExternalApplicationResource</a> object represents a set
+          The <dfn>fingerprints</dfn> member
+          of an <a>ExternalApplicationResource</a> dictionary represents a set
           of cryptographic fingerprints used for verifying the application.
           It is given as an array of <a data-lt="fingerprint object">fingerprint objects</a>.
         </p>
@@ -3830,7 +3824,7 @@ <h2>
         "https://w3c.github.io/screen-orientation/#dfn-default-orientation"><dfn>
         default orientation</dfn></a> concept and the <a href=
         "https://w3c.github.io/screen-orientation/#idl-def-OrientationLockType">
-        <dfn><code>OrientationLockType</code></dfn></a> enum, are defined in
+        <dfn>OrientationLockType</dfn></a> enum, are defined in
         [[!SCREEN-ORIENTATION]].
       </p>
       <p>
@@ -3840,11 +3834,11 @@ <h2>
       </p>
       <p>
         The <a href=
-        "https://w3c.github.io/webappsec-csp/#manifest_src"><dfn><code>manifest-src</code></dfn></a>,
+        "https://w3c.github.io/webappsec-csp/#manifest_src"><dfn>manifest-src</dfn></a>,
         <a href=
-        "https://w3c.github.io/webappsec-csp/#img_src"><dfn><code>img-src</code></dfn></a>,
+        "https://w3c.github.io/webappsec-csp/#img_src"><dfn>img-src</dfn></a>,
         and <a href=
-        "https://w3c.github.io/webappsec-csp/#default_src"><dfn><code>default-src</code></dfn></a>
+        "https://w3c.github.io/webappsec-csp/#default_src"><dfn>default-src</dfn></a>
         directives are defined in [[!CSP3]].
       </p>
       <p>

From 8018ba602b203a4a418e69025fceee9c20058631 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Mon, 25 Sep 2017 14:25:24 +0200
Subject: [PATCH 3/9] More review fixes

---
 index.html | 554 ++++++++++++++++++++++++++---------------------------
 1 file changed, 272 insertions(+), 282 deletions(-)

diff --git a/index.html b/index.html
index cf1dcb5b8..663260e71 100644
--- a/index.html
+++ b/index.html
@@ -301,28 +301,26 @@ <h3>
         </h3>
         <p>
           The <dfn>application's name</dfn> is derived from either the
-          <a>name</a> member or <a>short_name</a>
-          member (if either is present) - otherwise, it is generated by the
-          user agent or provided by the end-user.
+          <a>name</a> member or <a>short_name</a> member (if either is present)
+          - otherwise, it is generated by the user agent or provided by the
+          end-user.
         </p>
         <p>
           When either member is missing from the manifest, a user agent MAY use
-          the <a>name</a> member as a fallback for the
-          <a>short_name</a> member or vice versa.
+          the <a>name</a> member as a fallback for the <a>short_name</a> member
+          or vice versa.
         </p>
         <p>
-          If the <a>name</a> and <a>short_name</a> members are
-          undefined, the user agent SHOULD assign a default name (e.g.,
-          "Untitled"). Alternatively, a user agent MAY allow the end-user to
-          input some text that can serve as the <a>application's name</a>.
+          If the <a>name</a> and <a>short_name</a> members are undefined, the
+          user agent SHOULD assign a default name (e.g., "Untitled").
+          Alternatively, a user agent MAY allow the end-user to input some text
+          that can serve as the <a>application's name</a>.
         </p>
         <p>
-          When both the <a>name</a> and
-          <a>short_name</a> members
-          are present, it is left up to implementations to decide which member
-          is best suited for the space available (e.g., the
-          <a>short_name</a> member might be better suited for the
-          space available underneath an icon).
+          When both the <a>name</a> and <a>short_name</a> members are present,
+          it is left up to implementations to decide which member is best
+          suited for the space available (e.g., the <a>short_name</a> member
+          might be better suited for the space available underneath an icon).
         </p>
       </section>
       <section>
@@ -826,13 +824,12 @@ <h2>
         a <code>SecurityError</code>.
       </p>
       <p data-link-for="WebAppManifest">
-        A developer specifies the navigation scope via the <a>scope</a>
-        member. In the case where the <a>scope</a> member is missing or
-        in error, the navigation scope is treated as <dfn>unbounded</dfn>
-        (represented as the value <code>undefined</code>). In such a case, the
-        manifest is applied to all URLs the application context is
-        <a>navigated</a> to (see related <a href=
-        "#navigation-scope-security-considerations">security
+        A developer specifies the navigation scope via the <a>scope</a> member.
+        In the case where the <a>scope</a> member is missing or in error, the
+        navigation scope is treated as <dfn>unbounded</dfn> (represented as the
+        value <code>undefined</code>). In such a case, the manifest is applied
+        to all URLs the application context is <a>navigated</a> to (see related
+        <a href="#navigation-scope-security-considerations">security
         considerations</a>).
       </p>
       <section data-link-for="DisplayModeType">
@@ -954,8 +951,9 @@ <h2>
         </p>
       </div>
       <p>
-        The <dfn>display modes values</dfn> defined by <dfn>DisplayModeType</dfn>,
-        and their corresponding <a>fallback display modes</a> are as follows:
+        The <dfn>display modes values</dfn> defined by
+        <dfn>DisplayModeType</dfn>, and their corresponding <a>fallback display
+        modes</a> are as follows:
       </p>
       <dl>
         <dt>
@@ -1015,12 +1013,11 @@ <h2>
       </dl>
       <p class="note">
         The <a>fullscreen</a> <a>display mode</a> is orthogonal to, and works
-        independently of, the [[WHATWG-FULLSCREEN]] API. The
-        <a>fullscreen</a> <a>display mode</a> affects the
-        fullscreen state of the browser window, while the [[WHATWG-FULLSCREEN]]
-        API operates on an element contained within the viewport. As such, a
-        web application can have its <a>display mode</a> set to
-        <a>fullscreen</a>, while
+        independently of, the [[WHATWG-FULLSCREEN]] API. The <a>fullscreen</a>
+        <a>display mode</a> affects the fullscreen state of the browser window,
+        while the [[WHATWG-FULLSCREEN]] API operates on an element contained
+        within the viewport. As such, a web application can have its <a>display
+        mode</a> set to <a>fullscreen</a>, while
         <code>document.fullScreenElement</code> returns <code>null</code>, and
         <code>fullscreenEnabled</code> returns <code>false</code>.
       </p>
@@ -1259,8 +1256,8 @@ <h3>
         </p>
         <p>
           A <a>manifest</a> is obtained and applied regardless of the
-          <a>media</a> attribute of the <a><code>link</code>
-          element</a> matches the environment or not.
+          <a>media</a> attribute of the <a><code>link</code> element</a>
+          matches the environment or not.
         </p>
       </section>
     </section>
@@ -1358,10 +1355,9 @@ <h4>
           </p>
           <div class="example">
             <p>
-              The <a>manifest-src</a> and
-              <a>default-src</a> directives govern the origins
-              from which a <a>user agent</a> can fetch a manifest. As with
-              other directives, by default the <a>manifest-src</a>
+              The <a>manifest-src</a> and <a>default-src</a> directives govern
+              the origins from which a <a>user agent</a> can fetch a manifest.
+              As with other directives, by default the <a>manifest-src</a>
               directive is <code>*</code>, meaning that a user agent can,
               [[!FETCH]]'s <abbr>CORS</abbr> permitting, fetch the manifest
               cross-domain. Remote origins (e.g., a <abbr title=
@@ -1374,11 +1370,11 @@ <h4>
               <img src="images/manifest-src-directive.svg" width="704" height=
               "342" alt="manifest-src directive example illustrated">
               <figcaption>
-                For a [[!HTML]] document, [[!CSP3]]'s
-                <a>manifest-src</a> directive controls the sources
-                from which a [[!HTML]] document can load a manifest from. The
-                same CSP policy's <code>img-src</code> directive controls where
-                the icon's images can be fetched from.
+                For a [[!HTML]] document, [[!CSP3]]'s <a>manifest-src</a>
+                directive controls the sources from which a [[!HTML]] document
+                can load a manifest from. The same CSP policy's
+                <code>img-src</code> directive controls where the icon's images
+                can be fetched from.
               </figcaption>
             </figure>
           </div>
@@ -1498,9 +1494,9 @@ <h3>
           argument.
           </li>
           <li>Let <var>icons</var> of <var>parsed manifest</var> be the result
-          of running the <a>steps for processing an array of image resources</a>
-          with <var>manifest</var>, <var>manifest URL</var>, and "icons" as
-          arguments.
+          of running the <a>steps for processing an array of image
+          resources</a> with <var>manifest</var>, <var>manifest URL</var>, and
+          "icons" as arguments.
           </li>
           <li>Let <var>scope</var> of <var>parsed manifest</var> be the result
           of running the <a>steps for processing the <code>scope</code>
@@ -1538,9 +1534,9 @@ <h3>
           argument.
           </li>
           <li>Let <var>screenshots</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing an array of image resources</a>
-          with <var>manifest</var>, <var>manifest URL</var>, and "screenshots"
-          as arguments.
+          result of running the <a>steps for processing an array of image
+          resources</a> with <var>manifest</var>, <var>manifest URL</var>, and
+          "screenshots" as arguments.
           </li>
           <li>Return <var>parsed manifest</var>.
           </li>
@@ -1572,9 +1568,9 @@ <h3 id="applying">
         <div>
           <p>
             Please note that the <a>start URL</a> is not necessarily the value
-            of the <a data-link-for="WebAppManifest"><code>start_url</code></a> member: the user or user agent
-            could have changed it when the application was added to home-screen
-            or otherwise bookmarked.
+            of the <a data-link-for="WebAppManifest"><code>start_url</code></a>
+            member: the user or user agent could have changed it when the
+            application was added to home-screen or otherwise bookmarked.
           </p>
         </div>
         <p>
@@ -1592,15 +1588,8 @@ <h3>
     </section>
     <section data-dfn-for="WebAppManifest" data-link-for="WebAppManifest">
       <h2>
-        Manifest and its members
+        <dfn>WebAppManifest</dfn> dictionary
       </h2>
-      <p>
-        A <dfn>manifest</dfn> is a JSON document that contains startup
-        parameters and application defaults for when a web application is
-        launched. A manifest consists of a top-level <dfn>WebAppManifest</dfn>
-        <a>dictionary</a> that contains zero or more members.
-        Each of the members are defined below, as well as how their values are processed.
-      </p>
       <pre class="idl">
           dictionary WebAppManifest {
              TextDirectionType? dir;
@@ -1623,6 +1612,11 @@ <h2>
              boolean? prefer_related_applications;
           };
       </pre>
+      <p>
+        A <dfn>manifest</dfn> is a JSON document that contains startup
+        parameters and application defaults for when a web application is
+        launched.
+      </p>
       <p>
         Every manifest has an associated <dfn>manifest URL</dfn>, which is the
         [[!URL]] from which the <a>manifest</a> was fetched.
@@ -1631,15 +1625,15 @@ <h2>
         <h3>
           <code>dir</code> member
         </h3>
-        <p>
-          The <dfn>dir</dfn> member specifies the <dfn>base
-          direction</dfn> for the <a>directionality-capable members</a> of the
-          <a>manifest</a>. The <a>dir</a> member's value can be set to
-          one of the <a>text-direction values</a>.
-        </p>
         <pre class="idl">
             enum TextDirectionType { "ltr", "rtl", "auto" };
         </pre>
+        <p>
+          The <dfn>dir</dfn> member specifies the <dfn>base direction</dfn> for
+          the <a>directionality-capable members</a> of the <a>manifest</a>. The
+          <a>dir</a> member's value can be set to one of the <a>text-direction
+          values</a>.
+        </p>
         <p>
           The <dfn>directionality-capable members</dfn> are:
         </p>
@@ -1655,9 +1649,10 @@ <h3>
           </li>
         </ul>
         <p>
-          The <dfn data-lt="text-direction value">text-direction values</dfn> defined by
-          <dfn>TextDirectionType</dfn>, are the following, implying that the value of the
-          <a>directionality-capable members</a> is by default:
+          The <dfn data-lt="text-direction value">text-direction values</dfn>
+          defined by <dfn>TextDirectionType</dfn>, are the following, implying
+          that the value of the <a>directionality-capable members</a> is by
+          default:
         </p>
         <dl data-dfn-for="TextDirectionType">
           <dt>
@@ -1686,8 +1681,8 @@ <h3>
           end-user, the user agent MUST use the <a>base direction</a> to
           compute directional runs and layout or position text correctly in
           text containing mixed-direction sequences [[!BIDI]]. When the <a>base
-          direction</a> is "<a data-link-for="TextDirectionType">auto</a>" the user
-          agent MUST run the <a>steps to programmatically determine the
+          direction</a> is "<a data-link-for="TextDirectionType">auto</a>" the
+          user agent MUST run the <a>steps to programmatically determine the
           directionality of a member</a> - and use the resulting
           <a>text-direction value</a> to assist in displaying the value of the
           member.
@@ -1752,10 +1747,10 @@ <h3>
           <code>lang</code> member
         </h3>
         <p>
-          The <dfn>lang</dfn> member is a
-          <a>language tag</a> (string) that specifies the primary language for
-          the values of the manifest's <a>directionality-capable members</a>
-          (as knowing the language can also help with directionality).
+          The <dfn>lang</dfn> member is a <a>language tag</a> (string) that
+          specifies the primary language for the values of the manifest's
+          <a>directionality-capable members</a> (as knowing the language can
+          also help with directionality).
         </p>
         <p>
           A <dfn>language tag</dfn> is a string that matches the production of
@@ -1817,10 +1812,10 @@ <h3>
           <code title="">name</code> member
         </h3>
         <p>
-          The <dfn>name</dfn> member is a
-          <a>string</a> that represents the name of the web application as it
-          is usually displayed to the user (e.g., amongst a list of other
-          applications, or as a label for an icon).
+          The <dfn>name</dfn> member is a <a>string</a> that represents the
+          name of the web application as it is usually displayed to the user
+          (e.g., amongst a list of other applications, or as a label for an
+          icon).
         </p>
         <p>
           The <dfn>steps for processing the <code>name</code> member</dfn> is
@@ -1851,10 +1846,10 @@ <h3>
           <code title="">short_name</code> member
         </h3>
         <p>
-          The <dfn>short_name</dfn> member
-          is a <a>string</a> that represents a short version of the name of the
-          web application. It is intended to be used where there is
-          insufficient space to display the full name of the web application.
+          The <dfn>short_name</dfn> member is a <a>string</a> that represents a
+          short version of the name of the web application. It is intended to
+          be used where there is insufficient space to display the full name of
+          the web application.
         </p>
         <p>
           The <dfn>steps for processing the <code>short_name</code>
@@ -1885,9 +1880,8 @@ <h3>
           <code title="">description</code> member
         </h3>
         <p>
-          The <dfn>description</dfn>
-          member allows the developer to describe the purpose of the web
-          application.
+          The <dfn>description</dfn> member allows the developer to describe
+          the purpose of the web application.
         </p>
         <p>
           The <dfn>steps for processing the <code>description</code>
@@ -1919,16 +1913,16 @@ <h3>
         </h3>
         <div class="issue" data-number="380"></div>
         <p>
-          The <dfn>scope</dfn> member is a
-          string that represents the navigation scope of this web application's
-          <a>application context</a>.
+          The <dfn>scope</dfn> member is a string that represents the
+          navigation scope of this web application's <a>application
+          context</a>.
         </p>
         <p>
           The <dfn>steps for processing the <code>scope</code> member</dfn> is
           given by the following algorithm. The algorithm takes a
           <a>manifest</a> <var>manifest</var>, a <a>URL</a> <var>manifest
-          URL</var>, a <a>URL</a> <var>document URL</var>, and a URL
-          <var>start URL</var> . This algorithm returns a <a>URL</a> or
+          URL</var>, a <a>URL</a> <var>document URL</var>, and a URL <var>start
+          URL</var> . This algorithm returns a <a>URL</a> or
           <code>undefined</code>.
         </p>
         <ol>
@@ -1995,13 +1989,13 @@ <h3>
           <code title="">icons</code> member
         </h3>
         <p>
-          The <dfn>icons</dfn> member is an
-          <a>array</a> of <a>ImageResource</a>s that can serve as iconic
-          representations of the web application in various contexts. For
-          example, they can be used to represent the web application amongst a
-          list of other applications, or to integrate the web application with
-          an <abbr title="operating system">OS</abbr>'s task switcher and/or
-          system preferences.
+          The <dfn>icons</dfn> member is an <a>array</a> of
+          <a>ImageResource</a>s that can serve as iconic representations of the
+          web application in various contexts. For example, they can be used to
+          represent the web application amongst a list of other applications,
+          or to integrate the web application with an <abbr title=
+          "operating system">OS</abbr>'s task switcher and/or system
+          preferences.
         </p>
         <p class="note">
           The <a>icons</a> member is processed using the <a>steps for
@@ -2074,11 +2068,11 @@ <h3>
           };
         </pre>
         <p>
-          The <dfn>display</dfn> member is a <a>DisplayModeType</a>,
-          whose value is one of <a>display modes values</a>. The
-          item represents the developer's preferred <a>display mode</a> for the
-          web application. When the member is missing or erroneous, the user
-          agent MUST use the <a>fallback display mode</a>.
+          The <dfn>display</dfn> member is a <a>DisplayModeType</a>, whose
+          value is one of <a>display modes values</a>. The item represents the
+          developer's preferred <a>display mode</a> for the web application.
+          When the member is missing or erroneous, the user agent MUST use the
+          <a>fallback display mode</a>.
         </p>
         <p>
           The <dfn>steps for processing the <code>display</code> member</dfn>
@@ -2121,27 +2115,25 @@ <h3>
           <code>orientation</code> member
         </h3>
         <p>
-          The <dfn>orientation</dfn>
-          member is a <a>string</a> that serves as the <a>default
-          orientation</a> for all <a>top-level browsing contexts</a> of the web
-          application. The possible values are those of the
-          <a>OrientationLockType</a> enum defined in
+          The <dfn>orientation</dfn> member is a <a>string</a> that serves as
+          the <a>default orientation</a> for all <a>top-level browsing
+          contexts</a> of the web application. The possible values are those of
+          the <a>OrientationLockType</a> enum defined in
           [[!SCREEN-ORIENTATION]].
         </p>
         <p>
-          If the user agent honors the value of the <a>orientation</a>
-          member as the <a>default orientation</a>, then that serves as the
-          <a>default orientation</a> for the life of the web application
-          (unless overridden by some other means at runtime). This means that
-          the user agent MUST return the orientation to the <a>default
-          orientation</a> any time the orientation is unlocked
-          [[!SCREEN-ORIENTATION]] or the <a>top-level browsing context</a> is
-          <a>navigated</a>.
+          If the user agent honors the value of the <a>orientation</a> member
+          as the <a>default orientation</a>, then that serves as the <a>default
+          orientation</a> for the life of the web application (unless
+          overridden by some other means at runtime). This means that the user
+          agent MUST return the orientation to the <a>default orientation</a>
+          any time the orientation is unlocked [[!SCREEN-ORIENTATION]] or the
+          <a>top-level browsing context</a> is <a>navigated</a>.
         </p>
         <p>
           Although the specification relies on the [[!SCREEN-ORIENTATION]]'s
-          <a>OrientationLockType</a>, it is OPTIONAL for a user
-          agent to implement the [[!SCREEN-ORIENTATION]] API. Supporting the
+          <a>OrientationLockType</a>, it is OPTIONAL for a user agent to
+          implement the [[!SCREEN-ORIENTATION]] API. Supporting the
           [[!SCREEN-ORIENTATION]] API is, of course, RECOMMENDED.
         </p>
         <p>
@@ -2181,10 +2173,9 @@ <h3>
           <li>Otherwise, <a>Trim</a>(<var>value</var>), convert to lower-case,
           and set <var>value</var> to be the result.
           </li>
-          <li>If <var>value</var> is not one of the
-          <a>OrientationLockType</a> enum values, or
-          <var>value</var> is unsupported by the user agent, or the
-          <var>value</var> <a>cannot be used together</a> with <var>display
+          <li>If <var>value</var> is not one of the <a>OrientationLockType</a>
+          enum values, or <var>value</var> is unsupported by the user agent, or
+          the <var>value</var> <a>cannot be used together</a> with <var>display
           mode:</var>
             <ol>
               <li>
@@ -2203,18 +2194,18 @@ <h3>
           <code>start_url</code> member
         </h3>
         <p>
-          The <dfn>start_url</dfn> member is a <a>string</a> that
-          represents the <dfn>start URL</dfn> , which is <a>URL</a> that the
-          developer would prefer the user agent load when the user launches the
-          web application (e.g., when the user clicks on the icon of the web
+          The <dfn>start_url</dfn> member is a <a>string</a> that represents
+          the <dfn>start URL</dfn> , which is <a>URL</a> that the developer
+          would prefer the user agent load when the user launches the web
+          application (e.g., when the user clicks on the icon of the web
           application from a device's application menu or homescreen).
         </p>
         <p>
-          The <a>start_url</a> member is purely advisory, and a
-          user agent MAY <a>ignore</a> it or provide the end-user the choice
-          not to make use of it. A user agent MAY also allow the end-user to
-          modify the URL when, for instance, a bookmark for the web application
-          is being created or any time thereafter.
+          The <a>start_url</a> member is purely advisory, and a user agent MAY
+          <a>ignore</a> it or provide the end-user the choice not to make use
+          of it. A user agent MAY also allow the end-user to modify the URL
+          when, for instance, a bookmark for the web application is being
+          created or any time thereafter.
         </p>
         <p>
           The <dfn>steps for processing the <code>start_url</code> member</dfn>
@@ -2258,9 +2249,9 @@ <h3>
           <li>If url is not <a>same origin</a> as <var>document URL</var>:
             <ol>
               <li>
-                <a>Issue a developer warning</a> that the
-                <a>start_url</a> needs to be <a>same-origin</a> as
-                <code>Document</code> of the <a>top-level browsing context</a>.
+                <a>Issue a developer warning</a> that the <a>start_url</a>
+                needs to be <a>same-origin</a> as <code>Document</code> of the
+                <a>top-level browsing context</a>.
               </li>
               <li>Return a new <a>URL</a> whose <var>input</var> is
               <var>document URL</var>.
@@ -2284,15 +2275,14 @@ <h3>
             Privacy consideration: <a>start_url</a> tracking
           </h3>
           <p>
-            It's conceivable that the <a>start_url</a> could be crafted
-            to indicate that the application was launched from outside the
-            browser (e.g., <code>"start_url":
-            "index.html?launcher=homescreen"</code>). This can be useful for
-            analytics and possibly other customizations. However, it is also
-            conceivable that developers could encode strings into the start_url
-            that uniquely identify the user (e.g., a server assigned
-            <abbr>UUID</abbr>). This is fingerprinting/privacy sensitive
-            information that the user might not be aware of.
+            It's conceivable that the <a>start_url</a> could be crafted to
+            indicate that the application was launched from outside the browser
+            (e.g., <code>"start_url": "index.html?launcher=homescreen"</code>).
+            This can be useful for analytics and possibly other customizations.
+            However, it is also conceivable that developers could encode
+            strings into the start_url that uniquely identify the user (e.g., a
+            server assigned <abbr>UUID</abbr>). This is fingerprinting/privacy
+            sensitive information that the user might not be aware of.
           </p>
           <p>
             Given the above, it is RECOMMENDED that, upon installation, or any
@@ -2306,12 +2296,11 @@ <h3>
           <code>serviceworker</code> member
         </h3>
         <p>
-          The <dfn>serviceworker</dfn> member describes a service
-          worker as defined in [[!SERVICE-WORKERS-1]].
+          The <dfn>serviceworker</dfn> member describes a service worker as
+          defined in [[!SERVICE-WORKERS-1]].
         </p>
         <p>
-          The <a>serviceworker</a> member represents an intented
-          <a href=
+          The <a>serviceworker</a> member represents an intented <a href=
           "https://w3c.github.io/ServiceWorker/#service-worker-registration-concept">
           service worker registration</a> in form of a <dfn>registration
           object</dfn>
@@ -2405,10 +2394,9 @@ <h3>
           <code title="">theme_color</code> member
         </h3>
         <p>
-          The <dfn>theme_color</dfn>
-          member serves as the <dfn>default theme color</dfn> for an
-          application context. What constitutes a <dfn>theme color</dfn> is
-          defined in [[!HTML]].
+          The <dfn>theme_color</dfn> member serves as the <dfn>default theme
+          color</dfn> for an application context. What constitutes a <dfn>theme
+          color</dfn> is defined in [[!HTML]].
         </p>
         <p>
           If the user agent honors the value of the <code>theme_color</code>
@@ -2470,11 +2458,11 @@ <h3>
           manifest</a>.
         </p>
         <p>
-          The <dfn>related_applications</dfn> member lists
-          <a>related applications</a> and serves as an indication of such a
-          relationship between web application and <a>related applications</a>.
-          This relationship is unidirectional and unless a listed application
-          claims the same relationship, the <a>user agent</a> MUST NOT assume a
+          The <dfn>related_applications</dfn> member lists <a>related
+          applications</a> and serves as an indication of such a relationship
+          between web application and <a>related applications</a>. This
+          relationship is unidirectional and unless a listed application claims
+          the same relationship, the <a>user agent</a> MUST NOT assume a
           bi-directional endorsement.
         </p>
         <p>
@@ -2488,7 +2476,8 @@ <h3>
           The <dfn>steps for processing the <code>related_applications</code>
           member</dfn> are given by the following algorithm. The algorithm
           takes a manifest as an argument. This algorithm returns a list of
-          <a>ExternalApplicationResource</a>s <var>applications</var>, which can be empty.
+          <a>ExternalApplicationResource</a>s <var>applications</var>, which
+          can be empty.
         </p>
         <ol>
           <li>Let <var>applications</var> be an empty list.
@@ -2560,11 +2549,11 @@ <h3>
         </h3>
         <div class="issue" data-number="365"></div>
         <p>
-          The <dfn>prefer_related_applications</dfn> member is a
-          boolean value that is used as a hint for the user agent to say that
-          <a>related applications</a> should be preferred over the web
-          application. The user agent MUST consider the missing value as
-          equivalent to have it set to <code>false</code>. If the
+          The <dfn>prefer_related_applications</dfn> member is a boolean value
+          that is used as a hint for the user agent to say that <a>related
+          applications</a> should be preferred over the web application. The
+          user agent MUST consider the missing value as equivalent to have it
+          set to <code>false</code>. If the
           <code>prefer_related_applications</code> is set to <code>true</code>,
           and the user agent wants to suggest to install the web application,
           the user agent might want to suggest installing one of the <a>related
@@ -2599,18 +2588,18 @@ <h3>
           <code title="">background_color</code> member
         </h3>
         <p>
-          The <dfn>background_color</dfn>
-          member describes the expected background color of the web
-          application. It repeats what is already available in the application
-          stylesheet but can be used by the <a>user agent</a> to draw the
-          background color of a web application for which the manifest is known
-          before the files are actually available, whether they are fetched
-          from the network or retrieved from disk.
+          The <dfn>background_color</dfn> member describes the expected
+          background color of the web application. It repeats what is already
+          available in the application stylesheet but can be used by the
+          <a>user agent</a> to draw the background color of a web application
+          for which the manifest is known before the files are actually
+          available, whether they are fetched from the network or retrieved
+          from disk.
         </p>
         <p>
-          The <a>background_color</a> member is only meant to improve the
-          user experience while a web application is loading and MUST NOT be
-          used by the <a>user agent</a> as the background color when the web
+          The <a>background_color</a> member is only meant to improve the user
+          experience while a web application is loading and MUST NOT be used by
+          the <a>user agent</a> as the background color when the web
           application's stylesheet is available.
         </p>
         <p>
@@ -2658,17 +2647,15 @@ <h3>
           <code title="">categories</code> member
         </h3>
         <p>
-          The <dfn>categories</dfn> member
-          describes the expected application categories to which the web
-          application belongs.
+          The <dfn>categories</dfn> member describes the expected application
+          categories to which the web application belongs.
         </p>
         <p>
-          The <a>categories</a> member is only meant as a hint to
-          catalogs or stores listing web applications and it is expected that
-          these will make a best effort to find appropriate categories (or
-          category) under which to list the web application. Like search
-          engines and meta keywords, catalogs and stores are not required to
-          honor this hint.
+          The <a>categories</a> member is only meant as a hint to catalogs or
+          stores listing web applications and it is expected that these will
+          make a best effort to find appropriate categories (or category) under
+          which to list the web application. Like search engines and meta
+          keywords, catalogs and stores are not required to honor this hint.
         </p>
         <p>
           The <dfn>steps for processing the <code>categories</code>
@@ -2720,9 +2707,9 @@ <h3>
           Manifest authors are encouraged to use lower-case.
         </p>
         <p class="note">
-          This specification does not define the particular <dfn>CategoryType</dfn>s
-          for a the <a>categories</a> member. However, the working group
-          maintains a <a href=
+          This specification does not define the particular
+          <dfn>CategoryType</dfn>s for a the <a>categories</a> member. However,
+          the working group maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Categories">list of known
           values</a> in our wiki.
         </p>
@@ -2732,9 +2719,9 @@ <h3>
           <code title="">screenshots</code> member
         </h3>
         <p>
-          The <dfn>screenshots</dfn>
-          member is an <a>array</a> of <a>ImageResource</a>s, representing the
-          web application in common usage scenarios.
+          The <dfn>screenshots</dfn> member is an <a>array</a> of
+          <a>ImageResource</a>s, representing the web application in common
+          usage scenarios.
         </p>
       </section>
       <section>
@@ -2742,15 +2729,15 @@ <h3>
           <code title="">iarc_rating_id</code> member
         </h3>
         <p>
-          The <dfn>iarc_rating_id</dfn>
-          member is a <a>string</a> that represents an ID value of the
-          IARC rating of the web application. It is intended to be used to
-          determine which ages the web application is appropriate for.
+          The <dfn>iarc_rating_id</dfn> member is a <a>string</a> that
+          represents an ID value of the IARC rating of the web application. It
+          is intended to be used to determine which ages the web application is
+          appropriate for.
         </p>
         <p>
-          The <dfn>steps for processing the <a>iarc_rating_id</a>
-          member</dfn> is given by the following algorithm. The algorithm takes
-          a <var>manifest</var> as an argument. This algorithm returns a string
+          The <dfn>steps for processing the <a>iarc_rating_id</a> member</dfn>
+          is given by the following algorithm. The algorithm takes a
+          <var>manifest</var> as an argument. This algorithm returns a string
           or <code>undefined</code>.
         </p>
         <ol>
@@ -2813,24 +2800,24 @@ <h2>
         };
       </pre>
       <p>
-        Each <dfn>ImageResource</dfn>
-        represents an image that is used as part of a web application, suitable
-        to use in various contexts depending on the semantics of the member
-        that is using the object (e.g., an icon that is part of an application
-        menu, etc.). For an image resource, this specification provides
-        developers with a means of specifying the dimensions, and media type of
-        an image (i.e., a "responsive image" solution [[RESPIMG-USECASES]]). A
-        user agent can use these values to select an image that is best suited
-        to display on the end-user's device or most closely matches the
-        end-user's preferences.
+        Each <dfn>ImageResource</dfn> represents an image that is used as part
+        of a web application, suitable to use in various contexts depending on
+        the semantics of the member that is using the object (e.g., an icon
+        that is part of an application menu, etc.). For an image resource, this
+        specification provides developers with a means of specifying the
+        dimensions, and media type of an image (i.e., a "responsive image"
+        solution [[RESPIMG-USECASES]]). A user agent can use these values to
+        select an image that is best suited to display on the end-user's device
+        or most closely matches the end-user's preferences.
       </p>
       <p>
-        User agents may modify the images associated with an <a>ImageResource</a>
-        to better match the platform’s visual style before displaying it to the
-        user, for example by rounding the corners or painting it in a specific color.
-        It is recommended that developers prepare their image resources for such
-        scenarios to avoid losing important information through, e.g., change
-        of color or clipped corners.
+        User agents may modify the images associated with an
+        <a>ImageResource</a> to better match the platform’s visual style before
+        displaying it to the user, for example by rounding the corners or
+        painting it in a specific color. It is recommended that developers
+        prepare their image resources for such scenarios to avoid losing
+        important information through, e.g., change of color or clipped
+        corners.
       </p>
       <section>
         <h3>
@@ -2838,11 +2825,11 @@ <h3>
         </h3>
         <p>
           To <a>fetch</a> the image associated with an <a>ImageResource</a>,
-          the user agent MUST run the <dfn>steps to fetch an image resource</dfn>.
-
-          The algorithm takes an <var>image URL</var> (<a>ImageResource.src</a>),
-          the <var>manifest URL</var>, and the <var>document</var> (<code>Document</code>)
-          from which the manifest was linked. It returns a <a>Response</a>:
+          the user agent MUST run the <dfn>steps to fetch an image
+          resource</dfn>. The algorithm takes an <var>image URL</var>
+          (<a>ImageResource.src</a>), the <var>manifest URL</var>, and the
+          <var>document</var> (<code>Document</code>) from which the manifest
+          was linked. It returns a <a>Response</a>:
         </p>
         <ol>
           <li>Let <var>request</var> be a new <a>Request</a>.
@@ -2927,10 +2914,9 @@ <h3>
           <code>purpose</code> member
         </h3>
         <p>
-          The <dfn>purpose</dfn> member is an <a>unordered set of
-          unique space-separated tokens</a> that are <a>ASCII
-          case-insensitive</a>. The allowed values are the <a>icon
-          purposes</a>.
+          The <dfn>purpose</dfn> member is an <a>unordered set of unique
+          space-separated tokens</a> that are <a>ASCII case-insensitive</a>.
+          The allowed values are the <a>icon purposes</a>.
         </p>
         <p>
           When an <a>ImageResource</a> is used as an <dfn>icon</dfn>, a
@@ -2941,9 +2927,9 @@ <h3>
           For example, as a <a data-lt="badge purpose">badge</a> or "pinned"
           icon that is visually distinct, in color or form, from an
           application's launch icon. The user agent uses the value of the
-          <a>purpose</a> member as a hint to determine where and
-          how an <a>ImageResource</a> is displayed. Unless declared otherwise by
-          the developer, a user agent can use an icon for <a>any purpose</a>.
+          <a>purpose</a> member as a hint to determine where and how an
+          <a>ImageResource</a> is displayed. Unless declared otherwise by the
+          developer, a user agent can use an icon for <a>any purpose</a>.
         </p>
         <p>
           The <dfn>icon purposes</dfn> are as follows:
@@ -2966,8 +2952,8 @@ <h3>
         <p>
           The <dfn>steps for processing a <code>purpose</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>ImageResource</a> <var>image</var>. This algorithm will return a
-          set.
+          an <a>ImageResource</a> <var>image</var>. This algorithm will return
+          a set.
         </p>
         <ol>
           <li>Let <var>purpose</var> be an empty set.
@@ -3040,8 +3026,8 @@ <h3>
           <code>sizes</code> member
         </h3>
         <p>
-          The <dfn>sizes</dfn> member of an <a>ImageResource</a>
-          is a <a>string</a> consisting of an <a>unordered set of unique
+          The <dfn>sizes</dfn> member of an <a>ImageResource</a> is a
+          <a>string</a> consisting of an <a>unordered set of unique
           space-separated tokens</a> which are <a>ASCII case-insensitive</a>
           that represents the dimensions of an image. Each keyword is either an
           <a>ASCII case-insensitive</a> match for the string "<a data-lt=
@@ -3057,8 +3043,8 @@ <h3>
         <p>
           The <dfn>steps for processing a <code>sizes</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>ImageResource</a> <var>image</var>. This algorithm will return a
-          set.
+          an <a>ImageResource</a> <var>image</var>. This algorithm will return
+          a set.
         </p>
         <ol>
           <li>Let <var>sizes</var> be an empty set.
@@ -3093,20 +3079,19 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="imageresource">
+      <section data-dfn-for="ImageResource" data-link-for="ImageResource">
         <h3>
           <code>src</code> member
         </h3>
         <p>
-          The <dfn>src</dfn> member of an
-          <a>ImageResource</a> is a <a>URL</a> from which a user agent can fetch
-          the image's data.
+          The <dfn>src</dfn> member of an <a>ImageResource</a> is a <a>URL</a>
+          from which a user agent can fetch the image's data.
         </p>
         <p>
           The <dfn>steps for processing the <code>src</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
-          a <a>ImageResource</a> <var>icon</var>, and a <a>URL</a> <var>manifest
-          URL</var> , which is the <a>URL</a> from which the
+          a <a>ImageResource</a> <var>icon</var>, and a <a>URL</a>
+          <var>manifest URL</var> , which is the <a>URL</a> from which the
           <var>manifest</var> was fetched. This algorithm will return a
           <a>URL</a> or <code>undefined</code>.
         </p>
@@ -3134,15 +3119,14 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="imageresource">
+      <section data-dfn-for="ImageResource">
         <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn>type</dfn> member of an <a>ImageResource</a> is
-          a hint as to the media type of the image. The purpose of this member
-          is to allow a user agent to ignore images of media types it does not
-          support.
+          The <dfn>type</dfn> member of an <a>ImageResource</a> is a hint as to
+          the media type of the image. The purpose of this member is to allow a
+          user agent to ignore images of media types it does not support.
         </p>
         <p>
           There is no default MIME type for image resources. However, for the
@@ -3187,13 +3171,13 @@ <h3>
           Processing an array of image resources
         </h3>
         <p>
-          The <dfn>steps for processing an array of image resources</dfn> are given by
-          the following algorithm. The algorithm takes a manifest, a <a>URL</a>
-          <var>manifest URL</var>, which is the URL from which the
+          The <dfn>steps for processing an array of image resources</dfn> are
+          given by the following algorithm. The algorithm takes a manifest, a
+          <a>URL</a> <var>manifest URL</var>, which is the URL from which the
           <var>manifest</var> was fetched, and a string that represents the
           <var>member name</var> of the member which contains the array of
-          <a>ImageResource</a>s. This algorithm returns a sequence of <a>ImageResource</a>s,
-          which can be empty.
+          <a>ImageResource</a>s. This algorithm returns a sequence of
+          <a>ImageResource</a>s, which can be empty.
         </p>
         <ol>
           <li>Let <var>images</var> be an empty sequence.
@@ -3274,13 +3258,14 @@ <h2>
         Each member specifies which object a multi-purpose member can be used
         with.
       </p>
-      <section data-dfn-for="ExternalApplicationResource" data-link-for="ExternalApplicationResource">
+      <section data-dfn-for="ExternalApplicationResource" data-link-for=
+      "ExternalApplicationResource">
         <h3>
           <code>platform</code> member
         </h3>
         <p>
-          The <dfn>platform</dfn> member represents the
-          <a>platform</a> to which a containing object applies.
+          The <dfn>platform</dfn> member represents the <a>platform</a> to
+          which a containing object applies.
         </p>
         <p>
           The following object types can make use of this member:
@@ -3299,16 +3284,15 @@ <h3>
         </p>
         <p class="note">
           This specification does not define the particular values for a the
-          <a>platform</a> member. However, the working group
-          maintains a <a href=
-          "https://github.com/w3c/manifest/wiki/Platforms">list of known
-          platform values</a> in our wiki.
+          <a>platform</a> member. However, the working group maintains a
+          <a href="https://github.com/w3c/manifest/wiki/Platforms">list of
+          known platform values</a> in our wiki.
         </p>
         <p>
           The <dfn>steps for processing the <code>platform</code> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
-          algorithm will return a string or <code>undefined</code>.
+          takes an <a>ExternalApplicationResource</a> <var>application</var>.
+          This algorithm will return a string or <code>undefined</code>.
         </p>
         <ol>
           <li>Let <var>value</var> be the result of calling the
@@ -3334,8 +3318,8 @@ <h2>
         The ServiceWorkerRegistration dictionary and its members
       </h2>
       <p>
-        A <dfn>ServiceWorkerRegistration</dfn> dictionary represents a service worker
-        registration for the web application.
+        A <dfn>ServiceWorkerRegistration</dfn> dictionary represents a service
+        worker registration for the web application.
       </p>
       <pre class="idl">
         dictionary ServiceWorkerRegistration {
@@ -3433,8 +3417,8 @@ <h3>
           <code>type</code> member
         </h3>
         <p>
-          The <dfn>type</dfn> member of a
-          <a>ServiceWorkerRegistration</a> dictionary is the service worker's <a href=
+          The <dfn>type</dfn> member of a <a>ServiceWorkerRegistration</a>
+          dictionary is the service worker's <a href=
           "https://html.spec.whatwg.org/multipage/workers.html#workertype">worker
           type</a>.
         </p>
@@ -3475,15 +3459,16 @@ <h3>
           </li>
         </ol>
       </section>
-      <section data-dfn-for="ServiceWorkerRegistration">
+      <section data-dfn-for="ServiceWorkerRegistration" data-link-for=
+      "ServiceWorkerRegistration">
         <h3>
           <code>use_cache</code> member
         </h3>
         <p>
-          The <dfn>use_cache</dfn> member of a
-          <a>ServiceWorkerRegistration</a> dictionary determines whether the user agent
-          <a href="https://w3c.github.io/ServiceWorker/#dfn-use-cache">cache</a>
-          should be used when fetching the service worker.
+          The <dfn>use_cache</dfn> member of a <a>ServiceWorkerRegistration</a>
+          dictionary determines whether the user agent <a href=
+          "https://w3c.github.io/ServiceWorker/#dfn-use-cache">cache</a> should
+          be used when fetching the service worker.
         </p>
         <p>
           The <dfn>steps for processing the <code>use_cache</code> member of a
@@ -3515,7 +3500,8 @@ <h3>
         </ol>
       </section>
     </section>
-    <section>
+    <section data-dfn-for="ExternalApplicationResource" data-link-for=
+    "ExternalApplicationResource">
       <h2>
         ExternalApplicationResource and its members
       </h2>
@@ -3529,9 +3515,9 @@ <h2>
         };
       </pre>
       <p>
-        Each <dfn>ExternalApplicationResource</dfn>s represents an application related to
-        the web application. An application resource has the following
-        properties:
+        Each <dfn>ExternalApplicationResource</dfn>s represents an application
+        related to the web application. An application resource has the
+        following properties:
       </p>
       <dl>
         <dt>
@@ -3620,8 +3606,8 @@ <h3>
         <p>
           The <dfn>steps for processing the <a>url</a> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
-          algorithm will return an <a>URL</a> or <code>undefined</code>.
+          takes an <a>ExternalApplicationResource</a> <var>application</var>.
+          This algorithm will return an <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
           <li>Let <var>value</var> be the result of calling the
@@ -3651,14 +3637,14 @@ <h3>
         </h3>
         <p>
           The <dfn>id</dfn> member of an <a>ExternalApplicationResource</a>
-          dictionary represents the id which is used to represent the application
-          on the platform.
+          dictionary represents the id which is used to represent the
+          application on the platform.
         </p>
         <p>
           The <dfn>steps for processing the <code>id</code> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>. This
-          algorithm will return a string or <code>undefined</code>.
+          takes an <a>ExternalApplicationResource</a> <var>application</var>.
+          This algorithm will return a string or <code>undefined</code>.
         </p>
         <ol>
           <li>Let <var>value</var> be the result of calling the
@@ -3685,14 +3671,16 @@ <h3>
         <p>
           The <dfn>min_version</dfn> member of an
           <a>ExternalApplicationResource</a> dictionary represents the minimum
-          version of the application that is considered related to this web app.
-          This version is a string with platform-specific syntax and semantics.
+          version of the application that is considered related to this web
+          app. This version is a string with platform-specific syntax and
+          semantics.
         </p>
         <p>
           The <dfn>steps for processing the <code>min_version</code> member of
           an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>ExternalApplicationResource</a> <var>application</var>.
-          This algorithm will return a string or <code>undefined</code>.
+          algorithm takes an <a>ExternalApplicationResource</a>
+          <var>application</var>. This algorithm will return a string or
+          <code>undefined</code>.
         </p>
         <ol>
           <li>Let <var>value</var> be the result of calling the
@@ -3717,10 +3705,11 @@ <h3>
           <code>fingerprints</code> member
         </h3>
         <p>
-          The <dfn>fingerprints</dfn> member
-          of an <a>ExternalApplicationResource</a> dictionary represents a set
-          of cryptographic fingerprints used for verifying the application.
-          It is given as an array of <a data-lt="fingerprint object">fingerprint objects</a>.
+          The <dfn>fingerprints</dfn> member of an
+          <a>ExternalApplicationResource</a> dictionary represents a set of
+          cryptographic fingerprints used for verifying the application. It is
+          given as an array of <a data-lt="fingerprint object">fingerprint
+          objects</a>.
         </p>
         <p>
           A <dfn>fingerprint object</dfn> has two properties: <code>type</code>
@@ -3730,9 +3719,10 @@ <h3>
         <p>
           The <dfn>steps for processing the <code>fingerprints</code> member of
           an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>ExternalApplicationResource</a> <var>application</var>.
-          This algorithm will return a list of <a data-lt=
-          "fingerprint object">fingerprint objects</a>, possibly empty.
+          algorithm takes an <a>ExternalApplicationResource</a>
+          <var>application</var>. This algorithm will return a list of
+          <a data-lt="fingerprint object">fingerprint objects</a>, possibly
+          empty.
         </p>
         <ol>
           <li>Let <var>fingerprints</var> be an empty list.
@@ -4510,7 +4500,7 @@ <h2>
       </p>
     </section>
     <section id="idl-index" class="appendix">
-        <!-- All the Web IDL will magically appear here -->
+      <!-- All the Web IDL will magically appear here -->
     </section>
     <section class="appendix">
       <h2>

From 50541f16815630efcab7cc951361e4cfb4b04291 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Thu, 28 Sep 2017 15:41:06 +0200
Subject: [PATCH 4/9] Add IDL processing

---
 index.html | 1175 ++++++++++++++--------------------------------------
 1 file changed, 301 insertions(+), 874 deletions(-)

diff --git a/index.html b/index.html
index 663260e71..7728dcc70 100644
--- a/index.html
+++ b/index.html
@@ -1380,7 +1380,7 @@ <h4>
           </div>
         </section>
       </section>
-      <section id="processing">
+      <section id="processing" data-link-for="WebAppManifest">
         <h3>
           Processing the manifest
         </h3>
@@ -1416,10 +1416,13 @@ <h3>
           inputting an JSON document into this algorithm is a <dfn>processed
           manifest</dfn>.
         </p>
+        <p class="issue">
+          We need to catch throws associated with enumerations in IDL
+          conversion as the spec might gain new values over time not supported
+          by all exising browsers.
+        </p>
         <ol>
-          <li>Let <var>parsed manifest</var> be an empty object.
-          </li>
-          <li>Let <var>manifest</var> be the result of <a data-cite=
+          <li>Let <var>json</var> be the result of <a data-cite=
           "!ECMASCRIPT#sec-json.parse">parsing</a> <var>text</var>. If
           <a data-cite="!ECMASCRIPT#sec-json.parse">parsing</a> throws an
           error:
@@ -1428,19 +1431,19 @@ <h3>
                 <a>Issue a developer warning</a> with any details pertaining to
                 the JSON parsing error.
               </li>
-              <li>Set <var>manifest</var> to be the result of <a data-cite=
+              <li>Set <var>json</var> to be the result of <a data-cite=
               "!ECMASCRIPT#sec-15.12.2">parsing</a> the string
               <code>"{}"</code>.
               </li>
             </ol>
           </li>
-          <li>If <a>Type</a>(<var>manifest</var>) is not "object":
+          <li>If <a>Type</a>(<var>json</var>) is not <code>Object</code>:
             <ol>
               <li>
                 <a>Issue a developer warning</a> that the manifest needs to be
                 an object.
               </li>
-              <li>Set <var>manifest</var> to be the result of <a data-cite=
+              <li>Set <var>json</var> to be the result of <a data-cite=
               "!ECMASCRIPT#sec-15.12.2">parsing</a> the string
               <code>"{}"</code>.
               </li>
@@ -1450,95 +1453,60 @@ <h3>
             <a>Extension point</a>: process any proprietary and/or other
             supported members at this point in the algorithm.
           </li>
-          <li>Let the <var>default direction</var> of <var>parsed
-          manifest</var> be the result of running the <a>steps for processing
-          the <code>dir</code> member</a> with <var>manifest</var> as the
-          argument.
+          <li>Let <a>WebAppManifest</a> <var>manifest</var> be the result of
+          converting <var>json</var> <a>to IDL dictionary value</a>.
           </li>
-          <li>Let <var>start URL</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>start_url</code> member</a> with <var>manifest</var>,
-          <var>manifest URL,</var> and <var>document URL</var> as arguments.
+          <li>Let <var>manifest["<a>start_url</a>"]</var> be the result of
+          running the <a>steps for post-processing the <code>start_url</code>
+          member</a> with <var>manifest</var>, <var>manifest URL,</var> and
+          <var>document URL</var> as arguments.
           </li>
-          <li>Let <var>service worker registration</var> of <var>parsed
-          manifest</var> be the result of running the <a>steps for processing
-          the <code>serviceworker</code> member</a> with <var>manifest</var>,
-          <var>manifest URL</var>, and <var>serviceworker</var> as arguments.
+          <li>Let <var>manifest["<a>display</a>"]</var> be the result of
+          running the <a>steps for post-processing the <code>display</code>
+          member</a> with <var>manifest</var> as the argument.
           </li>
-          <li>Let <var>display mode</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>display</code> member</a> with <var>manifest</var> as the
-          argument.
+          <li>Let <var>manifest["<a>lang</a>"]</var> be the result of running
+          the <a>steps for post-processing the <code>lang</code> member</a>
+          with <var>manifest</var> as the argument.
           </li>
-          <li>Let <var>orientation</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>orientation</code> member</a> with <var>manifest</var> and
-          <var>display mode</var> as arguments.
+          <li>Let <var>manifest["<a>scope</a>"]</var> be the result of running
+          the <a>steps for post-processing the <code>scope</code> member</a>
+          with <var>manifest</var>, <var>manifest URL</var>, <var>document
+          URL</var>, <var>start URL</var> as arguments.
           </li>
-          <li>Let <var>name</var> of <var>parsed manifest</var> be the result
-          of running the <a>steps for processing the <code>name</code>
-          member</a> with <var>manifest</var> as the argument.
+          <li>Let <var>manifest["<a>theme_color</a>"]</var> be the result of
+          running the <a>steps for post-processing the <code>theme_color</code>
+          member</a> with <var>manifest</var> as argument.
           </li>
-          <li>Let <var>description</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>description</code> member</a> with <var>manifest</var> as the
+          <li>Let <var>manifest["<a>background_color</a>"]</var> be the result
+          of running the <a>steps for post-processing the
+          <code>background_color</code> member</a> with <var>manifest</var> as
           argument.
           </li>
-          <li>Let <var>language</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the <code>lang</code>
-          member</a> with <var>manifest</var> as the argument.
-          </li>
-          <li>Let <var>short name</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>short_name</code> member</a> with <var>manifest</var> as the
-          argument.
+          <li>Let <var>manifest["<a>categories</a>"]</var> be the result of
+          running the <a>steps for post-processing the <code>categories</code>
+          member</a> with <var>manifest</var> as argument.
           </li>
-          <li>Let <var>icons</var> of <var>parsed manifest</var> be the result
-          of running the <a>steps for processing an array of image
-          resources</a> with <var>manifest</var>, <var>manifest URL</var>, and
-          "icons" as arguments.
+          <li>Let <var>manifest["<a>icons</a>"]</var> be the result of running
+          the <a>steps for post-processing ImageResource members</a> with <var>
+            manifest</var>, <var>manifest URL</var>, and "icons" as arguments.
           </li>
-          <li>Let <var>scope</var> of <var>parsed manifest</var> be the result
-          of running the <a>steps for processing the <code>scope</code>
-          member</a> with <var>manifest</var>, <var>manifest URL</var>,
-          <var>document URL</var>, <var>start URL</var> as arguments.
+          <li>Let <var>manifest["<a>screenshots</a>"]</var> be the result of
+          running the <a>steps for post-processing ImageResource members</a>
+          with <var>manifest</var>, <var>manifest URL</var>, and "screenshots"
+          as arguments.
           </li>
-          <li>Let <var>related applications</var> of <var>parsed manifest</var>
-          be the result of running the <a>steps for processing the
+          <li>Let <var>manifest["<a>related_applications</a>"]</var> be the
+          result of running the <a>steps for processing the
           <code>related_applications</code> member</a> with <var>manifest</var>
           as argument.
           </li>
-          <li>Let <var>prefer related applications</var> of <var>parsed
-          manifest</var> be the result of running the <a>steps for processing
-          the <code>prefer_related_applications</code> member</a> with
-          <var>manifest</var> as argument.
-          </li>
-          <li>Let <var>theme color</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>theme_color</code> member</a> with <var>manifest</var> as
-          argument.
-          </li>
-          <li>Let <var>background_color</var> of <var>parsed manifest</var> be
-          the result of running the <a>steps for processing the
-          <code>background_color</code> member</a> with <var>manifest</var> as
-          argument.
+          <li>Let <var>manifest["<a>serviceworker</a>"]</var> be the result of
+          running the <a>steps for processing the <code>serviceworker</code>
+          member</a> with <var>manifest</var>, <var>manifest URL</var>, and
+          <var>serviceworker</var> as arguments.
           </li>
-          <li>Let <var>categories</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing the
-          <code>categories</code> member</a> with <var>manifest</var> as
-          argument.
-          </li>
-          <li>Let <var>iarc_rating_id</var> of <var>parsed manifest</var> be
-          the result of running the <a>steps for processing the
-          <code>iarc_rating_id</code> member</a> with <var>manifest</var> as
-          argument.
-          </li>
-          <li>Let <var>screenshots</var> of <var>parsed manifest</var> be the
-          result of running the <a>steps for processing an array of image
-          resources</a> with <var>manifest</var>, <var>manifest URL</var>, and
-          "screenshots" as arguments.
-          </li>
-          <li>Return <var>parsed manifest</var>.
+          <li>Return <var>manifest</var>.
           </li>
         </ol>
       </section>
@@ -1599,7 +1567,7 @@ <h2>
              USVString? description;
              sequence&lt;ImageResource&gt;? icons;
              sequence&lt;ImageResource&gt;? screenshots;
-             sequence&lt;CategoryType&gt;? categories;
+             sequence&lt;USVString&gt;? categories;
              DOMString? iarc_rating_id;
              USVString? start_url;
              DisplayModeType? display;
@@ -1698,47 +1666,9 @@ <h3>
           [[!BIDI]].
           </li>
           <li>If such a character is found and it is of bidirectional character
-          type AL or R, return "rtl".
+          type AL or R, return <code>"rtl"</code>.
           </li>
-          <li>Otherwise, return "ltr".
-          </li>
-        </ol>
-        <p>
-          The <dfn>steps for processing the <code>dir</code> member</dfn> is
-          given by the following algorithm. The algorithm takes a
-          <var>manifest</var> as an argument. This algorithm returns one of the
-          <a>text-direction values</a>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>dir</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>If <a>Type</a>(<var>value</var>) is "undefined", return
-              "auto".
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>), convert to lower-case,
-          and let <var>direction</var> be the result.
-          </li>
-          <li>If <var>direction</var> not one one the <a>text-direction
-          values</a>, then:
-            <ol>
-              <li>
-                <a>Issue a developer warning</a> that the <var>value</var> is
-                invalid.
-              </li>
-              <li>Return "auto".
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>direction</var>.
+          <li>Otherwise, return <code>"ltr"</code>.
           </li>
         </ol>
       </section>
@@ -1768,42 +1698,34 @@ <h3>
           structurally valid.
         </p>
         <p>
-          The <dfn>steps for processing the <code>lang</code> member</dfn> is
-          given by the following algorithm. The algorithm takes a
-          <var>manifest</var> as an argument. This algorithm returns a string
-          or <code>undefined</code>.
+          The <dfn>steps for post-processing the <code>lang</code> member</dfn>
+          is given by the following algorithm. The algorithm takes a
+          <a>WebAppManifest</a> <var>manifest</var> as an argument. This
+          algorithm returns a <code>DOMString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>lang</code>".
+          <li>Let <var>V</var> be <var>manifest.lang</var>.
           </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
+          <li>If <a>Type</a>(<var>V</var>) is <code>String</code>:
             <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and let <var>tag</var>
-          be the result.
-          </li>
-          <li>If calling <a>IsStructurallyValidLanguageTag</a> with
-          <var>tag</var> as the argument returns <code>false</code>, then:
-            <ol>
-              <li>
-                <a>Issue a developer warning</a> that the <var>value</var> is
-                invalid.
+              <li>If calling <a>IsStructurallyValidLanguageTag</a> with
+              <var>V</var> as the argument returns <code>false</code>, then:
+                <ol>
+                  <li>
+                    <a>Issue a developer warning</a> that the <var>V</var> is
+                    invalid.
+                  </li>
+                  <li>Return <code>null</code>.
+                  </li>
+                </ol>
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Otherwise, return the result of calling the
+              <a>CanonicalizeLanguageTag</a> abstract operation, passing <var>
+                V</var> as the argument.
               </li>
             </ol>
           </li>
-          <li>Otherwise, return the result of calling the
-          <a>CanonicalizeLanguageTag</a> abstract operation, passing
-          <var>tag</var> as the argument.
+          <li>Return <code>null</code>
           </li>
         </ol>
       </section>
@@ -1817,29 +1739,6 @@ <h3>
           (e.g., amongst a list of other applications, or as a label for an
           icon).
         </p>
-        <p>
-          The <dfn>steps for processing the <code>name</code> member</dfn> is
-          given by the following algorithm. The algorithm takes a
-          <var>manifest</var> as an argument. This algorithm returns a string
-          or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>name</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -1851,29 +1750,6 @@ <h3>
           be used where there is insufficient space to display the full name of
           the web application.
         </p>
-        <p>
-          The <dfn>steps for processing the <code>short_name</code>
-          member</dfn> is given by the following algorithm. The algorithm takes
-          a <var>manifest</var> as an argument. This algorithm returns a string
-          or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>short_name</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -1883,29 +1759,6 @@ <h3>
           The <dfn>description</dfn> member allows the developer to describe
           the purpose of the web application.
         </p>
-        <p>
-          The <dfn>steps for processing the <code>description</code>
-          member</dfn> is given by the following algorithm. The algorithm takes
-          a <var>manifest</var> as an argument. This algorithm returns a string
-          or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>description</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -1918,40 +1771,31 @@ <h3>
           context</a>.
         </p>
         <p>
-          The <dfn>steps for processing the <code>scope</code> member</dfn> is
-          given by the following algorithm. The algorithm takes a
-          <a>manifest</a> <var>manifest</var>, a <a>URL</a> <var>manifest
-          URL</var>, a <a>URL</a> <var>document URL</var>, and a URL <var>start
-          URL</var> . This algorithm returns a <a>URL</a> or
-          <code>undefined</code>.
+          The <dfn>steps for post-processing the <code>scope</code>
+          member</dfn> is given by the following algorithm. The algorithm takes
+          a <a>WebAppManifest</a> <var>manifest</var>, a <a>URL</a>
+          <var>manifest URL</var>, a <a>URL</a> <var>document URL</var>, and a
+          URL <var>start URL</var> . This algorithm returns a <a>URL</a> or
+          <code>null</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of the <var>manifest</var>
-          with argument "<code>scope</code>".
+          <li>Let <var>V</var> be <var>manifest.scope</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>Let <var>type</var> be <a>Type</a>(<var>V</var>).
           </li>
-          <li>If <var>type</var> is not "string" or <var>value</var> is the
-          empty string, then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", <a>issue
-              a developer warning</a> that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>If <var>type</var> is not <code>String</code> or <var>V</var> is
+          the empty string, then return <code>null</code>.
           </li>
-          <li>Let <var>scope URL</var> be a new <a>URL</a> using
-          <var>value</var> as <var>input</var> and <var>manifest URL</var> as
-          the <var>base</var> URL.
+          <li>Let <var>scope URL</var> be a new <a>URL</a> using <var>V</var>
+          as <var>input</var> and <var>manifest URL</var> as the
+          <var>base</var> URL.
           </li>
           <li>If <var>scope URL</var> is failure:
             <ul>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Return <code>null</code>.
               </li>
             </ul>
           </li>
@@ -1966,7 +1810,7 @@ <h3>
                 same-origin</a> as <code>Document</code> of the <a>application
                 context</a>.
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Return <code>null</code>.
               </li>
             </ol>
           </li>
@@ -1976,7 +1820,7 @@ <h3>
                 <a>Issue a developer warning</a> that the start URL is not
                 <a>within scope</a> of the navigation scope.
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Return <code>null</code>.
               </li>
             </ol>
           </li>
@@ -1997,10 +1841,6 @@ <h3>
           "operating system">OS</abbr>'s task switcher and/or system
           preferences.
         </p>
-        <p class="note">
-          The <a>icons</a> member is processed using the <a>steps for
-          processing an array of image resources</a>.
-        </p>
         <p>
           If there are multiple equally appropriate icons in <var>icons</var>,
           a user agent MUST use the last one declared in order at the time that
@@ -2075,38 +1915,18 @@ <h3>
           <a>fallback display mode</a>.
         </p>
         <p>
-          The <dfn>steps for processing the <code>display</code> member</dfn>
-          are given by the following algorithm. The algorithm takes a manifest
-          <var>manifest</var> as an argument, and returns a string.
+          The <dfn>steps for post-processing the <code>display</code>
+          member</dfn> are given by the following algorithm. The algorithm
+          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument, and
+          returns a <a>DisplayModeType</a>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          passing "<code>display</code>" as the argument.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is unsupported.
-              </li>
-              <li>Return the <a>fallback display mode</a>'s value.
-              </li>
-            </ol>
+          <li>Let <var>V</var> be <var>manifest["display"]</var>.
           </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>), convert to lower-case,
-          and set <var>value</var> to be the result.
-          </li>
-          <li>If <var>value</var> does not match one of the <a>display modes
-          values</a>:
-            <ol>
-              <li>
-                <a>Issue a developer warning</a> that the value is unsupported.
-              </li>
-              <li>Return the <a>fallback display mode</a>'s value.
-              </li>
-            </ol>
+          <li>If <a>Type</a>(<var>V</var>) is <code>null</code> return the <a>
+            fallback display mode</a>'s value.
           </li>
-          <li>Return <var>value</var>.
+          <li>Return <var>V</var>.
           </li>
         </ol>
       </section>
@@ -2150,44 +1970,6 @@ <h3>
           orientation of a <a>top-level browsing context</a> (such as via
           [[!SCREEN-ORIENTATION]] API).
         </p>
-        <p>
-          The <dfn>steps for processing the <code>orientation</code>
-          member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>manifest</a> <var>manifest</var> and <a>display mode</a>
-          <var>display mode</var> as an argument, and returns a string.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>orientation</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>), convert to lower-case,
-          and set <var>value</var> to be the result.
-          </li>
-          <li>If <var>value</var> is not one of the <a>OrientationLockType</a>
-          enum values, or <var>value</var> is unsupported by the user agent, or
-          the <var>value</var> <a>cannot be used together</a> with <var>display
-          mode:</var>
-            <ol>
-              <li>
-                <a>Issue a developer warning</a>.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>value</var>.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -2208,31 +1990,22 @@ <h3>
           created or any time thereafter.
         </p>
         <p>
-          The <dfn>steps for processing the <code>start_url</code> member</dfn>
-          are given by the following algorithm. The algorithm takes a
-          <a>manifest</a> <var>manifest</var>, a <a>URL</a> <var>manifest
-          URL</var> , and a <a>URL</a> <var>document URL</var>. This algorithm
-          returns a <a>URL</a>.
+          The <dfn>steps for post-processing the <code>start_url</code>
+          member</dfn> are given by the following algorithm. The algorithm
+          takes a <a>WebAppManifest</a> <var>manifest</var>, a <a>URL</a>
+          <var>manifest URL</var>, and a <a>URL</a> <var>document URL</var>.
+          This algorithm returns a <a>URL</a>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of the <var>manifest</var>
-          with argument "<code>start_url</code>".
+          <li>Let <var>V</var> be <var>manifest["start_url"]</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>Let <var>type</var> be <a>Type</a>(<var>V</var>).
           </li>
-          <li>If <var>type</var> is not "string" or <var>value</var> is the
-          empty string:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", <a>issue
-              a developer warning</a> that the type is unsupported.
-              </li>
-              <li>Return a new <a>URL</a> whose <var>input</var> is
-              <var>document URL</var>.
-              </li>
-            </ol>
+          <li>If <var>type</var> is not <code>String</code> or <var>V</var> is
+          the empty string, return a new <a>URL</a> whose <var>input</var> is
+          <var>document URL</var>.
           </li>
-          <li>Let <var>url</var> be a new <a>URL</a> using <var>value</var> as
+          <li>Let <var>url</var> be a new <a>URL</a> using <var>V</var> as
           <var>input</var> and <var>manifest URL</var> as the <var>base</var>
           URL.
           </li>
@@ -2314,66 +2087,42 @@ <h3>
         <p>
           The <dfn>steps for processing the <code>serviceworker</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>manifest</a> <var>manifest</var>. This algorithm returns a
-          <a>registration object</a> <var>registration</var>, which can be
-          <code>undefined</code>.
+          takes a <a>WebAppManifest</a> <var>manifest</var>. This algorithm
+          returns a <a>registration object</a> <var>registration'</var>, which
+          can be <code>null</code>.
         </p>
         <ol>
-          <li>Let <var>unprocessed registration</var> be the result of calling
-          the <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>serviceworker</code>".
+          <li>Let <var>registration</var> be
+          <var>manifest["serviceworker"]</var>.
+          </li>
+          <li>If <var>registration</var> is <code>null</code>, return
+          <code>null</code>.
           </li>
           <li>Let <var>src</var> be the result of running the <a>steps for
           processing the <code>src</code> member of a service worker</a> with
-          <var>unprocessed registration</var> and <var>manifest URL</var>.
-          </li>
-          <li>If <var>src</var> is <code>undefined</code>, or if the result of
-          running <a>is origin potentially trustworthy</a> with the origin of
-          <var>src</var> is <code>Not Trusted</code>, <a>issue a developer
-          warning</a>, abort these steps and return <code>undefined</code>.
-          </li>
-          <li>Otherwise, let <var>registration</var> be an object with
-          properties <code>src</code>, <code>scope</code>, <code>type</code>
-          and <code>use_cache</code>. All properties initially set to
-          <code>undefined</code>.
+          <var>registration</var> and <var>manifest URL</var>.
           </li>
-          <li>Set <var>registration</var>'s <code>src</code> property to be
-          <var>src</var>.
+          <li>If the result of running <a>is origin potentially trustworthy</a>
+          with the origin of <var>src</var> is <code>Not Trusted</code>,
+          <a>issue a developer warning</a>, abort these steps and return <code>
+            null</code>.
           </li>
           <li>Let <var>scope</var> be the result of running the <a>steps for
           processing the <code>scope</code> member of a service worker</a>
-          passing <var>unprocessed registration</var>.
-          </li>
-          <li>If <var>scope</var> is <code>undefined</code>, <a>issue a
-          developer warning</a>, abort these steps and return
-          <code>undefined</code>.
-          </li>
-          <li>Otherwise, set <var>registration</var>'s <code>scope</code>
-          property to be <var>scope</var>.
+          passing <var>registration</var>.
           </li>
           <li>Let <var>type</var> be the result of running the <a>steps for
           processing the <code>type</code> member of a service worker</a>
-          passing <var>unprocessed registration</var>.
-          </li>
-          <li>If <var>type</var> is <code>undefined</code>, <a>issue a
-          developer warning</a>, abort these steps and return
-          <code>undefined</code>.
-          </li>
-          <li>Otherwise, set <var>registration</var>'s <code>type</code>
-          property to be <var>type</var>.
+          passing <var>registration</var>.
           </li>
-          <li>Let <var>use cache</var> be the result of running the <a>steps
+          <li>Let <var>use_cache</var> be the result of running the <a>steps
           for processing the <code>use_cache</code> member of a service
-          worker</a> passing <var>unprocessed registration</var>.
+          worker</a> passing <var>registration</var>.
           </li>
-          <li>If <var>use cache</var> is <code>undefined</code>, <a>issue a
-          developer warning</a>, abort these steps and return
-          <code>undefined</code>.
-          </li>
-          <li>Otherwise, set <var>registration</var>'s <code>use_cache</code>
-          property to be <var>use cache</var>.
+          <li>Let <var>registration'</var> be a new object created as if by the
+          expression ({ src, scope, type, use_cache }).
           </li>
-          <li>Return <var>registration</var>.
+          <li>Return <var>registration'</var>.
           </li>
         </ol>
         <div class="example">
@@ -2408,29 +2157,21 @@ <h3>
           "theme-color".
         </p>
         <p>
-          The <dfn>steps for processing the <code>theme_color</code>
+          The <dfn>steps for post-processing the <code>theme_color</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <var>manifest</var> as an argument. This algorithm returns a
-          string or <code>undefined</code>.
+          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
+          This algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>theme_color</code>".
+          <li>Let <var>V</var> be <var>manifest["theme_color"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> return
+          <code>null</code>.
           </li>
           <li>Otherwise, let <var>potential color</var> be the result of
           running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>value</var> as input. If parsing returns a syntax error,
-          return <code>undefined</code>.
+          with <var>V</var> as input. If parsing returns a syntax error, return
+          <code>undefined</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
           <var>potential color</var> as a CSS color, as per [[!CSS-SYNTAX-3]].
@@ -2439,7 +2180,7 @@ <h3>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Return <code>null</code>.
               </li>
             </ol>
           </li>
@@ -2475,71 +2216,48 @@ <h3>
         <p>
           The <dfn>steps for processing the <code>related_applications</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a manifest as an argument. This algorithm returns a list of
-          <a>ExternalApplicationResource</a>s <var>applications</var>, which
-          can be empty.
+          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
+          This algorithm returns an
+          Array&lt;<a>ExternalApplicationResource</a>&gt;.
         </p>
         <ol>
-          <li>Let <var>applications</var> be an empty list.
+          <li>Let <var>A</var> be <var>manifest["related_applications"]</var>.
           </li>
-          <li>Let <var>unprocessed applications</var> be the result of calling
-          the <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>related_applications</code>".
+          <li>Let <var>A'</var> be a new Array object created as if by the
+          expression [].
           </li>
-          <li>If <var>unprocessed applications</var> is an <a>array</a>, then:
+          <li>For <var>V</var> in <var>A</var>:
             <ol>
-              <li>For each <var>potential application</var> in the array:
+              <li>if neither <var>V["src"]</var> nor <var>V["url"]</var> are
+              <code>null</code>:
                 <ol>
-                  <li>Let <var>platform</var> be the result of running the <a>
-                    steps for processing the <code>platform</code> member of an
-                    application</a> with <var>potential application</var>.
-                  </li>
-                  <li>If <var>platform</var> is <code>undefined</code>, move
-                  onto the next item if any are left.
-                  </li>
-                  <li>Let <var>id</var> be the result of running the <a>steps
-                  for processing the <code>id</code> member of an
-                  application</a> with <var>potential application</var>.
+                  <li>Let <var>V'</var> be a new object created as if by the
+                  expression ({}).
                   </li>
-                  <li>Let <var>url</var> be the result of running the <a>steps
-                  for processing the <code>url</code> member of an
-                  application</a> with <var>potential application</var>.
+                  <li>Set <var>V'["platform"]</var> to be
+                  <var>V["platform"]</var>.
                   </li>
-                  <li>If both <var>id</var> and <var>url</var> are
-                  <code>undefined</code>, move onto the next item if any are
-                  left.
+                  <li>Set <var>V'["id"]</var> to be <var>V["id"]</var>.
                   </li>
-                  <li>Let <var>minVersion</var> be the result of running the
-                  <a>steps for processing the <code>min_version</code> member
-                  of an application</a> with <var>potential application</var>.
+                  <li>Set <var>V'["min_version"]</var> to be
+                  <var>V["min_version"]</var>.
                   </li>
-                  <li>Let <var>fingerprints</var> be the result of running the
-                  <a>steps for processing the <code>fingerprints</code> member
-                  of an application</a> with <var>potential application</var>.
+                  <li>Set <var>V'["url"]</var> be the result of running the <a>
+                    steps for processing the <code>url</code> member of an
+                    application</a> with <var>V</var>.
                   </li>
-                  <li>Let <var>application</var> be an object with properties
-                  <code>platform</code>, <code>id</code>, <code>url</code>,
-                  <code>min_version</code>, and <code>fingerprints</code>
-                  respectively set to <var>platform</var>, <var>id</var>, <var>
-                    url</var>, <var>minVersion</var>, and
-                    <var>fingerprints</var>.
+                  <li>Set <var>V'["fingerprints"]</var> be the result of
+                  running the <a>steps for processing the
+                  <code>fingerprints</code> member of an application</a> with
+                  <var>V</var>.
                   </li>
-                  <li>Append <var>application</var> to <var>applications</var>.
+                  <li>Append <var>V'</var> to <var>A'</var>
                   </li>
                 </ol>
               </li>
             </ol>
           </li>
-          <li>Otherwise, if <var>unprocessed applications</var> is not
-          <code>undefined</code>:
-            <ol>
-              <li>
-                <a>Issue a developer warning</a> that the type is not
-                supported.
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>applications</var>.
+          <li>Return <var>A'</var>.
           </li>
         </ol>
       </section>
@@ -2559,29 +2277,6 @@ <h3>
           the user agent might want to suggest installing one of the <a>related
           applications</a> instead.
         </p>
-        <p>
-          The <dfn>steps for processing the
-          <code>prefer_related_applications</code> member</dfn> are given by
-          the following algorithm. The algorithm takes a manifest as an
-          argument. This algorithm returns a boolean.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>prefer_related_applications</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "boolean":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>false</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>value</var>.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -2603,29 +2298,21 @@ <h3>
           application's stylesheet is available.
         </p>
         <p>
-          The <dfn>steps for processing the <a>background_color</a>
+          The <dfn>steps for post-processing the <a>background_color</a>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <var>manifest</var> as an argument. This algorithm returns a
-          string or <code>undefined</code>.
+          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
+          This algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>background_color</code>".
+          <li>Let <var>V</var> be <var>manifest["background_color"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> return
+          <code>null</code>.
           </li>
           <li>Otherwise, let <var>potential color</var> be the result of
           running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>value</var> as input. If parsing returns a syntax error,
-          return <code>undefined</code>.
+          with <var>V</var> as input. If parsing returns a syntax error, return
+          <code>null</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
           <var>potential color</var> as a CSS color, as per [[!CSS-SYNTAX-3]].
@@ -2634,7 +2321,7 @@ <h3>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>undefined</code>.
+              <li>Return <code>null</code>.
               </li>
             </ol>
           </li>
@@ -2658,43 +2345,32 @@ <h3>
           keywords, catalogs and stores are not required to honor this hint.
         </p>
         <p>
-          The <dfn>steps for processing the <code>categories</code>
+          The <dfn>steps for post-processing the <code>categories</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <var>manifest</var> as an argument. This algorithm returns an
-          array of strings or <code>undefined</code>.
+          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
+          This algorithm returns an <code>Array&lt;USVString&gt;</code>.
         </p>
         <ol>
-          <li>Let <var>categories</var> be an empty list.
+          <li>Let <var>A</var> be <var>manifest["categories"]</var>.
           </li>
-          <li>Let <var>unprocessed categories</var> be the result of calling
-          the <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>categories</code>".
+          <li>Let <var>n</var> be the length of A.
           </li>
-          <li>If <var>unprocessed categories</var>is an array, then:
-            <ol>
-              <li>For each <var>potential category</var> in the array:
-                <ol>
-                  <li>
-                    <a>Trim</a>(<var>value</var>) and convert <a>to ASCII
-                    lowercase</a>
-                  </li>
-                  <li>Append <var>potential category</var> to
-                  <var>categories</var>
-                  </li>
-                </ol>
-              </li>
-            </ol>
+          <li>Initialize <var>i</var> to be 0.
           </li>
-          <li>Otherwise, if <var>unprocessed categories</var> is not
-          <code>undefined</code>
+          <li>While <var>i</var> &lt; <var>n</var>:
             <ol>
+              <li>Let <var>V</var> be the value in <var>A</var> at index <var>
+                i</var>.
+              </li>
               <li>
-                <a>Issue a developer warning</a> that the type is not
-                supported.
+                <a>Trim</a>(<var>V</var>) and convert <a>to ASCII lowercase</a>
+                in place.
+              </li>
+              <li>Set <var>i</var> to <var>i</var> + 1.
               </li>
             </ol>
           </li>
-          <li>Return <var>categories</var>
+          <li>Return <var>A</var>.
           </li>
         </ol>
         <p>
@@ -2707,8 +2383,8 @@ <h3>
           Manifest authors are encouraged to use lower-case.
         </p>
         <p class="note">
-          This specification does not define the particular
-          <dfn>CategoryType</dfn>s for a the <a>categories</a> member. However,
+          This specification does not define the particular values for
+          <dfn>USVString</dfn>s for a the <a>categories</a> member. However,
           the working group maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Categories">list of known
           values</a> in our wiki.
@@ -2734,29 +2410,6 @@ <h3>
           is intended to be used to determine which ages the web application is
           appropriate for.
         </p>
-        <p>
-          The <dfn>steps for processing the <a>iarc_rating_id</a> member</dfn>
-          is given by the following algorithm. The algorithm takes a
-          <var>manifest</var> as an argument. This algorithm returns a string
-          or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with argument "<code>iarc_rating_id</code>".
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
         <div class="informative">
           <p>
             The following shows a very simple <a>manifest</a> with the
@@ -2950,51 +2603,40 @@ <h3>
           </dd>
         </dl>
         <p>
-          The <dfn>steps for processing a <code>purpose</code> member of an
+          The <dfn>steps for processing the <code>purpose</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           an <a>ImageResource</a> <var>image</var>. This algorithm will return
           a set.
         </p>
         <ol>
-          <li>Let <var>purpose</var> be an empty set.
-          </li>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>image</var>
-          passing "<code>purpose</code>" as the argument.
+          <li>Let <var>S</var> be an empty set.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>Let <var>V</var> be <var>image["purpose"]</var>.
           </li>
-          <li>If <var>type</var> is not "string", then:
+          <li>If <a>Type</a>(<var>V</var>) is String:
             <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", <a>issue
-              a developer warning</a> that the type is unsupported.
-              </li>
-              <li>Add "any" to <var>purpose</var>.
+              <li>Let <var>keywords</var> be the result of <a>splitting</a>
+              <var>V</var> on spaces.
               </li>
-              <li>Return <var>purpose</var>.
-              </li>
-            </ol>
-          </li>
-          <li>Let <var>keywords</var> be the result of <a>splitting</a>
-          <var>value</var> on spaces.
-          </li>
-          <li>For each <var>keyword</var> in <var>keywords</var>:
-            <ol>
-              <li>Convert <var>keyword</var> <a>to ASCII lowercase</a>.
-              </li>
-              <li>If <var>keyword</var> is not one of the <a>icon purposes</a>,
-              or is already contained in <var>keywords</var>, <a>issue a
-              developer warning</a> and continue to the next <var>keyword</var>
-              skipping the sub-steps below.
-              </li>
-              <li>Otherwise, add <var>keyword</var> to <var>purpose</var>.
+              <li>For each <var>keyword</var> in <var>keywords</var>:
+                <ol>
+                  <li>Convert <var>keyword</var> <a>to ASCII lowercase</a>.
+                  </li>
+                  <li>If <var>keyword</var> is not one of the <a>icon
+                  purposes</a>, or is already contained in <var>keywords</var>,
+                  <a>issue a developer warning</a> and continue to the next
+                  <var>keyword</var> skipping the sub-steps below.
+                  </li>
+                  <li>Otherwise, add <var>keyword</var> to <var>S</var>.
+                  </li>
+                </ol>
               </li>
             </ol>
           </li>
-          <li>if the size of purpose is 0, then add "any" to
-          <var>purpose</var>.
+          <li>if the size of <var>S</var> is 0, then add <code>"any"</code> to
+          <var>S</var>.
           </li>
-          <li>Return <var>purpose</var>.
+          <li>Return <var>S</var>.
           </li>
         </ol>
         <div class="example">
@@ -3041,41 +2683,31 @@ <h3>
           display context (and ignore any that are inappropriate).
         </p>
         <p>
-          The <dfn>steps for processing a <code>sizes</code> member of an
+          The <dfn>steps for processing the <code>sizes</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           an <a>ImageResource</a> <var>image</var>. This algorithm will return
           a set.
         </p>
         <ol>
-          <li>Let <var>sizes</var> be an empty set.
+          <li>Let <var>S</var> be an empty set.
           </li>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>image</var>
-          passing "<code>sizes</code>" as the argument.
+          <li>Let <var>V</var> be <var>image.sizes</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
+          <code>null</code>.
           </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", <a>issue
-              a developer warning</a> that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, parse <var>value</var> as if it was a [[!HTML]] <code>
-            <a>sizes</a></code> attribute and let <var>keywords</var> be the
+          <li>Otherwise, parse <var>V</var> as if it was a [[!HTML]] <code><a>
+            sizes</a></code> attribute and let <var>keywords</var> be the
             result.
           </li>
           <li>For each <var>keyword</var> in <var>keywords</var>:
             <ol>
               <li>Convert <var>keyword</var> <a>to ASCII lowercase</a> and add
-              the resulting string to <var>sizes</var>.
+              the resulting string to <var>S</var>.
               </li>
             </ol>
           </li>
-          <li>Return <var>sizes</var>.
+          <li>Return <var>S</var>.
           </li>
         </ol>
       </section>
@@ -3096,23 +2728,10 @@ <h3>
           <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>image</var>
-          passing "<code>src</code>" as the argument.
-          </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
-          </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>Let <var>V</var> be <var>image.src</var>.
           </li>
-          <li>If <a>Trim</a>(value) is the empty string, then return
-          <code>undefined</code>.
+          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
+          <code>null</code>.
           </li>
           <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
           URL</var> as the base URL and return the result.
@@ -3140,23 +2759,10 @@ <h3>
           string or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>potential
-          image</var> passing "<code>type</code>" as the argument.
+          <li>Let <var>V</var> be <var>image["type"]</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
-          </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Trim(<var>value</var>) and set <var>value</var> to be resulting
-          string.
+          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
+          <code>null</code>.
           </li>
           <li>If <var>value</var> is not a <a>valid MIME type</a> or the value
           of <var>type</var> is not a supported media format, issue a developer
@@ -3168,84 +2774,57 @@ <h3>
       </section>
       <section>
         <h3>
-          Processing an array of image resources
+          Post-processing an array of image resources
         </h3>
         <p>
-          The <dfn>steps for processing an array of image resources</dfn> are
-          given by the following algorithm. The algorithm takes a manifest, a
-          <a>URL</a> <var>manifest URL</var>, which is the URL from which the
+          The <dfn>steps for post-processing <a>ImageResource</a> members</dfn>
+          are given by the following algorithm. The algorithm takes a manifest,
+          a <a>URL</a> <var>manifest URL</var>, which is the URL from which the
           <var>manifest</var> was fetched, and a string that represents the
           <var>member name</var> of the member which contains the array of
           <a>ImageResource</a>s. This algorithm returns a sequence of
           <a>ImageResource</a>s, which can be empty.
         </p>
         <ol>
-          <li>Let <var>images</var> be an empty sequence.
-          </li>
-          <li>Let <var>unprocessed images</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>manifest</var>
-          with <var>member name</var> as the argument.
-          </li>
-          <li>If <var>unprocessed images</var> is an <a>array</a>, then:
-            <ol>
-              <li>From unprocessed images, filter out any <var>item</var> where
-              <a>HasOwnProperty</a>(item, "src") returns <code>false</code>.
-              </li>
-              <li>For each <var>potential image</var> in the array:
-                <ol>
-                  <li>Let <var>src</var> be the result of running the <a>steps
-                  for processing the <code>src</code> member of an image</a>
-                  with <var>potential image</var> and <var>manifest URL</var>.
-                  </li>
-                  <li>If <var>src</var> is <code>undefined</code>, move onto
-                  the next item in <var>images</var> (if any are left).
-                  </li>
-                  <li>Otherwise, let <var>image</var> be an object with
-                  properties <code>src</code>, <code>type</code>, and
-                  <code>sizes</code>. All properties initially set to
-                  <code>undefined</code>.
-                  </li>
-                  <li>Set <var>image</var>'s <code>src</code> property to be
-                  <var>src</var>.
-                  </li>
-                  <li>Let <var>type</var> be the result of running the <a>steps
-                  for processing the <code>type</code> member of an image</a>
-                  passing <var>potential image</var>.
-                  </li>
-                  <li>If <var>type</var> is not <code>undefined</code>, set
-                  <var>image</var>'s <code>type</code> property to be
-                  <var>type</var>.
-                  </li>
-                  <li>Let <var>sizes</var> be the list that result from running
-                  the <a>steps for processing a <code>sizes</code> member of an
-                  image</a> passing <var>potential image</var>.
-                  </li>
-                  <li>If <var>sizes</var> is not <code>undefined</code>, set
-                  <var>image</var>'s <code>sizes</code> property to be
-                  <var>sizes</var>.
-                  </li>
-                  <li>Set <var>image</var>'s <code>purpose</code> property to
-                  be the result of running the <a>steps for processing a <code>
-                    purpose</code> member of an image</a> passing
-                    <var>potential image</var>.
-                  </li>
-                  <li>Append <var>image</var> to <var>images</var>.
-                  </li>
-                </ol>
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, if <var>unprocessed images</var> is not
-          <code>undefined</code>:
-            <ol>
-              <li>
-                <a>Issue a developer warning</a> that the type is not
-                supported.
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>images</var>.
-          </li>
+          <ol>
+            <li>Let <var>A</var> be <var>manifest</var>[<var>member
+            name</var>].
+            </li>
+            <li>Remove from <var>A</var> all entries <var>V</var> where
+            <var>V["src"]</var> returns <code>false</code>
+            </li>
+            <li>Let <var>n</var> be the length of <var>A</var>.
+            </li>
+            <li>Initialize <var>i</var> to be 0.
+            </li>
+            <li>While <var>i</var> &lt; <var>n</var>:
+              <ol>
+                <li>Let <var>V</var> be the value in <var>A</var> at index
+                <var>i</var>.
+                </li>
+                <li>Let <var>V["src"]</var> be the result of running the
+                <a>steps for processing the <code>src</code> member of an
+                image</a> with <var>V</var> and <var>manifest URL</var>.
+                </li>
+                <li>Let <var>V["type"]</var> be the result of running the
+                <a>steps for processing the <code>type</code> member of an
+                image</a> with <var>V</var> and <var>manifest URL</var>.
+                </li>
+                <li>Let <var>V["sizes"]</var> be the result of running the <a>
+                  steps for processing the <code>sizes</code> member of an
+                  image</a> with <var>V</var> and <var>manifest URL</var>.
+                </li>
+                <li>Let <var>V["purpose"]</var> be the result of running the
+                <a>steps for processing the <code>purpose</code> member of an
+                image</a> with <var>V</var> and <var>manifest URL</var>.
+                </li>
+                <li>Set <var>i</var> to <var>i</var> + 1.
+                </li>
+              </ol>
+            </li>
+            <li>Return <var>A</var>.
+            </li>
+          </ol>
         </ol>
       </section>
     </section>
@@ -3288,29 +2867,6 @@ <h3>
           <a href="https://github.com/w3c/manifest/wiki/Platforms">list of
           known platform values</a> in our wiki.
         </p>
-        <p>
-          The <dfn>steps for processing the <code>platform</code> member of an
-          application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>.
-          This algorithm will return a string or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>application</var>
-          passing "<code>platform</code>" as the argument.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
     </section>
     <section>
@@ -3347,25 +2903,12 @@ <h3>
           <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>registration</var>
-          passing "<code>src</code>" as the argument.
-          </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>Let <var>V</var> be <var>registration["src"]</var>.
           </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>If <a>Trim</a>(value) is the empty string, then return
-          <code>undefined</code>.
+          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> or <var>
+            V</var> is the empty string, then return <code>null</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>V</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -3388,26 +2931,11 @@ <h3>
           <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>registration</var>
-          passing "<code>scope</code>" as the argument.
+          <li>Let <var>V</var> be <var>registration["scope"]</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>If <var>V</var> is <code>null</code>, return <code>null</code>.
           </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported and return <code>
-                undefined</code>.
-              </li>
-              <li>Return <code>null</code>.
-              </li>
-            </ol>
-          </li>
-          <li>If <a>Trim</a>(value) is the empty string, then return
-          <code>undefined</code>.
-          </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>V</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -3431,31 +2959,12 @@ <h3>
           fetched. This algorithm will return a string.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>registration</var>
-          passing "<code>type</code>" as the argument.
-          </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
+          <li>Let <var>V</var> be <var>registration["type"]</var>.
           </li>
-          <li>If <var>type</var> is not "string", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported and return <code>
-                undefined</code>.
-              </li>
-              <li>Return <code>"classic"</code>.
-              </li>
-            </ol>
-          </li>
-          <li>If <a>Trim</a>(value) is the empty string, then:
-            <ol>
-              <li>Issue a developer warning that the type is unsupported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>If <var>V</var> is <code>null</code>, return
+          <code>"classic"</code>.
           </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
+          <li>Otherwise, return <var>V</var>.
           </li>
         </ol>
       </section>
@@ -3479,23 +2988,11 @@ <h3>
           fetched. This algorithm will return a boolean.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>registration</var>
-          passing "<code>use_cache</code>" as the argument.
+          <li>Let <var>V</var> be <var>registration["use_cache"]</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
-          </li>
-          <li>If <var>type</var> is not "boolean", then:
-            <ol>
-              <li>If <var>type</var> is not "<code>undefined</code>", issue a
-              developer warning that the type is unsupported and return <code>
-                undefined</code>.
-              </li>
-              <li>Otherwise, return <code>false</code>
-              </li>
-            </ol>
+          <li>If <var>V</var> is <code>null</code>, return <code>false</code>.
           </li>
-          <li>Otherwise, return <var>value</var>.
+          <li>Otherwise, return <var>V</var>.
           </li>
         </ol>
       </section>
@@ -3610,24 +3107,12 @@ <h3>
           This algorithm will return an <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>application</var>
-          passing "<code>url</code>" as the argument.
+          <li>Let <var>V</var> be <var>application["url"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
+          <li>If <var>V</var> is <code>null</code>, return <code>null</code>.
           </li>
-          <li>Trim(<var>value</var>) and set <var>value</var> to be resulting
-          string.
-          </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> and if the result is not
-          failure, return the result, otherwise return <code>undefined</code>.
+          <li>Otherwise, <a>parse</a> <var>V</var> and if the result is not
+          failure, return the result, otherwise return <code>null</code>.
           </li>
         </ol>
       </section>
@@ -3640,29 +3125,6 @@ <h3>
           dictionary represents the id which is used to represent the
           application on the platform.
         </p>
-        <p>
-          The <dfn>steps for processing the <code>id</code> member of an
-          application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>.
-          This algorithm will return a string or <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>application</var>
-          passing "<code>id</code>" as the argument.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
       <section data-dfn-for="ExternalApplicationResource">
         <h3>
@@ -3675,30 +3137,6 @@ <h3>
           app. This version is a string with platform-specific syntax and
           semantics.
         </p>
-        <p>
-          The <dfn>steps for processing the <code>min_version</code> member of
-          an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>ExternalApplicationResource</a>
-          <var>application</var>. This algorithm will return a string or
-          <code>undefined</code>.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be the result of calling the
-          <a>[[\GetOwnProperty]]</a> internal method of <var>application</var>
-          passing "<code>min_version</code>" as the argument.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not "string":
-            <ol>
-              <li>If <a>Type</a>(<var>value</var>) is not "undefined", <a>issue
-              a developer warning</a> that the type is not supported.
-              </li>
-              <li>Return <code>undefined</code>.
-              </li>
-            </ol>
-          </li>
-          <li>Otherwise, <a>Trim</a>(<var>value</var>) and return the result.
-          </li>
-        </ol>
       </section>
       <section data-dfn-for="ExternalApplicationResource">
         <h3>
@@ -3720,52 +3158,36 @@ <h3>
           The <dfn>steps for processing the <code>fingerprints</code> member of
           an application</dfn> are given by the following algorithm. The
           algorithm takes an <a>ExternalApplicationResource</a>
-          <var>application</var>. This algorithm will return a list of
+          <var>application</var>. This algorithm will return an array of
           <a data-lt="fingerprint object">fingerprint objects</a>, possibly
           empty.
         </p>
         <ol>
-          <li>Let <var>fingerprints</var> be an empty list.
+          <li>Let <var>A</var> be an empty array.
           </li>
-          <li>Let <var>unprocessed fingerprints</var> be the result of calling
-          the <a>[[\GetOwnProperty]]</a> internal method of
-          <var>application</var> passing "<code>fingerprints</code>" as the
-          argument.
-          </li>
-          <li>If <var>unprocessed fingerprints</var> is an array, then for each
-          <var>potential fingerprint</var> in <var>unprocessed
-          fingerprints</var>:
+          <li>For each <var>V</var> in <var>application["fingerprints"]</var>:
             <ol>
-              <li>Let <var>type</var> be the result of calling the
-              <a>[[\GetOwnProperty]]</a> internal method of <var>potential
-              fingerprint</var> passing "<code>type</code>" as an argument.
+              <li>Let <var>type</var> be <var>V["type"]</var>.
               </li>
-              <li>If Type(<var>type</var>) is not "string", then <a>issue a
+              <li>If Type(<var>type</var>) is not String, then <a>issue a
               developer warning</a> that the type is unsupported, and move on
-              to the next item in <var>unprocessed fingerprints</var> (if any
-              are left).
+              to the next item (if any are left).
               </li>
-              <li>Let <var>value</var> be the result of calling the
-              <a>[[\GetOwnProperty]]</a> internal method of <var>potential
-              fingerprint</var> passing "<code>value</code>" as an argument.
+              <li>Let <var>value</var> be <var>V["value"]</var>.
               </li>
-              <li>If Type(<var>value</var>) is not "string", then <a>issue a
-              developer warning</a> that the type is unsupported, and move on
-              to the next item in <var>unprocessed fingerprints</var> (if any
-              are left).
+              <li>If Type(<var>value</var>) is not <code>String</code>, then
+              <a>issue a developer warning</a> that the type is unsupported,
+              and move on to the next item (if any are left).
               </li>
               <li>Let <var>fingerprint</var> be a <a>fingerprint object</a>,
               with its <code>type</code> member set to <var>type</var> and its
               <code>value</code> member set to <var>value</var>.
               </li>
-              <li>Append <var>fingerprint</var> to <var>fingerprints</var>.
+              <li>Append <var>fingerprint</var> to <var>A</var>.
               </li>
             </ol>
           </li>
-          <li>Otherwise, <a>issue a developer warning</a> that the type is
-          unsupported.
-          </li>
-          <li>Return <var>fingerprints</var>.
+          <li>Return <var>A</var>.
           </li>
         </ol>
       </section>
@@ -3822,6 +3244,11 @@ <h2>
         "https://dev.w3.org/csswg/css-syntax/#parse-component-value"><dfn>parse
         a component value</dfn></a> is defined in [[!CSS-SYNTAX-3]].
       </p>
+      <p>
+        The algorithm to convert a ECMAScript <a>object</a> <a href=
+        "https://www.w3.org/TR/WebIDL-1/#es-dictionary"><dfn>to IDL dictionary
+        value</dfn></a> is defined in [[!WEBIDL]].
+      </p>
       <p>
         The <a href=
         "https://w3c.github.io/webappsec-csp/#manifest_src"><dfn>manifest-src</dfn></a>,

From 278816fcfcc3fd2805a546c4928552809a0ef928 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 3 Oct 2017 13:01:08 +0200
Subject: [PATCH 5/9] Fix review comments from Matt

---
 index.html | 476 +++++++++++++++++++++++++----------------------------
 1 file changed, 220 insertions(+), 256 deletions(-)

diff --git a/index.html b/index.html
index 7728dcc70..95cd2be52 100644
--- a/index.html
+++ b/index.html
@@ -370,9 +370,9 @@ <h3>
               an <a>installation process</a>'s UI.
               </li>
               <li>If <a>obtaining the manifest</a> succeeds, and the result of
-              running the <a>steps for processing the serviceworker member</a>
-              with <a>manifest</a> returns a valid <var>registration</var>, a
-              user agent can at this point
+              running the <a>steps for post-processing the serviceworker
+              member</a> with <a>manifest</a> returns a valid
+              <var>registration</var>, a user agent can at this point
                 <ol>
                   <li>Let <var>client</var> be the <a>top-level browsing
                   context</a> <code>Document</code>'s <a href=
@@ -923,11 +923,12 @@ <h2>
         of switching to another <a>display mode</a>.
       </p>
       <p>
-        When the <code>display</code> member is missing, or if there is no
-        valid <code>display</code> member, the user agent uses the
-        <code>browser</code> <a>display mode</a> as the <a>default display
-        mode</a>. As such, the user agent is REQUIRED to support the
-        <code>browser</code> <a>display mode</a>.
+        When the <a data-link-for="WebAppManifest">display</a> member is
+        missing, or if there is no valid <a data-link-for=
+        "WebAppManifest">display</a> member, the user agent uses the
+        <a>browser</a> <a>display mode</a> as the <a>default display mode</a>.
+        As such, the user agent is REQUIRED to support the <a>browser</a>
+        <a>display mode</a>.
       </p>
       <p>
         Each <a>display mode</a>, except <code>browser</code>, has a
@@ -1453,18 +1454,15 @@ <h3>
             <a>Extension point</a>: process any proprietary and/or other
             supported members at this point in the algorithm.
           </li>
-          <li>Let <a>WebAppManifest</a> <var>manifest</var> be the result of
-          converting <var>json</var> <a>to IDL dictionary value</a>.
+          <li>Let <var>manifest</var> be the result of <a data-lt=
+          "to idl dictionary value">converting</a> <var>json</var> to a
+          <a>WebAppManifest</a>.
           </li>
           <li>Let <var>manifest["<a>start_url</a>"]</var> be the result of
           running the <a>steps for post-processing the <code>start_url</code>
           member</a> with <var>manifest</var>, <var>manifest URL,</var> and
           <var>document URL</var> as arguments.
           </li>
-          <li>Let <var>manifest["<a>display</a>"]</var> be the result of
-          running the <a>steps for post-processing the <code>display</code>
-          member</a> with <var>manifest</var> as the argument.
-          </li>
           <li>Let <var>manifest["<a>lang</a>"]</var> be the result of running
           the <a>steps for post-processing the <code>lang</code> member</a>
           with <var>manifest</var> as the argument.
@@ -1472,7 +1470,7 @@ <h3>
           <li>Let <var>manifest["<a>scope</a>"]</var> be the result of running
           the <a>steps for post-processing the <code>scope</code> member</a>
           with <var>manifest</var>, <var>manifest URL</var>, <var>document
-          URL</var>, <var>start URL</var> as arguments.
+          URL</var>, <var>manifest["<a>start_url</a>"]</var> as arguments.
           </li>
           <li>Let <var>manifest["<a>theme_color</a>"]</var> be the result of
           running the <a>steps for post-processing the <code>theme_color</code>
@@ -1497,14 +1495,14 @@ <h3>
           as arguments.
           </li>
           <li>Let <var>manifest["<a>related_applications</a>"]</var> be the
-          result of running the <a>steps for processing the
+          result of running the <a>steps for post-processing the
           <code>related_applications</code> member</a> with <var>manifest</var>
           as argument.
           </li>
           <li>Let <var>manifest["<a>serviceworker</a>"]</var> be the result of
-          running the <a>steps for processing the <code>serviceworker</code>
-          member</a> with <var>manifest</var>, <var>manifest URL</var>, and
-          <var>serviceworker</var> as arguments.
+          running the <a>steps for post-processing the
+          <code>serviceworker</code> member</a> with <var>manifest</var>, <var>
+            manifest URL</var>, and <var>serviceworker</var> as arguments.
           </li>
           <li>Return <var>manifest</var>.
           </li>
@@ -1560,24 +1558,24 @@ <h2>
       </h2>
       <pre class="idl">
           dictionary WebAppManifest {
-             TextDirectionType? dir;
-             DOMString? lang;
-             USVString? name;
-             USVString? short_name;
-             USVString? description;
-             sequence&lt;ImageResource&gt;? icons;
-             sequence&lt;ImageResource&gt;? screenshots;
-             sequence&lt;USVString&gt;? categories;
-             DOMString? iarc_rating_id;
-             USVString? start_url;
-             DisplayModeType? display;
-             OrientationLockType? orientation;
-             USVString? theme_color;
-             USVString? background_color;
-             USVString? scope;
-             ServiceWorkerRegistration? serviceworker;
-             sequence&lt;ExternalApplicationResource&gt;? related_applications;
-             boolean? prefer_related_applications;
+             TextDirectionType dir;
+             DOMString lang;
+             USVString name;
+             USVString short_name;
+             USVString description;
+             sequence&lt;ImageResource&gt; icons;
+             sequence&lt;ImageResource&gt; screenshots;
+             sequence&lt;USVString&gt; categories;
+             DOMString iarc_rating_id;
+             USVString start_url;
+             DisplayModeType display = "browser";
+             OrientationLockType orientation;
+             USVString theme_color;
+             USVString background_color;
+             USVString scope;
+             ServiceWorkerRegistration serviceworker;
+             sequence&lt;ExternalApplicationResource&gt; related_applications;
+             boolean prefer_related_applications;
           };
       </pre>
       <p>
@@ -1704,18 +1702,19 @@ <h3>
           algorithm returns a <code>DOMString?</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>manifest.lang</var>.
+          <li>Let <var>value</var> be <var>manifest.lang</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) is <code>String</code>:
+          <li>If <a>Type</a>(<var>value</var>) is <code>String</code>:
             <ol>
               <li>If calling <a>IsStructurallyValidLanguageTag</a> with
-              <var>V</var> as the argument returns <code>false</code>, then:
+              <var>value</var> as the argument returns <code>false</code>,
+              then:
                 <ol>
                   <li>
-                    <a>Issue a developer warning</a> that the <var>V</var> is
-                    invalid.
+                    <a>Issue a developer warning</a> that the <var>value</var>
+                    is invalid.
                   </li>
-                  <li>Return <code>null</code>.
+                  <li>Return <code>undefined</code>.
                   </li>
                 </ol>
               </li>
@@ -1725,7 +1724,7 @@ <h3>
               </li>
             </ol>
           </li>
-          <li>Return <code>null</code>
+          <li>Return <code>undefined</code>
           </li>
         </ol>
       </section>
@@ -1776,26 +1775,26 @@ <h3>
           a <a>WebAppManifest</a> <var>manifest</var>, a <a>URL</a>
           <var>manifest URL</var>, a <a>URL</a> <var>document URL</var>, and a
           URL <var>start URL</var> . This algorithm returns a <a>URL</a> or
-          <code>null</code>.
+          <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>manifest.scope</var>.
+          <li>Let <var>value</var> be <var>manifest.scope</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>V</var>).
+          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
           </li>
-          <li>If <var>type</var> is not <code>String</code> or <var>V</var> is
-          the empty string, then return <code>null</code>.
+          <li>If <var>type</var> is not <code>String</code> or <var>value</var>
+          is the empty string, then return <code>undefined</code>.
           </li>
-          <li>Let <var>scope URL</var> be a new <a>URL</a> using <var>V</var>
-          as <var>input</var> and <var>manifest URL</var> as the
-          <var>base</var> URL.
+          <li>Let <var>scope URL</var> be a new <a>URL</a> using
+          <var>value</var> as <var>input</var> and <var>manifest URL</var> as
+          the <var>base</var> URL.
           </li>
           <li>If <var>scope URL</var> is failure:
             <ul>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>null</code>.
+              <li>Return <code>undefined</code>.
               </li>
             </ul>
           </li>
@@ -1810,7 +1809,7 @@ <h3>
                 same-origin</a> as <code>Document</code> of the <a>application
                 context</a>.
               </li>
-              <li>Return <code>null</code>.
+              <li>Return <code>undefined</code>.
               </li>
             </ol>
           </li>
@@ -1820,7 +1819,7 @@ <h3>
                 <a>Issue a developer warning</a> that the start URL is not
                 <a>within scope</a> of the navigation scope.
               </li>
-              <li>Return <code>null</code>.
+              <li>Return <code>undefined</code>.
               </li>
             </ol>
           </li>
@@ -1911,24 +1910,7 @@ <h3>
           The <dfn>display</dfn> member is a <a>DisplayModeType</a>, whose
           value is one of <a>display modes values</a>. The item represents the
           developer's preferred <a>display mode</a> for the web application.
-          When the member is missing or erroneous, the user agent MUST use the
-          <a>fallback display mode</a>.
-        </p>
-        <p>
-          The <dfn>steps for post-processing the <code>display</code>
-          member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument, and
-          returns a <a>DisplayModeType</a>.
         </p>
-        <ol>
-          <li>Let <var>V</var> be <var>manifest["display"]</var>.
-          </li>
-          <li>If <a>Type</a>(<var>V</var>) is <code>null</code> return the <a>
-            fallback display mode</a>'s value.
-          </li>
-          <li>Return <var>V</var>.
-          </li>
-        </ol>
       </section>
       <section>
         <h3>
@@ -1997,15 +1979,15 @@ <h3>
           This algorithm returns a <a>URL</a>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>manifest["start_url"]</var>.
+          <li>Let <var>value</var> be <var>manifest["start_url"]</var>.
           </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>V</var>).
+          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
           </li>
-          <li>If <var>type</var> is not <code>String</code> or <var>V</var> is
-          the empty string, return a new <a>URL</a> whose <var>input</var> is
-          <var>document URL</var>.
+          <li>If <var>type</var> is not <code>String</code> or <var>value</var>
+          is the empty string, return a new <a>URL</a> whose <var>input</var>
+          is <var>document URL</var>.
           </li>
-          <li>Let <var>url</var> be a new <a>URL</a> using <var>V</var> as
+          <li>Let <var>url</var> be a new <a>URL</a> using <var>value</var> as
           <var>input</var> and <var>manifest URL</var> as the <var>base</var>
           URL.
           </li>
@@ -2085,44 +2067,43 @@ <h3>
           they coalesce. If they have different script URLs, last one wins.
         </p>
         <p>
-          The <dfn>steps for processing the <code>serviceworker</code>
+          The <dfn>steps for post-processing the <code>serviceworker</code>
           member</dfn> are given by the following algorithm. The algorithm
           takes a <a>WebAppManifest</a> <var>manifest</var>. This algorithm
-          returns a <a>registration object</a> <var>registration'</var>, which
-          can be <code>null</code>.
+          returns a <a>registration object</a> <var>registration</var>, which
+          can be <code>undefined</code>.
         </p>
         <ol>
           <li>Let <var>registration</var> be
           <var>manifest["serviceworker"]</var>.
           </li>
-          <li>If <var>registration</var> is <code>null</code>, return
-          <code>null</code>.
+          <li>If <var>registration</var> is <code>undefined</code>, return
+          <code>undefined</code>.
           </li>
           <li>Let <var>src</var> be the result of running the <a>steps for
-          processing the <code>src</code> member of a service worker</a> with
-          <var>registration</var> and <var>manifest URL</var>.
+          post-processing the <code>src</code> member of a service worker</a>
+          with <var>registration</var> and <var>manifest URL</var>.
           </li>
           <li>If the result of running <a>is origin potentially trustworthy</a>
           with the origin of <var>src</var> is <code>Not Trusted</code>,
           <a>issue a developer warning</a>, abort these steps and return <code>
-            null</code>.
+            undefined</code>.
           </li>
           <li>Let <var>scope</var> be the result of running the <a>steps for
-          processing the <code>scope</code> member of a service worker</a>
+          post-processing the <code>scope</code> member of a service worker</a>
           passing <var>registration</var>.
           </li>
           <li>Let <var>type</var> be the result of running the <a>steps for
-          processing the <code>type</code> member of a service worker</a>
+          post-processing the <code>type</code> member of a service worker</a>
           passing <var>registration</var>.
           </li>
           <li>Let <var>use_cache</var> be the result of running the <a>steps
-          for processing the <code>use_cache</code> member of a service
+          for post-processing the <code>use_cache</code> member of a service
           worker</a> passing <var>registration</var>.
           </li>
-          <li>Let <var>registration'</var> be a new object created as if by the
-          expression ({ src, scope, type, use_cache }).
-          </li>
-          <li>Return <var>registration'</var>.
+          <li>Return a new object created as if by the expression ({
+          <var>src</var>, <var>scope</var>, <var>type</var>,
+          <var>use_cache</var> }).
           </li>
         </ol>
         <div class="example">
@@ -2163,15 +2144,15 @@ <h3>
           This algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>manifest["theme_color"]</var>.
+          <li>Let <var>value</var> be <var>manifest["theme_color"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> return
-          <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code>
+          return <code>undefined</code>.
           </li>
           <li>Otherwise, let <var>potential color</var> be the result of
           running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>V</var> as input. If parsing returns a syntax error, return
-          <code>undefined</code>.
+          with <var>value</var> as input. If parsing returns a syntax error,
+          return <code>undefined</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
           <var>potential color</var> as a CSS color, as per [[!CSS-SYNTAX-3]].
@@ -2180,7 +2161,7 @@ <h3>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>null</code>.
+              <li>Return <code>undefined</code>.
               </li>
             </ol>
           </li>
@@ -2214,50 +2195,38 @@ <h3>
           application.
         </p>
         <p>
-          The <dfn>steps for processing the <code>related_applications</code>
-          member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
-          This algorithm returns an
+          The <dfn>steps for post-processing the
+          <code>related_applications</code> member</dfn> are given by the
+          following algorithm. The algorithm takes a <a>WebAppManifest</a>
+          <var>manifest</var> as an argument. This algorithm returns an
           Array&lt;<a>ExternalApplicationResource</a>&gt;.
         </p>
         <ol>
-          <li>Let <var>A</var> be <var>manifest["related_applications"]</var>.
-          </li>
-          <li>Let <var>A'</var> be a new Array object created as if by the
-          expression [].
+          <li>Let <var>relatedApplications</var> be a new Array object created
+          as if by the expression [].
           </li>
-          <li>For <var>V</var> in <var>A</var>:
+          <li>For each <var>app</var> in
+          <var>manifest["related_applications"]</var>:
             <ol>
-              <li>if neither <var>V["src"]</var> nor <var>V["url"]</var> are
-              <code>null</code>:
+              <li>if neither <var>app["src"]</var> nor <var>app["url"]</var>
+              are <code>undefined</code>:
                 <ol>
-                  <li>Let <var>V'</var> be a new object created as if by the
-                  expression ({}).
+                  <li>Set <var>app["url"]</var> be the result of running the
+                  <a>steps for post-processing the <code>url</code> member of
+                  an application</a> with <var>app</var>.
                   </li>
-                  <li>Set <var>V'["platform"]</var> to be
-                  <var>V["platform"]</var>.
-                  </li>
-                  <li>Set <var>V'["id"]</var> to be <var>V["id"]</var>.
-                  </li>
-                  <li>Set <var>V'["min_version"]</var> to be
-                  <var>V["min_version"]</var>.
-                  </li>
-                  <li>Set <var>V'["url"]</var> be the result of running the <a>
-                    steps for processing the <code>url</code> member of an
-                    application</a> with <var>V</var>.
-                  </li>
-                  <li>Set <var>V'["fingerprints"]</var> be the result of
-                  running the <a>steps for processing the
+                  <li>Set <var>app["fingerprints"]</var> be the result of
+                  running the <a>steps for post-processing the
                   <code>fingerprints</code> member of an application</a> with
-                  <var>V</var>.
+                  <var>app</var>.
                   </li>
-                  <li>Append <var>V'</var> to <var>A'</var>
+                  <li>Append <var>app</var> to <var>relatedApplications</var>
                   </li>
                 </ol>
               </li>
             </ol>
           </li>
-          <li>Return <var>A'</var>.
+          <li>Return <var>relatedApplications</var>.
           </li>
         </ol>
       </section>
@@ -2304,15 +2273,15 @@ <h3>
           This algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>manifest["background_color"]</var>.
+          <li>Let <var>value</var> be <var>manifest["background_color"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> return
-          <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code>
+          return <code>undefined</code>.
           </li>
           <li>Otherwise, let <var>potential color</var> be the result of
           running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>V</var> as input. If parsing returns a syntax error, return
-          <code>null</code>.
+          with <var>value</var> as input. If parsing returns a syntax error,
+          return <code>undefined</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
           <var>potential color</var> as a CSS color, as per [[!CSS-SYNTAX-3]].
@@ -2321,7 +2290,7 @@ <h3>
               <li>
                 <a>Issue a developer warning</a>.
               </li>
-              <li>Return <code>null</code>.
+              <li>Return <code>undefined</code>.
               </li>
             </ol>
           </li>
@@ -2351,26 +2320,15 @@ <h3>
           This algorithm returns an <code>Array&lt;USVString&gt;</code>.
         </p>
         <ol>
-          <li>Let <var>A</var> be <var>manifest["categories"]</var>.
-          </li>
-          <li>Let <var>n</var> be the length of A.
-          </li>
-          <li>Initialize <var>i</var> to be 0.
-          </li>
-          <li>While <var>i</var> &lt; <var>n</var>:
+          <li>For each <var>category</var> in
+          <var>manifest["categories"]</var>:
             <ol>
-              <li>Let <var>V</var> be the value in <var>A</var> at index <var>
-                i</var>.
-              </li>
-              <li>
-                <a>Trim</a>(<var>V</var>) and convert <a>to ASCII lowercase</a>
-                in place.
-              </li>
-              <li>Set <var>i</var> to <var>i</var> + 1.
+              <li>Convert <var>category</var> <a>to ASCII lowercase</a> in
+              place.
               </li>
             </ol>
           </li>
-          <li>Return <var>A</var>.
+          <li>Return <var>categories</var>.
           </li>
         </ol>
         <p>
@@ -2384,8 +2342,8 @@ <h3>
         </p>
         <p class="note">
           This specification does not define the particular values for
-          <dfn>USVString</dfn>s for a the <a>categories</a> member. However,
-          the working group maintains a <a href=
+          <dfn>USVString</dfn>s for the <a>categories</a> member. However, the
+          working group maintains a <a href=
           "https://github.com/w3c/manifest/wiki/Categories">list of known
           values</a> in our wiki.
         </p>
@@ -2603,20 +2561,20 @@ <h3>
           </dd>
         </dl>
         <p>
-          The <dfn>steps for processing the <code>purpose</code> member of an
-          image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>ImageResource</a> <var>image</var>. This algorithm will return
-          a set.
+          The <dfn>steps for post-processing the <code>purpose</code> member of
+          an image</dfn> are given by the following algorithm. The algorithm
+          takes an <a>ImageResource</a> <var>image</var>. This algorithm will
+          return a set.
         </p>
         <ol>
-          <li>Let <var>S</var> be an empty set.
+          <li>Let <var>set</var> be an empty set.
           </li>
-          <li>Let <var>V</var> be <var>image["purpose"]</var>.
+          <li>Let <var>value</var> be <var>image["purpose"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) is String:
+          <li>If <a>Type</a>(<var>value</var>) is String:
             <ol>
               <li>Let <var>keywords</var> be the result of <a>splitting</a>
-              <var>V</var> on spaces.
+              <var>value</var> on spaces.
               </li>
               <li>For each <var>keyword</var> in <var>keywords</var>:
                 <ol>
@@ -2627,16 +2585,16 @@ <h3>
                   <a>issue a developer warning</a> and continue to the next
                   <var>keyword</var> skipping the sub-steps below.
                   </li>
-                  <li>Otherwise, add <var>keyword</var> to <var>S</var>.
+                  <li>Otherwise, add <var>keyword</var> to <var>set</var>.
                   </li>
                 </ol>
               </li>
             </ol>
           </li>
-          <li>if the size of <var>S</var> is 0, then add <code>"any"</code> to
-          <var>S</var>.
+          <li>if the size of <var>set</var> is 0, then add <code>"any"</code>
+          to <var>set</var>.
           </li>
-          <li>Return <var>S</var>.
+          <li>Return <var>set</var>.
           </li>
         </ol>
         <div class="example">
@@ -2683,31 +2641,31 @@ <h3>
           display context (and ignore any that are inappropriate).
         </p>
         <p>
-          The <dfn>steps for processing the <code>sizes</code> member of an
-          image</dfn> are given by the following algorithm. The algorithm takes
-          an <a>ImageResource</a> <var>image</var>. This algorithm will return
-          a set.
+          The <dfn>steps for post-processing the <code>sizes</code> member of
+          an image</dfn> are given by the following algorithm. The algorithm
+          takes an <a>ImageResource</a> <var>image</var>. This algorithm will
+          return a set.
         </p>
         <ol>
-          <li>Let <var>S</var> be an empty set.
+          <li>Let <var>set</var> be an empty set.
           </li>
-          <li>Let <var>V</var> be <var>image.sizes</var>.
+          <li>Let <var>value</var> be <var>image.sizes</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
-          <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) it not <code>String</code>,
+          return <code>undefined</code>.
           </li>
-          <li>Otherwise, parse <var>V</var> as if it was a [[!HTML]] <code><a>
-            sizes</a></code> attribute and let <var>keywords</var> be the
+          <li>Otherwise, parse <var>value</var> as if it was a [[!HTML]] <code>
+            <a>sizes</a></code> attribute and let <var>keywords</var> be the
             result.
           </li>
           <li>For each <var>keyword</var> in <var>keywords</var>:
             <ol>
               <li>Convert <var>keyword</var> <a>to ASCII lowercase</a> and add
-              the resulting string to <var>S</var>.
+              the resulting string to <var>set</var>.
               </li>
             </ol>
           </li>
-          <li>Return <var>S</var>.
+          <li>Return <var>set</var>.
           </li>
         </ol>
       </section>
@@ -2720,7 +2678,7 @@ <h3>
           from which a user agent can fetch the image's data.
         </p>
         <p>
-          The <dfn>steps for processing the <code>src</code> member of an
+          The <dfn>steps for post-processing the <code>src</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           a <a>ImageResource</a> <var>icon</var>, and a <a>URL</a>
           <var>manifest URL</var> , which is the <a>URL</a> from which the
@@ -2728,10 +2686,10 @@ <h3>
           <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>image.src</var>.
+          <li>Let <var>value</var> be <var>image.src</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
-          <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) it not <code>String</code>,
+          return <code>undefined</code>.
           </li>
           <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
           URL</var> as the base URL and return the result.
@@ -2753,16 +2711,16 @@ <h3>
           must expect the resource to be an image.
         </p>
         <p>
-          The <dfn>steps for processing the <code>type</code> member of an
+          The <dfn>steps for post-processing the <code>type</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           an <var>image</var> object as an argument, and returns either a
           string or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>image["type"]</var>.
+          <li>Let <var>value</var> be <var>image["type"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) it not <code>String</code>, return
-          <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) it not <code>String</code>,
+          return <code>undefined</code>.
           </li>
           <li>If <var>value</var> is not a <a>valid MIME type</a> or the value
           of <var>type</var> is not a supported media format, issue a developer
@@ -2782,47 +2740,49 @@ <h3>
           a <a>URL</a> <var>manifest URL</var>, which is the URL from which the
           <var>manifest</var> was fetched, and a string that represents the
           <var>member name</var> of the member which contains the array of
-          <a>ImageResource</a>s. This algorithm returns a sequence of
-          <a>ImageResource</a>s, which can be empty.
+          <a>ImageResource</a>s. This algorithm returns an
+          Array&lt;<a>ImageResource</a>&gt;
         </p>
         <ol>
           <ol>
-            <li>Let <var>A</var> be <var>manifest</var>[<var>member
-            name</var>].
-            </li>
-            <li>Remove from <var>A</var> all entries <var>V</var> where
-            <var>V["src"]</var> returns <code>false</code>
-            </li>
-            <li>Let <var>n</var> be the length of <var>A</var>.
-            </li>
-            <li>Initialize <var>i</var> to be 0.
+            <li>Let <var>imageResources</var> be a new Array object created as
+            if by the expression [].
             </li>
-            <li>While <var>i</var> &lt; <var>n</var>:
+            <li>For each <var>entry</var> in <var>manifest</var>[<var>member
+            name</var>]:
               <ol>
-                <li>Let <var>V</var> be the value in <var>A</var> at index
-                <var>i</var>.
-                </li>
-                <li>Let <var>V["src"]</var> be the result of running the
-                <a>steps for processing the <code>src</code> member of an
-                image</a> with <var>V</var> and <var>manifest URL</var>.
-                </li>
-                <li>Let <var>V["type"]</var> be the result of running the
-                <a>steps for processing the <code>type</code> member of an
-                image</a> with <var>V</var> and <var>manifest URL</var>.
-                </li>
-                <li>Let <var>V["sizes"]</var> be the result of running the <a>
-                  steps for processing the <code>sizes</code> member of an
-                  image</a> with <var>V</var> and <var>manifest URL</var>.
-                </li>
-                <li>Let <var>V["purpose"]</var> be the result of running the
-                <a>steps for processing the <code>purpose</code> member of an
-                image</a> with <var>V</var> and <var>manifest URL</var>.
-                </li>
-                <li>Set <var>i</var> to <var>i</var> + 1.
+                <li>if <var>entry["src"]</var> is not <code>undefined</code>:
+                  <ol>
+                    <li>Let <var>image</var> be a new object created as if by
+                    the expression ({}).
+                    </li>
+                    <li>Let <var>image["src"]</var> be the result of running
+                    the <a>steps for post-processing the <code>src</code>
+                    member of an image</a> with <var>entry</var> and
+                    <var>manifest URL</var>.
+                    </li>
+                    <li>Let <var>image["type"]</var> be the result of running
+                    the <a>steps for post-processing the <code>type</code>
+                    member of an image</a> with <var>entry</var> and
+                    <var>manifest URL</var>.
+                    </li>
+                    <li>Let <var>image["sizes"]</var> be the result of running
+                    the <a>steps for post-processing the <code>sizes</code>
+                    member of an image</a> with <var>entry</var> and
+                    <var>manifest URL</var>.
+                    </li>
+                    <li>Let <var>image["purpose"]</var> be the result of
+                    running the <a>steps for post-processing the
+                    <code>purpose</code> member of an image</a> with
+                    <var>entry</var> and <var>manifest URL</var>.
+                    </li>
+                    <li>Append <var>image</var> to <var>imageResources</var>
+                    </li>
+                  </ol>
                 </li>
               </ol>
             </li>
-            <li>Return <var>A</var>.
+            <li>Return <var>imageResources</var>.
             </li>
           </ol>
         </ol>
@@ -2894,7 +2854,7 @@ <h3>
           dictionary is a <a>URL</a> representing a service worker.
         </p>
         <p>
-          The <dfn>steps for processing the <code>src</code> member of a
+          The <dfn>steps for post-processing the <code>src</code> member of a
           service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
@@ -2903,12 +2863,12 @@ <h3>
           <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>registration["src"]</var>.
+          <li>Let <var>value</var> be <var>registration["src"]</var>.
           </li>
-          <li>If <a>Type</a>(<var>V</var>) is not <code>String</code> or <var>
-            V</var> is the empty string, then return <code>null</code>.
+          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code> or
+          <var>V</var> is the empty string, then return <code>undefined</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>V</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -2922,7 +2882,7 @@ <h3>
           dictionary is the service worker's associated <a>scope URL</a>.
         </p>
         <p>
-          The <dfn>steps for processing the <code>scope</code> member of a
+          The <dfn>steps for post-processing the <code>scope</code> member of a
           service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
@@ -2931,11 +2891,12 @@ <h3>
           <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>registration["scope"]</var>.
+          <li>Let <var>value</var> be <var>registration["scope"]</var>.
           </li>
-          <li>If <var>V</var> is <code>null</code>, return <code>null</code>.
+          <li>If <var>value</var> is <code>undefined</code>, return
+          <code>undefined</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>V</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -2951,7 +2912,7 @@ <h3>
           type</a>.
         </p>
         <p>
-          The <dfn>steps for processing the <code>type</code> member of a
+          The <dfn>steps for post-processing the <code>type</code> member of a
           service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>ServiceWorkerRegistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
@@ -2959,12 +2920,12 @@ <h3>
           fetched. This algorithm will return a string.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>registration["type"]</var>.
+          <li>Let <var>value</var> be <var>registration["type"]</var>.
           </li>
-          <li>If <var>V</var> is <code>null</code>, return
+          <li>If <var>value</var> is <code>undefined</code>, return
           <code>"classic"</code>.
           </li>
-          <li>Otherwise, return <var>V</var>.
+          <li>Otherwise, return <var>value</var>.
           </li>
         </ol>
       </section>
@@ -2980,19 +2941,20 @@ <h3>
           be used when fetching the service worker.
         </p>
         <p>
-          The <dfn>steps for processing the <code>use_cache</code> member of a
-          service worker</dfn> are given by the following algorithm. The
+          The <dfn>steps for post-processing the <code>use_cache</code> member
+          of a service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>serviceworkerregistration</a>
           <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
           which is the <a>URL</a> from which the <var>manifest</var> was
           fetched. This algorithm will return a boolean.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>registration["use_cache"]</var>.
+          <li>Let <var>value</var> be <var>registration["use_cache"]</var>.
           </li>
-          <li>If <var>V</var> is <code>null</code>, return <code>false</code>.
+          <li>If <var>value</var> is <code>undefined</code>, return
+          <code>false</code>.
           </li>
-          <li>Otherwise, return <var>V</var>.
+          <li>Otherwise, return <var>value</var>.
           </li>
         </ol>
       </section>
@@ -3101,18 +3063,19 @@ <h3>
           found.
         </p>
         <p>
-          The <dfn>steps for processing the <a>url</a> member of an
+          The <dfn>steps for post-processing the <a>url</a> member of an
           application</dfn> are given by the following algorithm. The algorithm
           takes an <a>ExternalApplicationResource</a> <var>application</var>.
           This algorithm will return an <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>V</var> be <var>application["url"]</var>.
+          <li>Let <var>value</var> be <var>application["url"]</var>.
           </li>
-          <li>If <var>V</var> is <code>null</code>, return <code>null</code>.
+          <li>If <var>value</var> is <code>undefined</code>, return
+          <code>undefined</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>V</var> and if the result is not
-          failure, return the result, otherwise return <code>null</code>.
+          <li>Otherwise, <a>parse</a> <var>value</var> and if the result is not
+          failure, return the result, otherwise return <code>undefined</code>.
           </li>
         </ol>
       </section>
@@ -3155,25 +3118,26 @@ <h3>
           and semantics are platform-defined.
         </p>
         <p>
-          The <dfn>steps for processing the <code>fingerprints</code> member of
-          an application</dfn> are given by the following algorithm. The
-          algorithm takes an <a>ExternalApplicationResource</a>
+          The <dfn>steps for post-processing the <code>fingerprints</code>
+          member of an application</dfn> are given by the following algorithm.
+          The algorithm takes an <a>ExternalApplicationResource</a>
           <var>application</var>. This algorithm will return an array of
           <a data-lt="fingerprint object">fingerprint objects</a>, possibly
           empty.
         </p>
         <ol>
-          <li>Let <var>A</var> be an empty array.
+          <li>Let <var>fingerprints</var> be an empty array.
           </li>
-          <li>For each <var>V</var> in <var>application["fingerprints"]</var>:
+          <li>For each <var>entry</var> in
+          <var>application["fingerprints"]</var>:
             <ol>
-              <li>Let <var>type</var> be <var>V["type"]</var>.
+              <li>Let <var>type</var> be <var>entry["type"]</var>.
               </li>
               <li>If Type(<var>type</var>) is not String, then <a>issue a
               developer warning</a> that the type is unsupported, and move on
               to the next item (if any are left).
               </li>
-              <li>Let <var>value</var> be <var>V["value"]</var>.
+              <li>Let <var>value</var> be <var>entry["value"]</var>.
               </li>
               <li>If Type(<var>value</var>) is not <code>String</code>, then
               <a>issue a developer warning</a> that the type is unsupported,
@@ -3183,11 +3147,11 @@ <h3>
               with its <code>type</code> member set to <var>type</var> and its
               <code>value</code> member set to <var>value</var>.
               </li>
-              <li>Append <var>fingerprint</var> to <var>A</var>.
+              <li>Append <var>fingerprint</var> to <var>fingerprints</var>.
               </li>
             </ol>
           </li>
-          <li>Return <var>A</var>.
+          <li>Return <var>fingerprints</var>.
           </li>
         </ol>
       </section>
@@ -3218,9 +3182,9 @@ <h2>
         As the manifest uses the JSON format, this specification relies on the
         types defined in [[!ECMA-404]] specification: namely <dfn>object</dfn>,
         <dfn>array</dfn>, <dfn>number</dfn>, <dfn>string</dfn>,
-        <code>true</code>, <code>false</code>, and <code>null</code>. Strict
-        type checking is not enforced by this specification. Instead, each
-        member's definition specifies the steps required to process a
+        <code>true</code>, <code>false</code>, and <code>undefined</code>.
+        Strict type checking is not enforced by this specification. Instead,
+        each member's definition specifies the steps required to process a
         particular member and what to do when a type does not match what is
         expected.
       </p>
@@ -3786,9 +3750,9 @@ <h3>
           doing so, please follow the conventions used in this specification.
           In particular, use the <a>extension point</a> to hook into the
           <a>steps for processing a manifest</a>. Also, be sure to specify the
-          steps for processing your particular member in the manner set forth
-          in this specification. This will help keep this part of the platform
-          consistent.
+          steps for post-processing your particular member in the manner set
+          forth in this specification. This will help keep this part of the
+          platform consistent.
         </p>
         <p>
           To allow the community can easily find extensions, please add your

From e4bfa1cf9b14c95e7cb3843dba110e9935a5b835 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 10 Oct 2017 11:51:26 +0200
Subject: [PATCH 6/9] Fix new comments from Matt

---
 index.html | 59 ++++++++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/index.html b/index.html
index 95cd2be52..461ae8f91 100644
--- a/index.html
+++ b/index.html
@@ -1558,7 +1558,7 @@ <h2>
       </h2>
       <pre class="idl">
           dictionary WebAppManifest {
-             TextDirectionType dir;
+             TextDirectionType dir = "auto";
              DOMString lang;
              USVString name;
              USVString short_name;
@@ -1575,7 +1575,7 @@ <h2>
              USVString scope;
              ServiceWorkerRegistration serviceworker;
              sequence&lt;ExternalApplicationResource&gt; related_applications;
-             boolean prefer_related_applications;
+             boolean prefer_related_applications = "false";
           };
       </pre>
       <p>
@@ -2080,30 +2080,24 @@ <h3>
           <li>If <var>registration</var> is <code>undefined</code>, return
           <code>undefined</code>.
           </li>
-          <li>Let <var>src</var> be the result of running the <a>steps for
-          post-processing the <code>src</code> member of a service worker</a>
-          with <var>registration</var> and <var>manifest URL</var>.
+          <li>Let <var>registration["src"]</var> be the result of running the
+          <a>steps for post-processing the <code>src</code> member of a service
+          worker</a> with <var>registration</var> and <var>manifest URL</var>.
           </li>
           <li>If the result of running <a>is origin potentially trustworthy</a>
-          with the origin of <var>src</var> is <code>Not Trusted</code>,
-          <a>issue a developer warning</a>, abort these steps and return <code>
-            undefined</code>.
+          with the origin of <var>registration["src"]</var> is <code>Not
+          Trusted</code>, <a>issue a developer warning</a>, abort these steps
+          and return <code>undefined</code>.
           </li>
-          <li>Let <var>scope</var> be the result of running the <a>steps for
-          post-processing the <code>scope</code> member of a service worker</a>
-          passing <var>registration</var>.
+          <li>Let <var>registration["scope"]</var> be the result of running the
+          <a>steps for post-processing the <code>scope</code> member of a
+          service worker</a> passing <var>registration</var>.
           </li>
-          <li>Let <var>type</var> be the result of running the <a>steps for
-          post-processing the <code>type</code> member of a service worker</a>
-          passing <var>registration</var>.
+          <li>Let <var>registration["type"]</var> be the result of running the
+          <a>steps for post-processing the <code>type</code> member of a
+          service worker</a> passing <var>registration</var>.
           </li>
-          <li>Let <var>use_cache</var> be the result of running the <a>steps
-          for post-processing the <code>use_cache</code> member of a service
-          worker</a> passing <var>registration</var>.
-          </li>
-          <li>Return a new object created as if by the expression ({
-          <var>src</var>, <var>scope</var>, <var>type</var>,
-          <var>use_cache</var> }).
+          <li>Return <var>registration</var>.
           </li>
         </ol>
         <div class="example">
@@ -2238,9 +2232,7 @@ <h3>
         <p>
           The <dfn>prefer_related_applications</dfn> member is a boolean value
           that is used as a hint for the user agent to say that <a>related
-          applications</a> should be preferred over the web application. The
-          user agent MUST consider the missing value as equivalent to have it
-          set to <code>false</code>. If the
+          applications</a> should be preferred over the web application. If the
           <code>prefer_related_applications</code> is set to <code>true</code>,
           and the user agent wants to suggest to install the web application,
           the user agent might want to suggest installing one of the <a>related
@@ -2842,7 +2834,7 @@ <h2>
           required USVString src;
           USVString scope;
           USVString type;
-          boolean use_cache;
+          boolean use_cache = "false";
         };
       </pre>
       <section data-dfn-for="serviceworkerregistration">
@@ -2940,23 +2932,6 @@ <h3>
           "https://w3c.github.io/ServiceWorker/#dfn-use-cache">cache</a> should
           be used when fetching the service worker.
         </p>
-        <p>
-          The <dfn>steps for post-processing the <code>use_cache</code> member
-          of a service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>serviceworkerregistration</a>
-          <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
-          which is the <a>URL</a> from which the <var>manifest</var> was
-          fetched. This algorithm will return a boolean.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be <var>registration["use_cache"]</var>.
-          </li>
-          <li>If <var>value</var> is <code>undefined</code>, return
-          <code>false</code>.
-          </li>
-          <li>Otherwise, return <var>value</var>.
-          </li>
-        </ol>
       </section>
     </section>
     <section data-dfn-for="ExternalApplicationResource" data-link-for=

From 36d8a437b6e0041f51ca756b5bb1fa8e627b3ef7 Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 10 Oct 2017 13:34:32 +0200
Subject: [PATCH 7/9] Fix fingerprints error

---
 index.html | 151 ++++++++++++++++-------------------------------------
 1 file changed, 45 insertions(+), 106 deletions(-)

diff --git a/index.html b/index.html
index 461ae8f91..d70baaf29 100644
--- a/index.html
+++ b/index.html
@@ -2082,7 +2082,8 @@ <h3>
           </li>
           <li>Let <var>registration["src"]</var> be the result of running the
           <a>steps for post-processing the <code>src</code> member of a service
-          worker</a> with <var>registration</var> and <var>manifest URL</var>.
+          worker</a> with <var>registration["src"]</var> and <var>manifest
+          URL</var>.
           </li>
           <li>If the result of running <a>is origin potentially trustworthy</a>
           with the origin of <var>registration["src"]</var> is <code>Not
@@ -2091,11 +2092,7 @@ <h3>
           </li>
           <li>Let <var>registration["scope"]</var> be the result of running the
           <a>steps for post-processing the <code>scope</code> member of a
-          service worker</a> passing <var>registration</var>.
-          </li>
-          <li>Let <var>registration["type"]</var> be the result of running the
-          <a>steps for post-processing the <code>type</code> member of a
-          service worker</a> passing <var>registration</var>.
+          service worker</a> passing <var>registration["scope"]</var>.
           </li>
           <li>Return <var>registration</var>.
           </li>
@@ -2207,12 +2204,7 @@ <h3>
                 <ol>
                   <li>Set <var>app["url"]</var> be the result of running the
                   <a>steps for post-processing the <code>url</code> member of
-                  an application</a> with <var>app</var>.
-                  </li>
-                  <li>Set <var>app["fingerprints"]</var> be the result of
-                  running the <a>steps for post-processing the
-                  <code>fingerprints</code> member of an application</a> with
-                  <var>app</var>.
+                  an application</a> with <var>app["url"]</var>.
                   </li>
                   <li>Append <var>app</var> to <var>relatedApplications</var>
                   </li>
@@ -2833,7 +2825,7 @@ <h2>
         dictionary ServiceWorkerRegistration {
           required USVString src;
           USVString scope;
-          USVString type;
+          USVString type = "classic";
           boolean use_cache = "false";
         };
       </pre>
@@ -2848,19 +2840,17 @@ <h3>
         <p>
           The <dfn>steps for post-processing the <code>src</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>ServiceWorkerRegistration</a>
-          <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
-          which is the <a>URL</a> from which the <var>manifest</var> was
-          fetched. This algorithm will return a <a>URL</a> or
-          <code>undefined</code>.
+          algorithm takes a <a>USVString</a> <var>source URL</var>, and a
+          <a>URL</a> <var>manifest URL</var>, which is the <a>URL</a> from
+          which the <var>manifest</var> was fetched. This algorithm will return
+          a <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>registration["src"]</var>.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code> or
-          <var>V</var> is the empty string, then return <code>undefined</code>.
+          <li>If <a>Type</a>(<var>source URL</var>) is not <code>String</code>
+          or <var>source URL</var> is the empty string, then return
+          <code>undefined</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>source URL</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -2876,19 +2866,16 @@ <h3>
         <p>
           The <dfn>steps for post-processing the <code>scope</code> member of a
           service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>ServiceWorkerRegistration</a>
-          <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
-          which is the <a>URL</a> from which the <var>manifest</var> was
-          fetched. This algorithm will return a <a>URL</a> or
-          <code>undefined</code>.
+          algorithm takes a <a>USVString</a> <var>scope URL</var>, and a
+          <a>URL</a> <var>manifest URL</var>, which is the <a>URL</a> from
+          which the <var>manifest</var> was fetched. This algorithm will return
+          a <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>registration["scope"]</var>.
-          </li>
-          <li>If <var>value</var> is <code>undefined</code>, return
-          <code>undefined</code>.
+          <li>If <var>scope URL</var> is <code>undefined</code>, return <code>
+            undefined</code>
           </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> using <var>manifest
+          <li>Otherwise, <a>parse</a> <var>scope URL</var> using <var>manifest
           URL</var> as the base URL and return the result.
           </li>
         </ol>
@@ -2903,23 +2890,6 @@ <h3>
           "https://html.spec.whatwg.org/multipage/workers.html#workertype">worker
           type</a>.
         </p>
-        <p>
-          The <dfn>steps for post-processing the <code>type</code> member of a
-          service worker</dfn> are given by the following algorithm. The
-          algorithm takes a <a>ServiceWorkerRegistration</a>
-          <var>registration</var>, and a <a>URL</a> <var>manifest URL</var>,
-          which is the <a>URL</a> from which the <var>manifest</var> was
-          fetched. This algorithm will return a string.
-        </p>
-        <ol>
-          <li>Let <var>value</var> be <var>registration["type"]</var>.
-          </li>
-          <li>If <var>value</var> is <code>undefined</code>, return
-          <code>"classic"</code>.
-          </li>
-          <li>Otherwise, return <var>value</var>.
-          </li>
-        </ol>
       </section>
       <section data-dfn-for="ServiceWorkerRegistration" data-link-for=
       "ServiceWorkerRegistration">
@@ -2945,7 +2915,7 @@ <h2>
           USVString url;
           DOMString id;
           USVString min_version;
-          USVString fingerprints;
+          sequence&lt;Fingerprint&gt; fingerprints;
         };
       </pre>
       <p>
@@ -2984,8 +2954,8 @@ <h2>
           <code>fingerprints</code>
         </dt>
         <dd>
-          an array of <a data-lt="fingerprint object">fingerprint objects</a>
-          used for verifying the application
+          an array of <a>Fingerprint</a> objects used for verifying the
+          application
         </dd>
       </dl>
       <p>
@@ -3040,17 +3010,16 @@ <h3>
         <p>
           The <dfn>steps for post-processing the <a>url</a> member of an
           application</dfn> are given by the following algorithm. The algorithm
-          takes an <a>ExternalApplicationResource</a> <var>application</var>.
-          This algorithm will return an <a>URL</a> or <code>undefined</code>.
+          takes a <a>USVString</a> <var>application URL</var>. This algorithm
+          will return an <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>application["url"]</var>.
-          </li>
-          <li>If <var>value</var> is <code>undefined</code>, return
+          <li>If <var>application URL</var> is <code>undefined</code>, return
           <code>undefined</code>.
           </li>
-          <li>Otherwise, <a>parse</a> <var>value</var> and if the result is not
-          failure, return the result, otherwise return <code>undefined</code>.
+          <li>Otherwise, <a>parse</a> <var>application URL</var> and if the
+          result is not failure, return the result, otherwise return
+          <code>undefined</code>.
           </li>
         </ol>
       </section>
@@ -3076,59 +3045,29 @@ <h3>
           semantics.
         </p>
       </section>
-      <section data-dfn-for="ExternalApplicationResource">
+      <section data-dfn-for="Fingerprint">
         <h3>
           <code>fingerprints</code> member
         </h3>
+        <pre class="idl">
+            dictionary Fingerprint {
+              USVString type;
+              USVString value;
+            };
+        </pre>
         <p>
-          The <dfn>fingerprints</dfn> member of an
-          <a>ExternalApplicationResource</a> dictionary represents a set of
-          cryptographic fingerprints used for verifying the application. It is
-          given as an array of <a data-lt="fingerprint object">fingerprint
-          objects</a>.
-        </p>
-        <p>
-          A <dfn>fingerprint object</dfn> has two properties: <code>type</code>
-          and <code>value</code>. Each of these are strings, but their syntax
-          and semantics are platform-defined.
+          The <dfn data-dfn-for=
+          "ExternalApplicationResource">fingerprints</dfn> member of an
+          <a>ExternalApplicationResource</a> dictionary represents an array of
+          <a>Fingerprint</a>s.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>fingerprints</code>
-          member of an application</dfn> are given by the following algorithm.
-          The algorithm takes an <a>ExternalApplicationResource</a>
-          <var>application</var>. This algorithm will return an array of
-          <a data-lt="fingerprint object">fingerprint objects</a>, possibly
-          empty.
+          Each <dfn>Fingerprint</dfn>s represents a set of cryptographic
+          fingerprints used for verifying the application. A fingerprint has
+          the following two properties: <dfn>type</dfn> and <dfn>value</dfn>.
+          Each of these are strings, but their syntax and semantics are
+          platform-defined.
         </p>
-        <ol>
-          <li>Let <var>fingerprints</var> be an empty array.
-          </li>
-          <li>For each <var>entry</var> in
-          <var>application["fingerprints"]</var>:
-            <ol>
-              <li>Let <var>type</var> be <var>entry["type"]</var>.
-              </li>
-              <li>If Type(<var>type</var>) is not String, then <a>issue a
-              developer warning</a> that the type is unsupported, and move on
-              to the next item (if any are left).
-              </li>
-              <li>Let <var>value</var> be <var>entry["value"]</var>.
-              </li>
-              <li>If Type(<var>value</var>) is not <code>String</code>, then
-              <a>issue a developer warning</a> that the type is unsupported,
-              and move on to the next item (if any are left).
-              </li>
-              <li>Let <var>fingerprint</var> be a <a>fingerprint object</a>,
-              with its <code>type</code> member set to <var>type</var> and its
-              <code>value</code> member set to <var>value</var>.
-              </li>
-              <li>Append <var>fingerprint</var> to <var>fingerprints</var>.
-              </li>
-            </ol>
-          </li>
-          <li>Return <var>fingerprints</var>.
-          </li>
-        </ol>
       </section>
     </section>
     <section>

From f9f5fba1f82977cc62e0c26a58ae4c8b57337cfc Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 10 Oct 2017 14:35:18 +0200
Subject: [PATCH 8/9] Give values directly to algorithms

---
 index.html | 261 ++++++++++++++++++++++++-----------------------------
 1 file changed, 120 insertions(+), 141 deletions(-)

diff --git a/index.html b/index.html
index d70baaf29..2e8f263fe 100644
--- a/index.html
+++ b/index.html
@@ -370,9 +370,9 @@ <h3>
               an <a>installation process</a>'s UI.
               </li>
               <li>If <a>obtaining the manifest</a> succeeds, and the result of
-              running the <a>steps for post-processing the serviceworker
-              member</a> with <a>manifest</a> returns a valid
-              <var>registration</var>, a user agent can at this point
+              running <a>post-processing the serviceworker member</a> with <a>
+                manifest</a> returns a valid <var>registration</var>, a user
+                agent can at this point
                 <ol>
                   <li>Let <var>client</var> be the <a>top-level browsing
                   context</a> <code>Document</code>'s <a href=
@@ -1243,12 +1243,12 @@ <h3>
           the user agent uses the first <a><code>link</code> element</a> in
           tree order and ignores all subsequent <a><code>link</code>
           element</a> with a <code>manifest</code> link type (even if the first
-          element was erroneous). See the <a>steps for obtaining a
+          element was erroneous). See the steps for <a>obtaining a
           manifest</a>.
         </p>
         <p>
-          To obtain a manifest, the user agent MUST run the <a data-lt=
-          "obtaining the manifest">steps for obtaining a manifest</a>. The
+          To obtain a manifest, the user agent MUST run the steps for
+          <a data-lt="obtaining the manifest">obtaining a manifest</a>. The
           appropriate time to obtain the manifest is left up to
           implementations. A user agent MAY opt to delay fetching a manifest
           until after the document and its other resources have been fully
@@ -1318,10 +1318,10 @@ <h3>
             response</var>'s <a data-cite=
             "!FETCH#concept-request-body">body</a>.
           </li>
-          <li>Let <var>manifest</var> be the result of running the <a>steps for
-          processing a manifest</a> with <var>text</var>, <var>manifest
-          URL</var>, and the URL that represents the address of the
-          <a>top-level browsing context</a>.
+          <li>Let <var>manifest</var> be the result of running <a>processing a
+          manifest</a> given <var>text</var>, <var>manifest URL</var>, and the
+          URL that represents the address of the <a>top-level browsing
+          context</a>.
           </li>
           <li>Return <var>manifest</var> and <var>manifest URL</var>.
           </li>
@@ -1409,7 +1409,7 @@ <h3>
           </p>
         </div>
         <p>
-          The <dfn>steps for processing a manifest</dfn> are given by the
+          The steps for <dfn>processing a manifest</dfn> are given by the
           following algorithm. The algorithm takes a <var>text</var> string as
           an argument, which represents a <a>manifest</a>, and a <a>URL</a>
           <var>manifest URL</var>, which represents the location of the
@@ -1456,53 +1456,53 @@ <h3>
           </li>
           <li>Let <var>manifest</var> be the result of <a data-lt=
           "to idl dictionary value">converting</a> <var>json</var> to a
-          <a>WebAppManifest</a>.
+          <a>WebAppManifest</a> dictionary.
           </li>
           <li>Let <var>manifest["<a>start_url</a>"]</var> be the result of
-          running the <a>steps for post-processing the <code>start_url</code>
-          member</a> with <var>manifest</var>, <var>manifest URL,</var> and
-          <var>document URL</var> as arguments.
+          running <a>post-processing the <code>start_url</code> member</a>
+          given <var>manifest["<a>start_url</a>"]</var>, <var>manifest
+          URL</var>, and <var>document URL</var>.
           </li>
           <li>Let <var>manifest["<a>lang</a>"]</var> be the result of running
-          the <a>steps for post-processing the <code>lang</code> member</a>
-          with <var>manifest</var> as the argument.
+          <a>post-processing the <code>lang</code> member</a> given
+          <var>manifest["<a>lang</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>scope</a>"]</var> be the result of running
-          the <a>steps for post-processing the <code>scope</code> member</a>
-          with <var>manifest</var>, <var>manifest URL</var>, <var>document
-          URL</var>, <var>manifest["<a>start_url</a>"]</var> as arguments.
+          <a>post-processing the <code>scope</code> member</a> given
+          <var>manifest["<a>scope</a>"]</var>, <var>manifest URL</var>,
+          <var>document URL</var>, and <var>manifest["<a>start_url</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>theme_color</a>"]</var> be the result of
-          running the <a>steps for post-processing the <code>theme_color</code>
-          member</a> with <var>manifest</var> as argument.
+          running <a>post-processing the <code>theme_color</code> member</a>
+          given <var>manifest["<a>theme_color</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>background_color</a>"]</var> be the result
-          of running the <a>steps for post-processing the
-          <code>background_color</code> member</a> with <var>manifest</var> as
-          argument.
+          of running <a>post-processing the <code>background_color</code>
+          member</a> given <var>manifest["<a>background_color</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>categories</a>"]</var> be the result of
-          running the <a>steps for post-processing the <code>categories</code>
-          member</a> with <var>manifest</var> as argument.
+          running <a>post-processing the <code>categories</code> member</a>
+          given <var>manifest["<a>categories</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>icons</a>"]</var> be the result of running
-          the <a>steps for post-processing ImageResource members</a> with <var>
-            manifest</var>, <var>manifest URL</var>, and "icons" as arguments.
+          <a>post-processing ImageResource members</a> given
+          <var>manifest["<a>icons</a>"]</var>, <var>manifest URL</var>, and
+          <code>"icons"</code>.
           </li>
           <li>Let <var>manifest["<a>screenshots</a>"]</var> be the result of
-          running the <a>steps for post-processing ImageResource members</a>
-          with <var>manifest</var>, <var>manifest URL</var>, and "screenshots"
-          as arguments.
+          running <a>post-processing ImageResource members</a> given
+          <var>manifest["<a>screenshots</a>"]</var>, <var>manifest URL</var>,
+          and <code>"screenshots"</code>.
           </li>
           <li>Let <var>manifest["<a>related_applications</a>"]</var> be the
-          result of running the <a>steps for post-processing the
-          <code>related_applications</code> member</a> with <var>manifest</var>
-          as argument.
+          result of running <a>post-processing the
+          <code>related_applications</code> member</a> given
+          <var>manifest["<a>related_applications</a>"]</var>.
           </li>
           <li>Let <var>manifest["<a>serviceworker</a>"]</var> be the result of
-          running the <a>steps for post-processing the
-          <code>serviceworker</code> member</a> with <var>manifest</var>, <var>
-            manifest URL</var>, and <var>serviceworker</var> as arguments.
+          running <a>post-processing the <code>serviceworker</code> member</a>
+          given <var>manifest["<a>serviceworker</a>"]</var>, <var>manifest
+          URL</var>, and <var>serviceworker</var>.
           </li>
           <li>Return <var>manifest</var>.
           </li>
@@ -1696,7 +1696,7 @@ <h3>
           structurally valid.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>lang</code> member</dfn>
+          The steps for <dfn>post-processing the <code>lang</code> member</dfn>
           is given by the following algorithm. The algorithm takes a
           <a>WebAppManifest</a> <var>manifest</var> as an argument. This
           algorithm returns a <code>DOMString?</code>.
@@ -1770,24 +1770,20 @@ <h3>
           context</a>.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>scope</code>
+          The steps for <dfn>post-processing the <code>scope</code>
           member</dfn> is given by the following algorithm. The algorithm takes
-          a <a>WebAppManifest</a> <var>manifest</var>, a <a>URL</a>
-          <var>manifest URL</var>, a <a>URL</a> <var>document URL</var>, and a
-          URL <var>start URL</var> . This algorithm returns a <a>URL</a> or
+          an <a>USVString</a> <var>scope URL</var>, a <a>URL</a> <var>manifest
+          URL</var>, a <a>URL</a> <var>document URL</var>, and a URL <var>start
+          URL</var>. This algorithm returns a <a>URL</a> or
           <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>manifest.scope</var>.
-          </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
-          </li>
-          <li>If <var>type</var> is not <code>String</code> or <var>value</var>
-          is the empty string, then return <code>undefined</code>.
+          <li>If <var>scope URL</var> is the empty string, then return
+          <code>undefined</code>.
           </li>
-          <li>Let <var>scope URL</var> be a new <a>URL</a> using
-          <var>value</var> as <var>input</var> and <var>manifest URL</var> as
-          the <var>base</var> URL.
+          <li>Let <var>scope URL</var> be a new <a>URL</a> using <var>scope
+          URL</var> as <var>input</var> and <var>manifest URL</var> as the
+          <var>base</var> URL.
           </li>
           <li>If <var>scope URL</var> is failure:
             <ul>
@@ -1972,26 +1968,21 @@ <h3>
           created or any time thereafter.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>start_url</code>
+          The steps for <dfn>post-processing the <code>start_url</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var>, a <a>URL</a>
+          takes a <a>USVString</a> <var>start URL</var>, a <a>URL</a>
           <var>manifest URL</var>, and a <a>URL</a> <var>document URL</var>.
           This algorithm returns a <a>URL</a>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>manifest["start_url"]</var>.
-          </li>
-          <li>Let <var>type</var> be <a>Type</a>(<var>value</var>).
-          </li>
-          <li>If <var>type</var> is not <code>String</code> or <var>value</var>
-          is the empty string, return a new <a>URL</a> whose <var>input</var>
-          is <var>document URL</var>.
+          <li>If <var>start URL</var> is the empty string, return a new
+          <a>URL</a> whose <var>input</var> is <var>document URL</var>.
           </li>
-          <li>Let <var>url</var> be a new <a>URL</a> using <var>value</var> as
-          <var>input</var> and <var>manifest URL</var> as the <var>base</var>
-          URL.
+          <li>Let <var>start URL</var> be a new <a>URL</a> using
+          <var>value</var> as <var>input</var> and <var>manifest URL</var> as
+          the <var>base</var> URL.
           </li>
-          <li>If <var>url</var> is failure:
+          <li>If <var>start URL</var> is failure:
             <ul>
               <li>
                 <a>Issue a developer warning</a>.
@@ -2001,7 +1992,8 @@ <h3>
               </li>
             </ul>
           </li>
-          <li>If url is not <a>same origin</a> as <var>document URL</var>:
+          <li>If <var>start URL</var> is not <a>same origin</a> as
+          <var>document URL</var>:
             <ol>
               <li>
                 <a>Issue a developer warning</a> that the <a>start_url</a>
@@ -2013,7 +2005,7 @@ <h3>
               </li>
             </ol>
           </li>
-          <li>Otherwise, return <var>url</var>.
+          <li>Otherwise, return <var>start URL</var>.
           </li>
         </ol>
         <div class="example">
@@ -2067,22 +2059,19 @@ <h3>
           they coalesce. If they have different script URLs, last one wins.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>serviceworker</code>
+          The steps for <dfn>post-processing the <code>serviceworker</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var>. This algorithm
-          returns a <a>registration object</a> <var>registration</var>, which
-          can be <code>undefined</code>.
+          takes a <a>ServiceWorkerRegistration</a> <var>registration</var>.
+          This algorithm returns a <a>ServiceWorkerRegistration</a>
+          <var>registration</var>, which can be <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>registration</var> be
-          <var>manifest["serviceworker"]</var>.
-          </li>
           <li>If <var>registration</var> is <code>undefined</code>, return
           <code>undefined</code>.
           </li>
-          <li>Let <var>registration["src"]</var> be the result of running the
-          <a>steps for post-processing the <code>src</code> member of a service
-          worker</a> with <var>registration["src"]</var> and <var>manifest
+          <li>Let <var>registration["src"]</var> be the result of running
+          <a>post-processing the <code>src</code> member of a service
+          worker</a> given <var>registration["src"]</var> and <var>manifest
           URL</var>.
           </li>
           <li>If the result of running <a>is origin potentially trustworthy</a>
@@ -2090,9 +2079,9 @@ <h3>
           Trusted</code>, <a>issue a developer warning</a>, abort these steps
           and return <code>undefined</code>.
           </li>
-          <li>Let <var>registration["scope"]</var> be the result of running the
-          <a>steps for post-processing the <code>scope</code> member of a
-          service worker</a> passing <var>registration["scope"]</var>.
+          <li>Let <var>registration["scope"]</var> be the result of running <a>
+            post-processing the <code>scope</code> member of a service
+            worker</a> given <var>registration["scope"]</var>.
           </li>
           <li>Return <var>registration</var>.
           </li>
@@ -2129,20 +2118,15 @@ <h3>
           "theme-color".
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>theme_color</code>
+          The steps for <dfn>post-processing the <code>theme_color</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
-          This algorithm returns a <code>USVString?</code>.
+          takes a <a>USVString</a> <var>theme color</var> as an argument. This
+          algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>manifest["theme_color"]</var>.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code>
-          return <code>undefined</code>.
-          </li>
-          <li>Otherwise, let <var>potential color</var> be the result of
-          running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>value</var> as input. If parsing returns a syntax error,
+          <li>Let <var>potential color</var> be the result of running
+          [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm with
+          <var>theme color</var> as input. If parsing returns a syntax error,
           return <code>undefined</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
@@ -2186,25 +2170,25 @@ <h3>
           application.
         </p>
         <p>
-          The <dfn>steps for post-processing the
+          The steps for <dfn>post-processing the
           <code>related_applications</code> member</dfn> are given by the
-          following algorithm. The algorithm takes a <a>WebAppManifest</a>
-          <var>manifest</var> as an argument. This algorithm returns an
+          following algorithm. The algorithm takes a
+          sequence&lt;<a>ExternalApplicationResource</a>&gt; <var>related
+          applications</var> as an argument. This algorithm returns an
           Array&lt;<a>ExternalApplicationResource</a>&gt;.
         </p>
         <ol>
           <li>Let <var>relatedApplications</var> be a new Array object created
           as if by the expression [].
           </li>
-          <li>For each <var>app</var> in
-          <var>manifest["related_applications"]</var>:
+          <li>For each <var>app</var> in <var>related applications</var>:
             <ol>
               <li>if neither <var>app["src"]</var> nor <var>app["url"]</var>
               are <code>undefined</code>:
                 <ol>
-                  <li>Set <var>app["url"]</var> be the result of running the
-                  <a>steps for post-processing the <code>url</code> member of
-                  an application</a> with <var>app["url"]</var>.
+                  <li>Set <var>app["url"]</var> be the result of running
+                  <a>post-processing the <code>url</code> member of an
+                  application</a> given <var>app["url"]</var>.
                   </li>
                   <li>Append <var>app</var> to <var>relatedApplications</var>
                   </li>
@@ -2251,21 +2235,16 @@ <h3>
           application's stylesheet is available.
         </p>
         <p>
-          The <dfn>steps for post-processing the <a>background_color</a>
+          The steps for <dfn>post-processing the <a>background_color</a>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
+          takes a <a>USVString</a> <var>background color</var> as an argument.
           This algorithm returns a <code>USVString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>manifest["background_color"]</var>.
-          </li>
-          <li>If <a>Type</a>(<var>value</var>) is not <code>String</code>
-          return <code>undefined</code>.
-          </li>
-          <li>Otherwise, let <var>potential color</var> be the result of
-          running [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm
-          with <var>value</var> as input. If parsing returns a syntax error,
-          return <code>undefined</code>.
+          <li>Let <var>potential color</var> be the result of running
+          [[!CSS-SYNTAX-3]]'s <a>parse a component value</a> algorithm with
+          <var>background color</var> as input. If parsing returns a syntax
+          error, return <code>undefined</code>.
           </li>
           <li>Let <var>color</var> be the result of attempting to parse
           <var>potential color</var> as a CSS color, as per [[!CSS-SYNTAX-3]].
@@ -2298,14 +2277,14 @@ <h3>
           keywords, catalogs and stores are not required to honor this hint.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>categories</code>
+          The steps for <dfn>post-processing the <code>categories</code>
           member</dfn> are given by the following algorithm. The algorithm
-          takes a <a>WebAppManifest</a> <var>manifest</var> as an argument.
-          This algorithm returns an <code>Array&lt;USVString&gt;</code>.
+          takes a sequence&lt;<a>USVString</a>&gt; <var>categories</var> as an
+          argument. This algorithm returns an
+          <code>Array&lt;USVString&gt;</code>.
         </p>
         <ol>
-          <li>For each <var>category</var> in
-          <var>manifest["categories"]</var>:
+          <li>For each <var>category</var> in <var>categories</var>:
             <ol>
               <li>Convert <var>category</var> <a>to ASCII lowercase</a> in
               place.
@@ -2545,7 +2524,7 @@ <h3>
           </dd>
         </dl>
         <p>
-          The <dfn>steps for post-processing the <code>purpose</code> member of
+          The steps for <dfn>post-processing the <code>purpose</code> member of
           an image</dfn> are given by the following algorithm. The algorithm
           takes an <a>ImageResource</a> <var>image</var>. This algorithm will
           return a set.
@@ -2625,7 +2604,7 @@ <h3>
           display context (and ignore any that are inappropriate).
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>sizes</code> member of
+          The steps for <dfn>post-processing the <code>sizes</code> member of
           an image</dfn> are given by the following algorithm. The algorithm
           takes an <a>ImageResource</a> <var>image</var>. This algorithm will
           return a set.
@@ -2662,7 +2641,7 @@ <h3>
           from which a user agent can fetch the image's data.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>src</code> member of an
+          The steps for <dfn>post-processing the <code>src</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           a <a>ImageResource</a> <var>icon</var>, and a <a>URL</a>
           <var>manifest URL</var> , which is the <a>URL</a> from which the
@@ -2695,7 +2674,7 @@ <h3>
           must expect the resource to be an image.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>type</code> member of an
+          The steps for <dfn>post-processing the <code>type</code> member of an
           image</dfn> are given by the following algorithm. The algorithm takes
           an <var>image</var> object as an argument, and returns either a
           string or <code>undefined</code>.
@@ -2719,7 +2698,7 @@ <h3>
           Post-processing an array of image resources
         </h3>
         <p>
-          The <dfn>steps for post-processing <a>ImageResource</a> members</dfn>
+          The steps for <dfn>post-processing <a>ImageResource</a> members</dfn>
           are given by the following algorithm. The algorithm takes a manifest,
           a <a>URL</a> <var>manifest URL</var>, which is the URL from which the
           <var>manifest</var> was fetched, and a string that represents the
@@ -2741,24 +2720,24 @@ <h3>
                     the expression ({}).
                     </li>
                     <li>Let <var>image["src"]</var> be the result of running
-                    the <a>steps for post-processing the <code>src</code>
-                    member of an image</a> with <var>entry</var> and
-                    <var>manifest URL</var>.
+                    <a>post-processing the <code>src</code> member of an
+                    image</a> given <var>entry</var> and <var>manifest
+                    URL</var>.
                     </li>
                     <li>Let <var>image["type"]</var> be the result of running
-                    the <a>steps for post-processing the <code>type</code>
-                    member of an image</a> with <var>entry</var> and
-                    <var>manifest URL</var>.
+                    <a>post-processing the <code>type</code> member of an
+                    image</a> given <var>entry</var> and <var>manifest
+                    URL</var>.
                     </li>
                     <li>Let <var>image["sizes"]</var> be the result of running
-                    the <a>steps for post-processing the <code>sizes</code>
-                    member of an image</a> with <var>entry</var> and
-                    <var>manifest URL</var>.
+                    <a>post-processing the <code>sizes</code> member of an
+                    image</a> given <var>entry</var> and <var>manifest
+                    URL</var>.
                     </li>
                     <li>Let <var>image["purpose"]</var> be the result of
-                    running the <a>steps for post-processing the
-                    <code>purpose</code> member of an image</a> with
-                    <var>entry</var> and <var>manifest URL</var>.
+                    running <a>post-processing the <code>purpose</code> member
+                    of an image</a> given <var>entry</var> and <var>manifest
+                    URL</var>.
                     </li>
                     <li>Append <var>image</var> to <var>imageResources</var>
                     </li>
@@ -2838,7 +2817,7 @@ <h3>
           dictionary is a <a>URL</a> representing a service worker.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>src</code> member of a
+          The steps for <dfn>post-processing the <code>src</code> member of a
           service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>USVString</a> <var>source URL</var>, and a
           <a>URL</a> <var>manifest URL</var>, which is the <a>URL</a> from
@@ -2864,7 +2843,7 @@ <h3>
           dictionary is the service worker's associated <a>scope URL</a>.
         </p>
         <p>
-          The <dfn>steps for post-processing the <code>scope</code> member of a
+          The steps for <dfn>post-processing the <code>scope</code> member of a
           service worker</dfn> are given by the following algorithm. The
           algorithm takes a <a>USVString</a> <var>scope URL</var>, and a
           <a>URL</a> <var>manifest URL</var>, which is the <a>URL</a> from
@@ -3008,7 +2987,7 @@ <h3>
           found.
         </p>
         <p>
-          The <dfn>steps for post-processing the <a>url</a> member of an
+          The steps for <dfn>post-processing the <a>url</a> member of an
           application</dfn> are given by the following algorithm. The algorithm
           takes a <a>USVString</a> <var>application URL</var>. This algorithm
           will return an <a>URL</a> or <code>undefined</code>.
@@ -3636,7 +3615,7 @@ <h3>
             Notes:
           </dt>
           <dd>
-            Please refer to the <a>steps for obtaining a manifest</a> for
+            Please refer to the steps for <a>obtaining a manifest</a> for
             details about how to fetch and <a>apply</a> a <a>manifest</a>.
           </dd>
         </dl>
@@ -3662,11 +3641,11 @@ <h3>
           This specification is designed to be extensible. Other specifications
           are encouraged to define new members for the manifest. However, in
           doing so, please follow the conventions used in this specification.
-          In particular, use the <a>extension point</a> to hook into the
-          <a>steps for processing a manifest</a>. Also, be sure to specify the
-          steps for post-processing your particular member in the manner set
-          forth in this specification. This will help keep this part of the
-          platform consistent.
+          In particular, use the <a>extension point</a> to hook into the steps
+          for <a>processing a manifest</a>. Also, be sure to specify the steps
+          for post-processing your particular member in the manner set forth in
+          this specification. This will help keep this part of the platform
+          consistent.
         </p>
         <p>
           To allow the community can easily find extensions, please add your

From 54af83494d9280f7f37cd9117dd4ae139e98443e Mon Sep 17 00:00:00 2001
From: Kenneth Rohde Christiansen <kenneth.r.christiansen@intel.com>
Date: Tue, 10 Oct 2017 15:11:19 +0200
Subject: [PATCH 9/9] Review comments from Tobie

---
 index.html | 76 +++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/index.html b/index.html
index 2e8f263fe..6b116a5ef 100644
--- a/index.html
+++ b/index.html
@@ -1458,50 +1458,50 @@ <h3>
           "to idl dictionary value">converting</a> <var>json</var> to a
           <a>WebAppManifest</a> dictionary.
           </li>
-          <li>Let <var>manifest["<a>start_url</a>"]</var> be the result of
+          <li>Set <var>manifest</var>["<a>start_url</a>"] to the result of
           running <a>post-processing the <code>start_url</code> member</a>
-          given <var>manifest["<a>start_url</a>"]</var>, <var>manifest
+          given <var>manifest</var>["<a>start_url</a>"], <var>manifest
           URL</var>, and <var>document URL</var>.
           </li>
-          <li>Let <var>manifest["<a>lang</a>"]</var> be the result of running
+          <li>Set <var>manifest</var>["<a>lang</a>"] to the result of running
           <a>post-processing the <code>lang</code> member</a> given
-          <var>manifest["<a>lang</a>"]</var>.
+          <var>manifest</var>["<a>lang</a>"].
           </li>
-          <li>Let <var>manifest["<a>scope</a>"]</var> be the result of running
+          <li>Set <var>manifest</var>["<a>scope</a>"] to the result of running
           <a>post-processing the <code>scope</code> member</a> given
-          <var>manifest["<a>scope</a>"]</var>, <var>manifest URL</var>,
-          <var>document URL</var>, and <var>manifest["<a>start_url</a>"]</var>.
+          <var>manifest</var>["<a>scope</a>"], <var>manifest URL</var>,
+          <var>document URL</var>, and <var>manifest</var>["<a>start_url</a>"].
           </li>
-          <li>Let <var>manifest["<a>theme_color</a>"]</var> be the result of
+          <li>Set <var>manifest</var>["<a>theme_color</a>"] to the result of
           running <a>post-processing the <code>theme_color</code> member</a>
-          given <var>manifest["<a>theme_color</a>"]</var>.
+          given <var>manifest</var>["<a>theme_color</a>"].
           </li>
-          <li>Let <var>manifest["<a>background_color</a>"]</var> be the result
+          <li>Set <var>manifest</var>["<a>background_color</a>"] to the result
           of running <a>post-processing the <code>background_color</code>
-          member</a> given <var>manifest["<a>background_color</a>"]</var>.
+          member</a> given <var>manifest</var>["<a>background_color</a>"].
           </li>
-          <li>Let <var>manifest["<a>categories</a>"]</var> be the result of
+          <li>Set <var>manifest</var>["<a>categories</a>"] to the result of
           running <a>post-processing the <code>categories</code> member</a>
-          given <var>manifest["<a>categories</a>"]</var>.
+          given <var>manifest</var>["<a>categories</a>"].
           </li>
-          <li>Let <var>manifest["<a>icons</a>"]</var> be the result of running
+          <li>Set <var>manifest</var>["<a>icons</a>"] to the result of running
           <a>post-processing ImageResource members</a> given
-          <var>manifest["<a>icons</a>"]</var>, <var>manifest URL</var>, and
+          <var>manifest</var>["<a>icons</a>"], <var>manifest URL</var>, and
           <code>"icons"</code>.
           </li>
-          <li>Let <var>manifest["<a>screenshots</a>"]</var> be the result of
+          <li>Set <var>manifest</var>["<a>screenshots</a>"] to the result of
           running <a>post-processing ImageResource members</a> given
-          <var>manifest["<a>screenshots</a>"]</var>, <var>manifest URL</var>,
+          <var>manifest</var>["<a>screenshots</a>"], <var>manifest URL</var>,
           and <code>"screenshots"</code>.
           </li>
-          <li>Let <var>manifest["<a>related_applications</a>"]</var> be the
+          <li>Set <var>manifest</var>["<a>related_applications</a>"] to the
           result of running <a>post-processing the
           <code>related_applications</code> member</a> given
-          <var>manifest["<a>related_applications</a>"]</var>.
+          <var>manifest</var>["<a>related_applications</a>"].
           </li>
-          <li>Let <var>manifest["<a>serviceworker</a>"]</var> be the result of
+          <li>Set <var>manifest</var>["<a>serviceworker</a>"] to the result of
           running <a>post-processing the <code>serviceworker</code> member</a>
-          given <var>manifest["<a>serviceworker</a>"]</var>, <var>manifest
+          given <var>manifest</var>["<a>serviceworker</a>"], <var>manifest
           URL</var>, and <var>serviceworker</var>.
           </li>
           <li>Return <var>manifest</var>.
@@ -1702,7 +1702,7 @@ <h3>
           algorithm returns a <code>DOMString?</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>manifest.lang</var>.
+          <li>Let <var>value</var> be <var>manifest</var>["lang"].
           </li>
           <li>If <a>Type</a>(<var>value</var>) is <code>String</code>:
             <ol>
@@ -2069,19 +2069,19 @@ <h3>
           <li>If <var>registration</var> is <code>undefined</code>, return
           <code>undefined</code>.
           </li>
-          <li>Let <var>registration["src"]</var> be the result of running
+          <li>Set <var>registration</var>["src"] to the result of running
           <a>post-processing the <code>src</code> member of a service
-          worker</a> given <var>registration["src"]</var> and <var>manifest
+          worker</a> given <var>registration</var>["src"] and <var>manifest
           URL</var>.
           </li>
           <li>If the result of running <a>is origin potentially trustworthy</a>
-          with the origin of <var>registration["src"]</var> is <code>Not
+          with the origin of <var>registration</var>["src"] is <code>Not
           Trusted</code>, <a>issue a developer warning</a>, abort these steps
           and return <code>undefined</code>.
           </li>
-          <li>Let <var>registration["scope"]</var> be the result of running <a>
+          <li>Set <var>registration</var>["scope"] to the result of running <a>
             post-processing the <code>scope</code> member of a service
-            worker</a> given <var>registration["scope"]</var>.
+            worker</a> given <var>registration</var>["scope"].
           </li>
           <li>Return <var>registration</var>.
           </li>
@@ -2183,12 +2183,12 @@ <h3>
           </li>
           <li>For each <var>app</var> in <var>related applications</var>:
             <ol>
-              <li>if neither <var>app["src"]</var> nor <var>app["url"]</var>
+              <li>if neither <var>app</var>["src"] nor <var>app</var>["url"]
               are <code>undefined</code>:
                 <ol>
-                  <li>Set <var>app["url"]</var> be the result of running
+                  <li>Set <var>app</var>["url"] to the result of running
                   <a>post-processing the <code>url</code> member of an
-                  application</a> given <var>app["url"]</var>.
+                  application</a> given <var>app</var>["url"].
                   </li>
                   <li>Append <var>app</var> to <var>relatedApplications</var>
                   </li>
@@ -2532,7 +2532,7 @@ <h3>
         <ol>
           <li>Let <var>set</var> be an empty set.
           </li>
-          <li>Let <var>value</var> be <var>image["purpose"]</var>.
+          <li>Let <var>value</var> be <var>image</var>["purpose"].
           </li>
           <li>If <a>Type</a>(<var>value</var>) is String:
             <ol>
@@ -2649,7 +2649,7 @@ <h3>
           <a>URL</a> or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>image.src</var>.
+          <li>Let <var>value</var> be <var>image</var>["src"].
           </li>
           <li>If <a>Type</a>(<var>value</var>) it not <code>String</code>,
           return <code>undefined</code>.
@@ -2680,7 +2680,7 @@ <h3>
           string or <code>undefined</code>.
         </p>
         <ol>
-          <li>Let <var>value</var> be <var>image["type"]</var>.
+          <li>Let <var>value</var> be <var>image</var>["type"].
           </li>
           <li>If <a>Type</a>(<var>value</var>) it not <code>String</code>,
           return <code>undefined</code>.
@@ -2714,27 +2714,27 @@ <h3>
             <li>For each <var>entry</var> in <var>manifest</var>[<var>member
             name</var>]:
               <ol>
-                <li>if <var>entry["src"]</var> is not <code>undefined</code>:
+                <li>If <var>entry</var>["src"] is not <code>undefined</code>:
                   <ol>
                     <li>Let <var>image</var> be a new object created as if by
                     the expression ({}).
                     </li>
-                    <li>Let <var>image["src"]</var> be the result of running
+                    <li>Set <var>image</var>["src"] to the result of running
                     <a>post-processing the <code>src</code> member of an
                     image</a> given <var>entry</var> and <var>manifest
                     URL</var>.
                     </li>
-                    <li>Let <var>image["type"]</var> be the result of running
+                    <li>Set <var>image</var>["type"] to the result of running
                     <a>post-processing the <code>type</code> member of an
                     image</a> given <var>entry</var> and <var>manifest
                     URL</var>.
                     </li>
-                    <li>Let <var>image["sizes"]</var> be the result of running
+                    <li>Set <var>image</var>["sizes"] to the result of running
                     <a>post-processing the <code>sizes</code> member of an
                     image</a> given <var>entry</var> and <var>manifest
                     URL</var>.
                     </li>
-                    <li>Let <var>image["purpose"]</var> be the result of
+                    <li>Set <var>image</var>["purpose"] to the result of
                     running <a>post-processing the <code>purpose</code> member
                     of an image</a> given <var>entry</var> and <var>manifest
                     URL</var>.