merge
authorEric Prud'hommeaux <eric@w3.org>
Wed, 14 Mar 2012 11:04:38 -0400
changeset 224 f93f0e829e9a
parent 223 a70167d334db (current diff)
parent 222 c43ac715dde2 (diff)
child 225 038053919b43
child 226 c1be34a1a238
merge
rdf-turtle/index.html
--- a/rdf-turtle/index.html	Wed Mar 14 11:03:52 2012 -0400
+++ b/rdf-turtle/index.html	Wed Mar 14 11:04:38 2012 -0400
@@ -1013,34 +1013,38 @@
         <!-- BEGIN N-TRIPLES SPEC -->
 
       <section id="sec-triples">
-        <h2>N′ (N-Triples)</h2>
-        <p class="issue">The RDF WG has not settled on a name for N′, N′ is used to distinguish it from the RDF Test Cases N-Triples.</p>
-        <p class="issue"><a href="http://www.w3.org/2011/rdf-wg/track/issues/4">ISSUE-4</a>: The RDF WG has specified N-Triples Prime to allow UTF-8 characters in IRIs, literals and blank node identifiers. Readers with an opinion about whether or not N-Triples should be ASCII-only may wish to comment.</p>
-        <p>This section defines an easy to parse line-based subset of
-Turtle named N-Triples Prime (<abbr title="N-Triples Prime">N′</abbr>).</p>
-        <p>The syntax is an improved version of N-Triples. N-Triples is a format
-originally defined in the RDF Test Cases [[!RDF-TESTCASES]] document. Its original intent was for
-writing test cases, but it has proven to be popular as a dump format for RDF
-data.</p>
+        <h2>N-Triples</h2>
+        <p>This section defines an easy to parse line-based subset of Turtle named N-Triples.</p>
+        <p>The syntax is an improved version of N-Triples as originally defined in the RDF Test Cases [[!RDF-TESTCASES]] document. Its original intent was for writing test cases, but it has proven to be popular as a dump format for RDF data.</p>
+        <section id="n-triples-mediatype">
+			<h2>Media Type and Content Encoding</h2>
+          
+			<p>The media type of N-Triples is <code>application/ntriples</code>.
+			The content encoding of N-Triples is always UTF-8. N-Triples may also be provided as <code>text/plain</code>. When used in this way N-Triples MUST use the escaped form of any character outside US-ASCII. As N-Triples is a subset of Turtle it MAY also be provided as <code>text/turtle</code>.
+			See <a href="#sec-mediaReg-n-triples">N-Triples Media Type</a> for the media type 
+			registration form.
+			</p>
+
+        </section>
         <section id="n-triple-changes" class="informative">
-          <h3>Changes from N-Triples</h3>
+          <h3>Changes from RDF Test Cases format</h3>
           <ul>
             <li>Default encoding is UTF-8 rather than US-ASCII only
             <li>Uses IRIs rather than RDF URI References
-            <li>Defines a unique media type <code>text/ntriples+turtle</code>
+            <li>Defines a unique media type <code>application/ntriples</code>
             <li>Subset of Turtle rather than Notation 3
             <li>Comments may occur after a triple production
           </ul>
         </section>
         <section id="n-triples-compatibility"  class="informative">
-          <h3>Compatibility with previous N-Triples</h3>
+          <h3>Compatibility with previous RDF Test Cases N-Triples</h3>
           <p>
-          An N-Triples document written using only absolute IRIs is a valid N′ document generating the same triples. N-Triples uses <code>\u</code> escape sequences for characters outside US-ASCII and processing will have turned these into the original character. A N′ document that is serialized into ASCII and uses <code>\u</code> escape sequences for any character outside US-ASCII should be equivalent to a N-Triples document. Any comments may also be removed to avoid changes in the locations that comments are allowed.
+          Full backwards compatibility with RDF Test Cases N-Triples is supported. An RDF Test Cases document written using only absolute IRIs is a valid N-Triples document generating the same triples. Both use <code>\u</code> escape sequences for characters outside US-ASCII and processing will have turned these into the original character. A N-Triples document that is serialized into ASCII and uses <code>\u</code> escape sequences for any character outside US-ASCII is equivalent to a RDF Test Cases document. Any comments may also be removed to avoid changes in the locations that comments are allowed.
           </p>
         </section>
         <section id="n-triple-grammar">
           <h3>Grammar</h3>
-          <p>A N′ document is a Unicode[[!UNICODE]] character string encoded in UTF-8.
+          <p>A N-Triples document is a Unicode[[!UNICODE]] character string encoded in UTF-8.
           Unicode codepoints only in the range U+0 to U+10FFFF inclusive are allowed.</p>
           <p><a href="#sec-strings">Escape sequence rules</a> are the same as Turtle. However, as only the <code>STRING_LITERAL2</code> production is allowed new lines in literals MUST be escaped.</p>
           <pre data-include="n-prime.bnf" data-oninclude="esc">
@@ -1056,7 +1060,7 @@
       <section id="sec-diff-n3" class="informative">
         <h3>Turtle compared to Notation 3 (Informative)</h3>
 
-        <p>Turtle is similar to and inspired by the more powerful Notation 3 (<abbr title="Notation 3">N3</abbr>).
+        <p>Turtle is similar to and inspired by Notation 3 (<abbr title="Notation 3">N3</abbr>).
 	Please see the most recent Notation3 specification for comparison with Turtle.
 <!-- 
         While the syntax played a role in the creation of Turtle
--- a/rdf-turtle/n-prime.bnf	Wed Mar 14 11:03:52 2012 -0400
+++ b/rdf-turtle/n-prime.bnf	Wed Mar 14 11:04:38 2012 -0400
@@ -1,4 +1,4 @@
-primeTriplesDoc         ::= triple? (EOL triple)* EOL?
+ntriplesDoc             ::= triple? (EOL triple)* EOL?
 triple                  ::= subj pred obj '.'
 subj                    ::= IRI_REF | BLANK_NODE_LABEL
 pred                    ::= IRI_REF