hg wants me to merge something for some reason. I don't understand hg.
authorRichard Cyganiak <richard@cyganiak.de>
Thu, 21 Jul 2011 13:52:11 +0100
changeset 99 bd30d03d1eb0
parent 98 570f93ddad85 (current diff)
parent 92 3126d7c769bd (diff)
child 100 0bad7dba369f
hg wants me to merge something for some reason. I don't understand hg.
--- a/rdf-turtle/index.html	Thu Jul 21 13:45:33 2011 +0100
+++ b/rdf-turtle/index.html	Thu Jul 21 13:52:11 2011 +0100
@@ -105,18 +105,14 @@
 			<p>This document defines a textual syntax for RDF called Turtle
 			that allows an RDF graph to be completely written in a compact and
 			natural text form, with abbreviations for common usage patterns and
-			datatypes.  Turtle provides levels of  compatibility with the existing
+			datatypes.  Turtle provides levels of compatibility with the existing
 			<a href="http://www.w3.org/TR/rdf-testcases/#ntriples">N-Triples</a>
 			and
 			<a href="http://www.w3.org/DesignIssues/Notation3">Notation 3</a> 
 			formats as well as the triple pattern syntax of the
-			<a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/">SPARQL</a>
+			<a href="http://www.w3.org/TR/sparql11-query/">SPARQL</a>
 			W3C Recommendation.
 			</p>
-
-			<p>This document specifies a language that is in common usage under the name 
-			"Turtle". It is intended to be compatible with, and a subset of, 
-			<a href="http://www.w3.org/DesignIssues/Notation3">Notation 3</a>.</p>
 	</section>
 
     <section id='sotd'>
@@ -143,10 +139,10 @@
 			<a href="http://www.w3.org/DesignIssues/Notation3">Notation 3</a>
 			([[N3]])
 			while staying within the RDF model.</p>
-
+            <p class="issue"><a href="http://www.w3.org/2011/rdf-wg/track/issues/4">ISSUE-4</a>: A future version of this document is expected to define N-Triples.</p>
 			<p>The Turtle grammar for <a href="#prod-turtle2-triples"><code>triples</code></a> is a subset of the 
 			<a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/">SPARQL Query Language for RDF</a>
-			[[RDF-SPARQL-QUERY]] grammar for <a href="http://www.w3.org/TR/rdf-sparql-query/#rTriplesBlock"><code>TriplesBlock</code></a>. The two grammars share production and terminal names where possible.</p>
+			[[RDF-SPARQL-QUERY]] grammar for <a href="http://www.w3.org/TR/sparql11-query/#rTriplesBlock"><code>TriplesBlock</code></a>. The two grammars share production and terminal names where possible.</p>
 	</section>
 	<section>
 
@@ -166,6 +162,7 @@
 			<a href="http://www.w3.org/TR/rdf-testcases/#ntriples">N-Triples</a>
 			[[N-TRIPLES]].
 			</p>
+            <p class="issue"><a href="http://www.w3.org/2011/rdf-wg/track/issues/4">ISSUE-4</a>: A future version of this document is expected to define N-Triples.</p>
 
 			<p>There are three types of <em>RDF Term</em>:
 			<a href="../rdf-concepts/index.html#dfn-iri">Internationalized Resource Identifiers</a> (IRIs for short),
