X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=website%2Fman_about.html;fp=website%2Fman_about.html;h=55cdc98ae3289c6077493a309e9bf9609834891c;hb=0713a22dde55639aaeaf872c6b74eb782582ff73;hp=9d644d4bb44f77a4374b14642010aef04e81a8cd;hpb=f4babbbb38eaf55202bcb99a17ed006b3411cdf3;p=jabaws.git

diff --git a/website/man_about.html b/website/man_about.html
index 9d644d4..55cdc98 100644
--- a/website/man_about.html
+++ b/website/man_about.html
@@ -46,6 +46,7 @@
   <a href="ServiceStatus" title="JABAWS webservices status. Click to test all web services. Please be patient while the services are being checked">Services Status</a>
   <a href="contacts.html">Contact Us</a>
   <a href="http://www.compbio.dundee.ac.uk" title="University of Dundee, The Barton Group" >Barton Group</a>
+  <a href="jabaws_funding.html">Funding</a>
 </div>
 <!-- panel end-->
 
@@ -62,7 +63,9 @@
   <li><a href="#jabaclient">What is JABAWS Client</a>?</li>
   <li><a href="#jalviewsup">JABAWS versions compatibility and Jalview support </a></li>
   <li><a href="#cmdclient">Programmatic access to JABAWS</a></li>
-  </ul>
+</ul>
+
+
 
 <h3><a name="wisjaba" id="wisjaba"></a>What is JABAWS?</h3>
 <p>
@@ -82,17 +85,22 @@
   in writing your own client, the JABAWS command line client is what you need.
 </p>
 
+
+
 <h3><a name="wjaba" id="wjaba"></a>JABAWS Benefits</h3>
 <ul>
-<li>Can be deployed on most operating systems, as a VMware or other compatible Virtual Appliance or a Tomcat Java Web Application.</li>
-<li>Comes complete with sources and binaries for all the bioinformatics programs that it runs.</li>
-<li>Can operate as a stand alone server or one that submits jobs to a cluster <em>via</em> <a href="http://www.drmaa.org/">DRMAA</a>.</li>
-<li>Easy to access from <a href="http://www.jalview.org">Jalview</a> using its graphical client, or using the JABAWS command line client.</li>
-<li>Clients can submit jobs to any JABAWS servers that you might want to access, such as the one running on your local computer, 
-    your lab's server, or the publicly available services at the <a href="http://www.compbio.dundee.ac.uk/">University of Dundee</a>.</li>
-<li>Local or intranet installation eliminates any security concerns you might have about sending sensitive data over the internet.</li>
-<li>Wide range of configuration options to control size of jobs accepted by a server and the command line options available for the program run by a service.</li>
+  <li>Can be deployed on most operating systems, as a VMware or other compatible Virtual Appliance or a Tomcat Java Web Application.</li>
+  <li>Comes complete with sources and binaries for all the bioinformatics programs that it runs.</li>
+  <li>Can operate as a stand alone server or one that submits jobs to a cluster <em>via</em> <a href="http://www.drmaa.org/">DRMAA</a>.</li>
+  <li>Easy to access from <a href="http://www.jalview.org">Jalview</a> using its graphical client, or using the JABAWS command line client.</li>
+  <li>Clients can submit jobs to any JABAWS servers that you might want to access, such as the one running on your local computer, 
+      your lab's server, or the publicly available services at the <a href="http://www.compbio.dundee.ac.uk/">University of Dundee</a>.</li>
+  <li>Local or intranet installation eliminates any security concerns you might have about sending sensitive data over the internet.</li>
+  <li>Wide range of configuration options to control size of jobs accepted by a server and the command line options available for the program run by a service.</li>
 </ul>
+
+
+
 <h3><a name="alprog" id="alprog"/>JABA Web Services Programs </h3>
 <p> JABAWS currently provides access to the following programs:</p>
 <p>Multiple Sequence Alignement </p>
@@ -103,8 +111,7 @@
   <li><a href="http://www.drive5.com/muscle">Muscle</a> (version 3.8.31) </li>
   <li><a href="http://www.tcoffee.org/Projects_home_page/t_coffee_home_page.html">Tcoffee</a> (version 8.99) </li>
   <li><a href="http://probcons.stanford.edu/">Probcons</a> (version 1.12)</li>
-  </ul>
-
+</ul>
 <p>Protein disorder prediction</p>
 <ul>
   <li><span style="color:black; font-weight:normal; text-align:left;"><a href="http://dis.embl.de/">DisEMBL</a></span> (1.5) </li>
