svn commit: r943300 [2/3] - in /websites/staging/taverna/trunk: cgi-bin/ content/ content/about/ content/community/ content/doc/ content/download/ content/download/code/ content/download/command-line-tool/ content/download/language/ content/download/ma...

[buildbot]

Modified: 
websites/staging/taverna/trunk/content/download/command-line-tool/index.html
==============================================================================
--- 
websites/staging/taverna/trunk/content/download/command-line-tool/index.html 
(original)
+++ 
websites/staging/taverna/trunk/content/download/command-line-tool/index.html 
Wed Mar 11 08:35:22 2015
@@ -104,188 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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</h1>
-      <div id="content"><div class="alert alert-info" role="alert"><p>
-<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-Taverna is transitioning to the Apache Incubator. 
-Currently there is no Apache version of the Command Line.
-This page is a template for the download page once an Apache version is 
available. 
-</div>
-
-<p>The first Apache version of the command line is unlikely to include all the 
features of 
-  Taverna 2.5.
-If there are particular features you feel should be prioritized please <a 
href="/community">contact us</a>.</p>
-<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</h3>
-<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</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.<br />
-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/";>None 
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</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: 61fbd2d523b4b6d8b609981775a318ae5f52d5b4</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</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: b74d21ef3cff3550bdad4b948982e8ca012527d6</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</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: 19ed9725c283c100bae2133af5fc85ea533984a6</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</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: 19ed9725c283c100bae2133af5fc85ea533984a6</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</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: bd417d8bc71d96aa111efc51447259f3ed551c1d</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</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: 113002d562827e3f560daf3bf665df71b4e0a00b</li>
-<li>MD5: d4b283fdb60bc830fd2b60b163afd590</li>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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 Wed Mar 11 
08:35:22 2015
@@ -104,163 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>Download</h1>
-      <div id="content"><h2 id="which-taverna-to-download">Which Taverna to 
download?</h2>
-<p>There are several Taverna tools that you can download:</p>
-<ul>
-<li><a href="/download/workbench">Taverna Workbench</a> enables you to 
graphically create, edit and 
-     run workflows on your computer. 
-     (None Apache) Taverna 2.5 Workbench is the latest series of the 
Workbench; 
-     it is highly recommended that you use this version if you are new to 
Taverna, 
-     or to migrate to this version if you have used an earlier Taverna 
Workbench before.</li>
-<li><a href="/download/language">Taverna Language</a> (Soon to be released) 
Language used to specify 
-     Taverna Workflows</li>
-<li><a href="/download/command-line-tool">Taverna Command Line Tool</a> (Not 
yet Apache) 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 
-      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 in nature so that 
-      various plugins can be added in order to increase its functionality.</li>
-</ul>
-<h2 id="associated-tools">Associated tools</h2>
-<p>There is also a number of associated tools available to use with 
(non-Apache) Taverna 2. </p>
-<blockquote>
-<p><strong>Note</strong>: There are currently no known plans to bring out 
Apache Taverna
-versions of these tools. If you are interested in migrating these too
-to Apache Taverna, please <a href="/community">contact us</a>.</p>
-</blockquote>
-<ul>
-<li><a href="http://www.taverna.org.uk/download/taverna-galaxy/";>Taverna 
2-Galaxy</a> is a tool for automatic generation and exposure of 
-   Taverna workflows as <a href="http://galaxy.psu.edu/";>Galaxy</a> tools. 
-   Galaxy is an open, Web-based platform for data intensive biomedical 
research.</li>
-<li><a 
href="http://www.taverna.org.uk/download/associated-tools/dataviewer-tool/";>DataViewer
 Tool</a></li>
-<li><a 
href="http://www.taverna.org.uk/download/associated-tools/api-consumer-tool";>API
 Consumer Tool</a></li>
-<li><a 
href="http://dev.mygrid.org.uk/wiki/display/taverna/Interaction+service";>Interaction
 Service</a></li>
-<li><a 
href="http://www.taverna.org.uk/download/associated-tools/webservice-data-proxy";>Web
 service Data Proxy</a></li>
-<li><a 
href="http://www.taverna.org.uk/download/associated-tools/workflow-monitor";>Workflow
 Monitor</a></li>
-<li><a 
href="http://www.taverna.org.uk/download/associated-tools/seahawk-applet/";>Seahawk
 Applet</a></li>
