merge
authorTim L <lebot@rpi.edu>
Mon, 09 Jul 2012 17:12:58 -0400
changeset 3842 01234010e4a7
parent 3841 1b9b62b3c85c (current diff)
parent 3840 ef1fc4b701b8 (diff)
child 3843 a9771c404954
child 3845 472e6d47cd36
merge
--- a/model/diff.html	Mon Jul 09 17:12:44 2012 -0400
+++ b/model/diff.html	Mon Jul 09 17:12:58 2012 -0400
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
 <html lang="en" dir="ltr">
 <head><style type="text/css"><!--
@@ -976,8 +975,10 @@
 <dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
 <dt>Authors:</dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
 <dd><span>Reza B'Far</span>, Oracle Corporation</dd>
-<dd><span>Stephen Cresswell</span>, legislation.gov.uk</dd>
-<dd><span>Sam Coppens</span>, IBBT - Ghent University</dd>
+<dd><a href="http://homepages.inf.ed.ac.uk/jcheney/"><span class="insert">James Cheney</span></a><span class="insert">, University of Edinburgh</span></dd>
+<dd><span><span class="insert">Sam Coppens</span></span><span class="insert">, IBBT - Ghent University</span></dd>
+<dd><span>Stephen Cresswell</span>, legislation.gov.uk
+<span class="delete">Sam Coppens</span><span class="delete">, IBBT - Ghent University</span></dd>
 <dd><a href="http://www.isi.edu/~gil/">Yolanda Gil</a>, Invited Expert</dd>
 <dd><a href="http://www.few.vu.nl/~pgroth/">Paul Groth</a>, VU University of Amsterdam</dd>
 <dd><span>Graham Klyne</span>, University of Oxford</dd>
--- a/model/prov-dm.html	Mon Jul 09 17:12:44 2012 -0400
+++ b/model/prov-dm.html	Mon Jul 09 17:12:58 2012 -0400
@@ -344,10 +344,12 @@
                 company: "University of Manchester" },
               { name: "Reza B'Far",
                 company: "Oracle Corporation" },
+              { name: "James Cheney", url: "http://homepages.inf.ed.ac.uk/jcheney/",
+                company: "University of Edinburgh" },
+              { name: "Sam Coppens",
+                company: "IBBT - Ghent University"},
               { name: "Stephen Cresswell",
                 company: "legislation.gov.uk"},
-              { name: "Sam Coppens",
-                company: "IBBT - Ghent University"},
               { name: "Yolanda Gil",
                 company: "Invited Expert", url:"http://www.isi.edu/~gil/"},
               { name: "Paul Groth", url: "http://www.few.vu.nl/~pgroth/",
--- a/model/prov-n.html	Mon Jul 09 17:12:44 2012 -0400
+++ b/model/prov-n.html	Mon Jul 09 17:12:58 2012 -0400
@@ -271,10 +271,14 @@
           // This is optional, uncomment if you have authors as well as editors.
           // only "name" is required. Same format as editors.
 
-//          authors:  [
-//              { name: "TBD" },
-//         ],
- 
+          authors:  [
+              { name: "James Cheney", url: "http://homepages.inf.ed.ac.uk/jcheney/",
+                company: "University of Edinburgh" },
+
+              { name: "Stian Soiland-Reyes", url: "http://soiland-reyes.com/stian/",
+                company: "University of Manchester" }
+         ],
+
           
           // name of the WG
           wg:           "Provenance Working Group",