hg merge 1170
authorEric Prud'hommeaux <eric@w3.org>
Sat, 02 Nov 2013 12:00:34 -0400
changeset 1200 ee888aa84dd7
parent 1198 1a37a81515e4 (current diff)
parent 1199 1cc3e076e369 (diff)
child 1202 0d60976b6789
child 1203 90ec1fa63df9
hg merge 1170
rdf-turtle/index.html
--- a/rdf-turtle/index.html	Fri Nov 01 15:58:14 2013 -0400
+++ b/rdf-turtle/index.html	Sat Nov 02 12:00:34 2013 -0400
@@ -942,7 +942,7 @@
               <tr id="handle-STRING_LITERAL_LONG_SINGLE_QUOTE"    ><td style="text-align:left;"><a class="type lexicalForm" href="#grammar-production-STRING_LITERAL_LONG_SINGLE_QUOTE" >STRING_LITERAL_LONG_SINGLE_QUOTE </a></td><td><a href="../rdf-concepts/index.html#dfn-lexical-form">                         lexical form</a></td><td>The characters between the outermost "'''"s are taken, with <a href="#numeric">numeric</a> and <a href="#string">string</a> escape sequences unescaped, to form the unicode string of a lexical form.</td></tr>
               <tr id="handle-STRING_LITERAL_LONG_QUOTE"    ><td style="text-align:left;"><a class="type lexicalForm" href="#grammar-production-STRING_LITERAL_LONG_QUOTE" >STRING_LITERAL_LONG_QUOTE </a></td><td><a href="../rdf-concepts/index.html#dfn-lexical-form">                         lexical form</a></td><td>The characters between the outermost '"""'s are taken, with <a href="#numeric">numeric</a> and <a href="#string">string</a> escape sequences unescaped, to form the unicode string of a lexical form.</td></tr>
               <tr id="handle-LANGTAG"                 ><td style="text-align:left;"><a class="type langTag"     href="#grammar-production-LANGTAG"              >LANGTAG              </a></td><td><a href="../rdf-concepts/index.html#dfn-language-tag">language tag</a></td><td>The characters following the <code>@</code> form the unicode string of the language tag.</td></tr>
-              <tr id="handle-RDFLiteral"              ><td style="text-align:left;"><a class="type literal"     href="#grammar-production-RDFLiteral"           >RDFLiteral           </a></td><td><a href="../rdf-concepts/index.html#dfn-literal">            literal     </a></td><td>The literal has a lexical form of the first rule argument, <code>String</code>, and either a language tag of <code>LANGTAG</code> or a datatype IRI of <code>iri</code>, depending on which rule matched the input. if neither a language tag nor a datatype IRI is provided, the literal has a datatype of <code>xsd:string</code>.</td></tr>
+              <tr id="handle-RDFLiteral"              ><td style="text-align:left;"><a class="type literal"     href="#grammar-production-RDFLiteral"           >RDFLiteral           </a></td><td><a href="../rdf-concepts/index.html#dfn-literal">            literal     </a></td><td>The literal has a lexical form of the first rule argument, <code>String</code>. If the <code>'^^' iri</code> rule matched, the datatype is <code>iri</code> and the literal has no language tag. If the <code>LANGTAG</code> rule matched, the datatype is <code>rdf:langString</code> and the language tag is <code>LANGTAG</code>. If neither matched, the datatype is <code>xsd:string</code> and the literal has no language tag.</td></tr>
               <tr id="handle-INTEGER"                 ><td style="text-align:left;"><a class="type integer"     href="#grammar-production-INTEGER"              >INTEGER              </a></td><td><a href="../rdf-concepts/index.html#dfn-literal">            literal     </a></td><td>The literal has a lexical form of the input string, and a datatype of <code>xsd:integer</code>.</td></tr>
               <tr id="handle-DECIMAL"                 ><td style="text-align:left;"><a class="type decimal"     href="#grammar-production-DECIMAL"              >DECIMAL              </a></td><td><a href="../rdf-concepts/index.html#dfn-literal">            literal     </a></td><td>The literal has a lexical form of the input string, and a datatype of <code>xsd:decimal</code>.</td></tr>
               <tr id="handle-DOUBLE"                  ><td style="text-align:left;"><a class="type double"      href="#grammar-production-DOUBLE"               >DOUBLE               </a></td><td><a href="../rdf-concepts/index.html#dfn-literal">            literal     </a></td><td>The literal has a lexical form of the input string, and a datatype of <code>xsd:double</code>.</td></tr>
@@ -1021,7 +1021,7 @@
         </section>
       <section id="in-html" class="appendix informative">
         <h2>Embedding Turtle in HTML documents</h2>
-        <p>HTML ([[!HTML5]]) <code>script</code> <a href="http://dev.w3.org/html5/spec/Overview.html#scripting-1">tags</a> 
+        <p>HTML ([[HTML5]]) <code>script</code> <a href="http://dev.w3.org/html5/spec/Overview.html#scripting-1">tags</a> 
         can be used to embed data blocks in documents. Turtle can be easily embedded in HTML this way.</p>
         <pre class="example">&lt;script type="text/turtle">
 @prefix dc: &lt;http://purl.org/dc/terms/> .