Merge rdf-xml branch
authorGavin Carothers <gavin@carothers.name>
Tue, 30 Oct 2012 02:46:50 -0700
changeset 522 558da8cd92bb
parent 521 a5ff026cbe3a (current diff)
parent 520 5c1fa0067221 (diff)
child 523 f1209dd6946a
Merge rdf-xml branch
--- a/rdf-xml/index.html	Tue Oct 30 02:46:33 2012 -0700
+++ b/rdf-xml/index.html	Tue Oct 30 02:46:50 2012 -0700
@@ -1777,6 +1777,9 @@
           <dt><span class="termdef"><a id="eventterm-element-children" name="eventterm-element-children">children</a></span><br /></dt>
           <dd>Set to the value of element information item property [children].</dd>
 
+          <dt><span class="termdef"><a id="eventterm-element-parent" name="eventterm-element-parent">parent</a></span><br /></dt>
+          <dd>Set to the value of element information item property [parent].</dd>
+		  
           <dt><span class="termdef"><a id="eventterm-element-base-uri" name="eventterm-element-base-uri">base-uri</a></span><br /></dt>
           <dd>Set to the value of element information item property [base URI].</dd>
 
@@ -2802,8 +2805,8 @@
         <em>a</em>.<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:type</code>
         then
 
-        <em>u</em>:=uri(identifier:=resolve(<em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>))
-        and the following tiple is added to the graph:
+        <em>u</em>:=uri(identifier:=resolve(<em>e</em>, <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>))
+        and the following triple is added to the graph:
         <div class="ntripleOuter"><div class="ntripleInner"><p>
         <code><em>e</em>.<a href="#eventterm-element-subject">subject</a>.<a href="#eventterm-identifier-string-value">string-value</a> &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; <em>u</em>.<a href="#eventterm-identifier-string-value">string-value</a> .</code>
 
@@ -3248,7 +3251,7 @@
 
             <li><p>If <em>a</em>.<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:type</code>
 
-            then <em>u</em>:=uri(identifier:=resolve(<em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>))
+            then <em>u</em>:=uri(identifier:=resolve(<em>e</em>, <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>))
             and the following triple is added to the graph:</p>
             <div class="ntripleOuter"><div class="ntripleInner"><p>
             <code><em>r</em>.<a href="#eventterm-identifier-string-value">string-value</a> &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#type&gt; <em>u</em>.<a href="#eventterm-identifier-string-value">string-value</a> .</code>
@@ -3656,6 +3659,19 @@
     <section id="section-Acknowledgments" class="informative">
         <h2>Acknowledgments (Informative)</h2>
 
+		<p class="issue">This section does not yet list those who made
+        contributions to the RDF 1.1 version, nor does it list the
+        current RDF WG members.</p>
+
+        <p>The RDF 2004 editors acknowledge valuable contributions from
+        ....</p>
+
+        <p>This specification contains a significant contribution from ...</p>
+
+        <p>This specification is a product of extended deliberations by the
+        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Acknowledgments">members
+        of the RDFcore Working Group and the RDF and RDF Schema Working Group</a>.</p>
+		
         <p>The following people provided valuable contributions to the document:</p>
 
         <ul>
@@ -3728,7 +3744,7 @@
           </dt>
 
           <dd>
-          <cite><a href="http://www.w3.org/TR/2000/REC-xml-20001006">Extensible Markup Language (XML) 1.0, Second Edition</a></cite>, T. Bray, J. Paoli, C.M. Sperberg-McQueen and E. Maler, Editors.  World Wide Web Consortium.  6 October 2000. This version is http://www.w3.org/TR/2000/REC-xml-20001006. <a href="http://www.w3.org/TR/REC-xml">latest version of XML</a> is available at http://www.w3.org/TR/REC-xml.
+          <cite><a href="http://www.w3.org/TR/2000/REC-xml-20001006">Extensible Markup Language (XML)</a></cite>, T. Bray, J. Paoli, C.M. Sperberg-McQueen and E. Maler, Editors.  World Wide Web Consortium.  6 October 2000. <a href="http://www.w3.org/TR/REC-xml">latest version of XML</a> is available at http://www.w3.org/TR/REC-xml.
           </dd>
 
           <dt>
@@ -3818,7 +3834,7 @@
             <a id="ref-unicode" name="ref-unicode">[UNICODE]</a>
 
           </dt>
-          <dd><cite>The Unicode Standard, Version 3</cite>, The Unicode
+          <dd><cite>The Unicode Standard</cite>, The Unicode
             Consortium, Addison-Wesley, 2000. ISBN 0-201-61633-5, as updated
             from time to time by the publication of new versions. (See <a href="http://www.unicode.org/unicode/standard/versions/">http://www.unicode.org/unicode/standard/versions/</a>
             for the latest version and additional information on versions of
@@ -4304,8 +4320,6 @@
         <p>None</p>
     </section>
 
-
-
         <hr />
 
         <div class="metadata">
@@ -4314,24 +4328,5 @@
         </div>
     </section>
 
-
-    <section id="section-Acknowledgments" class="informative">
-        <h2>Acknowledgments</h2>
-
-        <p class="issue">This section does not yet list those who made
-        contributions to the RDF 1.1 version, nor does it list the
-        current RDF WG members.</p>
-
-        <p>The RDF 2004 editors acknowledge valuable contributions from
-        ....</p>
-
-        <p>This specification contains a significant contribution from ...</p>
-
-        <p>This specification is a product of extended deliberations by the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Acknowledgments">members
-        of the RDFcore Working Group and the RDF and RDF Schema Working Group</a>.</p>
-    </section>
-
     </body>
-</html>
-
+</html>
\ No newline at end of file