-</ul>
-<h2 id="apache-taverna">Apache Taverna</h2>
-<p>There are not yet any public releases of Apache Taverna.</p>
-<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>.</p>
-<h3 id="license">License</h3>
-<p>Apache Taverna is distributed under the <a 
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache Software License 
2.0</a>.</p>
-<h3 id="planned-releases">Planned releases</h3>
-<p>The project is planning a staged set of releases for Apache Taverna 3.x:</p>
-<ol>
-<li>taverna-language 3.0.0</li>
-<li>taverna-command-line 3.0.0</li>
-<li>taverna-server 3.0.0</li>
-<li>taverna-workbench 3.0.0-alpha3</li>
-<li>taverna.workbench 3.0.0</li>
-</ol>
-<h2 id="non-apache-taverna">Non-Apache Taverna</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)</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>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/language/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/language/index.html 
(original)
+++ websites/staging/taverna/trunk/content/download/language/index.html Wed Mar 
11 08:35:22 2015
@@ -104,107 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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 Language</h1>
-      <div id="content"><p>The Taverna Language SCUFL2 will be the first 
Taverna product released under Apache.</p>
-<p>Download detail will here here shortly.</p></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/maven/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/maven/index.html (original)
+++ websites/staging/taverna/trunk/content/download/maven/index.html Wed Mar 11 
08:35:22 2015
@@ -104,138 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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></h1>
-      <div id="content"><div class="alert alert-info" role="alert"><p><span 
class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-Taverna is transitioning to the Apache Incubator. 
-Currently there is no Apache release of any Taverna products.
-This page is a template for the download page once an Apache version is 
available. 
-</div>
-
-<h2 id="pre-apache-releases-and-snapshots">Pre Apache Releases and 
Snapshots</h2>
-<p>The pre Apache Taverna code is available as a maven download from 
-  <a 
href="http://repository.mygrid.org.uk/artifactory/mygrid-all/";>http://repository.mygrid.org.uk/artifactory/mygrid-all/</a></p>
-<h4 id="release-repository">Release repository</h4>
-<div class="codehilite"><pre><span class="nt">&lt;repository&gt;</span>
-    <span class="nt">&lt;id&gt;</span>mygrid-repository<span 
class="nt">&lt;/id&gt;</span>
-    <span class="nt">&lt;name&gt;</span>myGrid Repository<span 
class="nt">&lt;/name&gt;</span>
-    <span 
class="nt">&lt;url&gt;</span>http://www.mygrid.org.uk/maven/repository<span 
class="nt">&lt;/url&gt;</span>
-    <span class="nt">&lt;releases</span> <span class="nt">/&gt;</span>
-    <span class="nt">&lt;snapshots&gt;</span>
-        <span class="nt">&lt;enabled&gt;</span>false<span 
class="nt">&lt;/enabled&gt;</span>
-    <span class="nt">&lt;/snapshots&gt;</span>
-<span class="nt">&lt;/repository&gt;</span>
-</pre></div>
-
-
-<h4 id="snapshot-repository">Snapshot repository</h4>
-<div class="codehilite"><pre><span class="nt">&lt;repository&gt;</span>
-    <span class="nt">&lt;id&gt;</span>mygrid-snapshot-repository<span 
class="nt">&lt;/id&gt;</span>
-    <span class="nt">&lt;name&gt;</span>myGrid Snapshot Repository<span 
class="nt">&lt;/name&gt;</span>
-    <span 
class="nt">&lt;url&gt;</span>http://www.mygrid.org.uk/maven/snapshot-repository<span
 class="nt">&lt;/url&gt;</span>
