merge
authorTim L <lebot@rpi.edu>
Fri, 06 Jul 2012 13:31:44 -0400
changeset 3760 efad68adb0af
parent 3759 fca7eecf90af (current diff)
parent 3758 1c1e52d3b554 (diff)
child 3761 e5bd8bcc3ac9
merge
--- a/primer/Primer.html	Fri Jul 06 13:31:09 2012 -0400
+++ b/primer/Primer.html	Fri Jul 06 13:31:44 2012 -0400
@@ -1185,7 +1185,7 @@
      <span class="exampleheader"><b>PROV-N Example</b></span></div>
     <pre>
      specializationOf(ex:articleV2, ex:article)
-     alternateOf(ex:articleV1, ex:articleV2)
+     alternateOf(ex:articleV2, ex:articleV1)
     </pre>
    </div>
    <p>
Binary file primer/images/everything.png has changed
--- a/primer/images/everything.svg	Fri Jul 06 13:31:09 2012 -0400
+++ b/primer/images/everything.svg	Fri Jul 06 13:31:44 2012 -0400
@@ -22,7 +22,7 @@
    inkscape:export-ydpi="90"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs6"><linearGradient
        id="linearGradient3148"><stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -523,6 +523,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -558,6 +559,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.2454971,0,0,-1,65.32126,1035.0947)"
    id="g262-0"><path
@@ -587,6 +589,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,294.12,802.15)"
    id="g334"
@@ -613,6 +616,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.9368205,0,0,-1,-142.39394,1034.7)"
    id="g340"
@@ -655,6 +659,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,-175.5,1034.7)"
    id="g498"
@@ -731,6 +736,7 @@
 
 
 
+
 </g>
 
 
@@ -763,6 +769,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.71351425,0,0,-1,254.12833,1034.83)"
    id="g498-2"
@@ -800,6 +807,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,629.04784,802.28001)"
    id="g334-3"
@@ -821,6 +829,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.5826615,0,0,-1,38.212014,965.3546)"
    id="g936-0"
@@ -856,6 +865,7 @@
 
 
 
+
 </g><g
    id="g3270"
    transform="translate(0,-36.8)"><g
@@ -909,6 +919,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,-169.56841,991.0782)"
    id="g318"
@@ -960,6 +971,7 @@
 
 
 
+
 </g><text
    style="font-size:12px"
    y="-421.20554"
@@ -977,6 +989,7 @@
 
 
 
+
 <text
    style="font-size:11.99999905px"
    y="-654.78522"
@@ -994,6 +1007,7 @@
 
 
 
+
 <path
    style="fill:none;stroke:#000000;stroke-width:0.92126256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    d="M 506.9356,780.19235 79.473094,677.8999"
@@ -1033,6 +1047,7 @@
 
 
 
+
 <g
    transform="matrix(1,0,0,-1,-170.83865,906.41306)"
    id="g318-4"
@@ -1067,6 +1082,7 @@
 
 
 
+
 </g><path
    id="path344-6-9-2-6-1"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -1116,6 +1132,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.6167515,0,0,-1,-69.14114,1403.714)"
    id="g558"
@@ -1149,6 +1166,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.43309751,-0.00230963,0.02385816,-1.4614635,51.707733,1511.0808)"
    id="g572"
@@ -1201,6 +1219,7 @@
 
 
 
+
 <g
    transform="matrix(1.6167515,0,0,0.92048921,-60.257445,-125.07222)"
    id="g558-1-3"
@@ -1230,6 +1249,7 @@
 
 
 
+
 <g
    transform="matrix(0.43309751,0.00230963,0.02385816,1.4614635,60.59143,-253.39309)"
    id="g572-5-1"
@@ -1266,6 +1286,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.4146437,0,0,-0.84786888,92.069991,1075.8453)"
    id="g558-3"
@@ -1299,6 +1320,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.29192986,0.32279258,1.7382768,-0.60122387,-303.94221,938.06345)"
    id="g572-2"
@@ -1341,6 +1363,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.6837653,0.41048076,1.4796713,1.9262836,-179.39281,286.98448)"
    id="g572-2-5"
@@ -1383,6 +1406,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.62188296,0.39975874,1.3457576,1.8759678,-168.43478,203.36898)"
    id="g572-2-5-9"
@@ -1425,6 +1449,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.00870226,0.28186705,1.6936272,-0.18063826,-164.96914,810.84161)"
    id="g572-2-8"
@@ -1463,6 +1488,7 @@
 
 
 
+
 <g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1481,6 +1507,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1523,6 +1550,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1553,6 +1581,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1571,6 +1600,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -1611,8 +1641,9 @@
 
 
 
+
 </g><g
