svn commit: r977190 - in /websites/staging/taverna/trunk: cgi-bin/ content/ content/documentation/scufl2/bundle.html

[bu...@apache.org]

Author: buildbot
Date: Wed Jan  6 22:20:11 2016
New Revision: 977190

Log:
Staging update by buildbot for taverna

Modified:
    websites/staging/taverna/trunk/cgi-bin/   (props changed)
    websites/staging/taverna/trunk/content/   (props changed)
    websites/staging/taverna/trunk/content/documentation/scufl2/bundle.html

Propchange: websites/staging/taverna/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jan  6 22:20:11 2016
@@ -1 +1 @@
-1723417
+1723420

Propchange: websites/staging/taverna/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jan  6 22:20:11 2016
@@ -1 +1 @@
-1723417
+1723420

Modified: websites/staging/taverna/trunk/content/documentation/scufl2/bundle.html
==============================================================================
--- websites/staging/taverna/trunk/content/documentation/scufl2/bundle.html (original)
+++ websites/staging/taverna/trunk/content/documentation/scufl2/bundle.html Wed Jan  6 22:20:11 2016
@@ -224,7 +224,7 @@ The profiles define how these workflows
 <p>If the archive is a <a href="/documentation/scufl2/taverna_bundle">workflow bundle</a>, 
    i.e. <code>/mimetype</code> is <code>application/vnd.taverna.scufl2.workflow-bundle</code>, 
    then the <code>META-INF/container.xml</code> can define <strong>root files</strong> at alternative paths and media types. 
-This specification requires that one of those formats is <code>application/rdf+xml</code> according to this specification. </p>
+This specification requires that one of those formats is <code>application/rdf+xml</code>.</p>
 <p>Example <code>META-INF/container.xml</code>: (may be outdated)</p>
 <div class="codehilite"><pre><span class="cp">&lt;?xml version=&amp;quot;1.0&amp;quot;?&gt;</span>
 <span class="nt">&lt;container</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span>
@@ -245,8 +245,8 @@ This specification requires that one of
 <li><strong>Must</strong> set the bundle <strong>mimetype</strong> to <code>application/vnd.taverna.scufl2.workflow-bundle</code>.</li>
 <li><strong>Must</strong> add a workflow bundle document in <code>application/rdf+xml</code> format.</li>
 <li><strong>Should</strong> store the workflow bundle document in <code>/workflowBundle.rdf</code>.</li>
-<li><strong>Must not</strong> contain a resource <code>/workflowBundle.rdf</code> which is not the workflow bundle document.</li>
-<li><strong>May</strong> Add additional representation of the workflow bundle document (and other documents). 
+<li><strong>Must not</strong> contain a resource <code>/workflowBundle.rdf</code> that is not the workflow bundle document.</li>
+<li><strong>May</strong> add additional representation of the workflow bundle document (and other documents). 
      Alternates of the workflow bundle document <strong>should</strong> be included in the <code>META-INF/container.xml</code>, 
      but only if they can be considered to fully specify the workflow bundle as in the RDF/XML format. 
      (So for instance, a <code>text/html</code> or <code>image/png</code> representation would not normally be considered a 
@@ -467,7 +467,7 @@ Therefore, each of the workflows and pro
 
 
 <h2 id="parsingwriting">Parsing/writing<a class="headerlink" href="#parsingwriting" title="Permanent link">&para;</a></h2>
-<p>SCUFL2 compliant writers, when producing the workflow bundle document:</p>
+<p>SCUFL2-compliant writers, when producing the workflow bundle document:</p>
 <ul>
 <li><strong>Should</strong> write the workflow bundle RDF/XML document according to the SCUFL2 XML schema, 
       use the default namespace <code>xmlns="http://ns.taverna.org.uk/2010/scufl2#"</code> and declare the 
@@ -479,10 +479,12 @@ Therefore, each of the workflows and pro
 <li><strong>Should</strong> set <strong>rdf:about</strong> to <code>""</code> (or <code>"./"</code> if <code>xml:base</code> is not set).</li>
 <li><strong>Should</strong> declare a <strong>mainWorkflow</strong> and <strong>mainProfile</strong>.</li>
 <li><strong>Must</strong> ensure that any <strong>workflow</strong>/<strong>profile</strong> has a relative <strong>rdfs:seeAlso</strong> link to a bundle resource in 
-     <code>application/rdf+xml</code> which defines 
+     <code>application/rdf+xml</code>, which defines 
     that <a href="/documentation/scufl2/workflow">workflow</a> / <a href="/documentation/scufl2/profile">profile</a>.</li>
 </ul>
-<p>SCUFL2 compliant readers, when parsing a workflow bundle document:</p>
+<p>SCUFL2-compliant readers, when parsing a workflow bundle document:</p>
+<ul>
+<li>
 <p><strong>May</strong> assume that a declared workflow/profile is defined in the referenced representation. 
   For instance, in the code example below, <code>workflow/SomeNestedWorkflow.rdf</code> <strong>must</strong> contain a 
   <a href="/documentation/scufl2/workflow">workflow definition</a> for <code>workflow/SomeNestedWorkflow/</code>.   </p>
@@ -494,9 +496,13 @@ Therefore, each of the workflows and pro
 </pre></div>
 
 
-<p><strong>May</strong> parse the <code>/workflowBundle.rdf</code> as RDF/XML <br />
-<strong>May</strong> parse the {/workflowBundle.rdf}} according to the XML schema if the <code>xsi:type="WorkflowBundleDocument"</code> 
-   is set on the <code>rdf:RDF</code> element.</p></div>
+</li>
+<li>
+<p><strong>May</strong> parse the <code>/workflowBundle.rdf</code> as RDF/XML.</p>
+</li>
+<li><strong>May</strong> parse the {/workflowBundle.rdf}} according to the XML schema if the <code>xsi:type="WorkflowBundleDocument"</code> 
+   is set on the <code>rdf:RDF</code> element.</li>
+</ul></div>
 			</div>		
 			<div class="col-xs-12 hidden-sm hidden-md hidden-lg">
 			  <ul class="nav nav-pills nav-stacked">