Merge branch 'develop' of https://source.jalview.org/git/jabaws into develop

[jabaws.git] / website / man_about.html

diff --git a/website/man_about.html b/website/man_about.html
index 1257b60..084288d 100644 (file)
--- a/website/man_about.html
+++ b/website/man_about.html
@@ -70,11 +70,11 @@
   collection of web services for bioinformatics, and currently provides services that make it easy \r
   to access well-known multiple sequence alignment and protein disorder prediction programs \r
   (see <a href="#alprog">the list of currently supported programs</a>) from <a href="http://www.jalview.org">Jalview</a>.\r
-  Future versions of JABAWS will incorporate many other tools.\r
+  Future versions of JABAWS will incorporate other tools.\r
 </p>\r
 <h4>Getting JABAWS</h4>\r
 <p>\r
-  JABAWS consists of a server and client, but unlike most bioinformatics web service systems, you can download and \r
+  JABAWS consists of a server and a client, but unlike most bioinformatics web service systems, you can download and \r
   run both parts on your own computer! If you want a server just for yourself, then download and install the JABAWS \r
   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
@@ -90,10 +90,10 @@
   <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
+  <li>Clients can submit jobs to any JABAWS servers that they 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>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
 \r
@@ -141,11 +141,11 @@ section (registration is required).
 <strong>JABAWS Version 2.1 (Released 1st Oct 2013)</strong>\r
 <p>Several new web services are available in this version of JABAWS:</p>\r
 <ul>\r
-       <li>Two multiple sequence aligners: MSAprobs and GLprobs. Both services return the standard Alignment object</li>\r
-       <li>RNAalifoldWS returns RNAStructScoreManager which is the standard ScoreManager objects with several additional methods.</li>\r
+       <li>Two multiple sequence aligners (MSAprobs and GLprobs), both services return the standard Alignment object</li>\r
+       <li>RNAalifoldWS returns RNAStructScoreManager, which is the standard ScoreManager objects with several additional methods</li>\r
        <li>\r
-               JpredWS returns the JpredAligment object which is the standard Alignment with additional methods for extracting \r
-               Jpred predictions. These predictions are supplied as additional sequences in the aligment.\r
+               JpredWS returns the JpredAligment object, which is the standard alignment with additional methods for extracting \r
+               Jpred predictions. These predictions are supplied as additional sequences in the aligment\r
        </li>\r
 </ul>\r
 \r
@@ -165,7 +165,7 @@ section (registration is required).
   <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>JABAWS 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>JABAWS never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer than a period defined in Engine.properties</li>\r
   <li>Default web security has been incompatible with Tomcat 7.0.31 and newer</li>\r
   <li>Documentation has been updated</li>\r
   </ul>\r
@@ -216,7 +216,7 @@ section (registration is required).
   page, and you can use this to automatically generate service bindings for your program. If you use Java \r
   you may wish to use our <a href="http://gjb-www-1.cluster.lifesci.dundee.ac.uk:8086/jabaws-dev">client package</a> to access JABAWS. \r
   This package is based on the autogenerated source code produced by <span class="hightlight">wsimport</span>, which \r
-  is the Java tool for creating web service bindings; but in addition, offers some additional methods which simplify \r
+  is the Java tool for creating web service bindings. In addition, this offers some additional methods that simplify \r
   working with JABAWS. For more information please refer to the <a href="dm_javadoc/index.html">data model javadoc</a>.\r
 </p>\r
 </div><!-- content end-->\r