-   transform="matrix(1.0394571,0,0,-1,502.75321,1070.2623)"
+   transform="matrix(1.0394571,0,0,-1,502.75321,1071.8623)"
    id="g936-0-2-1"
    inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
    inkscape:export-xdpi="79.550438"
@@ -1621,7 +1652,7 @@
      style="fill:url(#linearGradient4283);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none"
      d="m 238.6758,155.4437 c 10.3144,8.5915 10.3144,22.5211 0,31.1126 -10.3145,8.5916 -27.0375,8.5916 -37.3519,0 -10.3145,-8.5915 -10.3145,-22.5211 0,-31.1126 10.3144,-8.5916 27.0374,-8.5916 37.3519,0"
      inkscape:connector-curvature="0" /></g><g
-   transform="matrix(1,0,0,-1,721.54046,901.47234)"
+   transform="matrix(1,0,0,-1,721.54046,903.07234)"
    id="g544-9-61-1-3"
    inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
    inkscape:export-xdpi="79.550438"
@@ -1643,6 +1674,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1686,6 +1718,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.9376888,0.34747621,0.34747621,-0.9376888,651.76262,989.27394)"
    id="g334-3-1-0"
@@ -1707,6 +1740,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1744,6 +1778,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.0611643,0,0,-1,-123.33092,1236.364)"
    id="g262-7-3"><path
@@ -1770,6 +1805,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1804,6 +1840,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1823,6 +1860,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -1864,6 +1902,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1898,6 +1937,7 @@
 
 
 
+
 </g><path
    sodipodi:type="arc"
    style="fill:#151b23;fill-opacity:0.97916667;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@@ -1943,6 +1983,7 @@
 
 
 
+
 </g><path
    id="path342-6-0-2"
    style="fill:none;stroke:#000000;stroke-width:1.27020955;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none"
@@ -1972,6 +2013,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.4146052,0,0,-0.84786888,359.52897,1054.7903)"
    id="g558-3-4-2"
@@ -2005,6 +2047,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.79741846,0.01415798,0.60418273,1.6898123,522.91277,437.9406)"
    id="g572-2-8-3"
@@ -2047,6 +2090,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.4860202,-0.23750576,-0.18759351,1.1471291,727.3055,719.20578)"
    id="g572-2-8-3-2"
@@ -2099,6 +2143,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.0340166,0.0659249,2.399107,-0.03142758,-305.93401,1016.1301)"
    id="g572-2-5-1"
@@ -2145,6 +2190,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2193,6 +2239,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2227,6 +2274,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2260,6 +2308,7 @@
 
 
 
+
 <g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2277,6 +2326,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2311,6 +2361,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.2806619,0,0,-1,201.63694,1272.02)"
    id="g936-4-8-8"
@@ -2343,6 +2394,7 @@
 
 
 
+
 </g><path
    id="path344-6-9-0"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -2382,6 +2434,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2405,6 +2458,7 @@
 
 
 
+
 <path
    id="path344-6-9-0-5"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -2436,4 +2490,33 @@
    transform="matrix(0.8,0,0,-0.8,252.93695,1122.9722)"
    inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
    inkscape:export-xdpi="79.550438"
-   inkscape:export-ydpi="79.550438" /></g></svg>
\ No newline at end of file
+   inkscape:export-ydpi="79.550438" /><g
+   inkscape:export-ydpi="79.550438"
+   inkscape:export-xdpi="79.550438"
+   inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
+   id="g340-3-5-8-9-1-4"
+   transform="matrix(0.34953261,0.56881474,0.81814162,-0.36408089,362.4421,670.551)"><path
+     inkscape:connector-curvature="0"
+     d="M 408.7794,240 524,240"
+     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none"
+     id="path342-6-0-2-5-7-0" /></g><path
+   id="path344-6-9-0-5-8"
+   style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   d="m 698.34308,812.71117 7.67897,4.5113 -6.52758,4.3201 -1.15139,-8.8314 z"
+   inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
+   inkscape:export-xdpi="79.550438"
+   inkscape:export-ydpi="79.550438"
+   inkscape:connector-curvature="0" /><text
+   style="font-size:11.99999905px"
+   y="131.42052"
+   x="1061.271"
+   transform="matrix(0.55092344,0.83455579,0.83455579,-0.55092344,0,0)"
+   id="text336-5-4-1-8"
+   inkscape:transform-center-x="32.286452"
+   inkscape:transform-center-y="-6.8540935"><tspan
+     style="font-size:11.19999886px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:ArialMT;-inkscape-font-specification:ArialMT"
+     x="1061.271 1069.9374 1076.6118"
+     y="131.42052"
+     sodipodi:role="line"
+     id="tspan338-5-3-1-2">wasRevisionOf</tspan></text>
+</g></svg>
\ No newline at end of file