@@ -115,9 +122,12 @@
 <p>Amino Acid conservation </p>
 <ul>
   <li><span style="color:black; font-weight:normal; text-align:left;"><a href="http://www.compbio.dundee.ac.uk/aacon">AACon</a></span> (1.0) </li>
-  </ul>
+</ul>
+
+
+
 <h3><a name="jaba2.0.1"/></a>What is new in JABAWS 2.0.1? </h3>
-<p>JABAWS Version 2.0.1 includes several minor updates and bug fixes for <a href="#jaba2">JABAWS Version 2</a>. These are listed below:</p>
+<p>JABAWS Version 2.0.1 includes several bug fixes and minor updates for <a href="#jaba2">JABAWS Version 2</a>. These are listed below:</p>
 <ul>
   <li>Disembl returned swapped strings for HOTLOOPS and REM465</li>
   <li>Jronn failed to process jobs with more than 3 sequences</li>
@@ -126,6 +136,7 @@
       in one call</li>
   <li>JABAWS never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer then a period defined in Engine.properties</li>
   <li>Default web security has been incompatible with Tomcat 7.0.31 and newer</li>
+  <li>Documentation has been updated</li>
   </ul>
   <a name="jaba2"/><strong>JABAWS Version 2 (Released 16th Dec 2011)</strong><p>Compared to JABAWS 1, JABAWS 2 offers a greater number and diversity of web services, Amazon EC2 integration and improved ease of use.</p><p>It contains:</p>
 <ul><li>updates for all multiple sequence alignment services</li>
@@ -139,10 +150,11 @@
   <li>Amazon Machine Image (AMI) distributive to enable users to use JABAWS on the EC2 cloud</li>
   <li>Improved web services client API</li>
   <li>Simplified WAR package installation</li>
-  </ul>
+</ul>
+
 
-<h3><a name="jabaclient" id="jabaclient"></a>What is JABAWS client?</h3>
 
+<h3><a name="jabaclient" id="jabaclient"></a>What is JABAWS client?</h3>
 <p>
   A JABAWS client is a program that lets you run the bioinformatics methods for which a JABAWS server provides web 
   services. The most basic JABAWS client is a command line Java application which can call any of the JABAWS web 
@@ -154,21 +166,27 @@
   provides a graphical JABAWS client. This client has the same functionality as the command line client, but 
   instead allows JABAWS services to be accessed in a more user-friendly manner, through a graphical user interface.
 </p>
+
+
+
 <h3><a name="jalviewsup"></a>JABAWS versions compatibility and Jalview support </h3>
 <p>
   JABAWS version 2.0.1 is fully backward compatible with JABAWS v1.0 and v2.0. That means that all JABAWS v1.0 and 
   v2.0 clients should also be able to use JABAWS 2.0.1 services. To access the analysis web services introduced in
   JABAWS 2.0, however, clients that were designed for JABAWS v1.0 must be updated.
 </p>
+
+
+
 <h3><a name="cmdclient" id="cmdclient"></a>Programmatic access to JABAWS </h3>
 <p>
-JABA Web Services are WS-I basic profile compliant, which means they can be accessed using any programming language 
-or system that can utilize standard SOAP web services. The WSDL for each service is published on the JABAWS home 
-page, and you can use this to automatically generate service bindings for your program. If you use Java, however, 
-then you may wish to use our <a href="http://www.compbio.dundee.ac.uk/download">client package</a> to access JABAWS. 
-This package is based on the autogenerated source code produced by <span class="hightlight">wsimport</span>, which 
-is the Java tool for creating web service bindings; but in addition, offers some additional methods which simplify 
-working with JABAWS. For more information please refer to the <a href="dm_javadoc/index.html">data model javadoc</a>.
+  JABA Web Services are WS-I basic profile compliant, which means they can be accessed using any programming language 
+  or system that can utilize standard SOAP web services. The WSDL for each service is published on the JABAWS home 
+  page, and you can use this to automatically generate service bindings for your program. If you use Java, however, 
+  then you may wish to use our <a href="http://www.compbio.dundee.ac.uk/download">client package</a> to access JABAWS. 
+  This package is based on the autogenerated source code produced by <span class="hightlight">wsimport</span>, which 
+  is the Java tool for creating web service bindings; but in addition, offers some additional methods which simplify 
+  working with JABAWS. For more information please refer to the <a href="dm_javadoc/index.html">data model javadoc</a>.
 </p>
 </div><!-- content end-->
 <div id="copyright">Last update: 28 June 2013<br/>Sasha Sherstnev, Peter Troshin, Jim Procter and Geoff Barton, The Barton Group, University of Dundee, UK</div>