Merge branches 'JABAWS_Release_2_1' and 'JABAWS_Release_2_1' of https://source.jalvie...

Conflicts:
	website/man_about.html
Tweaked the wording a bit more - introduced standard man_about.html#jabaX.Y.Z style name anchor for update history

diff --cc website/index.html
index ee35139,c60ab98..532c5d1
--- 1/website/index.html
--- 2/website/index.html
+++ b/website/index.html
@@@ -114,13 -115,13 +114,11 @@@ title="http://www.compbio.dundee.ac.uk/
     or if you are concerned about privacy or on an unreliable network connection, then you can \r
     <a href="http://www.compbio.dundee.ac.uk/download">download</a> and run the JABAWS Server on your own hardware.</p>\r
  <h3>Previous versions of JABAWS </h3>\r
- <p>Old JABAWS versions are available here:\r
-   <strong><a href="http://www.compbio.dundee.ac.uk/jabaws1">http://www.compbio.dundee.ac.uk/jabaws1</a> and \r
-   <a href="http://www.compbio.dundee.ac.uk/jabaws2">http://www.compbio.dundee.ac.uk/jabaws2</a></strong>. \r
-   We advise you to update to the JABAWS 2.0.1 as this version is fully backward compatible with JABAWS v1.0 and v2.0 and \r
-   contain  numerous improvements. Please consult the <a href="man_about.html#jalviewsup">manual</a> for more information \r
-   on compatibility between versions.\r
- </p>\r
 -<p>Old JABAWS version is available here:\r
 -  <strong><a href="http://www.compbio.dundee.ac.uk/jabaws1">http://www.compbio.dundee.ac.uk/jabaws1</a> and \r
 -  <a href="http://www.compbio.dundee.ac.uk/jabaws2">http://www.compbio.dundee.ac.uk/jabaws2</a></strong>. \r
 -  We advise you to update to the JABAWS 2.0.1 as this version is fully backward compatible with JABAWS v1.0 and v2.0 and \r
 -  contain  numerous improvements. Please consult the <a href="man_about.html#jalviewsup">manual</a> for more information \r
 -  on versions compatibility.\r
 -</p>\r
++<p>We advise you to update to JABAWS 2.0.1 as this version is fully backward compatible with JABAWS v1.0 and v2.0 and \r
++  contains <a href="man_about.html#jaba2.0.1">some important bug fixes</a>. Please consult the <a href="man_about.html#jalviewsup">manual</a> for more information \r
++  on compatibility between versions.</p><p>Should you require them, however, old versions of JABAWS are available here:</p><ul><li>\r
++  <strong><a href="http://www.compbio.dundee.ac.uk/jabaws1">http://www.compbio.dundee.ac.uk/jabaws1</a></strong></li> \r
++  <li><strong><a href="http://www.compbio.dundee.ac.uk/jabaws2">http://www.compbio.dundee.ac.uk/jabaws2</a></strong></li></ul> \r
  <h3>Reference</h3>\r
  <p><span class="hightlight">\r
  </span> Peter V. Troshin, James B. Procter and Geoffrey J. Barton - &quot;Java Bioinformatics Analysis Web Services for \r

diff --cc website/man_about.html
index 20c6a22,1f55cbc..f0c9b53
--- 1/website/man_about.html
--- 2/website/man_about.html
+++ b/website/man_about.html
@@@ -79,20 -80,23 +79,22 @@@
    Virtual Appliance. It requires no configuration and is simple to install. If you want to install JABAWS for your \r
    lab or institution then download the JABAWS Web Application aRchive. It is slightly more complicated to configure \r
    but is very straightforward too. Finally, if you want to script against any version of JABAWS or are interested \r
