Merge pull request #101 from w3c/landing-page

update landing page to match issue discussion in #94

index.html

@@ -421,7 +421,7 @@ <h4>Address</h4>
 
 					<p>A <a>Web Publication's</a>
 						<dfn>address</dfn> is a <a>URL</a> that refers to the Web Publication. It dereferences to the <a
-							href="#wp-landing-page">landing page</a>, which enables the retrieval of a representation of the
+							href="#wp-entry-page">entry page</a>, which enables the retrieval of a representation of the
 							<a>manifest</a>.</p>
 
 					<p>The availability of this address does not preclude the creation and use of other identifiers and/or
@@ -676,8 +676,6 @@ <h4>Table of Contents</h4>
 						<li>calculate a table of contents using its own algorithms.</li>
 					</ol>
 
-					<p class="ednote">This section should be brought in sync with the section on <a>landing page</a>.</p>
-
 					<p class="issue" data-number="9">The question is whether the manifest/infoset needs to provide
 						navigation, or whether such mechanisms belong in the content.</p>
 
@@ -811,24 +809,22 @@ <h2>Linking to a Manifest</h2>
 						>wiki analysis</a>.</p>
 			</section>
 
-			<section id="wp-landing-page">
-				<h3>Landing Page</h3>
+			<section id="wp-entry-page">
+				<h3>Entry Page</h3>
 
 				<p>As described in <a href="#wp-address"></a>, a <a>Web Publication</a> has an <a>address</a> that can be
-					dereferenced. The address URL MUST resolve to the <dfn>landing page</dfn>, an [[!html]] document that
-					represents the primary entry point for the Web Publication.</p>
-
-				<p>Unlike other resources, the landing page MUST <a href="#wp-linking">link to the manifest</a> to ensure
-					that user agents can discover the Web Publication.</p>
-
-				<p>To ensure that the Web Publication is consumable in different types of user agents, including those that
-					do not support Web Publications, the landing page SHOULD include an [[!html]] serialization of the <a
-						href="#enh-toc">table of contents</a> (see <a href="#wp-table-of-contents"></a> for more
-					information).</p>
-
-				<p class="issue" data-number="94">Additional questions about whether specifying HTML is necessary, whether
-					the resource has to be part of the web publication or not, and whether the table of contents is necessary
-					to specify at this location if provided in the content.</p>
+					dereferenced. This URL MUST resolve to the <dfn>entry page</dfn>, which MUST be an [[!html]] document
+					that represents the primary entry point for the Web Publication.</p>
+
+				<p>The entry page MUST be a resource of the Web Publication, but it can be any resource, including one that
+					is not listed in the <a>default reading order</a>. Unlike other resources, the entry page MUST <a
+						href="#wp-linking">link to the manifest</a> to ensure that user agents can discover the Web
+					Publication.</p>
+
+				<p class="note">To improve the usability of the Web Publication, particularly in user agents that do not
+					support Web Publications, provide access on the entry page to navigation aids that facilitate consumption
+					of the content (e.g., include a <a href="#enh-toc">table of contents</a> on the page, or provide a link
+					to one).</p>
 			</section>
 		</section>
 		<section id="wp-lifecycle">