@@ -601,7 +598,7 @@
             <p>The <acronym title="Extended Backus–Naur Form">EBNF</acronym> used here is defined in XML 1.0 (Third Edition)
             [[!EBNF-NOTATION]]. Production labels consisting of a number and a final 's', e.g. [<a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#rRDFLiteral"><span class="prodNo">60s</span></a>], reference to the production with that number in the <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#sparqlGrammar">SPARQL Query Language for RDF grammar</a> [[RDF-SPARQL-QUERY]].
             </p>
-            <p class="note">@@At this point there should be the table output from yacker, but I was having trouble getting it to behave as expected. See <a href="turtle.bnf">turtle.bnf</a> for exact grammar.</p>
+            <p class="note">There are known formating issues with the table form of the grammar. Please see <a href="turtle.bnf">turtle.bnf</a> for exact grammar.</p>
             <div data-include="turtle-bnf.html">
             </div>
           </section>
@@ -840,8 +837,9 @@
         <p>Turtle is related to a number of other languages.</p>
       <section id="sec-diff-ntriples" class="informative">
         <h3>Turtle compared to N-Triples (Informative)</h3>
-        <p class="note">All of the parts of Turtle that talk about being derived from N-Triples need to change if this document also specifies N-Triples.</p>
-        <p>Turtle adds the following syntax to N-Triples:</p>
+       
+        <p class="issue"><a href="http://www.w3.org/2011/rdf-wg/track/issues/4">ISSUE-4</a>: A future version of this document is expected to define N-Triples.</p>
+        <p>All N-Triples files are vaild Turtle documents. Turtle adds the following syntax to N-Triples:</p>
 
         <ol>
           <li>Whitespace restrictions removed</li>
@@ -868,8 +866,9 @@
       <section id="sec-diff-n3" class="informative">
         <h3>Turtle compared to Notation 3 (Informative)</h3>
 
-        <p>While Notation 3 (<acronym title="Notation 3">N3</acronym>) syntax played a large role in the creation of Turtle
-        they are not strictly compatable. There are a number of differences in 
+        <p>Turtle is similar to, inspired by, and largely compatible with Notation 3 (<acronym title="Notation 3">N3</acronym>). 
+        While the syntax played a role in the creation of Turtle
+        they are not strictly compatible. There are a number of differences in 
         escaping, encoding and structure. N3 triples are a superset of RDF triples. 
         In particular, N3 formulae (graphs) may be the subject or object of N3 triples.
         For example here, the formula with <code>_:Bob a foaf:Person</code> is the object of another arc:</p>
@@ -907,21 +906,21 @@
       <section  id="sec-diff-sparql" class="informative">
       <h3>Turtle compared to SPARQL (Informative)</h3>
 
-      <p>The <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/">SPARQL Query Language for RDF</a> (<acronym title="SPARQL Protocol And RDF Query Language">SPARQL</acronym>) [[RDF-SPARQL-QUERY]] uses a Turtle/N3 style syntax for its <a href="../../../2009/sparql/docs/query-1.1/rq25#rTriplesBlock">TriplesBlock production</a>.
+      <p>The <a href="http://www.w3.org/TR/sparql11-query/">SPARQL Query Language for RDF</a> (<acronym title="SPARQL Protocol And RDF Query Language">SPARQL</acronym>) [[RDF-SPARQL-QUERY]] uses a Turtle style syntax for its <a href=".http://www.w3.org/TR/sparql11-query/#rTriplesBlock">TriplesBlock production</a>.
       This production differs from the Turtle language in that:
       </p>
 
       <ol>
-    <li>SPARQL permits RDF Literals as the subject of RDF triples (per <a href="../../../2009/sparql/docs/query-1.1/rq25#rGraphTerm">editor's draft</a>)</li>
+    <li>SPARQL permits RDF Literals as the subject of RDF triples (per <a href="http://www.w3.org/TR/sparql11-query/#rGraphTerm">Last Call draft</a>)</li>
 
     <li>SPARQL permits variables (<code>?</code><em>name</em> or <code>$</code><em>name</em>) in any part of the triple of the form</li>
-    <li>Turtle allows <a href="#prod-turtle2-directive">prefix and base declarations</a> anywhere outside of a triple. In SPARQL, they are only allowed in the <a href="http://www.w3.org/TR/rdf-sparql-query/#rPrologue">Prologue</a> (at the start of the SPARQL query).</li>
+    <li>Turtle allows <a href="#prod-turtle2-directive">prefix and base declarations</a> anywhere outside of a triple. In SPARQL, they are only allowed in the <a href="http://www.w3.org/TR/sparql11-query/#rPrologue">Prologue</a> (at the start of the SPARQL query).</li>
 
       </ol>
 
       <p>For further information see the
-      <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#QSynIRI">Syntax for IRIs</a>
-      and <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#grammar">SPARQL Grammar</a>
+      <a href="http://www.w3.org/TR/sparql11-query/#QSynIRI">Syntax for IRIs</a>
+      and <a href="http://www.w3.org/TR/sparql11-query/#grammar">SPARQL Grammar</a>
       sections of the SPARQL query document [[RDF-SPARQL-QUERY]].
       </p>
       </section>