Author: buildbot
Date: Wed Jul 13 19:21:24 2016
New Revision: 992704

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/download/index.html

Propchange: websites/staging/taverna/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 13 19:21:24 2016
@@ -1 +1 @@
-1752466
+1752525

Propchange: websites/staging/taverna/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 13 19:21:24 2016
@@ -1 +1 @@
-1752466
+1752525

Modified: websites/staging/taverna/trunk/content/download/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/index.html (original)
+++ websites/staging/taverna/trunk/content/download/index.html Wed Jul 13 
19:21:24 2016
@@ -186,42 +186,66 @@
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="which-taverna-to-download">Which Taverna to download?<a 
class="headerlink" href="#which-taverna-to-download" title="Permanent 
link">&para;</a></h2>
+<p>Taverna was started by the <a href="http://www.mygrid.org.uk/";>myGrid 
project</a> and in 2014 entered incubation at the 
+<a href="http://incubator.apache.org/";>Apache Software Foundation</a>. Not all 
tools have yet been migrated to Apache. </p>
+<p>For unreleased Apache Taverna tools, links to Pre-Apache versions (2.x) are 
provided. See below for links to complete
+<strong>earlier Taverna releases</strong> as well as a list of Taverna 2.x 
tools that are <strong>not planned for migration.</strong></p>
+<h3 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent 
link">&para;</a></h3>
 <p>There are several Taverna tools you can download:</p>
 <ul>
-<li><a href="/download/commandline">Apache Taverna Command-line Tool</a> 
enables you to run
+<li>
+<p><a href="/download/commandline">Apache Taverna Command-line Tool</a> 
enables you to run
   workflows from a command prompt.
-  This enables scripted execution of workflows, e.g. on a Linux server.</li>
-<li><a href="/download/workbench">Taverna Workbench</a> enables you to 
graphically create, edit and
+  This enables scripted execution of workflows, e.g. on a Linux server.</p>
+</li>
+<li>
+<p>Pre-Apache Taverna</p>
+</li>
+<li>
+<p><a href="/download/workbench">Taverna Workbench</a> enables you to 
graphically create, edit and
    run workflows on your computer.
    Taverna 2.5 Workbench (non-Apache) is the latest series of the Workbench;
-   it is highly recommended that you use this version if you are new to 
Taverna.</li>
-<li><a href="/download/server">Taverna Server</a> is the remote workflow 
execution service that enables you
-  to set up a dedicated server for executing workflows remotely.</li>
-<li><a href="/documentation/plugins">Taverna Plugins</a> - the design of 
Taverna is modular so that
- various plugins can be added in order to increase its functionality.</li>
+   it is highly recommended that you use this version if you are new to 
Taverna.</p>
+</li>
+<li>
+<p><a href="/download/server">Taverna Server</a> is the remote workflow 
execution service that enables you
+  to set up a dedicated server for executing workflows remotely.</p>
+</li>
+<li>
+<p><a href="/documentation/plugins">Taverna Plugins</a> - because the design 
of Taverna is modular,
+ various plugins can be added to increase its functionality.</p>
+</li>
 </ul>
 <h3 id="taverna-libraries">Taverna libraries<a class="headerlink" 
href="#taverna-libraries" title="Permanent link">&para;</a></h3>
-<p>The Taverna Command-line, Workbench and Server share several Java libraries
+<p>The Taverna Command-line, Workbench, and Server share several Java libraries
 for constructing and executing workflows. These libraries can be downloaded
 separately for development usage:</p>
 <ul>
-<li><a href="/download/language">Apache Taverna Language</a> gives 
programmatic access to
+<li>
+<p><a href="/download/language">Apache Taverna Language</a> gives programmatic 
access to
  inspecting, modifying and converting Taverna's
  <a href="/documentation/scufl2/">SCUFL2</a> workflow definitions and
