X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=website%2Fdownload.html;h=88923dff7fdb68f8b82bbd3cb764429722bdab11;hb=c219257fd9512af182cd65ab5bda8d3dc7ef12c6;hp=fe56e7d123eb227eb14bf1b2e06055bab68bdcea;hpb=7c102bb3efc01ed4768aa04f5e43f9143c244778;p=jabaws.git

diff --git a/website/download.html b/website/download.html
index fe56e7d..88923df 100644
--- a/website/download.html
+++ b/website/download.html
@@ -38,7 +38,7 @@ page</title>
 <!-- panel end-->
 <div id="content">
   <h2 id="headtitle" style="text-align:left">JABAWS Server Virtual Machine</h2>
-  <p><span style="text-align:left">JABAWS virtual machine is a way of running fully functional JABA Web Services on your own computer. To use virtual machine (VM) you have to install a software for running it. We would recommend <a href="http://www.vmware.com/products/player">VMWare Player</a> for Windows and Linux users. There is also an  <a href="http://www.virtualbox.org/wiki/Download_Old_Builds_3_2">Oracle VirtualBox</a> (version 3.2.12) for Mac users. Both are free and installation is simple.  <a href="http://www.jalview.org/download.html">Jalview</a></span> can <a href="man_servervm.html#jalviewWithJaba">use your local JABAWS VM</a>. </p>
+  <p><span style="text-align:left">JABAWS virtual machine is a way of running fully functional JABA Web Services on your own computer. To use virtual machine (VM) you have to install a software for running it. We would recommend <a href="http://www.vmware.com/products/player">VMWare Player</a> for Windows and Linux users or <a href="http://www.vmware.com/products/fusion/overview.html">VMware Fusion</a> for Mac users.    <a href="http://www.jalview.org/download.html">Jalview</a></span> can <a href="man_servervm.html#jalviewWithJaba">use your local JABAWS VM</a>. </p>
   <ul>
     <li> JABAWS Virtual Appliance: <a href="http://www.compbio.dundee.ac.uk/jabaws/archive/jabaws-vm.zip">download</a> (520M)</li>
     </ul>
@@ -46,11 +46,12 @@ page</title>
 
 
 <h2><a name="jabawswar" id="jabawswar"></a>JABAWS Server Web Application </h2>
-<p> The JABAWS Server Web Application aRchive (WAR) version is for you if you want to deploy JABAWS for many users e.g. your laboratory or if you are an expert user and want to have more control on JABAWS. Typically, you will have a cluster or at least a powerful server machine which all users are willing to use. If you only have a single server then, you may use JABAWS Server Virtual Appliance instead. The server is provided as a self-contained <a href="http://en.wikipedia.org/wiki/WAR_(Sun_file_format)">Web Application
-aRchive (WAR) </a> containing all necessary binaries. WAR file can be deployed on any
- web application server
-<!-- Note - mention servlet 2.4 compliance here? -->supporting at least version 2.4 of the Java servlet specification, i.e. <a href="http://tomcat.apache.org/download-60.cgi">Tomcat 7.0</a>. </p>
-
+<p> The JABAWS Server Web Application aRchive (WAR) version is for you if you want to deploy JABAWS for many users e.g. your laboratory or if you are an expert user and want to have more control on JABAWS. You can also use this version for Mac and Linux computers if you do not want to use virtualization. Finally, you can use this version with a cluster. <br/>
+  The server is provided as a self-contained <a href="http://en.wikipedia.org/wiki/WAR_(Sun_file_format)">Web Application
+  aRchive (WAR) </a> containing all necessary binaries. WAR file can be deployed on any
+  web application server
+  <!-- Note - mention servlet 2.4 compliance here? -->
+  supporting at  the Java servlet specification v. 2.4 or above, i.e. <a href="http://tomcat.apache.org/download-60.cgi">Tomcat 7.0</a>. </p>
 <ul>
 <li>A Complete Server for all platforms: <a href=
 "http://www.compbio.dundee.ac.uk/jabaws/archive/jaba.war">download</a>
@@ -58,7 +59,7 @@ aRchive (WAR) </a> containing all necessary binaries. WAR file can be deployed o
 </ul>
 
 
-<p>Please bear in mind that if you deploy JABAWS WAR on Windows, only the Muscle and Clustal web services will work! If you want to run the other web services on Windows, then use the JABAWS Server VM package instead.  
+<p>Please bear in mind that if you deploy JABAWS WAR on Windows, not all web services will be functional.  Use the JABAWS Server VM package instead.  
   <!-- content end-->
 </p>