-    <span class="nt">&lt;releases&gt;</span>
-        <span class="nt">&lt;enabled&gt;</span>false<span 
class="nt">&lt;/enabled&gt;</span>
-    <span class="nt">&lt;/releases&gt;</span>
-    <span class="nt">&lt;snapshots</span> <span class="nt">/&gt;</span>
-<span class="nt">&lt;/repository&gt;</span>
-</pre></div></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/pre-apache.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/pre-apache.html (original)
+++ websites/staging/taverna/trunk/content/download/pre-apache.html Wed Mar 11 
08:35:22 2015
@@ -104,144 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>Earlier (non-Apache) releases</h1>
-      <div id="content"><div class="alert alert-warning" role="alert"><span 
class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
-These earlier releases were made before incubation, and are 
-<strong>not endorsed</strong> by or provided by the Apache Software 
Foundation. 
-</div>
-
-<h3 id="taverna-30-alpha">Taverna 3.0 alpha</h3>
-<p>myGrid release: <a 
href="http://www.taverna.org.uk/developers/work-in-progress/taverna-3/";>Taverna 
3 alpha</a>,
-license: <a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL 2.1</a></p>
-<p>Binary downloads provided by <a 
href="https://launchpad.net/taverna/t3/";>launchpad.net</a>.</p>
-<p>Maven repository provided by University of Manchester:</p>
-<ul>
-<li><a 
href="http://www.mygrid.org.uk/maven/snapshot-repository/";>http://www.mygrid.org.uk/maven/snapshot-repository/</a></li>
-</ul>
-<h3 id="taverna-250">Taverna 2.5.0</h3>
-<p>myGrid release: <a href="http://www.taverna.org.uk/download/";>Taverna 
2.5</a>, license: <a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL 
2.1</a>
- / <a href="https://www.gnu.org/licenses/gpl-3.0.html";>GPL 3.0</a></p>
-<p>Binary downloads provided by <a 
href="https://bitbucket.org/";>bitbucket.org</a>:</p>
-<ul>
-<li><a 
href="https://bitbucket.org/taverna/taverna-workbench-product/downloads/";>Taverna
 Workbench 2.5</a></li>
-<li><a 
href="https://bitbucket.org/taverna/taverna-commandline-product/downloads";>Taverna
 Command Line 2.5</a></li>
-<li><a href="https://launchpad.net/taverna-server/+milestone/2.5.4";>Taverna 
Server 2.5</a></li>
-</ul>
-<p>Maven repository provided by University of Manchester:</p>
-<ul>
-<li><a 
href="http://www.mygrid.org.uk/maven/repository/";>http://www.mygrid.org.uk/maven/repository/</a></li>
-</ul>
-<h3 id="taverna-24-and-older">Taverna 2.4 and older</h3>
-<p>Taverna 2.4 and older can be downloaded from <a 
href="https://launchpad.net/";>launchpad.net</a>, <a 
href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL 2.1</a> license:</p>
-<ul>
-<li><a href="https://launchpad.net/taverna/";>Taverna Workbench &amp; command 
line 2.x</a></li>
-<li><a href="https://launchpad.net/taverna-server/";>Taverna Server 2.x</a></li>
-</ul>
-<h3 id="taverna-1">Taverna 1</h3>
-<ul>
-<li><a href="http://www.mygrid.org.uk/tools/taverna/taverna-download/";>Taverna 
Workbench 1.7</a></li>
-<li><a href="http://sourceforge.net/projects/taverna/files/";>Taverna Workbench 
1.6 and older</a></li>
-<li><a 
href="http://prdownloads.sourceforge.net/taverna/workflowlauncher-0.1.2.zip?download";>Taverna
 workflow launcher 0.1.2</a> (for 1.7)</li>
-<li><a 
href="http://sourceforge.net/projects/taverna/files/taverna%20utilities/utils/";>Taverna
 remote execution service 0.5</a></li>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/server/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/server/index.html (original)
+++ websites/staging/taverna/trunk/content/download/server/index.html Wed Mar 
11 08:35:22 2015
@@ -104,184 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>None Apache Taverna Server</h1>
-      <div id="content"><div class="alert alert-info" role="alert"><p><span 
class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-Taverna is transitioning to the Apache Incubator. 
-Currently there is no Apache version of Taverna Server. 
-This page is a template for the download page once an Apache version is 
available. 
-</div>
-
-<p>This version of the Server is based on Taverna 2.5 and is called 
<strong>Taverna Server 2.5.4</strong>. 
-<a href="/documentation/server/">Documentation</a> for the Server is available 
on-line.</p>
-<h2 id="installation">Installation</h2>
-<p>Download the <strong><a 
href="http://www.taverna.org.uk/download/server/2-5/";>Taverna Server 2.5.4 
WAR</a></strong> and 
-   follow the 
-   <a 
href="http://dev.mygrid.org.uk/wiki/display/taverna/Installation+Guide";>installation
 instructions</a>.</p>
