Merge
authorJohn Arwe
Mon, 30 Sep 2013 16:53:10 -0400
changeset 371 641980f7cb51
parent 369 f32bf3bb1259 (current diff)
parent 370 6af379583e5e (diff)
child 372 d85ca5c8cb68
Merge
--- a/ldp.html	Thu Sep 26 11:08:47 2013 +0100
+++ b/ldp.html	Mon Sep 30 16:53:10 2013 -0400
@@ -311,8 +311,8 @@
 </ul>
 
 <p>A conforming <b>LDP server</b> is an application program that processes HTTP 
-requests and generates HTTP responses that conform to the rules defined in <a href="#linked-data-platform-resources" class="sectionRef"></a>
-and <a href="#linked-data-platform-containers" class="sectionRef"></a>.</p>
+requests and generates HTTP responses that conform to the rules defined in <a href="#ldpr" class="sectionRef"></a>
+and <a href="#ldpc" class="sectionRef"></a>.</p>
 
 <p>A conforming <b>LDP client</b> is an application program that generates HTTP 
 requests and processes HTTP responses that conform to the rules defined in <a href="#linked-data-platform-resources" class="sectionRef"></a>
@@ -728,8 +728,7 @@
 		the URL for the next page. See <a href="#ldpr-Paging" class="sectionRef"></a> for additional details.
 	</div>
 	<div id="ldpr-pagingGET-2" class="rule">4.10.2.2 LDPR servers MAY split the response representation of any LDPR. 
-		This is known as
-		server-initiated paging. See <a href="#ldpr-Paging" class="sectionRef"></a> for
+		See <a href="#ldpr-Paging" class="sectionRef"></a> for
 		additional details.
 	</div>
 	<div id="ldpr-pagingGET-3" class="rule">4.10.2.3 LDPR servers that initiate paging SHOULD respond to requests for a LDPR
@@ -763,7 +762,7 @@
 <section id="ldpr-paging-HTTP_OPTIONS">
 <h3>HTTP OPTIONS</h3>
 
-<div id="ldpr-4_10_3_1" class="rule">4.10.3.1 LDPR servers MUST indicate their support for client-initiated paging by
+<div id="ldpr-4_10_3_1" class="rule">4.10.3.1 LDPR servers MUST indicate their support for paging by
 	responding to a HTTP <code>OPTIONS</code> request on the LDPR’s URL with the HTTP
 	response header for link relations using the header name of <code>Link</code> and link relation type <code>first</code> [[!RFC5988]].
 </div>
@@ -1613,6 +1612,7 @@
 
 <!-- <blockquote><em><a href="http://www.w3.org/TR/2013/WD-ldp-20130930/">Candidate Recommendation Draft</a></em></blockquote>  -->
 <ul>
+    <li>2013-09-23 - Remove client/server-initiated paging terms (JA)</li>
     <li>2013-09-17 - Change must to MUST in <a href="#ldpc-5_6_4">5.6.4</a> (SS)</li>
 	<li>2013-09-17 - Removed "at-risk" inlining feature from spec, <a href="https://www.w3.org/2012/ldp/track/actions/98">ACTION-98</a> (SS)</li>
 	<li>2013-09-17 - Fixed vanishing section ref problem (SS)</li>