You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by bu...@apache.org on 2016/05/09 14:57:06 UTC

svn commit: r987808 - in /websites/staging/taverna/trunk: cgi-bin/ content/ content/documentation/command-line/ content/download/ content/download/command-line-tool/ content/download/commandline/ content/download/system-requirements/ content/download/w...

Author: buildbot
Date: Mon May  9 14:57:06 2016
New Revision: 987808

Log:
Staging update by buildbot for taverna

Added:
    websites/staging/taverna/trunk/content/download/commandline/
    websites/staging/taverna/trunk/content/download/commandline/index.html
Removed:
    websites/staging/taverna/trunk/content/download/command-line-tool/index.html
Modified:
    websites/staging/taverna/trunk/cgi-bin/   (props changed)
    websites/staging/taverna/trunk/content/   (props changed)
    websites/staging/taverna/trunk/content/.htaccess
    websites/staging/taverna/trunk/content/documentation/command-line/index.html
    websites/staging/taverna/trunk/content/download/index.html
    websites/staging/taverna/trunk/content/download/system-requirements/index.html
    websites/staging/taverna/trunk/content/download/workbench/index.html
    websites/staging/taverna/trunk/content/introduction/index.html

Propchange: websites/staging/taverna/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon May  9 14:57:06 2016
@@ -1 +1 @@
-1742966
+1742969

Propchange: websites/staging/taverna/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon May  9 14:57:06 2016
@@ -1 +1 @@
-1742966
+1742969