-<ul>
-<li>
-<p><a href="http://www.taverna.org.uk/download/server/2-5/";>Taverna Server 
2.5.4</a> (WAR, 196 MiB)</p>
-<ul>
-<li>MD5: 20d27405b27a3418b783777171734514   </li>
-<li>SHA1:d2909ad0b222a001639c5337171b9e2b553f1cbc</li>
-</ul>
-</li>
-<li>
-<p><a href="http://www.taverna.org.uk/download/server/2-5/";>Installation 
Guide</a> (PDF, 7 MiB)</p>
-<ul>
-<li>MD5: a91d2ccb0aca9322a92e9d456a1389aa</li>
-<li>SHA1: d90daf85c09035caca48536cefd4d2d557aeca3a</li>
-</ul>
-</li>
-<li>
-<p><a href="http://www.taverna.org.uk/download/server/2-5/";>User Guide</a> 
(PDF, 13 MiB)</p>
-<ul>
-<li>MD5: 25f75e419a018d03252c63fbcd111a5f</li>
-<li>SHA1: d080ea3765e8ef41a8cecc6564bf2aaf11b78199</li>
-</ul>
-</li>
-</ul>
-<p>The software distributor Launchpad has an archive of 
-   <a href="https://launchpad.net/taverna-server/+series";>earlier None Apache 
releases of Taverna Server</a>.</p>
-<h2 id="system-requirements">System Requirements</h2>
-<h4 id="operating-system">Operating system</h4>
-<p>The Server can currently be installed on Linux and Mac OS X.</p>
-<h4 id="java">Java</h4>
-<p>You will need a Java 7 installation or newer. 
-Either OpenJDK 7 or Oracle Java 7 are recommended.</p>
-<blockquote>
-<p>If using Oracle Java 7, you must install the 
-  <strong><a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html";>Java
 Cryptography Extension extension for Java
-  1.7</a></strong>
-  and follow the included README on how to install the JCE to
-  <em>lib/security/</em> of your Java installation. 
-  This is <em>not</em> necessary for OpenJDK 7.</p>
-</blockquote>
-<h4 id="webapp-container">WebApp container</h4>
-<p>You will need a suitable servlet container.</p>
-<p>The Server has been developed using <a 
href="http://tomcat.apache.org/download-60.cgi";>Tomcat 6.0.26</a>
-   as the servlet container, but other versions of Tomcat are known to work 
-   (back to at least Tomcat 6.0.20, and up to Tomcat 7.0.53) and other 
containers may also 
-   function correctly as no Tomcat-specific APIs are used in the deployable 
code. 
-   We welcome feedback on which containers work, as well as on how to 
configure them.</p>
-<h2 id="source-code">Source Code</h2>
-<p>The source code to Apache Taverna Server is available from the Taverna 
project';s 
-   <a 
href="https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-server.git";>space
 on Apache;s Git Server</a>. 
-The 2.5.4 release was made automatically using Apache Maven from the 
-   <a 
href="https://github.com/taverna/taverna-server/releases/tag/2.5.4";>2.5.4</a> 
git tag; 
-   you may download the <a 
href="http://www.taverna.org.uk/download/server/2-5/";>exact source tree</a> 
-   if you wish, but it is easier to fork and check out the code.</p>
-<p>If you encounter any problems, please <a href="/community">contact 
us</a>.</p>
-<h2 id="client-side-stuff">Client side stuff</h2>
-<p>To complement the Taverna Server, 
-   we have developed several client side libraries and applications. 
-They access the Server's functionality and can help you build your client 
applications around 
-   the Server and provide exemplars of how such applications can  be 
implemented.</p>
-<h3 id="general">General</h3>
-<ul>
-<li>A <a href="https://github.com/myGrid/taverna2-gem";>Ruby gem</a> that 
enables you to interact with 
-     Taverna 2 workflows (.t2flow files). 
-   You can generate a t2flow model using the gem, and then use it to retrieve 
various 
-      information about the workflow by invoking different methods and 
attributes. You can also draw a workflow diagram using the gem.</li></li>
-<li>A <a href="https://rubygems.org/gems/taverna-baclava";>Ruby gem</a> for 
handling Baclava files.</li>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/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 
Wed Mar 11 08:35:22 2015
@@ -104,191 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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></h1>
-      <div id="content"><div class="alert alert-info" role="alert"><p><span 
class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-Taverna is transitioning to the Apache Incubator. 
-Currently there is no Apache approved distribution.
-</div>
-
-<h2 id="operating-system">Operating system</h2>
-<p>Taverna <a href="/download/workbench">Workbench</a> and <a 
href="/download/command-line-tool">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>
-<p>Platform-specific distributions are available for <small>(and tested 
on)</small>:</p>
-<ul>
-<li>Windows 64-bit (.exe installer) <small>(7, 8, 8.1)</small></li>
-<li>Windows 32-bit (.exe installer) <small>(7)</small></li>
-<li>Mac OS X 64-bit (.dmg disk image) <small>(10.8, 10.9)</small></li>
-<li>Linux 64-bit Debian-based (.deb package) <small>(Ubuntu 12.04.4, Bio-Linux 
7)</small></li>
-<li>Linux 64-bit Redhat-based (.rpm package) <small>(Fedora 20)</small></li>
-</ul>
-<p>Platform-neutral distributions are available as:</p>
-<ul>
-<li>Zip file</li>
-</ul>
-<p>The platform-neutral distribution has <a href="#standalone">additional 
system requirements</a>.</p>
-<h2 id="linux-libgnome">Linux: libgnome</h2>
-<p>If you want to use the 
-   <a 
href="http://dev.mygrid.org.uk/wiki/display/taverna/Interaction+service";>Interaction
 service</a> 