- <a href="https://w3id.org/bundle";>Research Object Bundles</a>.</li>
-<li><a href="/download/osgi">Apache Taverna OSGi</a> is a generic plugin 
system for Java-based
- console/desktop applications using OSGi, including an online update 
mechanism.</li>
-<li><a href="/download/engine">Apache Taverna Engine</a> is the API for the 
<em>workflow engine</em>
-  that executes workflows defined with <em>Taverna Language</em>.</li>
-<li><a href="/download/common-activities">Apache Taverna Common Activities</a> 
are plugins
+ <a href="https://w3id.org/bundle";>Research Object Bundles</a>.</p>
+</li>
+<li>
+<p><a href="/download/osgi">Apache Taverna OSGi</a> is a generic plugin system 
for Java-based
+ console/desktop applications using OSGi, including an online update 
mechanism.</p>
+</li>
+<li>
+<p><a href="/download/engine">Apache Taverna Engine</a> is the API for the 
<em>workflow engine</em>
+  that executes workflows defined with <em>Taverna Language</em>.</p>
+</li>
+<li>
+<p><a href="/download/common-activities">Apache Taverna Common Activities</a> 
are plugins
   for the <em>Taverna Engine</em> that provide implementations to invoke local 
and
-  remote tools and web services.  </li>
+  remote tools and web services.</p>
+</li>
 </ul>
 <h2 id="source-code">Source code<a class="headerlink" href="#source-code" 
title="Permanent link">&para;</a></h2>
 <p>You might be interested in the <a href="/download/code">source code</a> of 
Apache Taverna, or
 <a href="pre-apache">earlier non-Apache releases</a>. Unreleased tools that 
are under development
 include the <a 
href="https://github.com/apache/incubator-taverna-databundle-viewer";>Apache 
Taverna Databundle Viewer</a> web app
-and the Android app <a 
href="https://github.com/apache/incubator-taverna-mobile";>Apache Taverna 
Mobile</a>.</p>
+and the Android app: <a 
href="https://github.com/apache/incubator-taverna-mobile";>Apache Taverna 
Mobile</a>.</p>
 <h2 id="license">License<a class="headerlink" href="#license" title="Permanent 
link">&para;</a></h2>
 <p>Apache Taverna is distributed under the <a 
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache Software License 
2.0</a>.
 See the <code>NOTICE</code> file in the source code downloads for required 
attributions,
@@ -229,11 +253,11 @@ and the <code>LICENSE</code> file for de
 <p>Dependencies of Taverna are
 <a href="http://www.apache.org/legal/resolved.html";>compatible with Apache 
License 2.0</a>
 according to Apache Software Foundation policies.</p>
-<h2 id="associated-tools">Associated tools<a class="headerlink" 
href="#associated-tools" title="Permanent link">&para;</a></h2>
-<p>There are also a number of third-party tools available to use with Taverna 
2.</p>
+<h2 id="pre-apache-tools">Pre-Apache tools<a class="headerlink" 
href="#pre-apache-tools" title="Permanent link">&para;</a></h2>
+<p>There are a number of third-party tools available to use with Taverna 2.</p>
 <blockquote>
-<p><strong>Note</strong>: There are currently no known plans to bring out 
Apache Taverna 3
-versions of these tools. If you are interested in migrating any of these tools
+<p><strong>Note</strong>: There are currently <strong>no plans to bring out 
Apache Taverna 3
+versions</strong> of these tools. If you are interested in migrating any of 
these tools
 to Apache Taverna, please <a href="/community">contact us</a>.</p>
 </blockquote>
 <ul>
@@ -249,9 +273,7 @@ to Apache Taverna, please <a href="/comm
 <li><a href="https://github.com/myGrid/taverna-player-portal";>Taverna Player 
portal</a></li>
 <li><a href="https://rubygems.org/gems/taverna-t2flow/";>taverna-t2flow Ruby 
gem</a></li>
 </ul>
-<h2 id="non-apache-taverna">Non-Apache Taverna<a class="headerlink" 
href="#non-apache-taverna" title="Permanent link">&para;</a></h2>
-<p>This section covers Taverna releases done before incubation as an Apache 
project.</p>
-<h2 id="taverna-25-and-earlier-non-apache">Taverna 2.5 and earlier 
(non-Apache)<a class="headerlink" href="#taverna-25-and-earlier-non-apache" 
title="Permanent link">&para;</a></h2>
+<h2 id="pre-apache-taverna">Pre-Apache Taverna<a class="headerlink" 
href="#pre-apache-taverna" title="Permanent link">&para;</a></h2>
 <p>Taverna releases from 2001 to 2014 (e.g. Taverna 2.5) were made before 
Apache incubation:</p>
 <ul>
 <li><a href="/download/pre-apache">Earlier non-Apache releases</a></li>


Reply via email to