Modified: websites/staging/taverna/trunk/content/.htaccess
==============================================================================
--- websites/staging/taverna/trunk/content/.htaccess (original)
+++ websites/staging/taverna/trunk/content/.htaccess Mon May  9 14:57:06 2016
@@ -42,4 +42,5 @@ RewriteRule ^edit.* /community/edit [L,R
 RewriteRule ^doc/?$ /documentation/ [L,R]
 
 RewriteRule ^download/scufl2.* /download/language/ [L,R=permanent]
+RewriteRule ^download/command-line.* /download/commandline/ [L,R=permanent]
 

Modified: websites/staging/taverna/trunk/content/documentation/command-line/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/documentation/command-line/index.html (original)
+++ websites/staging/taverna/trunk/content/documentation/command-line/index.html Mon May  9 14:57:06 2016
@@ -191,7 +191,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Command Line Tool is a script that runs Taverna workflows from a terminal. 
 It comes in a form of a command line script called <em>executeworkflow</em> 
    (<em>executeworkflow.bat</em> on Windows and <em>executeworkflow.sh</em> on  Linux/UNIX).</p>
-<p>You can <a href="/download/command-line-tool">download the Command Line Tool</a> from the Taverna Web site 
+<p>You can <a href="/download/commandline/">download the Command Line Tool</a> from the Taverna Web site 
    or use the <em>executeworkflow.sh</em> or <em>executeworkflow.bat</em> that comes 
    bundled with the Taverna Workbench installation.</p>
 <ul>

Added: websites/staging/taverna/trunk/content/download/commandline/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/commandline/index.html (added)
+++ websites/staging/taverna/trunk/content/download/commandline/index.html Mon May  9 14:57:06 2016
@@ -0,0 +1,315 @@
+<!DOCTYPE html>
+<html lang="en">
+      <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">	  
+    <meta name="viewport" content="width=device-width, initial-scale=1">      
+    <title>Apache Taverna - Taverna Command Line Tool (non-Apache release)</title>
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="/img/taverna-logo-145x134.png" />
+
+	<link rel="shortcut icon" href="/favicon.ico">
+	<link rel="icon" type="image/png" sizes="145x134" href="/img/taverna-logo-145x134.png">
+	<link rel="apple-touch-icon" sizes="145x134" href="/img/taverna-logo-145x134.png">
+
+    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="/css/sticky-footer-navbar.css">
+    <link rel="stylesheet" href="/css/taverna.css">
+    <link rel="stylesheet" href="/css/pygments.css">
+
+    
+
+    
+    <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+
+    <!-- JSON-LD markup for Google Structured Data -->
+	
+	  <!-- custom JSON-LD for this page -->
+	  <script type="application/ld+json">  
+		  { "@context" : "http://schema.org", "@type" : ["Product", "SoftwareApplication"], "@id": "https://taverna.incubator.apache.org/download/common-activities/", "url": "https://taverna.incubator.apache.org/download/common-activities/", "applicationSuite": "Apache Taverna (incubating)", "name" : "Apache Taverna Common Activities (incubating)", "description" : "Apache Taverna Common Activities (incubating) .", "brand" : { "@type" : "Brand", "name" : "Apache Taverna", "logo" : "https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12332251&projectId=12318322" }, "publisher" : { "@type" : "Organization", "@id" : "https://www.apache.org/", "url" : "https://www.apache.org/", "name" : "The Apache Software Foundation (ASF)" }, "downloadUrl" : "https://www-eu.apache.org/dist/incubator/taverna/source/taverna-common-activities-2.1.0-incubating/apache-taverna-common-activities-2.1.0-incubating-source-release.zip", "fileSize": "607KB", "releaseNotes" : "https://issues.apache.org/jira/se
 cure/ReleaseNote.jspa?version=12332251&projectId=12318322", "author": { "@id": "https://taverna.incubator.apache.org/about/", "uri": "https://taverna.incubator.apache.org/about/", "type": "Organization", "name": "Apache Taverna PPMC" } }  
+	  </script>
+	
+	  <!-- generic JSON-LD for this page -->
+	  <script type="application/ld+json">  
+		{
+			"@context" : "http://schema.org",
+			"@type" : ["CreativeWork"],
+			"@id": "",
+			"name" : "Taverna Command Line Tool (non-Apache release)",
+			"publisher" : {
+				"@type" : "Organization", 
+				"url" : "http://www.apache.org/",
+				"name" : "The Apache Software Foundation (ASF)" 
+			},
+			"license": { 
+				"@type": "CreativeWork",
+				"@id": "http://www.apache.org/licenses/LICENSE-2.0",
+				"url": "http://www.apache.org/licenses/LICENSE-2.0",
+				"name": "Apache License, Version 2.0"
+			}
+		}		
+</script>
+	  
+  </head>
+
+
+  <body>
+              <!-- Static navbar -->
+      <nav class="navbar navbar-default no-margin-bottom" role="navigation">
+        <div class="container">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed no-margin-bottom" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+			<a class="navbar-brand" href="/"><img src="/img/taverna-logo-145x134.png" alt="">Apache Taverna</a>
+
+          </div>
+          <div id="navbar" class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="dropdown">
+					<a href="/introduction" data-toggle="dropdown" role="button" aria-expanded="false">Introduction<span class="caret"></span></a>
+					<ul class="dropdown-menu"  role="menu">
+					   <li><a href="/introduction">Introduction home</a></li>
+					   <li><a href="/introduction/taverna-features">Taverna features</a></li>
+					   <li><a href="/introduction/why-use-workflows">Why use workflows?</a></li>
+					   <li><a href="/introduction/what-is-in-silico-experimentation">What is ‘in silico’ experimentation?</a></li>
+					   <li><a href="/introduction/what-is-a-workflow-management-system">What is a Workflow Management System?</a></li>
+					   <li><a href="/introduction/how-can-taverna-help-me">How can Taverna help me?</a></li>
+					   <li><a href="/introduction/services-in-taverna">Services in Taverna</a></li>
+					   <li><a href="/introduction/related-projects">Related projects</a></li>
+					   <li><a href="/introduction/chemistry-web-services">Chemistry-web-services</a></li>
+                       <li><a href="/introduction/taverna-in-use">Taverna in use</a></li>
+				       <li><a href="/introduction/works-with">Works with...</a></li>
+                       <li><a href="/introduction/roadmap">Road Map</a></li>
+					</ul>
+				</li>
+                <li class="dropdown">
+					<a href="/documentation" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
+                  <ul class="dropdown-menu" role="menu">
+					  <li><a href="/documentation">Documentation home</a></li>
+					  <li><a href="/documentation/glossary">Glossary</a></li>
+					  <li><a href="/documentation/quick-start-guide">Quick start guide</a></li>
+					  <li><a href="/documentation/scufl2">Taverna's SCUFL2 Language</a></li>
+					  <li><a href="/documentation/components">Components</a></li>
+					  <li><a href="/documentation/interaction">Interactions</a></li>
+					  <li><a href="/documentation/tutorials">Tutorials</a></li>
+					  <li><a href="/documentation/videos">Videos</a></li>
+					  <li><a href="/documentation/example-workflows">Example workflows</a></li>
+					  <li><a href="/documentation/service-sets">Service sets</a></li>
+					  <li><a href="/documentation/provenance">Provenance management</a></li>
+					  <li><a href="/documentation/command-line">Command Line</a></li>
+					  <li><a href="/documentation/server">Taverna Server</a></li>
+					  <li><a href="/documentation/taverna-player">Taverna Player</a></li>
+					  <li><a href="/documentation/plugins">Plugins</a></li>
+					  <li><a href="/documentation/training-and-workshops">Training and workshops</a></li>
+					  <li><a href="/documentation/web-service-developers">Web service developers</a></li>
+					  <li><a href="/documentation/#tools">Tools and Services</a></li>
+				  </ul>
+    			</li>
+                <li class="dropdown">
+					<a href="/download" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Download<span class="caret"></span></a>
+                  <ul class="dropdown-menu" role="menu">
+                    <li><a href="/download">Which Taverna to use?</a></li>
+                    <li><a href="/download/language">Apache Taverna Language</a></li>
+        					  <li><a href="/download/osgi">Apache Taverna OSGi</a></li>
+                    <li><a href="/download/workbench">Taverna Workbench</a></li>
+					  <li><a href="/download/command-line-tool">Taverna Command Line</a></li>
+					  <li><a href="/download/server">Taverna Server</a></li>
+					  <li><a href="/documentation/plugins">Plugins</a></li>
+					  <li><a href="/download/code">Source Code</a></li>
+					  <li><a href="/download/maven">Maven Repository</a></li>
+					  <li><a href="/download/system-requirements">System Requirements</a></li>
+					  <li><a href="/download/pre-apache">Taverna 2.x (Pre-Apache)</a></li>
+				  </ul>
+				</li>
+                <li class="dropdown">
+					<a href="/community" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Community<span class="caret"></span></a>
+                  <ul class="dropdown-menu" role="menu">
+					  <li><a href="/community">Community home</a></li>
+					  <li><a href="/community/lists">Mailing Lists</a></li>
+					  <li><a href="/community#contribute">Contribute</a></li>
+					  <li><a href="/community/releasing">Release procedure</a></li>
+					  <li><a href="/community/issue-tracker">Report a Bug</a></li>
+					  <li><a href="/community/news">News</a></li>
+					  <li><a href="/community/cite">Cite Taverna</a></li>
+					  <li><a href="/community/publications">Publications</a></li>
+					  <li><a href="/community/references">References</a></li>
+					  <li><a href="/community/irc">IRC chat</a></li>
+            <li><a href="/community/edit">Edit website</a></li>
+				  </ul>
+				</li>
+            </ul>
+            <form class="navbar-form navbar-right" role="search"
+                   name="search" id="search" action="http://www.google.com/search" method="get">
+              <input value="taverna.incubator.apache.org" name="sitesearch" type="hidden"/>
+                <div class="form-group input-group">
+                  <input type="text" name="q" id="query" placeholder="Search" class="form-control">
+			      <span class="input-group-btn">
+                    <button type="submit" class="btn btn-default">Search</button>
+				  </span>
+                </div>
+            </form>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="http://www.apache.org/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">ASF<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
+                    <li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                    <li><a href="http://incubator.apache.org/projects/taverna.html">Taverna Incubation Status</a></li>
+                </ul>
+              </li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div><!--/.container-->
+      </nav>
+
+
+    <div id="page" class="container">
+       <h1>Taverna Command Line Tool (non-Apache release)</h1>
+      <div id="content"><style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+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>
+<div class="alert alert-info" role="alert"><p><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+Taverna has transitioned to the Apache Incubator.
+
+The first version info 
+Currently there is no Apache version of the Taverna Command Line.
+The first Apache version of the workbench is unlikely to include all the features of Taverna 2.5.
+If there are particular features you feel should be prioritized please
+<a class="alert-link" href="/community/lists">contact us</a>.
+</div>
+
+<p>Taverna <a href="/documentation/command-line">Command Line Tool</a> enables you to run workflows from a
+  command prompt.</p>
+<p>Taverna Command Line Tool is basically the Taverna Workbench stripped of its GUI so you can run
+   workflows from a command prompt headlessly (i.e. without the graphical environment).</p>
+<h3 id="download-formats">Download Formats<a class="headerlink" href="#download-formats" title="Permanent link">&para;</a></h3>
+<div class="alert alert-warning" role="alert"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
+This earlier releases were made before incubation, and are
+<strong>not endorsed</strong> by or provided by the Apache Software Foundation.
+Note that the license for Taverna Command Line 2.5 is
+<a class="alert-link" href="https://www.gnu.org/licenses/lgpl-2.1.html">LGPL 2.1</a>.
+</div>
+
+<p>Taverna Command Line is available in the current formats</p>
+<ul>
+<li><a href="#windows64">Windows 64-bit (.exe installer)</a> (7, 8, 8.1)</li>
+<li><a href="#windows32">Windows 32-bit (.exe installer)</a> (7)</li>
+<li><a href="#maxos">Mac OS X 64-bit (.dmg disk image)</a> (10.8, 10.9)</li>
+<li><a href="#linuxdeb">Linux 64-bit Debian-based (.deb package)</a> (Ubuntu 12.04.4, Bio-Linux 7)</li>
+<li><a href="#linuxrpm">Linux 64-bit Redhat-based (.rpm package)</a> (Fedora 20)</li>
+<li><a href="#zip">Stand Alone zip</a> (See
+   <a href="/download/system-requirements#standalone">additional requirements</a>)</li>
+<li><a href="/download/maven">Maven repository</a></li>
+<li><a href="/code">Source code</a></li>
+</ul>
+<p>Check <a href="/download/system-requirements">system requirements</a> before you download
+  Taverna.</p>
+<h2 id="adding-plugins">Adding plugins<a class="headerlink" href="#adding-plugins" title="Permanent link">&para;</a></h2>
+<p>Taverna can be extended with various <a href="/documentation/plugins">Plugins</a>.
+At this point it is undecided which plugins will be upgraded to Taverna 3.
+If you are interested in the upgrade of any plugin to Taverna 3 please <a href="/community">contact us</a></p>
+<p>Similarly it has not yet been decided which plugins will be pre-populated into a commandline
+   download, and if so how this will be done.  </p>
+<p>If you are interested in domain specific versions of Taverna as done in
+   <a href="http://www.taverna.org.uk/download/command-line-tool/2-5/">non-Apache Taverna 2.5</a> please
+   <a href="/community">contact us</a>.</p>
+<p><a name="windows64"></a></p>
+<h2 id="taverna-command-line-25-for-windows-64-bit">Taverna Command Line 2.5 for Windows 64-bit<a class="headerlink" href="#taverna-command-line-25-for-windows-64-bit" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-windows">taverna-commandline-core-2.5.0-winx64.exe</a></li>
+<li>SHA1: 37491b8161b815407f9c058c4ab410cec2508297</li>
+<li>MD5: 5f6348b2d87d163443d624cee0f1db02</li>
+</ul>
+<p><a name="windows32"></a></p>
+<h2 id="taverna-command-line-25-for-windows-32-bit">Taverna Command Line 2.5 for Windows 32-bit<a class="headerlink" href="#taverna-command-line-25-for-windows-32-bit" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-windows">taverna-commandline-core-2.5.0-wini386.exe</a></li>
+<li>SHA1: e8ef54855d721b81518f8999f3090114675c05b2</li>
+<li>MD5: 438ccd89979c26873a600aa5f52fa965</li>
+</ul>
+<p>Please <a href="/community">contact us</a> to confirm continued interest in a 32 bit installer</p>
+<p><a name="maxos"></a></p>
+<h2 id="taverna-command-line-25-for-mac-os-x">Taverna Command Line 2.5 for Mac OS X<a class="headerlink" href="#taverna-command-line-25-for-mac-os-x" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-mac">taverna-commandline-core-2.5.0-osx.tgz</a></li>
+<li>SHA1: e9acb3a48db9ccb39dac7d06d5487a1f5070041e</li>
+<li>MD5: b448e35542b1e8cc56492fa04577671d</li>
+</ul>
+<p><a name="linuxdeb"></a></p>
+<h2 id="taverna-command-line-25-for-linux-rpm-package">Taverna Command Line 2.5 for Linux RPM package<a class="headerlink" href="#taverna-command-line-25-for-linux-rpm-package" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-linux">taverna-commandline-core-2.5.0-linux_x86_64.rpm</a></li>
+<li>SHA1: 3c8da38e7febdf60fbe34dfa2113d9c33abb0e12</li>
+<li>MD5: 0b40e88c2cde85ae6482069d70009387</li>
+</ul>
+<p><a name="linuxrpm"></a></p>
+<h2 id="taverna-command-line-25-for-linux-debian-package">Taverna Command Line 2.5 for Linux Debian package<a class="headerlink" href="#taverna-command-line-25-for-linux-debian-package" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-linux">taverna-commandline-core-2.5.0-linux_amd64.deb</a></li>
+<li>SHA1: 52238b88cfb234618dbb6354f454f691458d92b2</li>
+<li>MD5: f9242892270688849f9d2ccf38e9d84a</li>
+</ul>
+<p><a name="#zip"></a></p>
+<h2 id="taverna-command-line-25-standalone">Taverna Command Line 2.5 standalone<a class="headerlink" href="#taverna-command-line-25-standalone" title="Permanent link">&para;</a></h2>
+<p>This is operating system and architecture-neutral binary.
+Check the standalone's <a href="/download/system-requirements#standalone">system requirements</a>.</p>
+<ul>
+<li><a href="http://www.taverna.org.uk/download/command-line-tool/2-5/core/#download-binary">taverna-commandline-core-2.5.0-standalone.zip</a></li>
+<li>SHA1: 3311b223a6a1d75c578500030b6a2c75a7413cf8</li>
+<li>MD5: d4b283fdb60bc830fd2b60b163afd590</li>
+</ul></div>
+
+    </div>
+
+        <footer class="footer">
+      <div class="container">
+
+           <p id="copyright" class="text-muted">
+              Copyright &#169; 2014-2016 The Apache Software Foundation, Licensed under the
+              <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+              Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+          </p>
+      </div>
+    </footer>
+
+
+    <script src="/lib/jquery/jquery-1.11.1.min.js"></script>
+<script src="/lib/bootstrap/js/bootstrap.min.js"></script>
+
+<!--script>
+	jQuery(function($) {
+        if($(window).width()>769){
+            $('.navbar .dropdown').hover(function() {
+                $(this).find('.dropdown-menu').first().stop(true, true).delay(250).slideDown();
+
+            }, function() {
+                $(this).find('.dropdown-menu').first().stop(true, true).delay(100).slideUp();
+
+            });
+
+            $('.navbar .dropdown > a').click(function(){
+                location.href = this.href;
+            });
+
+        }
+    });
+</script-->
+
+  </body>
+</html>
\ No newline at end of file

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 Mon May  9 14:57:06 2016
@@ -193,7 +193,7 @@ h2:hover > .headerlink, h3:hover > .head
      Taverna 2.5 (non-Apache) Workbench is the latest series of the Workbench;
      it is highly recommended that you use this version if you are new to Taverna,
      or migrate to this version if you have used an earlier Taverna Workbench before.</li>
-<li><a href="/download/command-line-tool">Taverna Command Line Tool</a> enables you to run
+<li><a href="/download/commandline">Taverna Command Line Tool</a> enables you to run
      workflows from a command prompt.
      This enables automated execution of workflows, e.g. on a Linux server.</li>
 <li><a href="/download/server">Taverna Server</a> is the remote workflow execution service that enables you

Modified: websites/staging/taverna/trunk/content/download/system-requirements/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/system-requirements/index.html (original)
+++ websites/staging/taverna/trunk/content/download/system-requirements/index.html Mon May  9 14:57:06 2016
@@ -185,7 +185,7 @@ Currently there is no Apache approved di
 </div>
 
 <h2 id="operating-system">Operating system<a class="headerlink" href="#operating-system" title="Permanent link">&para;</a></h2>
-<p>Taverna <a href="/download/workbench">Workbench</a> and <a href="/download/command-line-tool">Command Line</a> 
+<p>Taverna <a href="/download/workbench">Workbench</a> and <a href="/download/commandline">Command Line</a> 
   are available either in platform-specific or platform-neutral distributions. 
 We generally recommend the platform-specific distributions as they include any required
    third-party software.</p>

Modified: websites/staging/taverna/trunk/content/download/workbench/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/workbench/index.html (original)
+++ websites/staging/taverna/trunk/content/download/workbench/index.html Mon May  9 14:57:06 2016
@@ -207,9 +207,9 @@ Note that the license for Taverna Workbe
 <li><a href="/download/maven">Maven repository</a></li>
 <li><a href="/code">Source code</a></li>
 </ul>
-<p>Taverna <a href="/documentation/command-line">Command Line Tool</a>,
-  which is included in all workbench downloads,
-  is available as a <a href="/download/command-line-tool">stand-alone download</a>.</p>
+<p>For executing workflows without a user interface you might
+also be interested in the 
+Taverna <a href="/download/commandline/">Command Line Tool</a>.</p>
 <p>Check <a href="/download/system-requirements">system requirements</a> before you download
   Taverna.</p>
 <h2 id="adding-plugins">Adding plugins<a class="headerlink" href="#adding-plugins" title="Permanent link">&para;</a></h2>

Modified: websites/staging/taverna/trunk/content/introduction/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/introduction/index.html (original)
+++ websites/staging/taverna/trunk/content/introduction/index.html Mon May  9 14:57:06 2016
@@ -235,7 +235,7 @@ Taverna was started by the <a href="http
 <area shape="rect" coords="554,222,678,290" 
    href="download/server/2-2/" alt="Taverna Virtual Machine" />
 <area shape="rect" coords="434,284,558,352" 
-   href="/download/command-line-tool/" alt="Command Line Tool" />
+   href="/download/commandline/" alt="Command Line Tool" />
 <area shape="rect" coords="560,290,678,358" 
    href="http://www.osgi.org/Main/HomePage" alt="OSGi Alliance" />
 <area shape="rect" coords="200,344,422,380" 
@@ -250,7 +250,7 @@ Taverna was started by the <a href="http
    [Taverna Workbench][/download/workbench/] (the desktop client application) and 
    <a href="/documentation/server/">Taverna Server</a>
    (which executes remote workflows). 
-Taverna is also available as a <a href="/documentation/command-line-tool/">Command Line Tool</a> 
+Taverna is also available as a <a href="/download/commandline/">Command Line Tool</a> 
    for faster execution of workflows from a terminal without the overhead of a GUI.
 Taverna automates experimental methods through the use of a number of different (local or remote) services from 
    a diverse set of domains &#8211; biology, chemistry and medicine to music, meteorology and social sciences.</p>