-   from Taverna, for some versions of Linux it may be necessary to install the 
<strong>libgnome-2.0</strong>
-   package or equivalent. 
-This library is required to allows Taverna to open pages in your preferred Web 
browser and 
-   connect to the interactive service being called from the workflow.</p>
-<h2 id="memory">Memory</h2>
-<p>It is a good idea for your machine to have at least 2GB of RAM. 
-Taverna will run with less memory than that, but its performance may be 
affected.</p>
-<p>The Taverna Workbench installations for 64-bit operating systems will use 
by default up to 
-1 GB of working memory, plus up to 400 MB used by the Java runtime; 
-while installations for 32-bit operating systems and platform-independent 
installations will 
-use up to 700 MB of working memory, plus up to 200 MB used by Java runtime.</p>
-<blockquote>
-<p>If Taverna happens to run out of memory while running a workflow with
-large data or large number of data, you can set Taverna to store data
-in a database by going to <strong>Preferences -&gt; Data and 
Provenance</strong> and 
-removing the tick for <strong>“In-memory storage”</strong>.
-This will reduce execution speed slightly, but should consume less memory. 
-Also remember to remove any old runs you are no longer interested in.
-<a 
href="http://www.mygrid.org.uk/dev/wiki/display/taverna/Data+and+provenance+preferences";>User
 guide: Data and provenance preferences</a>
-has more details on the data settings in Taverna.</p>
-</blockquote>
-<p>If you need to increase the available memory, for Windows and Linux edit 
the 
-  <em>taverna.vmoptions</em> (and <em>executeworkflow.vmoptions</em>) file 
inside Taverna's installation 
-  directory (which might require administrator privileges). 
-You can then replace <em>-Xmx700m</em> or <em>-Xmx1g</em> with say 
<em>-Xmx1500m</em> to use 1.5 GB. 
-For OS X, you would need to modify the <em>Info.plist</em> file 
-   (right click on Taverna application in Finder and select <strong>Show 
Package Content</strong> 
-   and go inside the application bundle to find <em>Contents/Info.plist</em>) 
and change the same 
-   parameter under JavaVM using the <em>Property List Editor</em>. 
-For platform-neutral Taverna installations not using <em><em>.vmoptions</em> 
you may instead have to 
-   modify the </em>taverna.sh/taverna.bat<em> (Windows) and 
</em>executeworkflow.bat/executeworkflow.sh*.</p>
-<p><a 
href="http://dev.mygrid.org.uk/wiki/display/taverna/Memory+allocation";>User 
guide: Memory allocation</a>
-   has more details on configuring memory allocation.</p>
-<p><a name=standalone></a></p>
-<h2 id="taverna-standalone-requirements">Taverna Standalone requirements</h2>
-<p>Java and Graphviz are included in the platform specific downloads but not 
in the zip downloads.</p>
-<h3 id="java">Java</h3>
-<p>If you download a platform-neutral Taverna installation, you will need to 
install Java 7 or 
-   higher.</p>
-<p>For Oracle's Java 7 you would have also have to install the 
-   <a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html";>Java
 Cryptography Extension</a>