-   in writing your own client, the JABAWS command line client is what you need. </p>\r
+   in writing your own client, the JABAWS command line client is what you need.\r
+ </p>\r
+ \r
  <h3><a name="wjaba" id="wjaba"></a>JABAWS Benefits</h3>\r
  <ul>\r
 -  <li>Can be deployed on most operating systems, as a VMware or other compatible Virtual Appliance or a Tomcat Java Web Application.</li>\r
 -  <li>Comes complete with sources and binaries for all the bioinformatics programs that it runs.</li>\r
 -  <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>\r
 -  <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>\r
 -  <li>Clients can submit jobs to any JABAWS servers that you might want to access, such as the one running on your local computer, \r
 -      your lab's server, or the publicly available services at the <a href="http://www.compbio.dundee.ac.uk/">University of Dundee</a>.</li>\r
 -  <li>Local or intranet installation eliminates any security concerns you might have about sending sensitive data over the internet.</li>\r
 -  <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>\r
 +<li>Can be deployed on most operating systems, as a VMware or other compatible Virtual Appliance or a Tomcat Java Web Application.</li>\r
 +<li>Comes complete with sources and binaries for all the bioinformatics programs that it runs.</li>\r
 +<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>\r
 +<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>\r
 +<li>Clients can submit jobs to any JABAWS servers that you might want to access, such as the one running on your local computer, \r
 +    your lab's server, or the publicly available services at the <a href="http://www.compbio.dundee.ac.uk/">University of Dundee</a>.</li>\r
 +<li>Local or intranet installation eliminates any security concerns you might have about sending sensitive data over the internet.</li>\r
 +<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>\r
  </ul>\r
 -\r
  <h3><a name="alprog" id="alprog"/>JABA Web Services Programs </h3>\r
 -<p>JABAWS currently provides access to the following programs:</p>\r
 +<p> JABAWS currently provides access to the following programs:</p>\r
  <p>Multiple Sequence Alignement </p>\r
  <ul>\r
    <li><a href="http://www.clustal.org/omega">Clustal Omega </a> (version 1.0.2)</li>\r
@@@ -114,23 -118,20 +116,33 @@@
  <ul>\r
    <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>\r
    </ul>\r
- <h3><a name="jaba2"></a>What is new in JABAWS 2.0.1? </h3>\r
- <p>Compared to JABAWS 1, JABAWS 2.0.1 offers a greater number and diversity of web services, Amazon EC2 integration and improved easy of use. It contains </p>\r
 -\r
 -<h3><a name="jaba2"></a>What is new in JABAWS 2.0.1? </h3>\r
 -<p>This release of JABAWS 2.0.1 is mostly bug fixing release. This is a list of bugs which have been fixed in JABAWS 2.0.1:</p>\r
++<h3><a name="jaba2.0.1"/></a>What is new in JABAWS 2.0.1? </h3>\r
++<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>\r
+ <ul>\r
+   <li>Disembl returned swapped strings for HOTLOOPS and REM465</li>\r
+   <li>Jronn failed to process jobs with more than 3 sequences</li>\r
 -  <li>JABAWS could not deal with FASTA records with the '&gt' symbols in the record identificator</li>\r
++  <li>JABAWS could not deal with FASTA records with '&gt' symbols in the record identificator</li>\r
+   <li>Change of parameter description for AAcon: parameters have been replaced with options for calculation methods. This allows a user to get several AAcon's conservation scores \r
+       in one call</li>\r
+   <li>JABAW never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer then a period defined in Engine.properties</li>\r
+   <li>Default web security has been incompatible with Tomcat 7.0.31 and newer</li>\r
+   </ul>\r
++  <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>\r
 +<ul><li>updates for all multiple sequence alignment services</li>\r
 +  <li>four new protein disorder prediction services</li>\r
 +  <li>Clustal Omega multiple sequence alignment web service</li>\r
 +  <li>amino acid conservation service</li>\r
 +  <li>web services execution statistics visualization </li>\r
-   <li>web services  status check from a web page</li>\r
++  <li>web services status check from a web page</li>\r
 +  <li>VirtualBox support was dropped in favour of VMware</li>\r
 +  <li>new WAR package for Mac users</li>\r
 +  <li>Amazon Machine Image (AMI) distributive to enable users to use JABAWS on the EC2 cloud</li>\r
 +  <li>Improved web services client API</li>\r
 +  <li>Simplified WAR package installation</li>\r
 +  </ul>\r
  \r
  <h3><a name="jabaclient" id="jabaclient"></a>What is JABAWS client?</h3>\r
 +\r
  <p>\r
    A JABAWS client is a program that lets you run the bioinformatics methods for which a JABAWS server provides web \r
    services. The most basic JABAWS client is a command line Java application which can call any of the JABAWS web \r

diff --cc website/manual_qs_amazon.html
Simple merge

diff --cc website/manual_qs_client.html
Simple merge

diff --cc website/manual_qs_va.html
Simple merge

diff --cc website/manual_qs_war.html
Simple merge

diff --cc website/quick_start.html
Simple merge