-   separately.</p>
-<p>For <a href="http://openjdk.java.net/";>OpenJDK 7</a>, you do not need to 
install the Java Cryptography 
-   Extension as it is already included. 
-   On Linux, <em>apt-get install openjdk-7-jdk</em> or equivalent is usually 
sufficient.</p>
-<blockquote>
-<p>Taverna 2.5 has not been tested with Java 8.</p>
-<p>On newer versions of <strong>Mac OS X</strong>, Taverna Workbench might 
need the 
-   <a href="http://xquartz.macosforge.org/landing/";>XQuarts</a> shared X11 
libraries to be installed.</p>
-</blockquote>
-<h3 id="graphviz">GraphViz</h3>
-<p>If you download the platform-neutral Taverna Workbench installation, 
-   it includes binaries of the Graphviz tool, 
-   which is used for generating workflow diagrams in Taverna. 
-Binaries are included for OS X, Linux x86/x64 and Windows within the 
<em>bin</em> folder.</p>
-<p>In most cases Taverna should be able to pick up the location of the 
Graphviz binary <em>dot</em> 
-   from the download after you have installed it. 
-If this is not the case, see 
-   <a 
href="http://www.mygrid.org.uk/dev/wiki/display/taverna/Workbench+preferences";>User
 guide: Workbench preferences</a>
-   on how to configure the location of <em>dot</em> executable in Taverna 
Workbench.</p></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/workbench/index.html
==============================================================================
--- websites/staging/taverna/trunk/content/download/workbench/index.html 
(original)
+++ websites/staging/taverna/trunk/content/download/workbench/index.html Wed 
Mar 11 08:35:22 2015
@@ -104,195 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>None Apache Workbench 2.5</h1>
-      <div id="content"><div class="alert alert-info" role="alert"><p><span 
class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-Taverna is transitioning to the Apache Incubator. 
-Currently there is no Apache version of the Workbench.
-This page is a template for the download page once an Apache version is 
available. 
-</div>
-
-<p>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 
href="/community">contact us</a>.</p>
-<h3 id="download-formats">Download Formats</h3>
-<p>Taverna Workbench 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>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>Check <a href="/download/system-requirements">system requirements</a> 
before you download 
-  Taverna. </p>
-<h2 id="adding-plugins">Adding plugins</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 workbench 
-   download, and if so how this will be done.<br />
-If you are interested in domain specific versions of Taverna as done in 
-   <a href="http://www.taverna.org.uk/download/workbench/2-5/";>None Apache 
Taverna 2.5</a> please 
-   <a href="/community">contact us</a>.</p>
-<h2 id="next-steps">Next steps</h2>
-<p>See the <a href="/download/workbench/release-notes">release notes</a> for 
details about what is new 
-   in this release. 
-Follow the <a href="/documentation/quick-start-guide">quick start guide</a> if 
you are new to Taverna.
-<a href="/documentation/example-workflows">Example workflows</a> are available 
in the Starter Pack of 
-  the myExperiment tab within the Workbench.
-<a href="/documentation/service-sets">Service sets</a> are available for 
various domains to allow you to 
-  customize services that appear in your Workbench.
-If you run into issues, check the <a 
href="http://dev.mygrid.org.uk/wiki/display/taverna";>User Manual</a>
-   or <a href="/community">contact us</a>.</p>
-<p><a name="windows64"></a></p>
-<h2 id="taverna-workbench-25-for-windows-64-bit">Taverna Workbench 2.5 for 
Windows 64-bit</h2>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/2-5/core/#download-windows";>taverna-workbench-core-2.5.0-winx64.exe</a></li>
-<li>SHA1: 001c8d3dace245e54996d3bb6b68ea4a8f46dd9b</li>
-<li>MD5: 3467a6a87f40cc01c8588e8e7753875a</li>
-</ul>
-<p><a name="windows32"></a></p>
-<h2 id="taverna-workbench-25-for-windows-32-bit">Taverna Workbench 2.5 for 
Windows 32-bit</h2>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/2-5/core/#download-windows";>taverna-workbench-core-2.5.0-wini386.exe</a></li>
-<li>SHA1: 0643e384bbef03aa5192033677649cddb175141d </li>
-<li>MD5: 1233c91c7ad36e37f8fc6856a27f80fe</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-workbench-25-for-mac-os-x">Taverna Workbench 2.5 for Mac OS 
X</h2>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/2-5/core/#download-mac";>taverna-workbench-core-2.5.0-osx.dmg</a></li>
-<li>SHA1: 410b06a1655a607392601edf26b4324e491021d6</li>
-<li>MD5: 585b804806ffbb13c1fcac2ef0dad553</li>
-</ul>
-<p><a name="linuxdeb"></a></p>
-<h2 id="taverna-workbench-25-for-linux-rpm-package">Taverna Workbench 2.5 for 
Linux RPM package</h2>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/2-5/core/#download-linux";>taverna-workbench-core-2.5.0-linux_x86_64.rpm</a></li>
-<li>SHA1: 6ec0cc7c3f4c0edadb387de2983c610dc8c44945</li>
-<li>MD5: 3382e7a77c47d2d8a624e11fedb8b823</li>
-</ul>
-<p><a name="linuxrpm"></a></p>
-<h2 id="taverna-workbench-25-for-linux-debian-package">Taverna Workbench 2.5 
for Linux Debian package</h2>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/2-5/core/#download-linux";>taverna-workbench-core-2.5.0-linux_amd64.deb</a></li>
-<li>SHA1: 15a9ab5a2651f81e2cbe56db3caf920eba8bc1f1</li>
-<li>MD5: 8dd1d0d2b9579a3bc5a36caaa26898d</li>
-</ul>
-<p><a name="#zip"></a></p>
-<h2 id="taverna-workbench-25-standalone">Taverna Workbench 2.5 standalone</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/workbench/2-5/core/#download-binary";>taverna-workbench-core-2.5.0-standalone.zip</a></li>
-<li>SHA1: e1d23f5b208dffd3dedd953eb08e7e6387d01ae3</li>
-<li>MD5: 00d4d41ffeded092b4b02cf96abf1412</li>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/workbench/release-notes.html
==============================================================================
--- 
websites/staging/taverna/trunk/content/download/workbench/release-notes.html 
(original)
+++ 
websites/staging/taverna/trunk/content/download/workbench/release-notes.html 
Wed Mar 11 08:35:22 2015
@@ -104,111 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>Release notes</h1>
-      <div id="content"><h2 id="previous-none-apache-releases">Previous none 
Apache Releases</h2>
-<p>See the None Apache Website for release notes of previous versions:</p>
-<ul>
-<li><a 
href="http://www.taverna.org.uk/developers/work-in-progress/taverna-3/";>Taverna 
3</a></li>
-<li><a 
href="http://www.taverna.org.uk/download/workbench/release-notes/";>Taverna 
2</a></li>
-</ul></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/error_pages/404.html
==============================================================================
--- websites/staging/taverna/trunk/content/error_pages/404.html (original)
+++ websites/staging/taverna/trunk/content/error_pages/404.html Wed Mar 11 
08:35:22 2015
@@ -104,109 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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>404 File Not found</h1>
-      <div id="content"><p>Thank you for your interest in Taverna Apache 
(incubating).</p>
-<p>We regret that the page you are currently trying to find is not 
available.</p>
-<p>However please <a href="/community#mailinglists">contact us</a> so that we 
can answer your questions
-  as well as fix this page. </p></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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/error_pages/a.html
==============================================================================
--- websites/staging/taverna/trunk/content/error_pages/a.html (original)
+++ websites/staging/taverna/trunk/content/error_pages/a.html Wed Mar 11 
08:35:22 2015
@@ -104,106 +104,3 @@
                                          <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/workbench">TavernaWorkbench</a></li>
-                                         <li><a 
href="/download/language">Taverna's SCUFL2 Language</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/lists">Mailing Lists</a></li>
-                                         <li><a href="/community/irc">IRC 
chat</a></li>
-                                         <li><a 
href="/community#contribute">Contribute</a></li>
-                                         <li><a 
href="/community#reportbugs">Report a Bug</a></li>
-                                         <li><a href="/community/edit">Edit 
website</a></li>
-                                 </ul>
-                               </li>
-            </ul>
-             
-              <form >
-                      
-                      
-                      <!--<input type="submit" id="submit" value="Search">-->
-                    </form>
-              
-              <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></h1>
-      <div id="content"><p><span class="glyphicon 
glyphicon-pencil"></span>Improve this Page</p></div>
-
-    </div>
-
-        <footer class="footer">
-      <div class="container">
-           <p id="copyright" class="text-muted">
-              Copyright &#169; 2014-2015 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